Merge branch 'release/0.24.0'

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.github.libgraviton</groupId>
     <artifactId>worker-base</artifactId>
     <packaging>jar</packaging>
-    <version>0.23.4</version>
+    <version>0.24.0</version>
     <name>Graviton Worker Base Library</name>
     <url>https://github.com/libgraviton/graviton-worker-base-java</url>
     <inceptionYear>2015</inceptionYear>

src/main/java/com/github/libgraviton/workerbase/GravitonAuthApi.java

@@ -0,0 +1,45 @@
+package com.github.libgraviton.workerbase;
+
+import com.github.libgraviton.gdk.GravitonApi;
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import com.github.libgraviton.gdk.util.PropertiesLoader;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Public base class for workers api calls with auth headers
+ *
+ * @author List of contributors {@literal <https://github.com/libgraviton/graviton-worker-base-java/graphs/contributors>}
+ * @see <a href="http://swisscom.ch">http://swisscom.ch</a>
+ * @version $Id: $Id
+ */
+public class GravitonAuthApi extends GravitonApi {
+
+    protected Properties properties;
+
+    @Override
+    protected HeaderBag getDefaultHeaders() {
+        String authHeaderValue = properties.getProperty("graviton.authentication.prefix.username")
+                .concat(properties.getProperty("graviton.workerId"));
+        String authHeaderName = properties.getProperty("graviton.authentication.header.name");
+
+        return new HeaderBag.Builder()
+                .set("Content-Type", "application/json")
+                .set("Accept", "application/json")
+                .set(authHeaderName, authHeaderValue)
+                .build();
+    }
+
+
+    // TODO remove the setup override as soon as properties is no longer private in GravitonApi
+    @Override
+    protected void setup() {
+        try {
+            this.properties = PropertiesLoader.load();
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to load properties files.", e);
+        }
+        super.setup();
+    }
+}

src/main/java/com/github/libgraviton/workerbase/WorkerAbstract.java

@@ -282,6 +282,6 @@ public QueueManager getQueueManager() {
     }
 
     protected GravitonApi initGravitonApi() {
-        return new GravitonApi();
+        return new GravitonAuthApi();
     }
 }

src/main/resources/default.properties

@@ -10,4 +10,8 @@ graviton.workerId=java-test
 graviton.subscription=document.core.app.*
 
 application.version=${project.version}
-application.name=${project.name}
+application.name=${project.name}
+
+# Graviton Api Subnet authentication
+graviton.authentication.prefix.username=subnet-
+graviton.authentication.header.name=x-graviton-authentication

src/test/java/com/github/libgraviton/workerbase/GravitonAuthApiTest.java

@@ -0,0 +1,21 @@
+package com.github.libgraviton.workerbase;
+
+import com.github.libgraviton.gdk.api.header.Header;
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class GravitonAuthApiTest {
+
+    @Test
+    public void testGetDefaultHeader() {
+        GravitonAuthApi gravitonApi = new GravitonAuthApi();
+        HeaderBag headers = gravitonApi.getDefaultHeaders();
+        assertEquals(3, headers.all().size());
+
+        Header header = headers.get("x-graviton-authentication");
+        assertEquals("subnet-java-test", header.get(0));
+    }
+
+}

src/test/java/com/github/libgraviton/workerbase/WorkerBaseTestCase.java

@@ -27,7 +27,7 @@ public abstract class WorkerBaseTestCase {
     protected Worker worker;
     protected WorkerConsumer workerConsumer;
     protected Channel queueChannel;
-    protected GravitonApi gravitonApi;
+    protected GravitonAuthApi gravitonApi;
     protected Response response;
     protected ObjectMapper objectMapper;
 
@@ -42,7 +42,7 @@ public void baseMock() throws Exception {
         objectMapper = new GravitonObjectMapper(properties);
 
         response = mock(Response.class);
-        gravitonApi = mock(GravitonApi.class, RETURNS_DEEP_STUBS);
+        gravitonApi = mock(GravitonAuthApi.class, RETURNS_DEEP_STUBS);
 
         // PUT mock
         when(gravitonApi.put(any(GravitonBase.class)).execute()).thenReturn(response);

src/test/resources/app.properties

@@ -1,2 +1,7 @@
 addition=dude
-graviton.base.url=http://gravitonApi-base-url
+graviton.base.url=http://gravitonApi-base-url
+graviton.workerId=java-test
+
+# Graviton Api Subnet authentication
+graviton.authentication.prefix.username=subnet-
+graviton.authentication.header.name=x-graviton-authentication