add lazy

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java

@@ -27,6 +27,7 @@ import org.opengroup.osdu.indexer.model.ElasticType;
 import org.opengroup.osdu.indexer.model.IndexSchema;
 import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
 import org.opengroup.osdu.indexer.util.parser.NumberParser;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -52,6 +53,7 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
     @Inject
     private GeometryConversionService geometryConversionService;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
 
     @Override

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java

@@ -25,6 +25,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -43,6 +44,7 @@ public class CronServiceImpl implements CronService{
         @Inject
         private IndicesService indicesService;
         @Inject
+        @Lazy
         private JaxRsDpsLog log;
 
         @Value("${CRON_INDEX_CLEANUP_THRESHOLD_DAYS}")

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java

@@ -32,6 +32,7 @@ import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.apache.http.HttpStatus;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -48,6 +49,7 @@ public class IndexSchemaServiceImpl implements IndexSchemaService {
     private final Gson gson = new Gson();
 
     @Inject
+    @Lazy
     private JaxRsDpsLog log;
     @Inject
     private StorageService storageService;

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java

@@ -46,6 +46,7 @@ import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
 import org.opengroup.osdu.is.core.service.MappingServiceImpl;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.Preconditions;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import javax.inject.Inject;
 
@@ -53,6 +54,7 @@ import javax.inject.Inject;
 public class IndexerMappingServiceImpl extends MappingServiceImpl implements IndexerMappingService {
 
     @Inject
+    @Lazy
     private JaxRsDpsLog log;
     @Inject
     private ElasticClientHandler elasticClientHandler;

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java

@@ -52,6 +52,7 @@ import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.NestedNullException;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -72,6 +73,7 @@ public class IndexerServiceImpl implements IndexerService {
     private final Gson gson = new Gson();
 
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
     @Inject
     private AuditLogger auditLogger;
@@ -96,6 +98,7 @@ public class IndexerServiceImpl implements IndexerService {
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
 
     private DpsHeaders headers;

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java

@@ -28,6 +28,7 @@ import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.is.core.model.RecordChangedMessages;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -47,6 +48,7 @@ public class ReindexServiceImpl implements ReindexService {
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Override

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java

@@ -33,6 +33,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.UrlFetchService;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -57,10 +58,12 @@ public class StorageServiceImpl implements StorageService {
     @Inject
     private UrlFetchService urlFetchService;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Value("${STORAGE_SCHEMA_HOST}")

indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java

@@ -23,6 +23,7 @@ import org.opengroup.osdu.is.core.httpclient.HttpResponse;
 import org.opengroup.osdu.is.core.model.CloudTaskRequest;
 import org.opengroup.osdu.is.core.service.UrlFetchService;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -40,6 +41,7 @@ public class IndexerQueueTaskBuilder {
     @Inject
     private UrlFetchService urlFetchService;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Value("${INDEXER_QUEUE_HOST}")

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java

@@ -30,6 +30,7 @@ import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
 import org.opengroup.osdu.core.common.service.is.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
 import org.opengroup.osdu.is.core.model.RecordChangedMessages;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java

@@ -31,6 +31,7 @@ import org.opengroup.osdu.is.core.model.IdToken;
 import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java

@@ -47,6 +47,7 @@ import org.opengroup.osdu.is.core.model.IdToken;
 import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;