From ec27fef4aa4ffb7b231a53c8f2d23c74b9d4e6b3 Mon Sep 17 00:00:00 2001 From: majewsk6 Date: Sun, 16 May 2021 20:16:33 +0200 Subject: [PATCH] BAEL-4871 Spring Conditional Annotations --- .../conditional/DevEnvLoggingConfiguration.java | 2 +- .../annotations/conditional/IsDevEnvCondition.java | 2 +- .../annotations/conditional/IsWindowsCondition.java | 4 ++-- .../baeldung/annotations/conditional/Java8Condition.java | 6 +++--- .../annotations/conditional/Java8DependedService.java | 2 +- .../baeldung/annotations/conditional/Java8OrJava9.java | 2 +- .../baeldung/annotations/conditional/Java9Condition.java | 6 +++--- .../baeldung/annotations/conditional/LoggingService.java | 9 ++++----- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java index c2134ab053..39f1d568f0 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java @@ -1,4 +1,4 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java index 6da17d68c5..7a866560c8 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java @@ -1,4 +1,4 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java index d7e492b5af..21702ed9b8 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java @@ -1,4 +1,4 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.apache.commons.lang3.SystemUtils; @@ -10,6 +10,6 @@ public class IsWindowsCondition implements Condition { @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { - return SystemUtils.IS_OS_WINDOWS;; + return SystemUtils.IS_OS_WINDOWS; } } diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java index a18093ce18..0d2ad56917 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java @@ -1,6 +1,6 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; -import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; +import org.springframework.boot.system.JavaVersion; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -9,6 +9,6 @@ public class Java8Condition implements Condition { @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { - return ConditionalOnJava.JavaVersion.getJavaVersion().equals(ConditionalOnJava.JavaVersion.EIGHT); + return JavaVersion.getJavaVersion().equals(JavaVersion.EIGHT); } } diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java index bd2bdff99a..ab76dcd930 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java @@ -1,4 +1,4 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.springframework.context.annotation.Conditional; import org.springframework.stereotype.Service; diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java index 9574c60ce1..77c501ed08 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java @@ -1,4 +1,4 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; import org.springframework.context.annotation.Conditional; diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java index 2f9c29d9ec..6a21be8bde 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java @@ -1,6 +1,6 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; -import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; +import org.springframework.boot.system.JavaVersion; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -9,6 +9,6 @@ public class Java9Condition implements Condition { @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { - return ConditionalOnJava.JavaVersion.getJavaVersion().equals(ConditionalOnJava.JavaVersion.NINE); + return JavaVersion.getJavaVersion().equals(JavaVersion.NINE); } } diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java index f51ca10b7e..1a65a16763 100644 --- a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java +++ b/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java @@ -1,20 +1,19 @@ -package java.com.baeldung.annotations.conditional; +package com.baeldung.annotations.conditional; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.system.JavaVersion; import org.springframework.context.annotation.Conditional; import org.springframework.stereotype.Service; @Service -@Conditional(IsDevEnvCondition.class) +@Conditional({IsDevEnvCondition.class, IsWindowsCondition.class, Java8Condition.class}) @ConditionalOnProperty( value = "logging.enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnExpression("${logging.enabled:true} and ${logging.level:DEBUG}") -@ConditionalOnJava(ConditionalOnJava.JavaVersion.EIGHT) -@Conditional(IsWindowsCondition.class) -@Conditional(Java8Condition.class) +@ConditionalOnJava(JavaVersion.EIGHT) public class LoggingService { }