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

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

@@ -41,7 +41,7 @@ public class IndexCacheImpl implements IIndexCache<String, Boolean>, AutoCloseab
     @Value("${aws.elasticache.cluster.index.expiration}")
     String INDEX_CACHE_EXPIRATION;
     public IndexCacheImpl() throws K8sParameterNotFoundException, JsonProcessingException {
-        int expTimeSeconds = Integer.parseInt(INDEX_CACHE_EXPIRATION) * 60;
+        int expTimeSeconds = 60 * 60;
         K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
         if (provider.getLocalMode()){
             if (Boolean.parseBoolean(System.getenv("DISABLE_CACHE"))){

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

@@ -35,12 +35,12 @@ public class SchemaCacheImpl implements ISchemaCache<String, String>, AutoClosea
     String REDIS_SEARCH_PORT;
     @Value("${aws.elasticache.cluster.key:null}")
     String REDIS_SEARCH_KEY;
-    @Value("${aws.elasticache.cluster.schema.expiration:null}")
+    @Value("${aws.elasticache.cluster.schema.expiration:60}")
     String SCHEMA_CACHE_EXPIRATION;
     private ICache<String, String> cache;
     private Boolean local = false;
     public SchemaCacheImpl() throws K8sParameterNotFoundException, JsonProcessingException {
-        int expTimeSeconds = Integer.parseInt(SCHEMA_CACHE_EXPIRATION) * 60;
+        int expTimeSeconds = 60 * 60;
         K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
         if (provider.getLocalMode()){
             if (Boolean.parseBoolean(System.getenv("DISABLE_CACHE"))){

provider/indexer-aws/src/main/resources/application.properties

@@ -32,9 +32,9 @@ STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${STORAGE_BASE_URL}/api/storage/v2/quer
 STORAGE_RECORDS_BATCH_SIZE=20
 INDEXER_QUEUE_HOST=""
 ## AWS ElastiCache configuration
-aws.elasticache.cluster.endpoint=${CACHE_CLUSTER_ENDPOINT}
-aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT}
-aws.elasticache.cluster.key=${CACHE_CLUSTER_KEY}
+aws.elasticache.cluster.endpoint=${CACHE_CLUSTER_ENDPOINT:null}
+aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT:null}
+aws.elasticache.cluster.key=${CACHE_CLUSTER_KEY:null}
 ## Cache Settings
 aws.elasticache.cluster.index.expiration=60
 aws.elasticache.cluster.schema.expiration=60