Add more configuration properties

skjolber · skjolber · commit 596889e18c3e · 2025-02-05T17:58:50.000+01:00
diff --git a/azure/spring-boot-autoconfigure-azure-test/build.gradle b/azure/spring-boot-autoconfigure-azure-test/build.gradle
@@ -18,6 +18,8 @@ dependencies {
     api ("org.entur.jackson:jackson-syntax-highlight:${jacksonSyntaxHighlightVersion}")
     api ("org.entur.logback-logstash-syntax-highlighting-decorators:logback-logstash-syntax-highlighting-decorators:${logbackLogstashSyntaxHighlightingDecoratorsVersion}")
 
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+
     testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
 }
 
diff --git a/azure/spring-boot-autoconfigure-azure-test/src/main/java/no/entur/logging/cloud/azure/spring/test/LoggingStyleAutoConfiguration.java b/azure/spring-boot-autoconfigure-azure-test/src/main/java/no/entur/logging/cloud/azure/spring/test/LoggingStyleAutoConfiguration.java
@@ -13,11 +13,14 @@
 @ConditionalOnProperty(name = {"entur.logging.style"})
 public class LoggingStyleAutoConfiguration {
 
-    @Value("${entur.logging.style}") CompositeConsoleOutputType style;
+    @Value("${entur.logging.style}")
+    private CompositeConsoleOutputType style;
 
     @PostConstruct
     public void enforceStyle() {
-        CompositeConsoleOutputControl.setOutput(style);
+        if(style != null) {
+            CompositeConsoleOutputControl.setOutput(style);
+        }
     }
 
 }
diff --git a/azure/spring-boot-autoconfigure-azure-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/azure/spring-boot-autoconfigure-azure-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "entur.logging.style",
+      "type": "no.entur.logging.cloud.logback.logstash.test.CompositeConsoleOutputType"
+    }
+  ]
+}
diff --git a/gcp/spring-boot-autoconfigure-gcp-test/build.gradle b/gcp/spring-boot-autoconfigure-gcp-test/build.gradle
@@ -18,9 +18,16 @@ dependencies {
     api ("org.entur.jackson:jackson-syntax-highlight:${jacksonSyntaxHighlightVersion}")
     api ("org.entur.logback-logstash-syntax-highlighting-decorators:logback-logstash-syntax-highlighting-decorators:${logbackLogstashSyntaxHighlightingDecoratorsVersion}")
 
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+
     testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
 }
 
+tasks.named('compileJava') {
+    inputs.files(tasks.named('processResources'))
+}
+
+
 
 
 
diff --git a/gcp/spring-boot-autoconfigure-gcp-test/src/main/java/no/entur/logging/cloud/gcp/spring/test/LoggingStyleAutoConfiguration.java b/gcp/spring-boot-autoconfigure-gcp-test/src/main/java/no/entur/logging/cloud/gcp/spring/test/LoggingStyleAutoConfiguration.java
@@ -13,11 +13,14 @@
 @ConditionalOnProperty(name = {"entur.logging.style"})
 public class LoggingStyleAutoConfiguration {
 
-    @Value("${entur.logging.style}") CompositeConsoleOutputType style;
+    @Value("${entur.logging.style}")
+    private CompositeConsoleOutputType style;
 
     @PostConstruct
     public void enforceStyle() {
-        CompositeConsoleOutputControl.setOutput(style);
+        if(style != null) {
+            CompositeConsoleOutputControl.setOutput(style);
+        }
     }
 
 }
diff --git a/gcp/spring-boot-autoconfigure-gcp-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/gcp/spring-boot-autoconfigure-gcp-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "entur.logging.style",
+      "type": "no.entur.logging.cloud.logback.logstash.test.CompositeConsoleOutputType"
+    }
+  ]
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 #Fri Jan 31 09:40:22 UTC 2025
 org.gradle.jvmargs=-XX\:MaxMetaspaceSize\=512m -Xmx4g
-version=4.0.4-SNAPSHOT
+version=4.1.0-SNAPSHOT
 group=no.entur.logging.cloud

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ dependencies {`
`18`	`18`	`api ("org.entur.jackson:jackson-syntax-highlight:${jacksonSyntaxHighlightVersion}")`
`19`	`19`	`api ("org.entur.logback-logstash-syntax-highlighting-decorators:logback-logstash-syntax-highlighting-decorators:${logbackLogstashSyntaxHighlightingDecoratorsVersion}")`
`20`	`20`
	`21`	`+ annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"`
	`22`	`+`
`21`	`23`	`testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")`
`22`	`24`	`}`
`23`	`25`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,14 @@`
`13`	`13`	`@ConditionalOnProperty(name = {"entur.logging.style"})`
`14`	`14`	`public class LoggingStyleAutoConfiguration {`
`15`	`15`
`16`		`- @Value("${entur.logging.style}") CompositeConsoleOutputType style;`
	`16`	`+ @Value("${entur.logging.style}")`
	`17`	`+ private CompositeConsoleOutputType style;`
`17`	`18`
`18`	`19`	`@PostConstruct`
`19`	`20`	`public void enforceStyle() {`
`20`		`- CompositeConsoleOutputControl.setOutput(style);`
	`21`	`+ if(style != null) {`
	`22`	`+ CompositeConsoleOutputControl.setOutput(style);`
	`23`	`+ }`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`}`