use spring props annotation processor (#15)

Author: andrey-vasilyev

build.gradle.kts

@@ -1,3 +1,4 @@
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
@@ -28,6 +29,10 @@ dependencyManagement {
 }
 
 dependencies {
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+    annotationProcessor(libs.lombok)
+    compileOnly(libs.lombok)
+
     implementation(libs.log4jdbc)
     implementation("jakarta.annotation:jakarta.annotation-api")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
@@ -73,6 +78,13 @@ tasks.jacocoTestReport {
         xml.required = true
         html.required = true
     }
+    classDirectories.setFrom(
+        files(classDirectories.files.map {
+            fileTree(it) {
+                exclude("**/Log4jdbcProperties*")
+            }
+        })
+    )
 }
 
 pmd {

src/main/java/ru/vasiand/spring/boot/log4jdbc/Log4jdbcAutoConfiguration.java

@@ -6,16 +6,19 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for log4jdbc.
  *
  */
 @AutoConfiguration(after = DataSourceAutoConfiguration.class)
+@EnableConfigurationProperties(Log4jdbcProperties.class)
 @ConditionalOnClass(DataSourceSpy.class)
 @ConditionalOnProperty(name = "log4jdbc.spy.enabled", havingValue = "true", matchIfMissing = true)
 public class Log4jdbcAutoConfiguration {
+
     @Bean
     public static Log4jdbcBeanPostProcessor log4jdbcBeanPostProcessor() {
         return new Log4jdbcBeanPostProcessor();

src/main/java/ru/vasiand/spring/boot/log4jdbc/Log4jdbcBeanPostProcessor.java

@@ -28,6 +28,8 @@
 
 import javax.sql.DataSource;
 
+import static ru.vasiand.spring.boot.log4jdbc.Log4jdbcProperties.PROPERTIES;
+
 /**
  * A {@link BeanPostProcessor} implementation that sets up log4jdbc logging.
  *
@@ -37,28 +39,6 @@ public class Log4jdbcBeanPostProcessor implements BeanPostProcessor {
     @Autowired
     private Environment environment;
 
-    private static final String[] PROPERTIES_TO_COPY = {
-            "log4jdbc.auto.load.popular.drivers",
-            "log4jdbc.debug.stack.prefix",
-            "log4jdbc.drivers",
-            "log4jdbc.dump.booleanastruefalse",
-            "log4jdbc.dump.fulldebugstacktrace",
-            "log4jdbc.dump.sql.addsemicolon",
-            "log4jdbc.dump.sql.create",
-            "log4jdbc.dump.sql.delete",
-            "log4jdbc.dump.sql.insert",
-            "log4jdbc.dump.sql.maxlinelength",
-            "log4jdbc.dump.sql.select",
-            "log4jdbc.dump.sql.update",
-            "log4jdbc.log4j2.properties.file",
-            "log4jdbc.sqltiming.error.threshold",
-            "log4jdbc.sqltiming.warn.threshold",
-            "log4jdbc.statement.warn",
-            "log4jdbc.suppress.generated.keys.exception",
-            "log4jdbc.trim.sql",
-            "log4jdbc.trim.sql.extrablanklines",
-            };
-
     @Override
     public Object postProcessBeforeInitialization(final Object bean, final String beanName) throws BeansException {
         if (bean instanceof DataSource) {
@@ -78,7 +58,7 @@ public Object postProcessAfterInitialization(final Object bean, final String bea
     public void postConstruct() {
         // Log4jdbc only reads configuration from system properties, so copy relevant environment property to system properties
         // See net.sf.log4jdbc.Properties.getProperties()
-        for (final String property : PROPERTIES_TO_COPY) {
+        for (final String property : PROPERTIES) {
             if (this.environment.containsProperty(property)) {
                 System.setProperty(property, this.environment.getRequiredProperty(property));
             }