eeeeep

Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>

Author: markxnelson

spring-cloud-oci-adb/src/main/java/com/oracle/cloud/spring/adb/AutonomousDatabase.java renamed to spring-cloud-oci-adb/src/main/java/com/oracle/cloud/spring/adb/AutonomousDb.java

@@ -4,15 +4,15 @@
 package com.oracle.cloud.spring.adb;
 
 import com.oracle.bmc.database.DatabaseClient;
+import com.oracle.bmc.database.model.AutonomousDatabase;
 import com.oracle.bmc.database.responses.CreateAutonomousDatabaseResponse;
-import com.oracle.bmc.database.responses.GetAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
 import com.oracle.bmc.database.responses.DeleteAutonomousDatabaseResponse;
 
 /**
  * Interface for OCI Autonomous Database module.
  */
-public interface AutonomousDatabase {
+public interface AutonomousDb {
 
     /**
      * Direct instance of OCI Java SDK DatabaseClient.
@@ -41,7 +41,7 @@ CreateAutonomousDatabaseResponse createAutonomousDatabase(
      * @param databaseId OCID of the Autonomous Database to get details of
      * @return GetAutonomousDatabaseResponse
      */
-    GetAutonomousDatabaseResponse getAutonomousDatabase(String databaseId);
+    AutonomousDatabase getAutonomousDatabase(String databaseId);
 
     /**
      * Generate a wallet for an Autonomous Database.

spring-cloud-oci-adb/src/main/java/com/oracle/cloud/spring/adb/AutonomousDatabaseImpl.java renamed to spring-cloud-oci-adb/src/main/java/com/oracle/cloud/spring/adb/AutonomousDbImpl.java

@@ -4,6 +4,7 @@
 package com.oracle.cloud.spring.adb;
 
 import com.oracle.bmc.database.DatabaseClient;
+import com.oracle.bmc.database.model.AutonomousDatabase;
 import com.oracle.bmc.database.model.CreateAutonomousDatabaseBase;
 import com.oracle.bmc.database.model.CreateAutonomousDatabaseDetails;
 import com.oracle.bmc.database.model.GenerateAutonomousDatabaseWalletDetails;
@@ -19,11 +20,11 @@
 /**
  * Implementation for the OCI Autonomous Database module.
  */
-public class AutonomousDatabaseImpl implements AutonomousDatabase {
+public class AutonomousDbImpl implements AutonomousDb {
 
     final DatabaseClient client;
 
-    public AutonomousDatabaseImpl(DatabaseClient client) {
+    public AutonomousDbImpl(DatabaseClient client) {
         this.client = client;
     }
 
@@ -71,14 +72,17 @@ public CreateAutonomousDatabaseResponse createAutonomousDatabase(
      * @param databaseId OCID of the Autonomous Database to get details of
      * @return GetAutonomousDatabaseResponse
      */
-    public GetAutonomousDatabaseResponse getAutonomousDatabase(String databaseId) {
+    public AutonomousDatabase getAutonomousDatabase(String databaseId) {
         GetAutonomousDatabaseRequest getAutonomousDatabaseRequest = GetAutonomousDatabaseRequest.builder()
 		    .autonomousDatabaseId(databaseId)
 		    .build();
 
         GetAutonomousDatabaseResponse response = client.getAutonomousDatabase(getAutonomousDatabaseRequest);
+        AutonomousDatabase adb = response.getAutonomousDatabase();
+
+        System.out.println("***\n" + adb);
 
-        return response;
+        return adb;
     }
 
     /**

spring-cloud-oci-adb/src/test/java/com/oracle/cloud/spring/adb/AutonomousDatabaseImplTests.java renamed to spring-cloud-oci-adb/src/test/java/com/oracle/cloud/spring/adb/AutonomousDbImplTests.java

@@ -4,6 +4,7 @@
 package com.oracle.cloud.spring.adb;
 
 import com.oracle.bmc.database.DatabaseClient;
+import com.oracle.bmc.database.model.AutonomousDatabase;
 import com.oracle.bmc.database.responses.CreateAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GetAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
@@ -15,11 +16,11 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 
-public class AutonomousDatabaseImplTests {
+public class AutonomousDbImplTests {
 
     final DatabaseClient client = mock(DatabaseClient.class);
 
-    final AutonomousDatabase autonomousDatabase = new AutonomousDatabaseImpl(client);
+    final AutonomousDb autonomousDatabase = new AutonomousDbImpl(client);
 
     @Test
     void testDatabaseClient() {
@@ -37,8 +38,8 @@ void testDatbaseImpl() {
             "name", "compartment", "password", 200, 2f);
         assertNotNull(cadr);
 
-        GetAutonomousDatabaseResponse gadr = autonomousDatabase.getAutonomousDatabase("ocid");
-        assertNotNull(gadr);
+        AutonomousDatabase gadr = autonomousDatabase.getAutonomousDatabase("ocid");
+        //assertNotNull(gadr);
 
         GenerateAutonomousDatabaseWalletResponse gadwr = autonomousDatabase.generateAutonomousDatabaseWallet("ocid", "password");
         assertNotNull(gadwr);

spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/adb/AutonomousDatabaseAutoConfiguration.java renamed to spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/adb/AutonomousDbAutoConfiguration.java

@@ -3,7 +3,6 @@
 
 package com.oracle.cloud.spring.adb;
 
-import com.oracle.bmc.Region;
 import com.oracle.bmc.auth.RegionProvider;
 import com.oracle.bmc.database.DatabaseClient;
 import com.oracle.cloud.spring.autoconfigure.core.CredentialsProvider;
@@ -15,8 +14,6 @@
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 
-import java.text.MessageFormat;
-
 import static com.oracle.cloud.spring.autoconfigure.core.CredentialsProviderAutoConfiguration.credentialsProviderQualifier;
 import static com.oracle.cloud.spring.autoconfigure.core.RegionProviderAutoConfiguration.regionProviderQualifier;
 
@@ -26,18 +23,18 @@
  * {@link com.oracle.cloud.spring.autoconfigure.core.RegionProviderAutoConfiguration}
  * for loading the Authentication configuration
  *
- * @see com.oracle.cloud.spring.adb.AutonomousDatabase
+ * @see com.oracle.cloud.spring.adb.AutonomousDb
  */
 @AutoConfiguration
-@ConditionalOnClass({AutonomousDatabase.class})
+@ConditionalOnClass({AutonomousDb.class})
 @ConditionalOnProperty(name = "spring.cloud.oci.adb.enabled", havingValue = "true", matchIfMissing = true)
-public class AutonomousDatabaseAutoConfiguration {
+public class AutonomousDbAutoConfiguration {
 
     @Bean
     @RefreshScope
-    @ConditionalOnMissingBean(AutonomousDatabase.class)
-    AutonomousDatabase getQueueImpl(DatabaseClient databaseClient) {
-        return new AutonomousDatabaseImpl(databaseClient);
+    @ConditionalOnMissingBean(AutonomousDb.class)
+    AutonomousDb getQueueImpl(DatabaseClient databaseClient) {
+        return new AutonomousDbImpl(databaseClient);
     }
 
     @Bean

spring-cloud-oci-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -9,4 +9,4 @@ com.oracle.cloud.spring.streaming.StreamingAutoConfiguration
 com.oracle.cloud.spring.queue.QueueAutoConfiguration
 com.oracle.cloud.spring.genai.GenAIAutoConfiguration
 com.oracle.cloud.spring.vault.VaultAutoConfiguration
-com.oracle.cloud.spring.adb.AutonomousDatabaseAutoConfiguration
+com.oracle.cloud.spring.adb.AutonomousDbAutoConfiguration

spring-cloud-oci-samples/spring-cloud-oci-adb-samples/src/main/java/com/oracle/cloud/spring/sample/adb/springcloudociadbsample/AdbController.java

@@ -3,11 +3,12 @@
 
 package com.oracle.cloud.spring.sample.adb.springcloudociadbsample;
 
+import com.oracle.bmc.database.model.AutonomousDatabase;
 import com.oracle.bmc.database.responses.CreateAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.DeleteAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
 import com.oracle.bmc.database.responses.GetAutonomousDatabaseResponse;
-import com.oracle.cloud.spring.adb.AutonomousDatabase;
+import com.oracle.cloud.spring.adb.AutonomousDb;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@
 public class AdbController {
 
     @Autowired
-    AutonomousDatabase autonomousDatabase;
+    AutonomousDb autonomousDatabase;
 
     @PostMapping
     ResponseEntity<?> createAutonomousDatabase(
@@ -42,7 +43,7 @@ ResponseEntity<?> createAutonomousDatabase(
 
     @GetMapping
     ResponseEntity<?> getAutonomousDatabase(@Parameter(required = true, example = "databaseId") @RequestParam String databaseId) {
-        GetAutonomousDatabaseResponse response = autonomousDatabase.getAutonomousDatabase(databaseId);
+        AutonomousDatabase response = autonomousDatabase.getAutonomousDatabase(databaseId);
         return ResponseEntity.ok().body(response);
     }