Merge pull request #9 from CodeCraftersCN/fix/#8

Adjusted the order of bean initialisations.

devkit-core/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>devkit-core</artifactId>

devkit-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>devkit-utils</artifactId>

guid/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>guid</artifactId>

pom.xml

@@ -29,7 +29,7 @@
 
     <groupId>cn.org.codecrafters</groupId>
     <artifactId>jdevkit</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <inceptionYear>2023</inceptionYear>
 
     <packaging>pom</packaging>

simple-jwt-authzero/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>simple-jwt-authzero</artifactId>

simple-jwt-facade/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>simple-jwt-facade</artifactId>

simple-jwt-jjwt/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>simple-jwt-jjwt</artifactId>

simple-jwt-spring-boot-starter/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>simple-jwt-spring-boot-starter</artifactId>

simple-jwt-spring-boot-starter/src/main/java/cn/org/codecrafters/simplejwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java

@@ -25,11 +25,13 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.DependsOn;
 
 /**
  * <p>
@@ -61,6 +63,8 @@ import org.springframework.context.annotation.Bean;
 @EnableConfigurationProperties(value = {SimpleJwtProperties.class})
 @ConditionalOnClass({DecodedJWT.class, AuthzeroTokenResolver.class})
 @ConditionalOnMissingBean({TokenResolver.class})
+@ConditionalOnBean(value = {GuidCreator.class}, name = "jtiCreator")
+@AutoConfigureAfter(value = GuidAutoConfiguration.class)
 public class AuthzeroTokenResolverAutoConfiguration {
 
     /**
@@ -96,7 +100,6 @@ public class AuthzeroTokenResolverAutoConfiguration {
      * @return the {@link TokenResolver} instance
      */
     @Bean
-    @ConditionalOnBean(value = {GuidCreator.class}, name = "jtiCreator")
     public TokenResolver<DecodedJWT> tokenResolver() {
         return new AuthzeroTokenResolver(
                 jtiCreator,

simple-jwt-spring-boot-starter/src/main/java/cn/org/codecrafters/simplejwt/autoconfiguration/GuidAutoConfiguration.java

@@ -18,10 +18,13 @@
 package cn.org.codecrafters.simplejwt.autoconfiguration;
 
 import cn.org.codecrafters.guid.GuidCreator;
+import cn.org.codecrafters.simplejwt.autoconfiguration.conditions.GuidCreatorCondition;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 
 import java.util.UUID;
 
@@ -32,10 +35,10 @@ import java.util.UUID;
  */
 @Slf4j
 @AutoConfiguration
-@ConditionalOnMissingBean(value = GuidCreator.class, name = "jtiCreator")
 public class GuidAutoConfiguration {
 
     @Bean
+    @Conditional(GuidCreatorCondition.class)
     public GuidCreator<?> jtiCreator() {
         return UUID::randomUUID;
     }

simple-jwt-spring-boot-starter/src/main/java/cn/org/codecrafters/simplejwt/autoconfiguration/JjwtTokenResolverAutoConfiguration.java

@@ -19,7 +19,6 @@ package cn.org.codecrafters.simplejwt.autoconfiguration;
 
 import cn.org.codecrafters.guid.GuidCreator;
 import cn.org.codecrafters.simplejwt.TokenResolver;
-import cn.org.codecrafters.simplejwt.authzero.AuthzeroTokenResolver;
 import cn.org.codecrafters.simplejwt.autoconfiguration.properties.SimpleJwtProperties;
 import cn.org.codecrafters.simplejwt.jjwt.JjwtTokenResolver;
 import io.jsonwebtoken.Claims;
@@ -27,6 +26,7 @@ import io.jsonwebtoken.Jws;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -63,6 +63,8 @@ import org.springframework.context.annotation.Bean;
 @EnableConfigurationProperties(value = {SimpleJwtProperties.class})
 @ConditionalOnClass({Jws.class, Claims.class, JjwtTokenResolver.class})
 @ConditionalOnMissingBean({TokenResolver.class})
+@ConditionalOnBean(value = {GuidCreator.class}, name = "jtiCreator")
+@AutoConfigureAfter(value = GuidAutoConfiguration.class)
 public class JjwtTokenResolverAutoConfiguration {
 
     /**
@@ -98,7 +100,6 @@ public class JjwtTokenResolverAutoConfiguration {
      * @return the {@link TokenResolver} instance
      */
     @Bean
-    @ConditionalOnBean(value = {GuidCreator.class}, name = "jtiCreator")
     public TokenResolver<Jws<Claims>> tokenResolver() {
         return new JjwtTokenResolver(
                 jtiCreator,

simple-jwt-spring-boot-starter/src/main/java/cn/org/codecrafters/simplejwt/autoconfiguration/conditions/GuidCreatorCondition.java

@@ -0,0 +1,29 @@
+package cn.org.codecrafters.simplejwt.autoconfiguration.conditions;
+
+import cn.org.codecrafters.guid.GuidCreator;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import java.util.Objects;
+
+/**
+ * GuidCreatorCondition
+ * <p>
+ * Created on 28 Aug 2023
+ *
+ * @author Zihlu Wang
+ */
+@Slf4j
+public class GuidCreatorCondition implements Condition {
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        final var beanFactory = Objects.requireNonNull(context.getBeanFactory());
+        var isContainJtiCreator = beanFactory.containsBean("jtiCreator");
+        if (isContainJtiCreator) {
+            return !(beanFactory.getBean("jtiCreator") instanceof GuidCreator<?>);
+        }
+        return true;
+    }
+}

webcal/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>webcal</artifactId>