diff --git a/caf-boot-starters/caf-boot-starter-lock/pom.xml b/caf-boot-starters/caf-boot-starter-lock/pom.xml index 3ec125397a25ddbfad22c43037bdaa7e18770c17..e839e256545bbc13f2b2656bb775d7ee4b0be525 100644 --- a/caf-boot-starters/caf-boot-starter-lock/pom.xml +++ b/caf-boot-starters/caf-boot-starter-lock/pom.xml @@ -44,6 +44,10 @@ io.iec.edp caf-lock-extension-jpa + + io.iec.edp + caf-msu-api + org.springframework.boot diff --git a/caf-boot-starters/caf-boot-starter-lock/src/main/java/io/iec/edp/caf/lock/config/LockServiceAutoConfiguration.java b/caf-boot-starters/caf-boot-starter-lock/src/main/java/io/iec/edp/caf/lock/config/LockServiceAutoConfiguration.java index 03ce6594683ba4ac7dd98f04659f2a96472af8b7..102e4b88f0926de71e477c55bf324935c990c630 100644 --- a/caf-boot-starters/caf-boot-starter-lock/src/main/java/io/iec/edp/caf/lock/config/LockServiceAutoConfiguration.java +++ b/caf-boot-starters/caf-boot-starter-lock/src/main/java/io/iec/edp/caf/lock/config/LockServiceAutoConfiguration.java @@ -23,6 +23,7 @@ import io.iec.edp.caf.lock.service.api.api.DistributedLockFactory; import io.iec.edp.caf.lock.service.api.api.LockExtension; import io.iec.edp.caf.lock.service.api.api.LockService; import io.iec.edp.caf.lock.service.api.repositories.BatchLockRepo; +import io.iec.edp.caf.lock.service.api.repositories.DistributedLockRepo; import io.iec.edp.caf.lock.service.api.repositories.LockRepo; import io.iec.edp.caf.lock.service.memory.MemoryLockFactory; import io.iec.edp.caf.lock.service.memory.MemoryLockFactoryImpl; @@ -32,6 +33,7 @@ import io.iec.edp.caf.lock.service.redis.DistributedLockServiceImpl; import io.iec.edp.caf.lock.service.redis.DistributedLocksFactory; import io.iec.edp.caf.lockservice.api.IDistributedLockFactory; import io.iec.edp.caf.lockservice.api.ILockService; +import io.iec.edp.caf.msu.api.entity.MsuProperties; import org.redisson.api.RedissonClient; import org.redisson.config.ClusterServersConfig; import org.redisson.config.Config; @@ -75,9 +77,9 @@ public class LockServiceAutoConfiguration { @Bean @ConditionalOnExpression("#{!'false'.equals(environment['redis.enabled'])}") - public DistributedLockFactory getStandardDistributedLockFactory(RedissonClient redisson,RedisLockProperties redisLockProperties) { + public DistributedLockFactory getStandardDistributedLockFactory(RedissonClient redisson, RedisLockProperties redisLockProperties, MsuProperties configuration, DistributedLockRepo distributedLockRepo) { Config config =getRedissonConfig(redisson,redisLockProperties); - return new DistributedLockFactoryImpl(config); + return new DistributedLockFactoryImpl(config,configuration,distributedLockRepo); } @Bean @@ -103,9 +105,9 @@ public class LockServiceAutoConfiguration { @Bean // @ConditionalOnMissingBean @ConditionalOnExpression("#{!'false'.equals(environment['redis.enabled'])}") - public IDistributedLockFactory getOldStandardDistributedLockFactory(RedissonClient redisson, RedisLockProperties redisLockProperties) { + public IDistributedLockFactory getOldStandardDistributedLockFactory(RedissonClient redisson, RedisLockProperties redisLockProperties, MsuProperties configuration, DistributedLockRepo distributedLockRepo) { Config config = getRedissonConfig(redisson,redisLockProperties); - return new DistributedLocksFactory(config); + return new DistributedLocksFactory(config,configuration,distributedLockRepo); } @Bean