Added start and stop method to ADB controller

Author: ldemarchis

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

@@ -6,6 +6,8 @@
 import com.oracle.bmc.database.DatabaseClient;
 import com.oracle.bmc.database.responses.CreateAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
+import com.oracle.bmc.database.responses.StartAutonomousDatabaseResponse;
+import com.oracle.bmc.database.responses.StopAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.DeleteAutonomousDatabaseResponse;
 
 /**
@@ -60,4 +62,19 @@ CreateAutonomousDatabaseResponse createAutonomousDatabase(
      */
     DeleteAutonomousDatabaseResponse deleteAutonomousDatabase(String databaseId);
 
+    /**
+     * Start an Autonomous Database.
+     * 
+     * @param databaseId OCID of the Autonomous Database to be started
+     * @return StartAutonomousDatabaseResponse
+     */
+    StartAutonomousDatabaseResponse startAutonomousDatabase(String databaseId);
+
+    /**
+     * Stop an Autonomous Database.
+     * 
+     * @param databaseId OCID of the Autonomous Database to be stopped
+     * @return StopAutonomousDatabaseResponse
+     */
+    StopAutonomousDatabaseResponse stopAutonomousDatabase(String databaseId);
 }

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

@@ -12,10 +12,14 @@
 import com.oracle.bmc.database.responses.GetAutonomousDatabaseResponse;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
 import com.oracle.bmc.database.responses.DeleteAutonomousDatabaseResponse;
+import com.oracle.bmc.database.responses.StartAutonomousDatabaseResponse;
+import com.oracle.bmc.database.responses.StopAutonomousDatabaseResponse;
 import com.oracle.bmc.database.requests.GetAutonomousDatabaseRequest;
 import com.oracle.bmc.database.requests.GenerateAutonomousDatabaseWalletRequest;
 import com.oracle.bmc.database.requests.CreateAutonomousDatabaseRequest;
 import com.oracle.bmc.database.requests.DeleteAutonomousDatabaseRequest;
+import com.oracle.bmc.database.requests.StartAutonomousDatabaseRequest;
+import com.oracle.bmc.database.requests.StopAutonomousDatabaseRequest;
 
 /**
  * Implementation for the OCI Autonomous Database module.
@@ -137,5 +141,21 @@ public DeleteAutonomousDatabaseResponse deleteAutonomousDatabase(String database
 
         return response;
     }
+    @Override
+    public StartAutonomousDatabaseResponse startAutonomousDatabase(String databaseId) {
+        return getDatabaseClient().startAutonomousDatabase(
+            StartAutonomousDatabaseRequest.builder()
+                .autonomousDatabaseId(databaseId)
+                .build()
+        );
+    }
 
+    @Override
+    public StopAutonomousDatabaseResponse stopAutonomousDatabase(String databaseId) {
+        return getDatabaseClient().stopAutonomousDatabase(
+            StopAutonomousDatabaseRequest.builder()
+                .autonomousDatabaseId(databaseId)
+                .build()
+        );
+    }
 }

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

@@ -6,10 +6,15 @@
 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.StartAutonomousDatabaseResponse;
+import com.oracle.bmc.database.responses.StopAutonomousDatabaseResponse;
 import com.oracle.cloud.spring.adb.AutonomousDb;
 import com.oracle.cloud.spring.adb.AutonomousDbDetails;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
@@ -40,7 +45,15 @@ ResponseEntity<?> createAutonomousDatabase(
     ) {
         CreateAutonomousDatabaseResponse response = autonomousDatabase.createAutonomousDatabase(
             databaseName, compartmentId, adminPassword, displayName, dataStorageSizeInGBs, computeCount);
-        return ResponseEntity.accepted().body("opcRequestId : " + response.getOpcRequestId());
+        var adb = response.getAutonomousDatabase();
+    var result = Map.of(
+        "opcRequestId", response.getOpcRequestId(),
+        "autonomousDatabaseOcid", adb.getId(),
+        "displayName", adb.getDisplayName(),
+        "lifecycleState", adb.getLifecycleState().getValue()
+    );
+
+    return ResponseEntity.accepted().body(result);
     }
 
     @GetMapping
@@ -67,4 +80,30 @@ ResponseEntity<?> deleteAutonomousDatabase(@Parameter(required = true, example =
         return ResponseEntity.ok().body("opcRequestId for deleting the database : " +response.getOpcRequestId());
     }
 
+    @PostMapping("/start")
+    ResponseEntity<?> startAutonomousDatabase(@Parameter(required = true, example = "databaseId") @RequestParam String databaseId) {
+        StartAutonomousDatabaseResponse response = autonomousDatabase.startAutonomousDatabase(databaseId);
+        var adb = response.getAutonomousDatabase();
+        var result = Map.of(
+            "opcRequestId", response.getOpcRequestId(),
+            "autonomousDatabaseOcid", adb.getId(),
+            "displayName", adb.getDisplayName(),
+            "lifecycleState", adb.getLifecycleState().getValue()
+        );
+        return ResponseEntity.accepted().body(result);
+    }
+
+    @PostMapping("/stop")
+    ResponseEntity<?> stopAutonomousDatabase(@Parameter(required = true, example = "databaseId") @RequestParam String databaseId) {
+        StopAutonomousDatabaseResponse response = autonomousDatabase.stopAutonomousDatabase(databaseId);
+        var adb = response.getAutonomousDatabase();
+        var result = Map.of(
+            "opcRequestId", response.getOpcRequestId(),
+            "autonomousDatabaseOcid", adb.getId(),
+            "displayName", adb.getDisplayName(),
+            "lifecycleState", adb.getLifecycleState().getValue()
+        );
+        return ResponseEntity.accepted().body(result);
+    }
+
 }

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-adb-sample/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # Copyright (c) 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-spring.cloud.oci.region.static = us-phoenix-1
-spring.cloud.oci.config.type = file
+spring.cloud.oci.config.type = file
+spring.cloud.oci.config.profile = DEFAULT

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-gen-ai-sample/src/main/resources/application.properties

@@ -10,6 +10,5 @@ spring.cloud.oci.genai.embedding.enabled=true
 spring.cloud.oci.genai.embedding.compartment=${OCI_COMPARTMENT_ID}
 spring.cloud.oci.genai.chat.compartment=${OCI_COMPARTMENT_ID}
 
-spring.cloud.oci.genai.chat.onDemandModelId=${OCI_CHAT_MODEL_ID}
-spring.cloud.oci.genai.embedding.onDemandModelId=${OCI_EMBEDDING_MODEL_ID}
-
+spring.cloud.oci.genai.chat.onDemandModelId=cohere.command-r-plus-08-2024
+spring.cloud.oci.genai.embedding.onDemandModelId=cohere.embed-v4.0