Merge pull request #13 from oracle/topic_jjyoti_sync

Updating with latest code

Author: jjeewan

README.md

@@ -13,13 +13,22 @@ Spring Cloud for OCI, eases the integration with OCI services with the help of O
 
 All Spring Cloud for OCI artifacts are made available through Maven Central. Developers can bootstrap their application with Spring Initializr and add the OCI Support dependency. With Spring Cloud for OCI, the developers only need to add some annotations and a small number of configurations to connect Spring Cloud applications to the OCI services.
 
+## Spring Cloud OCI documentation
+
+For a deep dive into the project, refer to the Spring Cloud OCI documentation:
+
+| Version                | Reference Docs                                                                              | API Docs                                                                        |
+|------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
+| Spring Cloud OCI 1.0.0 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) | 
+
+
 ## Compatibility with Spring Project Versions
 
 This project has dependency and transitive dependencies on Spring Projects. The table below outlines the versions of Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Spring Cloud OCI version.
 
-| Spring Cloud OCI  | Spring Cloud    | Spring Boot         | Spring Framework | OCI Java SDK |
-|-------------------|-----------------|---------------------|------------------|--------------|
-| 1.0.0  	        | <to-be-checked> | 2.7.x, 3.0.x, 3.1.x | 5.3.23           | 3.19.0       |
+| Spring Cloud OCI  | Spring Cloud    | Spring Boot         | OCI Java SDK |
+|-------------------|-----------------|---------------------|--------------|
+| 1.0.0  	        | <to-be-checked> | 2.7.x, 3.0.x, 3.1.x  |  3.19.0      |
 
 
 ## Try out samples

pom.xml

@@ -33,7 +33,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
     </modules>
     <properties>
         <!-- spring-cloud-dependencies.version>2022.0.1</spring-cloud-dependencies.version -->
-        <spring-framework.version>5.3.23</spring-framework.version>
         <spring-boot-dependencies.version>2.7.4</spring-boot-dependencies.version>
         <oci-sdk.version>3.19.0</oci-sdk.version>
         <tomcat.version>8.0.33</tomcat.version>
@@ -140,13 +139,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${spring-framework.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

spring-cloud-oci-logging/src/main/java/com/oracle/cloud/spring/logging/LoggingSvc.java

@@ -28,6 +28,11 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
         <java.version>17</java.version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -36,6 +41,23 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>Jar-Tests-Package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>tests</classifier>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>

spring-cloud-oci-samples/spring-cloud-oci-common-sample/pom.xml

@@ -0,0 +1,37 @@
+/*
+ ** Copyright (c) 2023, Oracle and/or its affiliates.
+ ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+ */
+
+package com.oracle.cloud.spring.sample.common.base;
+
+
+
+import com.oracle.cloud.spring.sample.common.util.FileUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import java.io.File;
+
+/**
+ * Base class to be extended by Spring boot test classes
+ */
+
+public class SpringCloudSampleApplicationTestBase {
+
+	public static final String PRIVATE_KEY_PATH = "privateKey";
+	public static final String PRIVATE_KEY_CONTENT = "privateKeyContent";
+	public static final String privateKeyFilePath = System.getProperty("user.home") + File.separator + "privatekey.pem";
+	public static final String privateKeyContent = System.getProperty(PRIVATE_KEY_CONTENT) != null ? System.getProperty(PRIVATE_KEY_CONTENT) :
+			System.getenv().get(PRIVATE_KEY_CONTENT);
+	@BeforeAll
+	static void beforeAll() throws Exception {
+		System.setProperty(PRIVATE_KEY_PATH, privateKeyFilePath);
+		FileUtils.createFile(privateKeyFilePath, privateKeyContent.replace("\\n", "\n"));
+	}
+
+	@AfterAll
+	static void AfterAll() {
+		FileUtils.deleteFile(privateKeyFilePath);
+	}
+}

spring-cloud-oci-samples/spring-cloud-oci-common-sample/src/test/java/com/oracle/cloud/spring/sample/common/base/SpringCloudSampleApplicationTestBase.java

@@ -45,6 +45,13 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 			<artifactId>spring-cloud-oci-common-sample</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.oracle.cloud.spring.sample.common</groupId>
+			<artifactId>spring-cloud-oci-common-sample</artifactId>
+			<version>${project.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-ui</artifactId>
@@ -58,6 +65,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
 		</plugins>
 	</build>
 	<dependencyManagement>

spring-cloud-oci-samples/spring-cloud-oci-logging-sample/pom.xml

@@ -8,17 +8,14 @@
 import com.oracle.bmc.loggingingestion.responses.PutLogsResponse;
 
 import com.oracle.cloud.spring.logging.Logging;
-import com.oracle.cloud.spring.sample.common.util.FileUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import com.oracle.cloud.spring.sample.common.base.SpringCloudSampleApplicationTestBase;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.Assert;
 
-import java.io.File;
 
 /**
  * Environment variables needed to run this tests are :
@@ -28,31 +25,14 @@
 @SpringBootTest
 @EnabledIfSystemProperty(named = "it.logging", matches = "true")
 @TestPropertySource(locations="classpath:application-test.properties")
-class SpringCloudOciLoggingSampleApplicationTests {
-
-	public static final String PRIVATE_KEY_PATH = "privateKey";
-	public static final String PRIVATE_KEY_CONTENT = "privateKeyContent";
-	public static final String privateKeyFilePath = System.getProperty("user.home") + File.separator + "privatekey.pem";
-	public static final String privateKeyContent = System.getProperty(PRIVATE_KEY_CONTENT) != null ? System.getProperty(PRIVATE_KEY_CONTENT) :
-			System.getenv().get(PRIVATE_KEY_CONTENT);
-	@BeforeAll
-	static void beforeAll() throws Exception {
-		System.setProperty(PRIVATE_KEY_PATH, privateKeyFilePath);
-		FileUtils.createFile(privateKeyFilePath, privateKeyContent.replace("\\n", "\n"));
-	}
-
+class SpringCloudOciLoggingSampleApplicationTests extends SpringCloudSampleApplicationTestBase {
 	@Autowired
 	Logging logging;
 
 	@Test
 	void testLoggingApis() {
-
 		PutLogsResponse response = logging.putLogs("error starting logging application");
 		Assert.notNull(response.getOpcRequestId());
 	}
 
-	@AfterAll
-	static void AfterAll() {
-		FileUtils.deleteFile(privateKeyFilePath);
-	}
 }