From e67b859ea1a122503853c98b3c7c8f945e062994 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Fri, 9 Sep 2022 14:55:02 +0530 Subject: [PATCH] refactor: add lombok to cache module --- .../infrastructure/cache/data/CacheData.java | 16 +++++++++------- .../cache/domain/PlatformCache.java | 19 ++++++++----------- .../domain/ConfigurationDomainServiceJpa.java | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/data/CacheData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/data/CacheData.java index 7f0240de6..f487b5544 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/data/CacheData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/data/CacheData.java @@ -18,21 +18,23 @@ */ package org.apache.fineract.infrastructure.cache.data; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.fineract.infrastructure.core.data.EnumOptionData; +@Data +@NoArgsConstructor +@Accessors(chain = true) public final class CacheData { @SuppressWarnings("unused") - private final EnumOptionData cacheType; + private EnumOptionData cacheType; @SuppressWarnings("unused") - private final boolean enabled; + private boolean enabled; public static CacheData instance(final EnumOptionData cacheType, final boolean enabled) { - return new CacheData(cacheType, enabled); + return new CacheData().setCacheType(cacheType).setEnabled(enabled); } - private CacheData(final EnumOptionData cacheType, final boolean enabled) { - this.cacheType = cacheType; - this.enabled = enabled; - } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/domain/PlatformCache.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/domain/PlatformCache.java index c6daf687e..a425dd066 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/domain/PlatformCache.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/domain/PlatformCache.java @@ -21,23 +21,23 @@ package org.apache.fineract.infrastructure.cache.domain; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.Accessors; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; @Entity @Table(name = "c_cache") +@Getter +@Setter +@NoArgsConstructor +@Accessors(chain = true) public class PlatformCache extends AbstractPersistableCustom { @Column(name = "cache_type_enum") private Integer cacheType; - protected PlatformCache() { - this.cacheType = null; - } - - public PlatformCache(final CacheType cacheType) { - this.cacheType = cacheType.getValue(); - } - public boolean isNoCachedEnabled() { return CacheType.fromInt(this.cacheType).isNoCache(); } @@ -50,7 +50,4 @@ public class PlatformCache extends AbstractPersistableCustom { return CacheType.fromInt(this.cacheType).isDistributedCache(); } - public void update(final CacheType cacheType) { - this.cacheType = cacheType.getValue(); - } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java index f7f7b5f1b..4657bab32 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java @@ -124,7 +124,7 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService @Override public void updateCache(final CacheType cacheType) { this.cacheTypeRepository.findById(1L).ifPresent(cache -> { - cache.update(cacheType); + cache.setCacheType(cacheType.getValue()); this.cacheTypeRepository.save(cache); }); }