Merge branch 'release/0.5.0'

gdk-core/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.github.libgraviton</groupId>
         <artifactId>gdk</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
     </parent>
     <artifactId>gdk-core</artifactId>
     <name>gdk-core</name>

gdk-core/src/main/java/com/github/libgraviton/gdk/GravitonApi.java

@@ -10,6 +10,8 @@
 import com.github.libgraviton.gdk.api.endpoint.exception.UnableToLoadEndpointAssociationsException;
 import com.github.libgraviton.gdk.api.header.HeaderBag;
 import com.github.libgraviton.gdk.api.query.rql.Rql;
+import com.github.libgraviton.gdk.auth.HeaderAuth;
+import com.github.libgraviton.gdk.auth.NoAuth;
 import com.github.libgraviton.gdk.data.GravitonBase;
 import com.github.libgraviton.gdk.exception.SerializationException;
 import com.github.libgraviton.gdk.serialization.JsonPatcher;
@@ -48,6 +50,8 @@ public class GravitonApi {
 
     private RequestExecutor executor;
 
+    private HeaderAuth auth;
+
     public GravitonApi() {
         setup();
         this.baseUrl = properties.getProperty("graviton.base.url");
@@ -65,12 +69,18 @@ public GravitonApi(String baseUrl, EndpointManager endpointManager) {
         this.endpointManager = endpointManager;
     }
 
+    public GravitonApi(String baseUrl, GeneratedEndpointManager endpointManager, HeaderAuth auth) {
+        this(baseUrl, endpointManager);
+        this.auth = auth;
+    }
+
     protected void setup() {
         try {
             this.properties = PropertiesLoader.load();
         } catch (IOException e) {
             throw new IllegalStateException("Unable to load properties files.", e);
         }
+        this.auth = new NoAuth();
         this.objectMapper = new GravitonObjectMapper(properties);
         this.executor = new RequestExecutor(objectMapper);
     }
@@ -234,8 +244,11 @@ public ObjectMapper getObjectMapper() {
 
     // TODO make it configurable
     protected HeaderBag.Builder getDefaultHeaders() {
-        return new HeaderBag.Builder()
+        HeaderBag.Builder headerBuilder = new HeaderBag.Builder()
                 .set("Content-Type", "application/json")
                 .set("Accept", "application/json");
+        auth.addHeader(headerBuilder);
+
+        return headerBuilder;
     }
 }

gdk-core/src/main/java/com/github/libgraviton/gdk/auth/BasicAuth.java

@@ -0,0 +1,39 @@
+package com.github.libgraviton.gdk.auth;
+
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import okio.ByteString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.Charset;
+
+
+public class BasicAuth implements HeaderAuth {
+
+    private static final Logger LOG = LoggerFactory.getLogger(BasicAuth.class);
+
+    private String username;
+    private String password;
+
+    public BasicAuth(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    @Override
+    public void addHeader(HeaderBag.Builder headerBuilder) {
+        LOG.debug("Add basic auth header to request");
+        headerBuilder.set("Authorization", basic());
+    }
+
+    public String basic() {
+        return basic(Charset.forName("ISO-8859-1"));
+    }
+
+    public String basic(Charset charset) {
+        String usernameAndPassword = username + ":" + password;
+        byte[] bytes = usernameAndPassword.getBytes(charset);
+        String encoded = ByteString.of(bytes).base64();
+        return "Basic " + encoded;
+    }
+}

gdk-core/src/main/java/com/github/libgraviton/gdk/auth/HeaderAuth.java

@@ -0,0 +1,8 @@
+package com.github.libgraviton.gdk.auth;
+
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+
+public interface HeaderAuth {
+
+    void addHeader(HeaderBag.Builder headerBuilder);
+}

gdk-core/src/main/java/com/github/libgraviton/gdk/auth/NoAuth.java

@@ -0,0 +1,15 @@
+package com.github.libgraviton.gdk.auth;
+
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NoAuth implements HeaderAuth {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NoAuth.class);
+
+    @Override
+    public void addHeader(HeaderBag.Builder headerBuilder) {
+        LOG.debug("No auth selected.");
+    }
+}

gdk-core/src/test/java/com/github/libgraviton/gdk/auth/BasicAuthTest.java

@@ -0,0 +1,38 @@
+package com.github.libgraviton.gdk.auth;
+
+import com.github.libgraviton.gdk.api.header.Header;
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import com.github.libgraviton.gdk.exception.CommunicationException;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class BasicAuthTest {
+
+    @Test
+    public void testEncodedCredentials() throws CommunicationException {
+        String username = "asdf";
+        String password = "112233";
+        BasicAuth auth = new BasicAuth(username, password);
+
+        String encodedCredentials = auth.basic();
+        assertEquals("Basic YXNkZjoxMTIyMzM=", encodedCredentials);
+    }
+
+    @Test
+    public void testAddedHeader() throws CommunicationException {
+        String username = "asdf";
+        String password = "112233";
+        BasicAuth auth = new BasicAuth(username, password);
+
+        HeaderBag.Builder builder = new HeaderBag.Builder();
+        auth.addHeader(builder);
+
+        Map<String, Header> headers = builder.build().all();
+        assertEquals(1, headers.size());
+        assertNotNull(headers.get("Authorization"));
+    }
+}

gdk-core/src/test/java/com/github/libgraviton/gdk/auth/NoAuthTest.java

@@ -0,0 +1,25 @@
+package com.github.libgraviton.gdk.auth;
+
+import com.github.libgraviton.gdk.api.header.Header;
+import com.github.libgraviton.gdk.api.header.HeaderBag;
+import com.github.libgraviton.gdk.exception.CommunicationException;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class NoAuthTest {
+
+    @Test
+    public void testNoAddedHeader() throws CommunicationException {
+        NoAuth auth = new NoAuth();
+
+        HeaderBag.Builder builder = new HeaderBag.Builder();
+        auth.addHeader(builder);
+
+        Map<String, Header> headers = builder.build().all();
+        assertEquals(0, headers.size());
+    }
+}

gdk-maven-plugin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.libgraviton</groupId>
         <artifactId>gdk</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
     </parent>
     <artifactId>gdk-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.github.libgraviton</groupId>
             <artifactId>gdk-core</artifactId>
-            <version>0.4.1</version>
+            <version>0.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.jsonschema2pojo</groupId>

gdk-maven-plugin/src/main/java/com/github/libgraviton/gdk/maven/GenerateMojo.java

@@ -5,6 +5,7 @@
 import com.github.libgraviton.gdk.api.endpoint.EndpointInclusionStrategy;
 import com.github.libgraviton.gdk.api.endpoint.GeneratedEndpointManager;
 import com.github.libgraviton.gdk.api.endpoint.exception.UnableToLoadEndpointAssociationsException;
+import com.github.libgraviton.gdk.auth.BasicAuth;
 import com.github.libgraviton.gdk.generator.Generator;
 import com.github.libgraviton.gdk.generator.exception.GeneratorException;
 import com.github.libgraviton.gdk.generator.instructionloader.grvprofile.GrvProfileInstructionLoader;
@@ -22,6 +23,12 @@ public class GenerateMojo extends Jsonschema2PojoMojo {
     @Parameter(required = true)
     private String gravitonUrl;
 
+    @Parameter(required = false)
+    private String username;
+
+    @Parameter(required = false)
+    private String password;
+
     @Parameter(required = false)
     private String endpointBlacklistPath;
 
@@ -43,7 +50,8 @@ public void execute() throws MojoExecutionException
             endpointManager.setEndpointInclusionStrategy(getEndpointInclusionStrategy());
             GravitonApi gravitonApi = new GravitonApi(
                     gravitonUrl,
-                    endpointManager
+                    endpointManager,
+                    new BasicAuth(username, password)
             );
             Generator generator = new Generator(
                     generatorConfig,

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.libgraviton</groupId>
     <artifactId>gdk</artifactId>
-    <version>0.4.1</version>
+    <version>0.5.0</version>
     <packaging>pom</packaging>
     <name>gdk</name>
     <description>Graviton Development Kit</description>