Merge pull request #27 from securenative/dev

Fix context factory names

Author: inbaltako

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
     steps:
       - name: Notify slack success
         if: success()

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
     steps:
     - name: Notify slack success
       if: success()

README.md

@@ -33,7 +33,7 @@ When using Maven, add the following dependency to your `pom.xml` file:
 ```xml
 <dependency>
     <groupId>com.securenative.java</groupId>
-    <artifactId>sdk-base</artifactId>
+    <artifactId>securenative-java</artifactId>
     <version>LATEST</version>
 </dependency>
 ```

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.securenative.java</groupId>
     <artifactId>securenative-java</artifactId>
     <packaging>jar</packaging>
-    <version>0.4.5</version>
+    <version>0.4.6</version>
     <url>https://github.com/securenative/securenative-java</url>
 
     <name>${project.groupId}:${project.artifactId}:${project.version}</name>

pom.xml.asc

@@ -13,37 +13,37 @@ private SecureNativeContextBuilder() {
         this.context = new SecureNativeContext();
     }
 
-    public SecureNativeContextBuilder clientToken(String clientToken) {
+    public SecureNativeContextBuilder withClientToken(String clientToken) {
         this.context.setClientToken(clientToken);
         return this;
     }
 
-    public SecureNativeContextBuilder ip(String ip) {
+    public SecureNativeContextBuilder withIp(String ip) {
         this.context.setIp(ip);
         return this;
     }
 
-    public SecureNativeContextBuilder remoteIp(String remoteIp) {
+    public SecureNativeContextBuilder withRemoteIp(String remoteIp) {
         this.context.setRemoteIp(remoteIp);
         return this;
     }
 
-    public SecureNativeContextBuilder headers(Map<String, String> headers) {
+    public SecureNativeContextBuilder withHeaders(Map<String, String> headers) {
         this.context.setHeaders(headers);
         return this;
     }
 
-    public SecureNativeContextBuilder url(String url) {
+    public SecureNativeContextBuilder withUrl(String url) {
         this.context.setUrl(url);
         return this;
     }
 
-    public SecureNativeContextBuilder method(String method) {
+    public SecureNativeContextBuilder withMethod(String method) {
         this.context.setMethod(method);
         return this;
     }
 
-    public SecureNativeContextBuilder body(String body) {
+    public SecureNativeContextBuilder withBody(String body) {
         this.context.setBody(body);
         return this;
     }
@@ -61,13 +61,13 @@ public static SecureNativeContextBuilder fromHttpServletRequest(HttpServletReque
         }
 
         return new SecureNativeContextBuilder()
-                .url(request.getRequestURI())
-                .method(request.getMethod())
-                .headers(headers)
-                .clientToken(clientToken)
-                .ip(RequestUtils.getClientIpFromRequest(request, headers))
-                .remoteIp(RequestUtils.getRemoteIpFromRequest(request))
-                .body(null);
+                .withUrl(request.getRequestURI())
+                .withMethod(request.getMethod())
+                .withHeaders(headers)
+                .withClientToken(clientToken)
+                .withIp(RequestUtils.getClientIpFromRequest(request, headers))
+                .withRemoteIp(RequestUtils.getRemoteIpFromRequest(request))
+                .withBody(null);
     }
 
     public SecureNativeContext build(){

src/main/java/com/securenative/context/SecureNativeContextBuilder.java

@@ -35,9 +35,9 @@ public class ApiManagerImplTest extends HTTPServerMock {
     public ApiManagerImplTest() throws SecureNativeInvalidOptionsException {
         // init default event for tests
         SecureNativeContext context = SecureNative.contextBuilder()
-                .ip("127.0.0.1")
-                .clientToken("SECURED_CLIENT_TOKEN")
-                .headers(Maps.defaultBuilder()
+                .withIp("127.0.0.1")
+                .withClientToken("SECURED_CLIENT_TOKEN")
+                .withHeaders(Maps.defaultBuilder()
                             .put("user-agent", "Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405")
                             .build())
                 .build();

src/test/java/com/securenative/ApiManagerImplTest.java

@@ -83,13 +83,13 @@ public void createDefaultContextBuilderTest() {
     public void createCustomContextWithContextBuilderTest() {
         SecureNativeContext context =  SecureNativeContextBuilder
                 .defaultContextBuilder()
-                .url("/some-url")
-                .clientToken("SECRET_TOKEN")
-                .ip("10.0.0.0")
-                .body("{ \"name\": \"YOUR_NAME\" }")
-                .method("Get")
-                .remoteIp("10.0.0.1")
-                .headers(Maps.defaultBuilder()
+                .withUrl("/some-url")
+                .withClientToken("SECRET_TOKEN")
+                .withIp("10.0.0.0")
+                .withBody("{ \"name\": \"YOUR_NAME\" }")
+                .withMethod("Get")
+                .withRemoteIp("10.0.0.1")
+                .withHeaders(Maps.defaultBuilder()
                                  .put("header1", "value1")
                                  .build())
                 .build();