Merge pull request #12 from jegasmlm/master

Support for katana 1.2

Author: jegasmlm

.gradle/2.13/taskArtifacts/cache.properties.lock

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - 2017-09-01
+## Added
+- Start support for katana 1.2
+## Added
+- Support for optional arguments in java methods
+## Fixed
+- Fix immutable classes (Response, Request, HttpRequest, HttpResponse, Action, Transport)
+## Fixed
+- Fixed Response accessors for attributes
+## Added
+- Support for request attributes from katana 1.1.12
+- Accessors for request id and timestamp
+## Added
+- New header methods
+## Fixed
+- Fix default property in getProperty()
+
 ## [1.1.0] - 2017-06-01
 ### Changed
 - Updated CONTRIBUTING.md and README.md

.gradle/2.13/taskArtifacts/fileHashes.bin

@@ -10,7 +10,7 @@ Java SDK to interface with the **KATANA**™ framework (https://kusanagi.io).
 Requirements
 ------------
 
-* KATANA Framework 1.1
+* KATANA Framework 1.2
 * [JDK](http://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html) 1.8
 * [libzmq](http://zeromq.org/intro:get-the-software) 4.1.5+
 
@@ -33,15 +33,15 @@ If using **Maven**, add the following in your `pom.xml` file:
 <dependency>
     <groupId>io.kusanagi</groupId>
     <artifactId>katana-sdk-java8</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
 Or, if using **Gradle**, add the following in your `build.gradle` file:
 
 ```gradle
 dependencies {
-    compile group: 'io.kusanagi', name: 'katana-sdk-java8', version: '1.1.0'
+    compile group: 'io.kusanagi', name: 'katana-sdk-java8', version: '1.2.0'
 }
 ```
 

.gradle/2.13/taskArtifacts/fileSnapshots.bin

@@ -20,7 +20,7 @@ apply plugin: 'signing'
 
 group 'io.kusanagi'
 archivesBaseName = "katana-sdk-java8"
-version '1.1.0'
+version '1.2.0'
 
 mainClassName = 'io.kusanagi.katana.api.component.Component'
 

.gradle/2.13/taskArtifacts/taskArtifacts.bin

@@ -23,13 +23,15 @@
 import io.kusanagi.katana.sdk.Callable;
 import io.kusanagi.katana.sdk.ServiceSchema;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * Created by juan on 28/08/16.
  */
-public class Api {
+public abstract class Api {
 
     protected Component component;
 
@@ -76,81 +78,31 @@ public Api(Component component, String path, String name, String version, String
         this.isDebug = isDebug;
     }
 
-    public Api(Api other) {
-        this.path = other.path;
-        this.name = other.name;
-        this.version = other.version;
-        this.platformVersion = other.platformVersion;
-        this.variables = other.variables;
-        this.isDebug = other.isDebug;
-    }
-
-    /**
-     * Path setter
-     *
-     * @param path Path of the call
-     */
-    public void setPath(String path) {
+    public Api(Component component, String path, String name, String version, String platformVersion,
+               Map<String, String> variables, boolean isDebug, Mapping mapping) {
+        this.component = component;
         this.path = path;
-    }
-
-    /**
-     * Name setter
-     *
-     * @param name Name of the Service
-     */
-    public void setName(String name) {
         this.name = name;
-    }
-
-    /**
-     * Version setter
-     *
-     * @param version Version of the service
-     */
-    public void setProtocolVersion(String version) {
         this.version = version;
-    }
-
-    /**
-     * Platform version setter
-     *
-     * @param platformVersion Version of the platform
-     */
-    public void setPlatformVersion(String platformVersion) {
         this.platformVersion = platformVersion;
-    }
-
-    /**
-     * Variables setter
-     *
-     * @param variables Sdk variables
-     */
-    public void setVariables(Map<String, String> variables) {
         this.variables = variables;
+        this.isDebug = isDebug;
+        this.mapping = mapping;
     }
 
-    /**
-     * Debug state setter
-     *
-     * @param debug Debug state
-     */
-    public void setDebug(boolean debug) {
-        isDebug = debug;
+    public Api(Api other) {
+        this.path = other.path;
+        this.name = other.name;
+        this.version = other.version;
+        this.platformVersion = other.platformVersion;
+        this.variables = other.variables;
+        this.isDebug = other.isDebug;
     }
 
     public Mapping getMapping() {
         return mapping;
     }
 
-    public void setMapping(Mapping mapping) {
-        this.mapping = mapping;
-    }
-
-    public void setComponent(Component component) {
-        this.component = component;
-    }
-
     // SDK Method
 
     /**
@@ -165,7 +117,7 @@ public boolean isDebug() {
      * @return Return the version of the platform
      */
     @JsonIgnore
-    public String getPlatformVersion() {
+    public String getFrameworkVersion() {
         return platformVersion;
     }
 
@@ -201,6 +153,15 @@ public Map<String, String> getVariables() {
         return variables;
     }
 
+    /**
+     *
+     * @param name case-sensitive name argument.
+     * @return determine if a variable has been defined with the REQUIRED case-sensitive name argument.
+     */
+    public boolean hasVariable(String name) {
+        return this.variables.containsKey(name);
+    }
+
     /**
      * Get the variable with the REQUIRED case-sensitive name argument, and which MUST be returned as a string.
      *
@@ -228,6 +189,27 @@ public Callable getResource(String name) {
         return this.component.getResource(name);
     }
 
+    /**
+     *
+     * @return return an array with the Service versions in the stored schema mapping, in which each item MUST be an
+     * object with the key name that MUST have the name of the Service and the key version that MUST have the version of the Service.
+     */
+    public List<Map<String, String>> getServices(){
+        List<Map<String, String>> services = new ArrayList<>();
+
+        for (Map.Entry service : mapping.getServiceSchema().entrySet()) {
+            Map<String, ServiceSchema> versions = mapping.getServiceSchema().get((String) service.getKey());
+            for (Map.Entry version : versions.entrySet()) {
+                Map<String, String> serviceMap = new HashMap<>();
+                serviceMap.put("service", (String) service.getKey());
+                serviceMap.put("version", (String) version.getKey());
+                services.add(serviceMap);
+            }
+        }
+
+        return services;
+    }
+
     /**
      * Return an instance of the Mapping class for the Service defined by the REQUIRED case sensitive name and
      * version arguments, using the stored mapping of schemas.
@@ -259,6 +241,15 @@ public boolean log(String value) {
         return true;
     }
 
+    /**
+     *
+     * @return This function is only for use in an asynchronous implementation of the SDK, for any other implementation
+     * it MUST return false.
+     */
+    public boolean done(){
+        return false;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -320,4 +311,92 @@ public String toString() {
                 ", mapping=" + mapping +
                 '}';
     }
+
+    public abstract static class Builder<T> {
+        private Component component;
+        private String path;
+        private String name;
+        private String version;
+        private String platformVersion;
+        private Map<String, String> variables;
+        private boolean isDebug;
+        private Mapping mapping;
+
+        public Builder() {
+        }
+
+        public Builder<T> setComponent(Component component) {
+            this.component = component;
+            return this;
+        }
+
+        public Builder<T> setPath(String path) {
+            this.path = path;
+            return this;
+        }
+
+        public Builder<T> setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder<T> setVersion(String version) {
+            this.version = version;
+            return this;
+        }
+
+        public Builder<T> setPlatformVersion(String platformVersion) {
+            this.platformVersion = platformVersion;
+            return this;
+        }
+
+        public Builder<T> setVariables(Map<String, String> variables) {
+            this.variables = variables;
+            return this;
+        }
+
+        public Builder<T> setDebug(boolean debug) {
+            isDebug = debug;
+            return this;
+        }
+
+        public Builder<T> setMapping(Mapping mapping) {
+            this.mapping = mapping;
+            return this;
+        }
+
+        public Component getComponent() {
+            return component;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public String getPlatformVersion() {
+            return platformVersion;
+        }
+
+        public Map<String, String> getVariables() {
+            return variables;
+        }
+
+        public boolean isDebug() {
+            return isDebug;
+        }
+
+        public Mapping getMapping() {
+            return mapping;
+        }
+
+        public abstract T build();
+    }
 }

CHANGELOG.md

@@ -18,12 +18,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.kusanagi.katana.api.commands.common.CommandPayload;
 import io.kusanagi.katana.api.component.Key;
-import io.kusanagi.katana.sdk.Action;
+import io.kusanagi.katana.api.serializers.ActionEntity;
 
 /**
  * Created by juan on 26/09/16.
  */
-public class ActionCommandPayload extends CommandPayload<Action> {
+public class ActionCommandPayload extends CommandPayload<ActionEntity> {
 
     /**
      * The semantics of the command
@@ -81,29 +81,29 @@ public String toString() {
                 "} " + super.toString();
     }
 
-    public static class ActionCommand extends Command<Action> {
+    public static class ActionCommand extends Command<ActionEntity> {
 
         /**
          * The key/value arguments for the command, if no arguments exist this property SHOULD NOT be defined
          */
         @JsonProperty(Key.COMMAND_ARGUMENT)
-        private Action argument;
+        private ActionEntity argument;
 
         public ActionCommand() {
             //Empty constructor for serialization
         }
 
         public ActionCommand(ActionCommand other) {
             super(other);
-            this.argument = new Action(other.argument);
+            this.argument = new ActionEntity(other.argument);
         }
 
         @Override
-        public Action getArgument() {
+        public ActionEntity getArgument() {
             return argument;
         }
 
-        public void setArgument(Action argument) {
+        public void setArgument(ActionEntity argument) {
             this.argument = argument;
         }