Merge branch 'IBM-issue-fix' into 'master'

Ibm issue fix

See merge request !616

(cherry picked from commit 1f660096)

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...

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/IndexCache.java → 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));

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/cache/SchemaCache.java → 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