fix: use @nullable instead of Optional in constructor parameter (#410)

Co-authored-by: Álvaro Sánchez-Mariscal <[email protected]>

.github/workflows/graalvm.yml

@@ -42,6 +42,7 @@ jobs:
           version: ${{ matrix.graalvm }}
           java-version: ${{ matrix.java }}
           components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Gradle
         uses: gradle/[email protected]
       - name: Build with Gradle

buildSrc/src/main/groovy/io.micronaut.build.internal.oraclecloud-base.gradle

@@ -25,6 +25,10 @@ tasks.withType(JavaCompile).configureEach {
     ])
 }
 
+micronautBuild {
+    checkstyleVersion = "10.5.0"
+}
+
 // configurations.all {
 //     resolutionStrategy.dependencySubstitution {
 //         substitute(module('commons-logging:commons-logging'))

config/checkstyle/checkstyle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
 
@@ -171,8 +171,8 @@
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
         <!--<module name="MagicNumber">-->
-            <!--<property name="ignoreFieldDeclaration" value="true"/>-->
-            <!--<property name="ignoreHashCodeMethod" value="true"/>-->
+        <!--<property name="ignoreFieldDeclaration" value="true"/>-->
+        <!--<property name="ignoreHashCodeMethod" value="true"/>-->
         <!--</module>-->
         <module name="MissingSwitchDefault"/>
         <module name="SimplifyBooleanExpression"/>

config/checkstyle/custom-suppressions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+    <suppress checks="DesignForExtension" files=".*docs-examples.*" />
+    <suppress checks="[a-zA-Z0-9]*" files="io[\\/]micronaut[\\/]oraclecloud[\\/]atp[\\/]wallet" />
+    <suppress checks="MissingJavadocType" files=".*doc-examples.*" />
+</suppressions>

oraclecloud-logging/src/main/java/io/micronaut/oraclecloud/logging/OracleCloudLoggingClient.java

@@ -22,14 +22,13 @@
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.oraclecloud.core.OracleCloudCoreFactory;
 import io.micronaut.runtime.ApplicationConfiguration;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
 import jakarta.annotation.PreDestroy;
 import jakarta.inject.Singleton;
 
-import java.util.Optional;
-
 /**
  * OracleCloudLoggingClient is a {@link Logging} client that is required for {@link OracleCloudAppender}.
  *
@@ -53,11 +52,10 @@ final class OracleCloudLoggingClient implements ApplicationEventListener<ServerS
 
     public OracleCloudLoggingClient(
             Logging logging, ApplicationConfiguration applicationConfiguration,
-            @Property(name = PREFIX + ".logId")
-     Optional<String> internalLogId) {
+            @Nullable @Property(name = PREFIX + ".logId") String internalLogId) {
         this.internalLogging = logging;
         this.internalAppName = applicationConfiguration.getName().orElse("");
-        this.internalLogId = internalLogId.orElse(null);
+        this.internalLogId = internalLogId;
     }
 
     static synchronized boolean isReady() {

oraclecloud-logging/src/test/groovy/io/micronaut/oraclecloud/logging/OracleCloudLoggingAppenderSpec.groovy

@@ -41,7 +41,7 @@ class OracleCloudLoggingAppenderSpec extends Specification {
 
         oracleCloudLogsClient = new OracleCloudLoggingSpec.MockLogging()
 
-        new OracleCloudLoggingClient(oracleCloudLogsClient, config, Optional.empty()).onApplicationEvent(serverStartupEvent)
+        new OracleCloudLoggingClient(oracleCloudLogsClient, config, null).onApplicationEvent(serverStartupEvent)
 
     }