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 e2e26c5354efa8a9425def22901c2af1f23ca80e..fd71a5597050a52332887588388bc3fba47bad56 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 123ec7cab11460576bf87c981b70cff9527eeb4a..f6767fa96d53daf18e6268763444348baa4c4182 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 556bf55b612640191f53540e94d2a50783676cbb..6ee989889f040a03d9371e87597c46429b88e1d9 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 cb538b2c84f8083b08f0a655e799dbe9a61d84f9..9baf2c4a4845cf8ecfc1f6a042b83eed40914028 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 a0195fd9fff8296f2c2c57dd96e4c8c41730a91a..7b1d93b54cd41d6607fa036a681bccff07b15867 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 e9480fd450a5ed7893f1ae7397541a96d419f553..2a046d38a19ebeda5899fb2f1de920a9ea1994e0 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 5d24195bb7781c7a31d4fc3642a30f6272cb062c..7bf2c34fa7f0fbfa5a44277b1657568398a149ee 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 47d0a46cab74224f1ac02e5013e3cd21ec1e6940..b4da9295b4f4ae68a8e6cfae789f14226b4128a3 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 e47c7ac3d380d2413a811e1e31050473310e4141..e95c4d4af1ae4f29157c6fc52fb0e61fac69d09d 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 a3c31512a84a4c7708072c24527c74fd359ec518..dfda1230144fc26ff657c67ea5db17ba86eab8a9 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 166b765350162448fa89e06b1bd5f7924d18e5d1..77091777846b30ae6861eba4ae9b67c476c7ac04 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 02e6151b3f7457dbb3868d9a77a770af911a5bd3..94e3a9eb634337ca17a176464c0667749715e84c 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}")