fix review comments

Author: jitendrazkumar

docs/src/main/asciidoc/logging.adoc

@@ -36,11 +36,11 @@ The `Logging` bean (link[Javadoc]) can be used to ingest logs associated with a
 [source,java]
 ----
 @Autowired
-private Logging logging;
+private LogService logService;
 
-public void putLogs() {
+public void putLog() {
 
-    PutLogsResponse response = logging.putLogs("log-text");
+    PutLogsResponse response = logService.putLog("log-text");
 }
 ----
 

pom.xml

@@ -35,14 +35,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
         <!-- spring-cloud-dependencies.version>2022.0.1</spring-cloud-dependencies.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>
-        <javax-mail.version>1.5.5</javax-mail.version>
-        <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <javax.activation.version>1.2.0</javax.activation.version>
-        <spring-cloud-commons.version>3.1.0</spring-cloud-commons.version>
-        <testcontainers.version>1.17.2</testcontainers.version>
-        <spotless.version>2.22.0</spotless.version>
-        <awssdk.version>2.17.172</awssdk.version>
+        <spring-boot-maven-plugin.version>3.1.2</spring-boot-maven-plugin.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
     </properties>

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

@@ -5,6 +5,7 @@
 
 package com.oracle.cloud.spring.autoconfigure.core;
 
+import com.oracle.bmc.ClientRuntime;
 import com.oracle.bmc.Region;
 import com.oracle.bmc.auth.AuthenticationDetailsProvider;
 import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
@@ -29,6 +30,8 @@
 @EnableConfigurationProperties(CredentialsProperties.class)
 public class CredentialsProviderAutoConfiguration {
 
+    public static final String USER_AGENT_SPRING_CLOUD = "Oracle-SpringCloud";
+
     public static final String credentialsProviderQualifier = "credentialsProvider";
 
     private static final String PROFILE_DEFAULT = "DEFAULT";
@@ -40,7 +43,7 @@ public CredentialsProviderAutoConfiguration(CredentialsProperties properties) {
 
     /**
      * Creates a Authentication provider based on {@link CredentialsProperties.ConfigType} type
-     * @return
+     * @return BasicAuthenticationDetailsProvider
      * @throws IOException
      */
     @Bean (name = credentialsProviderQualifier)
@@ -82,7 +85,7 @@ public static BasicAuthenticationDetailsProvider createCredentialsProvider(Crede
 
                 break;
         }
-
+        ClientRuntime.setClientUserAgent(USER_AGENT_SPRING_CLOUD);
         return authenticationDetailsProvider;
     }
 

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

@@ -7,6 +7,7 @@
 
 import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
 import com.oracle.bmc.auth.RegionProvider;
+import com.oracle.bmc.loggingingestion.Logging;
 import com.oracle.bmc.loggingingestion.LoggingClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -25,10 +26,10 @@
  *  {@link com.oracle.cloud.spring.autoconfigure.core.RegionProviderAutoConfiguration}
  *  for loading the Authentication configuration
  *
- * @see Logging
+ * @see LogService
  */
 @AutoConfiguration
-@ConditionalOnClass({Logging.class})
+@ConditionalOnClass({LogService.class})
 @EnableConfigurationProperties(LoggingProperties.class)
 @ConditionalOnProperty(name = "spring.cloud.oci.logging.enabled", havingValue = "true", matchIfMissing = true)
 public class LoggingAutoConfiguration {
@@ -40,17 +41,17 @@ public LoggingAutoConfiguration(LoggingProperties properties) {
     }
 
     @Bean
-    @ConditionalOnMissingBean(Logging.class)
-    Logging getLoggingImpl(com.oracle.bmc.loggingingestion.Logging logging) {
-        return new LoggingImpl(logging, properties.getLogId());
+    @ConditionalOnMissingBean(LogService.class)
+    LogService getLoggingImpl(Logging logging) {
+        return new LogServiceImpl(logging, properties.getLogId());
     }
 
     @Bean
     @ConditionalOnMissingBean
-    com.oracle.bmc.loggingingestion.Logging loggingClient(@Qualifier(regionProviderQualifier) RegionProvider regionProvider,
+    Logging loggingClient(@Qualifier(regionProviderQualifier) RegionProvider regionProvider,
                                                           @Qualifier(credentialsProviderQualifier)
                                                           BasicAuthenticationDetailsProvider adp) {
-        com.oracle.bmc.loggingingestion.Logging logging = new LoggingClient(adp);
+        Logging logging = new LoggingClient(adp);
         if (regionProvider.getRegion() != null) logging.setRegion(regionProvider.getRegion());
         return logging;
     }

spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/storage/StorageAutoConfiguration.java

@@ -42,10 +42,10 @@ public class StorageAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(Storage.class)
     @ConditionalOnBean(StorageObjectConverter.class)
-    Storage storageActions(ObjectStorageClient osClient, StorageOutputStreamProvider storageOutputStreamProvider,
-                           StorageObjectConverter storageObjectConverter, Optional<StorageContentTypeResolver> contentTypeResolver,
+    Storage storageActions(ObjectStorageClient osClient, StorageObjectConverter storageObjectConverter,
+                           Optional<StorageContentTypeResolver> contentTypeResolver,
                            CompartmentProvider compartmentProvider) {
-        return new StorageImpl(osClient, storageOutputStreamProvider, storageObjectConverter,
+        return new StorageImpl(osClient, storageObjectConverter,
                 contentTypeResolver.orElseGet(StorageContentTypeResolverImpl::new),
                 (compartmentProvider == null ? null : compartmentProvider.getCompartmentOCID()));
     }
@@ -60,13 +60,6 @@ ObjectStorageClient objectStorageClient(@Qualifier(regionProviderQualifier) Regi
         return osClient;
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    StorageOutputStreamProvider inMemoryBufferingStorageStreamProvider(ObjectStorageClient osClient) {
-        //TODO: Param ObjectContentTypeResolver is skipped
-        return new DefaultStorageOutputStreamProvider(osClient);
-    }
-
     @AutoConfiguration
     @ConditionalOnClass(ObjectMapper.class)
     static class JacksonJSONStorageObjectConverterConfiguration {

spring-cloud-oci-core/src/main/java/com/oracle/cloud/spring/core/util/OCIObjectMapper.java

@@ -19,9 +19,9 @@
 /**
  * ObjectMapper to convert an Object to a JSON String
  */
-public class OCIObjectMapper {
-    private static String DEFAULT_FILTER = "explicitlySetFilter";
-    private static String DEFAULT_TIME_ZONE = "GMT";
+public final class OCIObjectMapper {
+    private static final String DEFAULT_FILTER = "explicitlySetFilter";
+    private static final String DEFAULT_TIME_ZONE = "GMT";
 
     private static final ObjectMapper objectMapper = createObjectMapper(false);
 

spring-cloud-oci-logging/pom.xml

@@ -55,11 +55,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 			<groupId>com.oracle.oci.sdk</groupId>
 			<artifactId>oci-java-sdk-identity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-oci-logging/src/main/java/com/oracle/cloud/spring/logging/Logging.java renamed to spring-cloud-oci-logging/src/main/java/com/oracle/cloud/spring/logging/LogService.java

@@ -5,23 +5,24 @@
 
 package com.oracle.cloud.spring.logging;
 
+import com.oracle.bmc.loggingingestion.Logging;
 import com.oracle.bmc.loggingingestion.responses.PutLogsResponse;
 
 /**
  * Interface for defining OCI logging module
  */
-public interface Logging {
+public interface LogService {
 
     /**
      * Direct instance of OCI Java SDK Logging Client.
      * @return Logging
      */
-    com.oracle.bmc.loggingingestion.Logging getClient();
+    Logging getClient();
 
     /**
      * Ingest logs associated with a Log OCID
      * @param logText Content of the log to be ingested
-     * @return
+     * @return PutLogsResponse
      */
-    PutLogsResponse putLogs(String logText);
+    PutLogsResponse putLog(String logText);
 }

spring-cloud-oci-logging/src/main/java/com/oracle/cloud/spring/logging/LoggingImpl.java renamed to spring-cloud-oci-logging/src/main/java/com/oracle/cloud/spring/logging/LogServiceImpl.java

@@ -5,6 +5,7 @@
 
 package com.oracle.cloud.spring.logging;
 
+import com.oracle.bmc.loggingingestion.Logging;
 import com.oracle.bmc.loggingingestion.model.LogEntry;
 import com.oracle.bmc.loggingingestion.model.LogEntryBatch;
 import com.oracle.bmc.loggingingestion.model.PutLogsDetails;
@@ -19,17 +20,17 @@
 /**
  * Implementation for the OCI Logging module
  */
-public class LoggingImpl implements Logging {
+public class LogServiceImpl implements LogService {
 
     private final String logSpecVersion = "1.0";
     private final String logSource = "Spring application";
     private final String logType = "custom.application";
     private final String subject = "custom.logging";
 
-    private com.oracle.bmc.loggingingestion.Logging logging;
+    private final Logging logging;
 
-    private String logId;
-    public LoggingImpl(com.oracle.bmc.loggingingestion.Logging logging, String logId) {
+    private final String logId;
+    public LogServiceImpl(Logging logging, String logId) {
         this.logging = logging;
         this.logId = logId;
     }
@@ -40,16 +41,16 @@ public LoggingImpl(com.oracle.bmc.loggingingestion.Logging logging, String logId
      * @return Logging
      */
     @Override
-    public com.oracle.bmc.loggingingestion.Logging getClient() {
+    public Logging getClient() {
         return logging;
     }
 
     /**
      * Ingest logs associated with a Log OCID
      * @param logText Content of the log to be ingested
-     * @return
+     * @return PutLogsResponse
      */
-    public PutLogsResponse putLogs(String logText) {
+    public PutLogsResponse putLog(String logText) {
 
         PutLogsDetails putLogsDetails = PutLogsDetails.builder()
                 .specversion(logSpecVersion)

spring-cloud-oci-notification/pom.xml

@@ -54,11 +54,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 			<groupId>com.oracle.oci.sdk</groupId>
 			<artifactId>oci-java-sdk-identity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>