Merge pull request #183 from devondragon/issue-182-FileAuditLogFlushScheduler-logs-despite-logEvents-being-disabled

Refactor conditional annotation in FileAuditLogFlushScheduler to use …

Author: devondragon

src/main/java/com/digitalsanctuary/spring/user/audit/FileAuditLogFlushScheduler.java

@@ -1,6 +1,6 @@
 package com.digitalsanctuary.spring.user.audit;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +13,7 @@
 @Slf4j
 @Component
 @RequiredArgsConstructor
-@ConditionalOnProperty(name = "user.audit.flushOnWrite", havingValue = "false")
+@ConditionalOnExpression("${user.audit.logEvents:true} && !${user.audit.flushOnWrite:true}")
 public class FileAuditLogFlushScheduler {
 
     /**