fix schema

drip-commons/pom.xml

@@ -127,6 +127,11 @@
             <artifactId>commons-io</artifactId>
             <version>2.6</version>
             <type>jar</type>
+        </dependency>        
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
         </dependency>                
     </dependencies>
     
@@ -161,7 +166,7 @@
                             <output>${project.build.directory}/generated-sources</output>
                             <apiPackage>${default.package}.handler</apiPackage>
                             <modelPackage>nl.uva.sne.drip.model</modelPackage>
-                            <invokerPackage>${default.package}.handler</invokerPackage>                            
+                            <invokerPackage>nl.uva.sne.drip.commons.cloud_storm.client</invokerPackage>                            
                         </configuration>
                     </execution>
                 </executions>

drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormSubTopology.java

+/*
+ * Copyright 2019 S. Koulouzis
+ *
+ * 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 nl.uva.sne.drip.model;
+
+import java.util.Objects;
+import com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author S. Koulouzis
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-12-09T16:00:08.961312+01:00[Europe/Amsterdam]")
+public class CloudsStormSubTopology {
+
+    public static final String SERIALIZED_NAME_VMS = "VMs";
+    @SerializedName(SERIALIZED_NAME_VMS)
+    private List<CloudsStormVM> vms = null;
+
+    public CloudsStormSubTopology vms(List<CloudsStormVM> vms) {
+
+        this.vms = vms;
+        return this;
+    }
+
+    public CloudsStormSubTopology addVmsItem(CloudsStormVM vmsItem) {
+        if (this.vms == null) {
+            this.vms = new ArrayList<CloudsStormVM>();
+        }
+        this.vms.add(vmsItem);
+        return this;
+    }
+
+    /**
+     * Get vms
+     *
+     * @return vms
+     *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public List<CloudsStormVM> getVms() {
+        return vms;
+    }
+
+    public void setVms(List<CloudsStormVM> vms) {
+        this.vms = vms;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CloudsStormSubTopology cloudsStormSubTopology = (CloudsStormSubTopology) o;
+        return Objects.equals(this.vms, cloudsStormSubTopology.vms);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(vms);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class CloudsStormSubTopology {\n");
+        sb.append("    vms: ").append(toIndentedString(vms)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormTopTopology.java

+/*
+ * Copyright 2019 S. Koulouzis
+ *
+ * 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 nl.uva.sne.drip.model;
+
+import java.util.Objects;
+import com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author S. Koulouzis
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-12-09T16:00:08.961312+01:00[Europe/Amsterdam]")
+public class CloudsStormTopTopology {
+
+    public static final String SERIALIZED_NAME_USER_NAME = "userName";
+    @SerializedName(SERIALIZED_NAME_USER_NAME)
+    private String userName;
+
+    public static final String SERIALIZED_NAME_PUBLIC_KEY_PATH = "publicKeyPath";
+    @SerializedName(SERIALIZED_NAME_PUBLIC_KEY_PATH)
+    private String publicKeyPath;
+
+    public static final String SERIALIZED_NAME_TOPOLOGIES = "topologies";
+    @SerializedName(SERIALIZED_NAME_TOPOLOGIES)
+    private List<CloudsStormSubTopology> topologies = null;
+
+    public CloudsStormTopTopology userName(String userName) {
+
+        this.userName = userName;
+        return this;
+    }
+
+    /**
+     * Get userName
+     *
+     * @return userName
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public CloudsStormTopTopology publicKeyPath(String publicKeyPath) {
+
+        this.publicKeyPath = publicKeyPath;
+        return this;
+    }
+
+    /**
+     * Get publicKeyPath
+     *
+     * @return publicKeyPath
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getPublicKeyPath() {
+        return publicKeyPath;
+    }
+
+    public void setPublicKeyPath(String publicKeyPath) {
+        this.publicKeyPath = publicKeyPath;
+    }
+
+    public CloudsStormTopTopology topologies(List<CloudsStormSubTopology> topologies) {
+
+        this.topologies = topologies;
+        return this;
+    }
+
+    public CloudsStormTopTopology addTopologiesItem(CloudsStormSubTopology topologiesItem) {
+        if (this.topologies == null) {
+            this.topologies = new ArrayList<CloudsStormSubTopology>();
+        }
+        this.topologies.add(topologiesItem);
+        return this;
+    }
+
+    /**
+     * Get topologies
+     *
+     * @return topologies
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public List<CloudsStormSubTopology> getTopologies() {
+        return topologies;
+    }
+
+    public void setTopologies(List<CloudsStormSubTopology> topologies) {
+        this.topologies = topologies;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CloudsStormTopTopology cloudsStormTopTopology = (CloudsStormTopTopology) o;
+        return Objects.equals(this.userName, cloudsStormTopTopology.userName)
+                && Objects.equals(this.publicKeyPath, cloudsStormTopTopology.publicKeyPath)
+                && Objects.equals(this.topologies, cloudsStormTopTopology.topologies);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(userName, publicKeyPath, topologies);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class CloudsStormTopTopology {\n");
+        sb.append("    userName: ").append(toIndentedString(userName)).append("\n");
+        sb.append("    publicKeyPath: ").append(toIndentedString(publicKeyPath)).append("\n");
+        sb.append("    topologies: ").append(toIndentedString(topologies)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormVM.java

+/*
+ * Copyright 2019 S. Koulouzis
+ *
+ * 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 nl.uva.sne.drip.model;
+
+import java.util.Objects;
+import com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ *
+ * @author S. Koulouzis
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-12-09T16:00:08.961312+01:00[Europe/Amsterdam]")
+public class CloudsStormVM {
+
+    public static final String SERIALIZED_NAME_NAME = "name";
+    @SerializedName(SERIALIZED_NAME_NAME)
+    private String name;
+
+    public static final String SERIALIZED_NAME_NODE_TYPE = "nodeType";
+    @SerializedName(SERIALIZED_NAME_NODE_TYPE)
+    private String nodeType;
+
+    public static final String SERIALIZED_NAME_OS_TYPE = "OSType";
+    @SerializedName(SERIALIZED_NAME_OS_TYPE)
+    private String osType;
+
+    public static final String SERIALIZED_NAME_SCRIPT = "script";
+    @SerializedName(SERIALIZED_NAME_SCRIPT)
+    private String script;
+
+    public static final String SERIALIZED_NAME_PUBLIC_ADDRESS = "publicAddress";
+    @SerializedName(SERIALIZED_NAME_PUBLIC_ADDRESS)
+    private String publicAddress;
+
+    public CloudsStormVM name(String name) {
+
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return name
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public CloudsStormVM nodeType(String nodeType) {
+
+        this.nodeType = nodeType;
+        return this;
+    }
+
+    /**
+     * Get nodeType
+     *
+     * @return nodeType
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getNodeType() {
+        return nodeType;
+    }
+
+    public void setNodeType(String nodeType) {
+        this.nodeType = nodeType;
+    }
+
+    public CloudsStormVM osType(String osType) {
+
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get osType
+     *
+     * @return osType
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getOsType() {
+        return osType;
+    }
+
+    public void setOsType(String osType) {
+        this.osType = osType;
+    }
+
+    public CloudsStormVM script(String script) {
+
+        this.script = script;
+        return this;
+    }
+
+    /**
+     * Get script
+     *
+     * @return script
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getScript() {
+        return script;
+    }
+
+    public void setScript(String script) {
+        this.script = script;
+    }
+
+    public CloudsStormVM publicAddress(String publicAddress) {
+
+        this.publicAddress = publicAddress;
+        return this;
+    }
+
+    /**
+     * Get publicAddress
+     *
+     * @return publicAddress
+  *
+     */
+    @javax.annotation.Nullable
+    @ApiModelProperty(value = "")
+
+    public String getPublicAddress() {
+        return publicAddress;
+    }
+
+    public void setPublicAddress(String publicAddress) {
+        this.publicAddress = publicAddress;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CloudsStormVM cloudsStormVM = (CloudsStormVM) o;
+        return Objects.equals(this.name, cloudsStormVM.name)
+                && Objects.equals(this.nodeType, cloudsStormVM.nodeType)
+                && Objects.equals(this.osType, cloudsStormVM.osType)
+                && Objects.equals(this.script, cloudsStormVM.script)
+                && Objects.equals(this.publicAddress, cloudsStormVM.publicAddress);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, nodeType, osType, script, publicAddress);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class CloudsStormVM {\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    nodeType: ").append(toIndentedString(nodeType)).append("\n");
+        sb.append("    osType: ").append(toIndentedString(osType)).append("\n");
+        sb.append("    script: ").append(toIndentedString(script)).append("\n");
+        sb.append("    publicAddress: ").append(toIndentedString(publicAddress)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}

openAPI/API/CloudStorm-1.0.0-openapi.yaml

@@ -44,4 +44,14 @@ paths:
 components:
   schemas:
     CloudsStormTopTopology:
-      $ref: https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormTopTopology.yml#/CloudsStormTopTopology
+        type: "object"
+        properties:
+            userName:
+                type: "string"
+            publicKeyPath:
+                type: "string"
+            topologies:
+                type: array
+                items:
+                    $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormSubTopology.yml#/CloudsStormSubTopology'
+

openAPI/schema/CloudsStormSubTopology.yml

-  CloudsStormSubTopology:
-    type: "object"
-    properties:
-        VMs:
-            type: array
-            items:
-                $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormVM.yml#/CloudsStormVM'
+    CloudsStormSubTopology:
+        type: "object"
+        properties:
+            VMs:
+                type: array
+                items:
+                    $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormVM.yml#/CloudsStormVM'
 
         

openAPI/schema/CloudsStormTopTopology.yml

-  CloudsStormTopTopology:
-    type: "object"
-    properties:
-        userName:
-            type: "string"
-        publicKeyPath:
-            type: "string"
-        topologies:
-        type: array
-        items:
-            $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormSubTopology.yml#/CloudsStormSubTopology'
+    CloudsStormTopTopology:
+        type: "object"
+        properties:
+            userName:
+                type: "string"
+            publicKeyPath:
+                type: "string"
+            topologies:
+                type: array
+                items:
+                    $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormSubTopology.yml#/CloudsStormSubTopology'

openAPI/schema/CloudsStormVM.yml

-  CloudsStormVM:
-    type: "object"
-    properties:
-        name:
-            type: "string"
-        nodeType:
-            type: "string"
-        OSType:
-            type: "string"
-        script:
-            type: "string"
-        publicAddress:
-            type: "string"
+    CloudsStormVM:
+        type: "object"
+        properties:
+            name:
+                type: "string"
+            nodeType:
+                type: "string"
+            OSType:
+                type: "string"
+            script:
+                type: "string"
+            publicAddress:
+                type: "string"