From 7c14044a5dffc3e3fcdc6db045c0a3da54ab64c8 Mon Sep 17 00:00:00 2001
From: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com>
Date: Wed, 8 Jan 2020 13:54:57 -0600
Subject: [PATCH] Update qualifier to use search DpsHeaders
---
.../opengroup/osdu/indexer/service/TenantInfoServiceImpl.java | 2 +-
.../org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java | 2 +-
.../org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java | 2 +-
.../org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java | 2 +-
.../org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java | 2 +-
.../opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java | 2 +-
.../org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java | 2 +-
.../osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java | 2 +-
.../java/org/opengroup/osdu/indexer/middleware/IndexFilter.java | 2 +-
.../org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java | 2 +-
.../java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java | 2 +-
.../osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
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 e2e26c535..fd71a5597 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
@@ -30,7 +30,7 @@ public class TenantInfoServiceImpl implements TenantInfoService {
@Inject
private ITenantFactory tenantFactory;
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headersInfo;
@Inject
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java
index 123ec7cab..f6767fa96 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java
@@ -31,7 +31,7 @@ public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
@Autowired
private ITenantFactory tenantFactory;
@Autowired
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headers;
@Override
protected TenantInfo createInstance() throws Exception {
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
index 556bf55b6..6ee989889 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
public class HeadersInfoAwsImpl implements IHeadersInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headersMap;
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
index cb538b2c8..9baf2c4a4 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
@@ -35,7 +35,7 @@ import java.util.Map;
public class RequestInfoImpl implements IRequestInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headersMap;
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 a0195fd9f..7b1d93b54 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
@@ -31,7 +31,7 @@ public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
@Inject
private ITenantFactory tenantFactory;
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headers;
@Override
protected TenantInfo createInstance() throws Exception {
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 e9480fd45..2a046d38a 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
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
public class HeadersInfoAzureImpl implements IHeadersInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
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 5d24195bb..7bf2c34fa 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
@@ -41,7 +41,7 @@ import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER
public class RequestInfoImpl implements IRequestInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Inject
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 47d0a46ca..b4da9295b 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
@@ -51,7 +51,7 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
@Inject
private IHeadersInfo headersInfoAzure;
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Inject
private IJwtCache cacheService;
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 e47c7ac3d..e95c4d4af 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
@@ -27,7 +27,7 @@ import java.util.Map;
public class IndexFilter implements Filter {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Inject
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 a3c31512a..dfda12301 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
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
public class HeadersInfoGcpImpl implements IHeadersInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
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 166b76535..770917778 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
@@ -29,7 +29,7 @@ import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION
public class RequestInfoImpl implements IRequestInfo {
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Inject
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 02e6151b3..94e3a9eb6 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
@@ -77,7 +77,7 @@ public class ServiceAccountJwtGcpClientImpl implements IServiceAccountJwtClient
@Inject
private JaxRsDpsLog log;
@Inject
- @Qualifier("dpsHeaderFactory")
+ @Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Value("${GOOGLE_AUDIENCES}")
--
GitLab