aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-02-23 04:38:05 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-23 04:38:05 +0000
commit077d14997f5663e570948a0c497e8fae80a0f5d5 (patch)
treed62768157ec91e76e2443525c580760977c118e3
parenta4272dde25c1de7110318d1c09c53b11de753b33 (diff)
parent6ce7e33eec5c63df024d33802b8afeb08d38cefe (diff)
Merge "ARIA REST client bugs"
-rw-r--r--aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/AriaClientFactory.java2
-rw-r--r--aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ServiceTemplateImpl.java15
2 files changed, 9 insertions, 8 deletions
diff --git a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/AriaClientFactory.java b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/AriaClientFactory.java
index a97384e084..7241b2ac65 100644
--- a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/AriaClientFactory.java
+++ b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/AriaClientFactory.java
@@ -25,7 +25,7 @@ import java.net.URL;
*/
public class AriaClientFactory {
- AriaClient createRestClient(String protocol, String address, int port, String version){
+ public AriaClient createRestClient(String protocol, String address, int port, String version){
return new AriaRestClient(protocol, address, port, version);
}
}
diff --git a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ServiceTemplateImpl.java b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ServiceTemplateImpl.java
index a41d5b7236..562fcb232e 100644
--- a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ServiceTemplateImpl.java
+++ b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ServiceTemplateImpl.java
@@ -41,6 +41,14 @@ public class ServiceTemplateImpl implements ServiceTemplate {
}
/**
+ * Construct service template from CSAR byte array
+ */
+ public ServiceTemplateImpl(String name, byte[] csar){
+ this.csar_blob = csar;
+ this.name = name;
+ }
+
+ /**
* Construct an instance based on CSAR
* @param name a textual name for the template
* @param uri a URI to a CSAR
@@ -53,13 +61,6 @@ public class ServiceTemplateImpl implements ServiceTemplate {
this.description=description;
}
- /**
- * Construct an instance based on CSAR array
- */
- public ServiceTemplateImpl(byte[] csar_bytes) {
- this.csar_blob = csar_bytes;
- }
-
public int getId(){
return id;
}