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..6ac08b6ee75a72b5a63f1e21d70b8d370e8601c7 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,11 +30,11 @@ 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 org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.lang.reflect.Type;
@@ -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..d5cbe7ecc60f5af57c63bdfe5dac64c0a2c65937 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,6 @@ 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 org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@@ -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..eea65eb172cee269ea810ceba7faa13aebea91cd 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,11 +27,11 @@ 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 org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -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..7bd9e97c3568b1d6f93c7c0d624b797c701d85e4 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,19 +17,19 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.List;
@Component
@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..fbdbd0669fd30b1d5b0e7efbba90254919cf87a3 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,21 +5,21 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
@Log
@Component("authorizationFilter")
@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..370194f3ee393464186e1937aea46bbc2200e6b5 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,10 +29,10 @@ 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 org.springframework.stereotype.Service;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
@@ -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..268f8196b7b8f8b2acafd4bfafd1585c55d8563f 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,10 +24,10 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.io.IOException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -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..e93c26135295ae7116723beb3733c66bc921fa92 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
@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..b8df1edacb279d0667dc8b8c6368f7f0ded6d1d1 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,9 +33,9 @@ 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 org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.HashMap;
@@ -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..ba6d69c7cd8e5dac55b145352e177e68b868c077 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,10 +31,10 @@ 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 org.apache.http.HttpStatus;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.io.IOException;
import java.util.HashMap;
@@ -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..ba2aecad45ddd34756881e72511c197532a1067e 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 org.springframework.stereotype.Service;
+import javax.inject.Inject;
@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..c24aca4913c3066e513524c9fbca9509378fd198 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,12 +47,11 @@ 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 org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.NestedNullException;
import org.springframework.stereotype.Service;
-
+import javax.inject.Inject;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
@@ -69,31 +68,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..b0b5c94e20856b20383cbdc0f644dcb0bd9a8643 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,9 +28,9 @@ 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 org.springframework.stereotype.Component;
+import javax.inject.Inject;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -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..485f3e98754644262296abb4790ef9bf32381756 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,11 +30,11 @@ 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 org.apache.http.HttpStatus;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import javax.inject.Inject;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.net.URISyntaxException;
@@ -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..0ec16d2fe4839b1f429ca60cc12a62095f3427c2 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 org.springframework.stereotype.Component;
+import javax.inject.Inject;
@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..0b844e122d212bde1e3841fcdbb0af6529a39749 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,12 +22,12 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
import java.net.URISyntaxException;
+import javax.inject.Inject;
import static org.opengroup.osdu.is.core.util.Constants.REINDEX_RELATIVE_URL;
import static org.opengroup.osdu.is.core.util.Constants.WORKER_RELATIVE_URL;
@@ -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..a246228e8ff78b0a9afca0c5799344a55371fe46 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,10 +22,10 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
@@ -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..22e44cef3531af417ba2b9084f87bdf09e9ad691 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,17 +15,18 @@
package org.opengroup.osdu.indexer.azure.api;
import org.opengroup.osdu.indexer.azure.util.ServiceAccountJwtClientImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import javax.inject.Inject;
+
@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..5c612fcd9b3ea64aab3119d653290a954e0adeb9 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,16 +17,16 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
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..b05eadaa593a633875ab4622ac85e8a749472b75 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,18 +18,18 @@ 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 org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
@Log
@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 2929833203c9a8047e392c06bc6dfe2e001b4e97..9c6060ad60b857c0e388aed9e5a90b5fa68abeb7 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import javax.inject.Inject;
@Component
public class ElasticRepositoryCosmosDB implements ElasticRepository {
- @Autowired
+ @Inject
private CosmosDBElasticSettings cosmosDB;
@Value("${ELASTIC_DATASTORE_KIND}")
private String ELASTIC_DATASTORE_KIND;
@@ -37,8 +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 0dd644bc3df84c94b6bc8565d803d315348a9b14..c826cb80029af30e247e1a3352fc928fb7e6bf3d 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,15 +15,15 @@
package org.opengroup.osdu.indexer.azure.persistence;
import org.opengroup.osdu.indexer.azure.model.ElasticSettingSchema;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+import javax.inject.Inject;
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..8ee551f0c4bff4f63146c6dea89f1a448789c4ef 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,10 +30,10 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -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..6cc8d7cab61185cde1abfeb649ef22ff2e54de92 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,6 @@
package org.opengroup.osdu.indexer.azure.security;
import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
-import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -23,10 +22,12 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import javax.inject.Inject;
+
@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..bf679e8e15fcd9600f74a24183885f764a9d89d7 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,11 +19,11 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.HashSet;
import java.util.Map;
import java.util.stream.Collectors;
@@ -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..9888e5f570d0526343f74aa4ca317421df196672 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,11 +23,11 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.Map;
import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
@@ -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..0930596b5cbb14ab2069c9c3d9de4c2539580353 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,10 +31,10 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.net.MalformedURLException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -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..98347465fa2719e1638cd9bacadd7cd255de3f22 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,10 +44,10 @@ 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 org.springframework.context.annotation.Lazy;
//import org.springframework.test.context.junit4.SpringRunner;
//
+//import javax.inject.Inject;
//import java.io.IOException;
//import java.lang.reflect.Type;
//import java.util.*;
@@ -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..8368a259e175f39f5abd9dfd9fd425d1479e076e 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,18 +4,18 @@ 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 org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
@Log
@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..89ba9cc67345b53668da3cd78763b4ec667b59b6 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,11 +8,11 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
+import javax.inject.Inject;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -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..5cb5a9fdeee7fda7ca981179590e8a60cae783a2 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,17 +21,17 @@ 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 org.springframework.stereotype.Component;
import org.threeten.bp.Duration;
+import javax.inject.Inject;
import java.util.HashMap;
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..acfbfb4c12065c6377628369b18e807028938627 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,9 +26,9 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import javax.inject.Inject;
@Log
@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..e66424a5d43db1d5beaec9a2aa54cbce2e616927 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,12 +36,12 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
import org.threeten.bp.Duration;
+import javax.inject.Inject;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.HashMap;
@@ -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..337ae032ccf2da39eddee17257f6aa21147d576c 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,10 +21,10 @@ 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 org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.HashSet;
import java.util.Map;
import java.util.stream.Collectors;
@@ -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..ca75dd2f72237c2a99d165d5b646fed5c9f8ff5d 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,11 +12,11 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.Map;
import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
@@ -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..a953e6ce9a4ad069b379bbe916244cf432bbac67 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,11 +46,11 @@ 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 org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -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;