incorporated AppengineHeaders from client lib gcp

indexer-service-gcp/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.os</groupId>
             <artifactId>client-lib-gcp</artifactId>
-            <version>0.0.8</version>
+            <version>0.0.10</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.os</groupId>

indexer-service-gcp/src/main/java/org/opendes/indexer/gcp/model/AppEngineHeaders.java

-// Copyright 2017-2019, Schlumberger
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opendes.indexer.gcp.model;
-
-public class AppEngineHeaders {
-    public static final String DATA_GROUPS = "X-Data-Groups";
-    public static final String TASK_QUEUE_RETRY_COUNT = "X-AppEngine-TaskExecutionCount";
-    public static final String TASK_QUEUE_NAME = "X-AppEngine-QueueName";
-    public static final String CITY_LAT_LONG = "X-AppEngine-CityLatLong";
-    public static final String COUNTRY = "X-AppEngine-Country";
-    public static final String REGION = "X-AppEngine-Region";
-    public static final String CITY = "X-AppEngine-City";
-    public static final String CLOUD_TRACE_CONTEXT = "X-Cloud-Trace-Context";
-    public static final String TRACE_ID = "X-Trace-Id";
-    public static final String CRON_SERVICE = "X-AppEngine-Cron";
-}
\ No newline at end of file

indexer-service-gcp/src/main/java/org/opendes/indexer/gcp/publish/PublisherImpl.java

@@ -27,12 +27,12 @@ import org.apache.http.HttpStatus;
 import org.elasticsearch.common.Strings;
 import org.opendes.client.api.DpsHeaders;
 import org.opendes.client.gcp.PubSub.PubSubExtensions;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.opendes.client.multitenancy.ITenantFactory;
 import org.opendes.client.multitenancy.TenantInfo;
 import org.opendes.core.model.DeploymentEnvironment;
 import org.opendes.core.util.AppException;
 import org.opendes.core.util.Config;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
 import org.opendes.indexer.model.RecordStatus;
 import org.opendes.indexer.publish.IPublisher;
 import org.opendes.indexer.util.JobStatus;

indexer-service-gcp/src/main/java/org/opendes/indexer/gcp/util/HeadersInfoGcpImpl.java

@@ -16,10 +16,10 @@ package org.opendes.indexer.gcp.util;
 
 import com.google.common.base.Strings;
 import org.opendes.client.api.DpsHeaders;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.opendes.core.model.SlbHeaders;
 import org.opendes.core.util.IHeadersInfo;
 import org.opendes.core.util.Preconditions;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 

indexer-service-gcp/src/main/java/org/opendes/indexer/gcp/util/RequestInfoImpl.java

@@ -3,13 +3,13 @@ package org.opendes.indexer.gcp.util;
 import com.google.common.base.Strings;
 import org.apache.http.HttpStatus;
 import org.opendes.client.api.DpsHeaders;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.opendes.client.multitenancy.TenantInfo;
 import org.opendes.core.model.DeploymentEnvironment;
 import org.opendes.core.util.AppException;
 import org.opendes.core.util.Config;
 import org.opendes.core.util.Constants;
 import org.opendes.core.util.HeadersInfo;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
 import org.opendes.indexer.util.IRequestInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 

indexer-service-gcp/src/main/java/org/opendes/indexer/gcp/util/TraceIdExtractor.java

@@ -15,7 +15,7 @@
 package org.opendes.indexer.gcp.util;
 
 import com.google.common.base.Strings;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.springframework.util.MultiValueMap;
 
 import java.util.Random;

indexer-service-gcp/src/test/java/org/opendes/indexer/gcp/util/HeadersInfoGcpImplTest.java

@@ -19,9 +19,9 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opendes.client.api.DpsHeaders;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.opendes.core.model.SlbHeaders;
 import org.opendes.core.util.HeadersUtil;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;

indexer-service-gcp/src/test/java/org/opendes/indexer/gcp/util/TraceIdExtractorTest.java

@@ -17,7 +17,7 @@ package org.opendes.indexer.gcp.util;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendes.client.api.DpsHeaders;
-import org.opendes.indexer.gcp.model.AppEngineHeaders;
+import org.opendes.client.gcp.model.AppEngineHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;