diff --git a/build.gradle b/build.gradle index 4fb14b7..86deb20 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } //버전 변경은 여기서 -def commonVer = "beta.1.0.61" +def commonVer = "beta.1.0.63" group = 'com.kri.common' version = commonVer diff --git a/src/main/java/com/kri/common/cache/AbstractListCache.java b/src/main/java/com/kri/common/cache/AbstractListCache.java index b010fc9..9cbc6b4 100644 --- a/src/main/java/com/kri/common/cache/AbstractListCache.java +++ b/src/main/java/com/kri/common/cache/AbstractListCache.java @@ -4,6 +4,8 @@ import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -15,7 +17,8 @@ public abstract class AbstractListCache { @EventListener(ApplicationReadyEvent.class) @Transactional(readOnly = true) public void loadOnStartup() { - doReload(); + List tempList = loadFromDb(); + if(tempList != null) setList(tempList); } public List getList() { @@ -29,20 +32,84 @@ public abstract class AbstractListCache { @Transactional(readOnly = true) public List reload() { - doReload(); + List tempList = loadFromDb(); + if(tempList == null) { + throw new UnsupportedOperationException("This cache does not support reload()."); + } + setList(tempList); return getList(); } - // 서브클래스가 "DB에서 뭘 읽어올지"만 구현 - protected abstract List loadFromDb(); - - private void doReload() { + public List clear() { lock.writeLock().lock(); - try { - this.list = List.copyOf(loadFromDb()); // 불변 리스트로 교체 + try{ + return list = List.of(); } finally { lock.writeLock().unlock(); } } + + public void setList(List next) { + lock.writeLock().lock(); + try { + this.list = List.copyOf(next == null ? List.of() : next); + } finally { + lock.writeLock().unlock(); + } + } + + public void addAll(List items) { + if (items == null || items.isEmpty()) return; + lock.writeLock().lock(); + try { + List merged = new java.util.ArrayList<>(this.list); + merged.addAll(items); + this.list = List.copyOf(merged); + } finally { + lock.writeLock().unlock(); + } + } + + public void addAll(int index, Collection items) { + if (items == null || items.isEmpty()) return; + + lock.writeLock().lock(); + try { + ArrayList next = new ArrayList<>(this.list); + int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size로 보정 + next.addAll(i, new ArrayList<>(items)); + this.list = List.copyOf(next); + } finally { + lock.writeLock().unlock(); + } + } + + public void add(T item) { + lock.writeLock().lock(); + try { + List merged = new java.util.ArrayList<>(this.list); + merged.add(item); + this.list = List.copyOf(merged); + } finally { + lock.writeLock().unlock(); + } + } + + public void add(int index, T item){ + lock.writeLock().lock(); + + try{ + ArrayList next = new ArrayList<>(this.list); + int i = Math.max(0, Math.min(index, next.size())); // 0 ~ size로 보정 + next.add(i, item); + this.list = List.copyOf(next); + } finally { + lock.writeLock().unlock(); + } + } + + protected List loadFromDb() { + return null; + } } diff --git a/src/main/java/com/kri/common/cache/AbstractMapCache.java b/src/main/java/com/kri/common/cache/AbstractMapCache.java index 50e17be..8cf6d4b 100644 --- a/src/main/java/com/kri/common/cache/AbstractMapCache.java +++ b/src/main/java/com/kri/common/cache/AbstractMapCache.java @@ -4,6 +4,7 @@ import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -15,7 +16,8 @@ public abstract class AbstractMapCache { @EventListener(ApplicationReadyEvent.class) @Transactional(readOnly = true) public void loadOnStartup() { - doReload(); + Map tempMap = loadFromDb(); + if(tempMap != null) setMap(tempMap); } public Map getMap() { @@ -47,20 +49,62 @@ public abstract class AbstractMapCache { @Transactional(readOnly = true) public Map reload() { - doReload(); + Map tempMap = loadFromDb(); + if(tempMap == null) { + throw new UnsupportedOperationException("This cache does not support reload()."); + } + setMap(tempMap); return getMap(); } - // 서브클래스가 "DB에서 어떤 Map을 만들지"만 구현 - protected abstract Map loadFromDb(); - - private void doReload() { + /** 수동: 전체 교체(불변 스냅샷으로 보관) */ + public void setMap(Map next) { lock.writeLock().lock(); try { - this.map = Map.copyOf(loadFromDb()); // 불변 맵으로 교체 + this.map = Map.copyOf(next == null ? Map.of() : next); } finally { lock.writeLock().unlock(); } } + + public void put(K key, V value) { + lock.writeLock().lock(); + try { + Map merged = new HashMap<>(this.map); + merged.put(key, value); + this.map = Map.copyOf(merged); + } finally { + lock.writeLock().unlock(); + } + } + + /** 수동: 부분 적재(기존 + entries 합쳐서 스냅샷 교체) */ + public void putAll(Map entries) { + if (entries == null || entries.isEmpty()) return; + + lock.writeLock().lock(); + try { + Map merged = new HashMap<>(this.map); + merged.putAll(entries); + this.map = Map.copyOf(merged); + } finally { + lock.writeLock().unlock(); + } + } + + /** clear: 완전 비우기 */ + public void clear() { + lock.writeLock().lock(); + try { + this.map = Map.of(); + } finally { + lock.writeLock().unlock(); + } + } + + // 서브클래스가 "DB에서 어떤 Map을 만들지"만 구현 + protected Map loadFromDb() { + return null; + } }