diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/RecordIndexerApi.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/RecordIndexerApi.java
index 505bd55040a244eadad8711d3463816bdbafa25d..91c8e11d3f5d2abebfe75c6defe509a0ab7f0976 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/RecordIndexerApi.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/RecordIndexerApi.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.indexer.util.RecordInfo;
import org.opengroup.osdu.is.core.model.RecordChangedMessages;
import org.opengroup.osdu.is.core.util.AppException;
import org.springframework.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.annotation.RequestScope;
@@ -46,9 +46,9 @@ import java.util.List;
@RequestScope
public class RecordIndexerApi {
- @Autowired
+ @Inject
private IndexerService indexerService;
- @Autowired
+ @Inject
private ReindexService reIndexService;
// THIS IS AN INTERNAL USE API ONLY
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
index 8acaf86068d08cd26a77e4828011e93fb185220f..f39b6d63cbe1878ce9331f8e4228609c0e5bf5be 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
@@ -18,7 +18,7 @@ import org.opengroup.osdu.indexer.logging.AuditLogger;
import org.opengroup.osdu.indexer.model.RecordReindexRequest;
import org.opengroup.osdu.indexer.service.ReindexService;
import org.opengroup.osdu.is.core.model.SearchServiceRole;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,9 +37,9 @@ import static java.util.Collections.singletonList;
@RequestScope
public class ReindexApi {
- @Autowired
+ @Inject
private ReindexService reIndexService;
- @Autowired
+ @Inject
private AuditLogger auditLogger;
@PreAuthorize("@authorizationFilter.hasPermission('" + SearchServiceRole.ADMIN + "')")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
index 13e7b4c6b98961f0cf93255df3c63ffbd762037b..612c7e2269ddb5601002468fbbf132fe94ec37e6 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
@@ -27,7 +27,7 @@ import org.opengroup.osdu.is.core.model.AuthorizationResponse;
import org.opengroup.osdu.is.core.provider.interfaces.auth.AuthorizationService;
import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.HeadersUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.web.context.annotation.RequestScope;
@@ -42,9 +42,9 @@ public class AuthorizationServiceEntitlements implements AuthorizationService {
private static final String TENANT_GROUP_FORMAT = "@%s";
- @Autowired
+ @Inject
private IEntitlementsFactory factory;
- @Autowired
+ @Inject
@Lazy
private JaxRsDpsLog jaxRsDpsLog;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
index 62fb154189f46b6d22f7b9690448502dd18f0e4a..8485a7e8061e39069c8b4d0538ed44cef05560fa 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
@@ -17,7 +17,7 @@ package org.opengroup.osdu.indexer.logging;
import org.opengroup.osdu.core.logging.payload.AuditPayload;
import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -27,9 +27,9 @@ import java.util.List;
@RequestScope
public class AuditLogger {
- @Autowired
+ @Inject
private JaxRsDpsLog logger;
- @Autowired
+ @Inject
private IHeadersInfo headers;
private AuditEvents events = null;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
index 5709b5f5163f9c02e11deb971766bc9dc4116c09..da17eed36ffcbd0c9c5fc97856ef76c54cd0b8e1 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
@@ -5,7 +5,7 @@ import lombok.extern.java.Log;
import org.opengroup.osdu.core.api.DpsHeaders;
import org.opengroup.osdu.is.core.model.AuthorizationResponse;
import org.opengroup.osdu.is.core.provider.interfaces.auth.AuthorizationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -14,12 +14,12 @@ import org.springframework.web.context.annotation.RequestScope;
@RequestScope
public class AuthorizationFilter {
- @Autowired
+ @Inject
private AuthorizationService authorizationService;
private DpsHeaders headers;
- @Autowired
+ @Inject
AuthorizationFilter(DpsHeaders headers) {
this.headers = headers;
}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
index a2e3ccec51259162aebf360818692d5f8945e0f8..1d80931b72f6f7e429e8994d4df8c0f3f4218a62 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
@@ -29,7 +29,7 @@ import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
import org.opengroup.osdu.indexer.util.parser.NumberParser;
import org.opengroup.osdu.is.core.util.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Service;
import org.springframework.web.context.annotation.RequestScope;
@@ -47,13 +47,13 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
private static final String GEOMETRY_COLLECTION = "geometrycollection";
private static final String GEOMETRIES = "geometries";
- @Autowired
+ @Inject
private NumberParser numberParser;
- @Autowired
+ @Inject
private DateTimeParser dateTimeParser;
- @Autowired
+ @Inject
private GeometryConversionService geometryConversionService;
- @Autowired
+ @Inject
private JobStatus jobStatus;
@Override
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
index 3ab46481847c5b5e30b0ea9c437d468cf945f74d..8c87ceedaee9d4739c98d30599fca81fd0ab9284 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
@@ -24,7 +24,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.AppException;
import org.opengroup.osdu.is.core.util.ElasticClientHandler;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -36,13 +36,13 @@ import java.util.List;
@Service
public class CronServiceImpl implements CronService{
- @Autowired
+ @Inject
private ElasticClientHandler elasticClientHandler;
- @Autowired
+ @Inject
private IRequestInfo requestInfo;
- @Autowired
+ @Inject
private IndicesService indicesService;
- @Autowired
+ @Inject
private JaxRsDpsLog log;
@Value("${CRON_INDEX_CLEANUP_THRESHOLD_DAYS}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
index b07fd8209db35920d8d9e28ac343720391fb1ff1..767fc38ecfaa1b80697cbfadadde1f34d365d1eb 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
@@ -23,20 +23,20 @@ import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticReposit
import org.opengroup.osdu.is.core.service.ElasticSettingService;
import org.opengroup.osdu.is.core.service.TenantInfoService;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Service
public class ElasticSettingServiceImpl implements ElasticSettingService {
- @Autowired
+ @Inject
private TenantInfoService tenantInfoServiceProvider;
- @Autowired
+ @Inject
private ElasticRepository elasticRepository;
- @Autowired
+ @Inject
private IElasticCredentialsCache elasticCredentialCache;
- @Autowired
+ @Inject
private JaxRsDpsLog log;
@Value("${GAE_SERVICE}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
index 97792aae1890bc722ef6161d536bd21c76969c78..e9e1e786d856733cf03d12a9891b4b6112e73c46 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
@@ -33,7 +33,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
import org.opengroup.osdu.is.core.service.ElasticSettingService;
import org.opengroup.osdu.is.core.service.IndicesService;
import org.opengroup.osdu.is.core.util.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -44,19 +44,19 @@ import java.util.Map;
@Service
public class IndexCopyServiceImpl implements IndexCopyService {
- @Autowired
+ @Inject
private ElasticClientHandler elasticClientHandler;
- @Autowired
+ @Inject
private ElasticIndexNameResolver elasticIndexNameResolver;
- @Autowired
+ @Inject
private IndicesService indicesService;
- @Autowired
+ @Inject
private ElasticSettingService elasticSettingService;
- @Autowired
+ @Inject
private IndexerMappingService mappingService;
- @Autowired
+ @Inject
private IHeadersInfo headersInfo;
- @Autowired
+ @Inject
private AuditLogger auditLogger;
@Override
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
index 6225cb7148bfaa4eb6d35eb02b77815f44550e77..48933d9dba88ca9cef340f85173c0647812e71bc 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
@@ -31,7 +31,7 @@ import org.opengroup.osdu.is.core.service.IndicesService;
import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.ElasticClientHandler;
import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.apache.http.HttpStatus;
import org.springframework.stereotype.Service;
@@ -47,19 +47,19 @@ public class IndexSchemaServiceImpl implements IndexSchemaService {
private final Gson gson = new Gson();
- @Autowired
+ @Inject
private JaxRsDpsLog log;
- @Autowired
+ @Inject
private StorageService storageService;
- @Autowired
+ @Inject
private ElasticClientHandler elasticClientHandler;
- @Autowired
+ @Inject
private ElasticIndexNameResolver elasticIndexNameResolver;
- @Autowired
+ @Inject
private IndexerMappingService mappingService;
- @Autowired
+ @Inject
private IndicesService indicesService;
- @Autowired
+ @Inject
private ISchemaCache schemaCache;
public void processSchemaMessages(Map<String, OperationType> schemaMsgs) throws IOException {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
index 2a0a92d16d410a811ae9bdafdf65acfee5a3d37b..bbf76509539f3b2428f696da87b48969e93bcf24 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
@@ -46,15 +46,15 @@ import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.Constants;
import org.opengroup.osdu.is.core.util.ElasticClientHandler;
import org.opengroup.osdu.is.core.util.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Service;
@Service
public class IndexerMappingServiceImpl extends MappingServiceImpl implements IndexerMappingService {
- @Autowired
+ @Inject
private JaxRsDpsLog log;
- @Autowired
+ @Inject
private ElasticClientHandler elasticClientHandler;
private TimeValue REQUEST_TIMEOUT = TimeValue.timeValueMinutes(1);
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index 1d20c569ca97ca86f1cb2ad6cf77dc92dc79a6fc..d1790b55e6577b71bea90100e78dde3ecea05d37 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -47,7 +47,7 @@ import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.Constants;
import org.opengroup.osdu.is.core.util.ElasticClientHandler;
import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.NestedNullException;
import org.springframework.stereotype.Service;
@@ -69,31 +69,31 @@ public class IndexerServiceImpl implements IndexerService {
private final Gson gson = new Gson();
- @Autowired
+ @Inject
private JaxRsDpsLog jaxRsDpsLog;
- @Autowired
+ @Inject
private AuditLogger auditLogger;
- @Autowired
+ @Inject
private StorageService storageService;
- @Autowired
+ @Inject
private IndexSchemaService schemaService;
- @Autowired
+ @Inject
private IndicesService indicesService;
- @Autowired
+ @Inject
private IndexerMappingService mappingService;
- @Autowired
+ @Inject
private IPublisher progressPublisher;
- @Autowired
+ @Inject
private ElasticClientHandler elasticClientHandler;
- @Autowired
+ @Inject
private IndexerQueueTaskBuilder indexerQueueTaskBuilder;
- @Autowired
+ @Inject
private ElasticIndexNameResolver elasticIndexNameResolver;
- @Autowired
+ @Inject
private IAttributeParsingService attributeParsingServiceImpl;
- @Autowired
+ @Inject
private IRequestInfo requestInfo;
- @Autowired
+ @Inject
private JobStatus jobStatus;
private DpsHeaders headers;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
index 1293c160d82ee8ab5706d74c8f8ebf0ce361bc6f..49f3e43cfa9c7f0b4b700ada18074b0572f1f5ae 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
@@ -28,7 +28,7 @@ import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
import org.opengroup.osdu.is.core.model.RecordChangedMessages;
import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import java.util.HashMap;
@@ -40,13 +40,13 @@ import java.util.stream.Collectors;
@Component
public class ReindexServiceImpl implements ReindexService {
- @Autowired
+ @Inject
private StorageService storageService;
- @Autowired
+ @Inject
private IndexerQueueTaskBuilder indexerQueueTaskBuilder;
- @Autowired
+ @Inject
private IRequestInfo requestInfo;
- @Autowired
+ @Inject
private JaxRsDpsLog jaxRsDpsLog;
@Override
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
index b1973d300553aeb90ff40e84067825cd718c1d9e..12dab7f1121ca6f6d8503b324610a149741f6c73 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
import org.opengroup.osdu.is.core.service.UrlFetchService;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.apache.http.HttpStatus;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -53,13 +53,13 @@ public class StorageServiceImpl implements StorageService {
private final Gson gson = new Gson();
- @Autowired
+ @Inject
private UrlFetchService urlFetchService;
- @Autowired
+ @Inject
private JobStatus jobStatus;
- @Autowired
+ @Inject
private IRequestInfo requestInfo;
- @Autowired
+ @Inject
private JaxRsDpsLog jaxRsDpsLog;
@Value("${STORAGE_SCHEMA_HOST}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
index 4d670e851b8a2f22b8480c30195c3e7fd1f49590..27c439efa6df3cd20e156e80d86851fc2527b613 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
@@ -20,18 +20,18 @@ import org.opengroup.osdu.core.multitenancy.ITenantFactory;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
import org.opengroup.osdu.is.core.service.TenantInfoService;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@Component
public class TenantInfoServiceImpl implements TenantInfoService {
- @Autowired
+ @Inject
private ITenantFactory tenantFactory;
- @Autowired
+ @Inject
private DpsHeaders headersInfo;
- @Autowired
+ @Inject
private TenantInfo tenantInfo;
public TenantInfo getTenantInfo() {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
index 47f3fc14c650e3a11575f258b0bbd94bd3dae800..c147f86676ee7644bf369927a52348d820f31c0c 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
@@ -22,7 +22,7 @@ import org.opengroup.osdu.is.core.httpclient.HttpResponse;
import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
import org.opengroup.osdu.is.core.model.CloudTaskRequest;
import org.opengroup.osdu.is.core.service.UrlFetchService;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -37,9 +37,9 @@ import static org.opengroup.osdu.is.core.util.Constants.WORKER_RELATIVE_URL;
@RequestScope
public class IndexerQueueTaskBuilder {
- @Autowired
+ @Inject
private UrlFetchService urlFetchService;
- @Autowired
+ @Inject
private JaxRsDpsLog jaxRsDpsLog;
@Value("${INDEXER_QUEUE_HOST}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/JobStatus.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/JobStatus.java
index b102b092462d1700f363be540c8fc3ffa001fa6a..3987422ded238acef43d0e83e65b85ea382d3c73 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/JobStatus.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/JobStatus.java
@@ -22,7 +22,7 @@ import org.opengroup.osdu.indexer.model.IndexingStatus;
import org.opengroup.osdu.indexer.model.OperationType;
import org.opengroup.osdu.indexer.model.RecordStatus;
import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
@RequestScope
public class JobStatus {
- @Autowired
+ @Inject
private JaxRsDpsLog jaxRsDpsLog;
private List<RecordStatus> statusesList = new ArrayList<>();
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java
index d2da8fe74082cf147c51403a10cfa9992b5f2c55..34878c14d4ffc02e42d055136a40e62eb15a5d97 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/api/AADController.java
@@ -15,7 +15,7 @@
package org.opengroup.osdu.indexer.azure.api;
import org.opengroup.osdu.indexer.azure.util.ServiceAccountJwtClientImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.http.*;
import org.springframework.stereotype.Controller;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class AADController {
- @Autowired
+ @Inject
ServiceAccountJwtClientImpl service;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
index d3a20cb6f87a760e99f6191dd5d59ffa87fff13b..aa7e5794538fad587c8a108f9033634cf24c58c9 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
@@ -17,7 +17,7 @@ package org.opengroup.osdu.indexer.azure.di;
import org.opengroup.osdu.core.cache.ICache;
import org.opengroup.osdu.core.multitenancy.ITenantFactory;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -26,7 +26,7 @@ import java.util.*;
@Component
@RequestScope
public class TenantFactoryImpl implements ITenantFactory {
- @Autowired
+ @Inject
private CosmosDBTenantInfo db;
private Map<String, TenantInfo> tenants;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
index e439cb487f8b502db7568c2e4704b4afa4cb7c06..6151b97951f77568e9ab8885e22b6cce5546e51a 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
@@ -18,7 +18,7 @@ import lombok.extern.java.Log;
import org.opengroup.osdu.core.api.DpsHeaders;
import org.opengroup.osdu.core.multitenancy.ITenantFactory;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -27,9 +27,9 @@ import org.springframework.web.context.annotation.RequestScope;
@Component
@RequestScope
public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
- @Autowired
+ @Inject
private ITenantFactory tenantFactory;
- @Autowired
+ @Inject
private DpsHeaders headers;
@Override
protected TenantInfo createInstance() throws Exception {
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
index 2bb047062736127f101e4e425a2f6527c921fb77..9bc61b6efec8527c151a39c2c6023b7df7b6aac8 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
@@ -22,14 +22,14 @@ import org.opengroup.osdu.is.core.model.ClusterSettings;
import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
public class ElasticRepositoryCosmosDB implements ElasticRepository {
- @Autowired
+ @Inject
private CosmosDBElasticSettings cosmosDB;
@Value("${ELASTIC_DATASTORE_KIND}")
private String ELASTIC_DATASTORE_KIND;
@@ -37,7 +37,7 @@ public class ElasticRepositoryCosmosDB implements ElasticRepository {
@Value("${ELASTIC_DATASTORE_ID}")
private String ELASTIC_DATASTORE_ID;
- @Autowired
+ @Inject
private ISchemaRepository schemaRepository;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java
index f65158815436ab5dc9b555af69cb875a767d0aa6..160dec674aa47dbb7ff91d2517e8f601d438d8c2 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticSettingSchemaRepositoryImpl.java
@@ -15,7 +15,7 @@
package org.opengroup.osdu.indexer.azure.persistence;
import org.opengroup.osdu.indexer.azure.model.ElasticSettingSchema;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Repository;
import java.util.Optional;
@@ -23,7 +23,7 @@ import java.util.Optional;
@Repository
public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
- @Autowired
+ @Inject
private CosmosDBElasticSettings db;
@Override
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
index ac26b9704721a3d3a76a39772077197685818d71..c6f40ca2660a76ce6cf7693e5d0c2b0aa2e4e497 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
import org.opengroup.osdu.indexer.util.JobStatus;
import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
import org.opengroup.osdu.is.core.model.RecordChangedMessages;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -45,10 +45,10 @@ import java.util.Map;
public class PublisherImpl implements IPublisher {
- @Autowired
+ @Inject
private TopicClient topicClient;
- @Autowired
+ @Inject
private JaxRsDpsLog logger;
@Override
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/BasicAuthSecurityConfig.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/BasicAuthSecurityConfig.java
index 8a8d07dbec21b9b97b664b549b77562a5e9f48c4..a3ed07cc59e50b8de011ddf8e95a5b2941052029 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/BasicAuthSecurityConfig.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/security/BasicAuthSecurityConfig.java
@@ -15,7 +15,7 @@
package org.opengroup.osdu.indexer.azure.security;
import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -26,7 +26,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class BasicAuthSecurityConfig extends WebSecurityConfigurerAdapter {
- @Autowired
+ @Inject
private AADAppRoleStatelessAuthenticationFilter appRoleAuthFilter;
@Override
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
index be4dbe2f8b0462d4794b9e61bd58a96bd66f9c16..1ffa4abef3517afc7dc6ae971453833ebe06487d 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
@@ -19,7 +19,7 @@ import org.opengroup.osdu.core.api.DpsHeaders;
import org.opengroup.osdu.is.core.model.SlbHeaders;
import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
import org.opengroup.osdu.is.core.util.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
@RequestScope
public class HeadersInfoAzureImpl implements IHeadersInfo {
- @Autowired
+ @Inject
private DpsHeaders headersMap;
@Value("${indexer.queue.key}")
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
index b52ee585d8741b9b5a4ec243480bd067a01f7c45..2b16861d48f3ae59a612b87bbc5d382d1b24861c 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
@@ -23,7 +23,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -38,15 +38,15 @@ import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER
@RequestScope
public class RequestInfoImpl implements IRequestInfo {
- @Autowired
+ @Inject
private DpsHeaders dpsHeaders;
- @Autowired
+ @Inject
private IHeadersInfo headersInfo;
- @Autowired
+ @Inject
private IServiceAccountJwtClient serviceAccountJwtClient;
- @Autowired
+ @Inject
private TenantInfo tenantInfo;
@Value("${DEPLOYMENT_ENVIRONMENT}")
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
index f2ca8ff9df370d352eab0b75d1668292b1b71209..db15936e5710560c094d29fe9868e6221071a3c5 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
@@ -31,7 +31,7 @@ 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.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -45,18 +45,18 @@ import java.util.concurrent.Future;
@RequestScope
public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
- @Autowired
+ @Inject
private ITenantFactory tenantInfoServiceProvider;
- @Autowired
+ @Inject
private IHeadersInfo headersInfoAzure;
- @Autowired
+ @Inject
private DpsHeaders dpsHeaders;
- @Autowired
+ @Inject
private IJwtCache cacheService;
- @Autowired
+ @Inject
private JaxRsDpsLog log;
- @Autowired
+ @Inject
private AADConfiguration configuration;
public String getIdToken(String tenantName) {
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerServiceTest.java
index 226c0c31d1e73cb098853594deac46b663d3d2d6..046d05ad8664d122fdec14bbdc7082836223e5d7 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerServiceTest.java
@@ -44,7 +44,7 @@ package org.opengroup.osdu.indexer.azure.service;//// Copyright 2017-2019, Schlu
//import org.opendes.indexer.util.JobStatus;
//import org.opendes.indexer.util.RecordInfo;
//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.springframework.beans.factory.annotation.Autowired;
+//import javax.inject.Inject;
//import org.springframework.context.annotation.Lazy;
//import org.springframework.test.context.junit4.SpringRunner;
//
@@ -106,7 +106,7 @@ package org.opengroup.osdu.indexer.azure.service;//// Copyright 2017-2019, Schlu
// @InjectMocks @Spy
// private JobStatus jobStatus = new JobStatus();
//
-// @Autowired
+// @Inject
// @Lazy
// private DpsHeaders dpsHeaders;
// private RecordChangedMessages recordChangedMessages;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
index d9c925ff7cf19a0c8cbc3678c0f1130c99ff1f11..47b7a9651cce4432365f5163f5add002c59d1724 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
@@ -4,7 +4,7 @@ import lombok.extern.java.Log;
import org.opengroup.osdu.core.api.DpsHeaders;
import org.opengroup.osdu.core.multitenancy.ITenantFactory;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -13,9 +13,9 @@ import org.springframework.web.context.annotation.RequestScope;
@Component
@RequestScope
public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
- @Autowired
+ @Inject
private ITenantFactory tenantFactory;
- @Autowired
+ @Inject
private DpsHeaders headers;
@Override
protected TenantInfo createInstance() throws Exception {
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
index cef6c468a3969b4c1f28aa54b723db44863c58bf..544f6bf7228d6973f5b90a39b8c5d5e8bc6984f8 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
@@ -8,7 +8,7 @@ import org.opengroup.osdu.core.headers.ResponseHeaders;
import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
@@ -25,10 +25,10 @@ import java.util.Map;
@Component
public class IndexFilter implements Filter {
- @Autowired
+ @Inject
private DpsHeaders dpsHeaders;
- @Autowired
+ @Inject
private IRequestInfo requestInfo;
@Value("${DEPLOYMENT_ENVIRONMENT}")
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
index 4e68421f643c28ea80626e1cfbb754fd87554ef6..6a001666a739da9c274cb22e5e3722ea32db3133 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
@@ -21,7 +21,7 @@ import com.google.cloud.datastore.DatastoreOptions;
import com.google.cloud.http.HttpTransportOptions;
import org.opengroup.osdu.indexer.cache.DatastoreCredentialCache;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.threeten.bp.Duration;
@@ -31,7 +31,7 @@ import java.util.Map;
@Component
public class DatastoreFactory {
- @Autowired
+ @Inject
private DatastoreCredentialCache cache;
private static Map<String, Datastore> DATASTORE_CLIENTS = new HashMap<>();
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
index a1f57d2732bca48cf846643c1e3963db01530d32..e99e9ed9b9564e9736e45d21a2364278671a2f81 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
@@ -26,7 +26,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.kms.IKmsClient;
import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -38,9 +38,9 @@ public class ElasticRepositoryDatastore implements ElasticRepository {
static final String PORT = "port";
static final String XPACK_RESTCLIENT_CONFIGURATION = "configuration";
- @Autowired
+ @Inject
private IKmsClient kmsClient;
- @Autowired
+ @Inject
private DatastoreFactory datastoreFactory;
@Value("${ELASTIC_DATASTORE_KIND}")
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
index 62d3ebcd16f54b12adda1793bc3a2827d7d0c546..8301215c6415571d5aa2a5de6782476368a05f89 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
@@ -36,7 +36,7 @@ import org.opengroup.osdu.core.multitenancy.ITenantFactory;
import org.opengroup.osdu.core.multitenancy.TenantInfo;
import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
import org.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -58,10 +58,10 @@ public class PublisherImpl implements IPublisher {
private static final String TOPIC_ID = "indexing-progress";
- @Autowired
+ @Inject
private ITenantFactory tenantStorageFactory;
- @Autowired
+ @Inject
private PubSubExtensions pubSubExtensions;
@Value("${DEPLOYMENT_ENVIRONMENT}")
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
index b755362fc914feab302cdf18225a4337ad42f10a..504c800293cc17504bf7733da9af02334e0f571c 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
@@ -21,7 +21,7 @@ import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
import org.opengroup.osdu.is.core.model.SlbHeaders;
import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
import org.opengroup.osdu.is.core.util.Preconditions;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
@RequestScope
public class HeadersInfoGcpImpl implements IHeadersInfo {
- @Autowired
+ @Inject
private DpsHeaders headersMap;
private static final HashSet<String> FORBIDDEN_FROM_LOGGING = new HashSet<>();
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
index a9a93f983d8b8e078ae7ac6fcdcf3ff94c014c39..82b531cbaf5bdbc694a0664a1a9452083aee5877 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
@@ -12,7 +12,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
import org.opengroup.osdu.is.core.util.AppException;
import org.opengroup.osdu.is.core.util.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -27,15 +27,15 @@ import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
@RequestScope
public class RequestInfoImpl implements IRequestInfo {
- @Autowired
+ @Inject
private DpsHeaders dpsHeaders;
- @Autowired
+ @Inject
private IHeadersInfo headersInfo;
- @Autowired
+ @Inject
private IServiceAccountJwtClient serviceAccountJwtClient;
- @Autowired
+ @Inject
private TenantInfo tenantInfo;
@Value("${DEPLOYMENT_ENVIRONMENT}")
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
index 8dcf8d1ba56800589ba0d837af88e2d6bc905155..785abf22372a9e280f06a712905e7b294e9b9c63 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
@@ -46,7 +46,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.opengroup.osdu.is.core.util.AppException;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -67,15 +67,15 @@ public class ServiceAccountJwtGcpClientImpl implements IServiceAccountJwtClient
private Iam iam;
- @Autowired
+ @Inject
private ITenantFactory tenantInfoServiceProvider;
- @Autowired
+ @Inject
private HeadersInfoGcpImpl headersInfoGcp;
- @Autowired
+ @Inject
private IJwtCache cacheService;
- @Autowired
+ @Inject
private JaxRsDpsLog log;
- @Autowired
+ @Inject
private DpsHeaders dpsHeaders;
@Value("${GOOGLE_AUDIENCES}")
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerServiceTest.java
index 01bd81270348576f15556011160bedcbc4f3bb61..c716cb1a637f5a5d843ebccd73656f2fa1c0752f 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerServiceTest.java
@@ -44,7 +44,7 @@ package org.opengroup.osdu.indexer.service;//// Copyright 2017-2019, Schlumberge
//import org.opendes.indexer.util.JobStatus;
//import org.opendes.indexer.util.RecordInfo;
//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.springframework.beans.factory.annotation.Autowired;
+//import javax.inject.Inject;
//import org.springframework.context.annotation.Lazy;
//import org.springframework.test.context.junit4.SpringRunner;
//
@@ -106,7 +106,7 @@ package org.opengroup.osdu.indexer.service;//// Copyright 2017-2019, Schlumberge
// @InjectMocks @Spy
// private JobStatus jobStatus = new JobStatus();
//
-// @Autowired
+// @Inject
// @Lazy
// private DpsHeaders dpsHeaders;
// private RecordChangedMessages recordChangedMessages;