Merge remote-tracking branch 'origin/dev' into aws-integration

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/IndexCacheImpl.java

@@ -32,11 +32,11 @@ public class IndexCacheImpl implements IIndexCache<String, Boolean>, AutoCloseab
 
     private ICache<String, Boolean> cache;
     private Boolean local;
-    @Value("${aws.elasticache.cluster.endpoint:null}")
+    @Value("${aws.elasticache.cluster.endpoint}")
     String REDIS_SEARCH_HOST;
-    @Value("${aws.elasticache.cluster.port:null}")
+    @Value("${aws.elasticache.cluster.port}")
     String REDIS_SEARCH_PORT;
-    @Value("${aws.elasticache.cluster.key:null}")
+    @Value("${aws.elasticache.cluster.key}")
     String REDIS_SEARCH_KEY;
     @Value("${aws.elasticache.cluster.index.expiration}")
     String INDEX_CACHE_EXPIRATION;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java

@@ -29,13 +29,13 @@ import java.util.Map;
 
 @Component
 public class SchemaCacheImpl implements ISchemaCache<String, String>, AutoCloseable {
-    @Value("${aws.elasticache.cluster.endpoint:null}")
+    @Value("${aws.elasticache.cluster.endpoint}")
     String REDIS_SEARCH_HOST;
-    @Value("${aws.elasticache.cluster.port:null}")
+    @Value("${aws.elasticache.cluster.port}")
     String REDIS_SEARCH_PORT;
-    @Value("${aws.elasticache.cluster.key:null}")
+    @Value("${aws.elasticache.cluster.key}")
     String REDIS_SEARCH_KEY;
-    @Value("${aws.elasticache.cluster.schema.expiration:60}")
+    @Value("${aws.elasticache.cluster.schema.expiration}")
     String SCHEMA_CACHE_EXPIRATION;
     private ICache<String, String> cache;
     private Boolean local = false;