From 727b29e79cc26efca068af9276eba73da28a8cda Mon Sep 17 00:00:00 2001
From: Anuj Gupta <anujgupta@in.ibm.com>
Date: Wed, 20 Sep 2023 05:21:32 +0000
Subject: [PATCH] Merge branch 'IBM-issue-fix' into 'master'
Ibm issue fix
See merge request osdu/platform/system/indexer-service!616
(cherry picked from commit 1f66009632e58a37f65debe61c72a35f1e2b266c)
43db14fe Removing these two classses to avoid conflicts call.These two file already part of core service.
e4b05411 Rename these class to avoid conflicts call
36bc039f Removing these two classses to avoid conflicts call.These two file already part of core service.
a11ced76 Rename these class to avoid conflicts call
34090a05 Merge branch 'IBM-issue-fix' of...
764cabdf Removing these two classses to avoid conflicts call.These two file already part of core service.
4fe529ef Rename these class to avoid conflicts call
22aa1532 Merge branch 'IBM-issue-fix' of...
---
.../ibm/cache/{IndexCache.java => IndexCacheImpl.java} | 4 ++--
.../ibm/cache/{SchemaCache.java => SchemaCacheImpl.java} | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
rename provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/{IndexCache.java => IndexCacheImpl.java} (85%)
rename provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/{SchemaCache.java => SchemaCacheImpl.java} (85%)
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCache.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCacheImpl.java
similarity index 85%
rename from provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCache.java
rename to provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCacheImpl.java
index 9a6389174..54bf3f42a 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCache.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCacheImpl.java
@@ -8,10 +8,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
-public class IndexCache implements IIndexCache<String, Boolean> {
+public class IndexCacheImpl implements IIndexCache<String, Boolean> {
private VmCache<String, Boolean> cache;
- public IndexCache(@Value("${INDEX_CACHE_EXPIRATION}") final String INDEX_CACHE_EXPIRATION,
+ public IndexCacheImpl(@Value("${INDEX_CACHE_EXPIRATION}") final String INDEX_CACHE_EXPIRATION,
@Value("${MAX_CACHE_VALUE_SIZE}") final String MAX_CACHE_VALUE_SIZE) {
cache = new VmCache<>(Integer.parseInt(INDEX_CACHE_EXPIRATION) * 60,
Integer.parseInt(MAX_CACHE_VALUE_SIZE));
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCache.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCacheImpl.java
similarity index 85%
rename from provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCache.java
rename to provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCacheImpl.java
index 6a85261f7..1795e51fa 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCache.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCacheImpl.java
@@ -9,10 +9,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
-public class SchemaCache implements ISchemaCache<String, String> {
+public class SchemaCacheImpl implements ISchemaCache<String, String> {
private VmCache<String, String> cache;
- public SchemaCache(@Value("${SCHEMA_CACHE_EXPIRATION}") final String SCHEMA_CACHE_EXPIRATION,
+ public SchemaCacheImpl(@Value("${SCHEMA_CACHE_EXPIRATION}") final String SCHEMA_CACHE_EXPIRATION,
@Value("${MAX_CACHE_VALUE_SIZE}") final String MAX_CACHE_VALUE_SIZE) {
cache = new VmCache<>(Integer.parseInt(SCHEMA_CACHE_EXPIRATION) * 60,
Integer.parseInt(MAX_CACHE_VALUE_SIZE));
@@ -37,4 +37,4 @@ public class SchemaCache implements ISchemaCache<String, String> {
public void clearAll() {
this.cache.clearAll();
}
-}
+}
\ No newline at end of file
--
GitLab