bug fix

TIHBS · Jul 29, 2020 · 6347bd9 · 6347bd9
1 parent 1771f2d
commit 6347bd9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/SCTransformation/ClientApplicationGenerator.cs b/SCTransformation/ClientApplicationGenerator.cs
@@ -89,7 +89,13 @@ private static string BuildJavaApplication(SmartContractDescriptor smartContract
 
                             foreach (var parameter in function.Outputs)
                             {
-                                template.Add("outputparameterarray", new[] {parameter});
+                                var privateParameter = new Parameter
+                                {
+                                    FirstCapital = ToUpperFirstLetter(parameter.Name),
+                                    Name = parameter.Name,
+                                    ParamType = parameter.Type
+                                };
+                                template.Add("outputparameterarray", new[] {privateParameter});
                             }
 
                             controllerFunctions += template.Render();

diff --git a/SCTransformation/Templates/JavaApplication/controller/smartcontract/ControllerEvents.st b/SCTransformation/Templates/JavaApplication/controller/smartcontract/ControllerEvents.st
@@ -3,7 +3,7 @@
     @RequestMapping(value = "/query/€event.Name€", method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE\})
     public List<Occurrence> query€event.FirstCapital€(@RequestBody QueryInput input) {
         List<Parameter> parameters= new ArrayList<Parameter>(){
-            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.Type€\"\}").build());\}};separator="\n"€
+            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.ParamType€\"\}").build());\}};separator="\n"€
         \};
         return scipClientFunctions.performQuery(null,"€event.Name€",parameters,input.getFilter(),input.getTimeFrame());
     \}
@@ -12,7 +12,7 @@
     @RequestMapping(value = "/subscribe/€event.Name€", method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE\})
     public Observable<SubscribeResponse> subscribe€event.FirstCapital€(@RequestBody SubscribeInput input) {
         List<Parameter> parameters= new ArrayList<Parameter>(){
-            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.Type€\"\}").build());\}};separator="\n"€
+            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.ParamType€\"\}").build());\}};separator="\n"€
         \};
         return scipClientFunctions.performSubscribe(null,"€event.Name€",parameters,input.getFilter(),input.getCorrelationIdentifier(), input.getDegreeOfConfidence());
     \}
@@ -21,7 +21,7 @@
     @RequestMapping(value = "/unsubscribe/€event.Name€", method = RequestMethod.POST, consumes = {MediaType.APPLICATION_JSON_VALUE\})
     public UnsubscribeResponse unsubscribe€event.FirstCapital€() {
         List<Parameter> parameters= new ArrayList<Parameter>(){
-            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.Type€\"\}").build());\}};separator="\n"€
+            €eventoutputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.ParamType€\"\}").build());\}};separator="\n"€
         \};
         return scipClientFunctions.performUnsubscribe("€event.Name€",null,parameters,null);
     \}

diff --git a/SCTransformation/Templates/JavaApplication/controller/smartcontract/ControllerFunctions.st b/SCTransformation/Templates/JavaApplication/controller/smartcontract/ControllerFunctions.st
@@ -6,7 +6,7 @@
             €inputparameterarray:{it|{add(Parameter.builder().name("€it.Name€").type("{\"type\": \"€it.ParamType€\"\}").value(parameter.get€it.FirstCapital€()).build());\}};separator="\n"€
        \};
        List<Parameter> outputParameters = new ArrayList<Parameter>(){
-            €outputparameterarray:{it|{add(new Parameter().builder().name("€it.name€").type("{\"type\": \"€it.type€\"\}").build());\}};separator="\n"€
+            €outputparameterarray:{it|{add(new Parameter().builder().name("€it.Name€").type("{\"type\": \"€it.ParamType€\"\}").build());\}};separator="\n"€
        \};
        return scipClientFunctions.performInvoke("€function.Name€",inputParameters,outputParameters,parameter.getDegreeOfConfidence()).get();
     \}