Skip to content

Commit 0df96c0

Browse files
andytaelandytael
committed
import cleanups
1 parent 26297d9 commit 0df96c0

File tree

19 files changed

+134
-31
lines changed

19 files changed

+134
-31
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77

88
import com.oracle.bmc.ClientRuntime;
99
import com.oracle.bmc.Region;
10-
import com.oracle.bmc.auth.*;
10+
import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
11+
import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
12+
import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
13+
import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider;
14+
import com.oracle.bmc.auth.SessionTokenAuthenticationDetailsProvider;
15+
import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
16+
import com.oracle.bmc.auth.SimplePrivateKeySupplier;
1117

1218
import java.io.IOException;
1319

‎spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/streaming/StreamingAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Streaming getStreamingImpl(Stream stream, StreamAdmin streamAdmin) {
4545
return new StreamingImpl(stream, streamAdmin);
4646
}
4747

48+
// TODO: StreamClient has been deprecated
4849
@Bean
4950
@RefreshScope
5051
@ConditionalOnMissingBean

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77

88
import com.oracle.bmc.Region;
99
import com.oracle.bmc.auth.RegionProvider;
10+
11+
import static org.junit.jupiter.api.Assertions.assertEquals;
12+
import static org.junit.jupiter.api.Assertions.assertFalse;
13+
import static org.junit.jupiter.api.Assertions.assertNull;
14+
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
1016
import org.junit.jupiter.api.Test;
1117
import org.springframework.boot.autoconfigure.AutoConfigurations;
1218
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1319
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
1420

15-
import static org.junit.jupiter.api.Assertions.*;
16-
1721
class RegionProviderAutoConfigurationTests {
1822
private final ApplicationContextRunner contextRunner =
1923
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import static org.junit.jupiter.api.Assertions.assertEquals;
2424
import static org.junit.jupiter.api.Assertions.assertNotNull;
2525
import static org.junit.jupiter.api.Assertions.assertTrue;
26-
import static org.mockito.Mockito.*;
26+
import static org.mockito.Mockito.mock;
27+
import static org.mockito.Mockito.mockStatic;
2728
import static org.mockito.Mockito.when;
2829

2930
public class FunctionAutoConfigurationTests {

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
import com.oracle.cloud.spring.autoconfigure.TestCommonConfigurationBeans;
1313
import com.oracle.cloud.spring.autoconfigure.core.CredentialsProvider;
1414
import com.oracle.cloud.spring.core.region.StaticRegionProvider;
15+
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertThrows;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
20+
import static org.mockito.Mockito.mock;
21+
import static org.mockito.Mockito.mockStatic;
22+
import static org.mockito.Mockito.when;
23+
1524
import org.junit.jupiter.api.Test;
1625
import org.mockito.MockedStatic;
1726
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -20,10 +29,6 @@
2029
import org.springframework.context.annotation.Bean;
2130
import org.springframework.context.annotation.Configuration;
2231

23-
24-
import static org.junit.jupiter.api.Assertions.*;
25-
import static org.mockito.Mockito.*;
26-
2732
class LoggingAutoConfigurationTests {
2833
private final ApplicationContextRunner contextRunner =
2934
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(LoggingAutoConfiguration.class,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import static org.junit.jupiter.api.Assertions.assertEquals;
2727
import static org.junit.jupiter.api.Assertions.assertNotNull;
2828
import static org.junit.jupiter.api.Assertions.assertTrue;
29-
import static org.mockito.Mockito.*;
29+
import static org.mockito.Mockito.mock;
30+
import static org.mockito.Mockito.mockStatic;
3031
import static org.mockito.Mockito.when;
3132

3233
class NotificationAutoConfigurationTests {

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
import com.oracle.cloud.spring.autoconfigure.TestCommonConfigurationBeans;
1313
import com.oracle.cloud.spring.autoconfigure.core.CredentialsProvider;
1414
import com.oracle.cloud.spring.core.region.StaticRegionProvider;
15+
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
19+
import static org.mockito.Mockito.mock;
20+
import static org.mockito.Mockito.mockStatic;
21+
import static org.mockito.Mockito.when;
22+
1523
import org.junit.jupiter.api.Test;
1624
import org.mockito.MockedStatic;
1725
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -20,9 +28,6 @@
2028
import org.springframework.context.annotation.Bean;
2129
import org.springframework.context.annotation.Configuration;
2230

23-
import static org.junit.jupiter.api.Assertions.*;
24-
import static org.mockito.Mockito.*;
25-
2631
class QueueAutoConfigurationTests {
2732
private final ApplicationContextRunner contextRunner =
2833
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(QueueAutoConfiguration.class,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import static org.junit.jupiter.api.Assertions.assertEquals;
2323
import static org.junit.jupiter.api.Assertions.assertNotNull;
2424
import static org.junit.jupiter.api.Assertions.assertTrue;
25-
import static org.mockito.Mockito.*;
25+
import static org.mockito.Mockito.mock;
26+
import static org.mockito.Mockito.mockStatic;
2627
import static org.mockito.Mockito.when;
2728

2829
class StorageAutoConfigurationTests {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.junit.jupiter.api.Test;
1515
import org.mockito.MockedConstruction;
1616
import org.mockito.MockedStatic;
17+
import org.mockito.Mockito;
1718
import org.springframework.boot.autoconfigure.AutoConfigurations;
1819
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
1920
import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
@@ -23,7 +24,9 @@
2324
import static org.junit.jupiter.api.Assertions.assertEquals;
2425
import static org.junit.jupiter.api.Assertions.assertNotNull;
2526
import static org.junit.jupiter.api.Assertions.assertTrue;
26-
import static org.mockito.Mockito.*;
27+
import static org.mockito.Mockito.mock;
28+
import static org.mockito.Mockito.mockConstruction;
29+
import static org.mockito.Mockito.mockStatic;
2730
import static org.mockito.Mockito.when;
2831

2932
class StreamingAutoConfigurationTests {
@@ -65,7 +68,7 @@ Stream stream() {
6568
try (MockedConstruction<StreamClient> mock =
6669
mockConstruction(StreamClient.class)) {
6770
CredentialsProvider credentialsProvider =
68-
mock(CredentialsProvider.class);
71+
Mockito.mock(CredentialsProvider.class);
6972
RegionProvider regionProvider = new StaticRegionProvider(Region.US_PHOENIX_1.getRegionId());
7073
stream = configuration.streamingClient(regionProvider,
7174
credentialsProvider);

‎spring-cloud-oci-notification/src/main/java/com/oracle/cloud/spring/notification/Notification.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
import com.oracle.bmc.ons.NotificationControlPlane;
99
import com.oracle.bmc.ons.NotificationDataPlane;
10-
import com.oracle.bmc.ons.responses.*;
10+
import com.oracle.bmc.ons.responses.CreateSubscriptionResponse;
11+
import com.oracle.bmc.ons.responses.CreateTopicResponse;
12+
import com.oracle.bmc.ons.responses.PublishMessageResponse;
1113

1214
/**
1315
* Interface for defining OCI logging module.

0 commit comments

Comments
 (0)