Skip to content

Commit a040cf6

Browse files
jitendrazkumarjitendrazkumar
authored
Merge pull request #27 from oracle/topic_sync_codeimprovement
code improvement
2 parents f5b1ebb + 63bd43c commit a040cf6

File tree

20 files changed

+78
-85
lines changed

20 files changed

+78
-85
lines changed

‎spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProviderAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public CredentialsProviderAutoConfiguration(CredentialsProperties properties) {
4343
}
4444

4545
/**
46-
* Creates a Authentication provider based on {@link CredentialsProperties.ConfigType} type
46+
* Creates an Authentication provider based on {@link CredentialsProperties.ConfigType} type
4747
* @return BasicAuthenticationDetailsProvider
4848
* @throws IOException
4949
*/

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/TestCommonConfigurationBeans.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
@Configuration
1717
public class TestCommonConfigurationBeans {
1818
@Bean
19-
public BasicAuthenticationDetailsProvider credentialsProvider() {
19+
BasicAuthenticationDetailsProvider credentialsProvider() {
2020
return mock(BasicAuthenticationDetailsProvider.class);
2121
}
2222

2323
@Bean
24-
public RegionProvider regionProvider() {
24+
RegionProvider regionProvider() {
2525
return mock(RegionProvider.class);
2626
}
2727

2828
@Bean
29-
public CompartmentProvider compartmentProvider() {
29+
CompartmentProvider compartmentProvider() {
3030
return mock(CompartmentProvider.class);
3131
}
3232

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/core/CompartmentProviderAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1111
import org.springframework.util.Assert;
1212

13-
public class CompartmentProviderAutoConfigurationTests {
14-
private ApplicationContextRunner contextRunner =
13+
class CompartmentProviderAutoConfigurationTests {
14+
private final ApplicationContextRunner contextRunner =
1515
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(
1616
CompartmentProviderAutoConfiguration.class));
1717

1818
@Test
1919
void testConfigurationValueDefaultsAreAsExpected() {
20-
this.contextRunner
20+
contextRunner
2121
.run(
2222
context -> {
2323
CompartmentProperties config = context.getBean(CompartmentProperties.class);
@@ -28,7 +28,7 @@ void testConfigurationValueDefaultsAreAsExpected() {
2828

2929
@Test
3030
void testConfigurationValueConfiguredAreAsExpected() {
31-
this.contextRunner
31+
contextRunner
3232
.withPropertyValues("spring.cloud.oci.compartment.static=demoCompartment")
3333
.run(
3434
context -> {

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProviderAutoConfigurationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
import static org.mockito.Mockito.mock;
1717

18-
public class CredentialsProviderAutoConfigurationTests {
19-
private ApplicationContextRunner contextRunner =
18+
class CredentialsProviderAutoConfigurationTests {
19+
private final ApplicationContextRunner contextRunner =
2020
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(
2121
CredentialsProviderAutoConfiguration.class)).withUserConfiguration(TestConfigurationBean.class);
2222

2323
@Test
2424
void testConfigurationValueDefaultsAreAsExpected() {
25-
this.contextRunner
25+
contextRunner
2626
.run(
2727
context -> {
2828
CredentialsProperties config = context.getBean(CredentialsProperties.class);
@@ -34,7 +34,7 @@ void testConfigurationValueDefaultsAreAsExpected() {
3434

3535
@Test
3636
void testConfigurationValueConfiguredAreAsExpected() {
37-
this.contextRunner
37+
contextRunner
3838
.withPropertyValues("spring.cloud.oci.config.type=SIMPLE")
3939
.withPropertyValues("spring.cloud.oci.config.userId=userId")
4040
.withPropertyValues("spring.cloud.oci.config.tenantId=tenantId")
@@ -62,7 +62,7 @@ void testConfigurationValueConfiguredAreAsExpected() {
6262
@Configuration
6363
static class TestConfigurationBean {
6464
@Bean
65-
public BasicAuthenticationDetailsProvider credentialsProvider() {
65+
BasicAuthenticationDetailsProvider credentialsProvider() {
6666
return mock(BasicAuthenticationDetailsProvider.class);
6767
}
6868
}

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/core/RegionProviderAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1111
import org.springframework.util.Assert;
1212

13-
public class RegionProviderAutoConfigurationTests {
14-
private ApplicationContextRunner contextRunner =
13+
class RegionProviderAutoConfigurationTests {
14+
private final ApplicationContextRunner contextRunner =
1515
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(
1616
RegionProviderAutoConfiguration.class));
1717

1818
@Test
1919
void testConfigurationValueDefaultsAreAsExpected() {
20-
this.contextRunner
20+
contextRunner
2121
.run(
2222
context -> {
2323
RegionProperties config = context.getBean(RegionProperties.class);
@@ -28,7 +28,7 @@ void testConfigurationValueDefaultsAreAsExpected() {
2828

2929
@Test
3030
void testConfigurationValueConfiguredAreAsExpected() {
31-
this.contextRunner
31+
contextRunner
3232
.withPropertyValues("spring.cloud.oci.region.static=us-phoenix-1")
3333
.run(
3434
context -> {

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/logging/LoggingAutoConfigurationTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import static org.mockito.Mockito.mock;
1818

19-
public class LoggingAutoConfigurationTests {
20-
private ApplicationContextRunner contextRunner =
19+
class LoggingAutoConfigurationTests {
20+
private final ApplicationContextRunner contextRunner =
2121
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(LoggingAutoConfiguration.class))
2222
.withUserConfiguration(TestCommonConfigurationBeans.class)
2323
.withUserConfiguration(TestSpecificConfigurationBeans.class);
2424

2525
@Test
2626
void testConfigurationValueDefaultsAreAsExpected() {
27-
this.contextRunner
27+
contextRunner
2828
.run(
2929
context -> {
3030
LoggingProperties config = context.getBean(LoggingProperties.class);
@@ -34,7 +34,7 @@ void testConfigurationValueDefaultsAreAsExpected() {
3434

3535
@Test
3636
void testConfigurationValueConfiguredAreAsExpected() {
37-
this.contextRunner
37+
contextRunner
3838
.withPropertyValues("spring.cloud.oci.logging.logId=demoLogId")
3939
.run(
4040
context -> {
@@ -45,7 +45,7 @@ void testConfigurationValueConfiguredAreAsExpected() {
4545

4646
@Test
4747
void testConfigurationDefaultsAreAsExpected() {
48-
this.contextRunner
48+
contextRunner
4949
.run(
5050
context -> {
5151
String[] logServiceBeanNames = context.getBeanNamesForType(LogService.class);
@@ -57,7 +57,7 @@ void testConfigurationDefaultsAreAsExpected() {
5757

5858
@Test
5959
void testConfigurationConfiguredAreAsExpected() {
60-
this.contextRunner
60+
contextRunner
6161
.withPropertyValues("spring.cloud.oci.logging.enabled=false")
6262
.run(
6363
context -> {
@@ -69,7 +69,7 @@ void testConfigurationConfiguredAreAsExpected() {
6969
@Configuration
7070
static class TestSpecificConfigurationBeans {
7171
@Bean
72-
public Logging logging() {
72+
Logging logging() {
7373
return mock(Logging.class);
7474
}
7575
}

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/notification/NotificationAutoConfigurationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
import static org.mockito.Mockito.mock;
1919

20-
public class NotificationAutoConfigurationTests {
21-
private ApplicationContextRunner contextRunner =
20+
class NotificationAutoConfigurationTests {
21+
private final ApplicationContextRunner contextRunner =
2222
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(NotificationAutoConfiguration.class))
2323
.withUserConfiguration(TestCommonConfigurationBeans.class)
2424
.withUserConfiguration(TestSpecificConfigurationBeans.class);
2525

2626
@Test
2727
void testConfigurationDefaultsAreAsExpected() {
28-
this.contextRunner
28+
contextRunner
2929
.run(
3030
context -> {
3131
String[] notificationBeanNames = context.getBeanNamesForType(Notification.class);
@@ -37,7 +37,7 @@ void testConfigurationDefaultsAreAsExpected() {
3737

3838
@Test
3939
void testConfigurationConfiguredAreAsExpected() {
40-
this.contextRunner
40+
contextRunner
4141
.withPropertyValues("spring.cloud.oci.notification.enabled=false")
4242
.run(
4343
context -> {
@@ -49,12 +49,12 @@ void testConfigurationConfiguredAreAsExpected() {
4949
@Configuration
5050
static class TestSpecificConfigurationBeans {
5151
@Bean
52-
public NotificationDataPlane notificationDPClient() {
52+
NotificationDataPlane notificationDPClient() {
5353
return mock(NotificationDataPlane.class);
5454
}
5555

5656
@Bean
57-
public NotificationControlPlane notificationCPClient() {
57+
NotificationControlPlane notificationCPClient() {
5858
return mock(NotificationControlPlane.class);
5959
}
6060
}

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/storage/StorageAutoConfigurationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import static org.mockito.Mockito.mock;
1818

19-
public class StorageAutoConfigurationTests {
20-
private ApplicationContextRunner contextRunner =
19+
class StorageAutoConfigurationTests {
20+
private final ApplicationContextRunner contextRunner =
2121
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(StorageAutoConfiguration.class))
2222
.withUserConfiguration(TestCommonConfigurationBeans.class)
2323
.withUserConfiguration(TestSpecificConfigurationBeans.class);
2424

2525
@Test
2626
void testConfigurationValueDefaultsAreAsExpected() {
27-
this.contextRunner
27+
contextRunner
2828
.run(
2929
context -> {
3030
String[] storageBeanNames = context.getBeanNamesForType(Storage.class);
@@ -36,7 +36,7 @@ void testConfigurationValueDefaultsAreAsExpected() {
3636

3737
@Test
3838
void testConfigurationValueConfiguredAreAsExpected() {
39-
this.contextRunner
39+
contextRunner
4040
.withPropertyValues("spring.cloud.oci.storage.enabled=false")
4141
.run(
4242
context -> {
@@ -48,7 +48,7 @@ void testConfigurationValueConfiguredAreAsExpected() {
4848
@Configuration
4949
static class TestSpecificConfigurationBeans {
5050
@Bean
51-
public ObjectStorageClient objectStorageClient() {
51+
ObjectStorageClient objectStorageClient() {
5252
return mock(ObjectStorageClient.class);
5353
}
5454

‎spring-cloud-oci-core/src/test/java/com/oracle/cloud/spring/core/compartment/CompartmentProviderTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import org.junit.jupiter.api.Test;
99
import static org.junit.jupiter.api.Assertions.*;
1010

11-
public class CompartmentProviderTests {
11+
class CompartmentProviderTests {
1212

1313
@Test
14-
public void testCompartmentProviderWithNullCompartmentId(){
14+
void testCompartmentProviderWithNullCompartmentId(){
1515
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
1616
new StaticCompartmentProvider(null);
1717
});
@@ -22,7 +22,7 @@ public void testCompartmentProviderWithNullCompartmentId(){
2222
}
2323

2424
@Test
25-
public void testCompartmentProviderWithCompartmentId(){
25+
void testCompartmentProviderWithCompartmentId(){
2626

2727
CompartmentProvider compartmentProvider =
2828
new StaticCompartmentProvider("dummyCompartmentId");

‎spring-cloud-oci-core/src/test/java/com/oracle/cloud/spring/core/region/RegionProviderTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
import static org.junit.jupiter.api.Assertions.*;
1111

12-
public class RegionProviderTests {
12+
class RegionProviderTests {
1313

1414
@Test
15-
public void testInvalidRegion(){
15+
void testInvalidRegion(){
1616
final String region = "foo";
1717
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
1818
new StaticRegionProvider(region);
@@ -24,7 +24,7 @@ public void testInvalidRegion(){
2424
}
2525

2626
@Test
27-
public void testValidRegion(){
27+
void testValidRegion(){
2828
final String region = "us-ashburn-1";
2929
StaticRegionProvider regionProvider = new StaticRegionProvider(region);
3030

0 commit comments

Comments
 (0)