Adjustment in the creation of Beans

Trendyol · Jun 24, 2023 · 2c26769 · 2c26769
1 parent e76544e
commit 2c26769
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/config/ConfigUtility.java b/Jdempotent-core/src/main/java/com/trendyol/jdempotent/core/config/ConfigUtility.java
@@ -5,6 +5,6 @@
 
 @Configuration
 public class ConfigUtility {
-    @Value("${jdempotent.cryptography.algorithm}")
+    @Value("${jdempotent.cryptography.algorithm:md5}")
     private String algorithm;
 }
diff --git a/...-starter/src/main/java/com/trendyol/jdempotent/redis/configuration/ApplicationConfig.java b/...-starter/src/main/java/com/trendyol/jdempotent/redis/configuration/ApplicationConfig.java
@@ -5,7 +5,9 @@
 import com.trendyol.jdempotent.core.callback.ErrorConditionalCallback;
 import com.trendyol.jdempotent.redis.repository.RedisIdempotentRepository;
 import org.springframework.beans.factory.annotation.Qualifier;
+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.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,8 +34,8 @@ public ApplicationConfig(RedisConfigProperties redisProperties) {
             prefix="jdempotent", name = "enable",
             havingValue = "true",
             matchIfMissing = true)
-    @ConditionalOnClass(ErrorConditionalCallback.class)
-    public IdempotentAspect getIdempotentAspect(@Qualifier("JdempotentRedisTemplate") RedisTemplate redisTemplate, ErrorConditionalCallback errorConditionalCallback) {
+    @ConditionalOnBean(ErrorConditionalCallback.class)
+    public IdempotentAspect getIdempotentAspectOnErrorConditionalCallback(@Qualifier("JdempotentRedisTemplate") RedisTemplate redisTemplate, ErrorConditionalCallback errorConditionalCallback) {
         return new IdempotentAspect(new RedisIdempotentRepository(redisTemplate, redisProperties), errorConditionalCallback);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -124,6 +124,27 @@
             <id>deploy</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <!-- Prevent `gpg` from using pinentry programs -->
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <!-- Javadoc plugin -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>