committing fixes for initial commit of rest service

Author: Paul-doherty-aquaq

src/main/java/uk/co/aquaq/kdb/connection/KdbConnectionWrapper.java

@@ -43,8 +43,6 @@ private String getCredentials() {
         return (username != null ? username : "") + ':' + (password != null ? password : "");
     }
 
-
-
     public void executeAsyncQuery(String query) throws IOException {
         c connectionToKdb=open();
         try {
@@ -59,7 +57,7 @@ public void executeAsyncQuery(String query) throws IOException {
     public Object executeDeferredSyncFunction(KdbRequest kdbRequest) throws c.KException , IOException{
         c connectionToKdb=open();
         try {
-            connectionToKdb.ks(kdbRequest.getFunctionTemplate(),
+            connectionToKdb.ks(kdbRequest.getGatewayFunction(),
                     new Object[]{kdbRequest.getFunctionName().toCharArray(),
                             kdbRequest.getArguments().toCharArray()},
                     kdbRequest.getCredentialDictionary());

src/main/java/uk/co/aquaq/kdb/controller/KdbController.java

@@ -15,6 +15,7 @@
 
 @RestController
 public class KdbController {
+
     @Autowired
     KdbService kdbService;
     @Value("${freeform.query.mode.enabled}")
@@ -24,15 +25,16 @@ public class KdbController {
     @RequestMapping(value = "/executeFunction", method = RequestMethod.POST)
     public Object executeFunction(@RequestBody FunctionRequest functionRequest, @RequestHeader("Authorization") String authString) {
         BasicCredentials authDetails =new BasicCredentials(authString);
+
         return kdbService.executeFunction(functionRequest, authDetails);
     }
 
     @CrossOrigin
     @RequestMapping(value = "/executeQuery", method = RequestMethod.POST)
     public List<Map<String, String>> executeQuery(@RequestBody QueryRequest queryRequest){
         if (freeFormQueryEnabled) {
-            return kdbService.executeQuery(queryRequest);
 
+            return kdbService.executeQuery(queryRequest);
         } else {
             throw new InvalidRequestException("Invalid Request Free form queries not enabled.");
         }

src/main/java/uk/co/aquaq/kdb/request/KdbRequest.java

@@ -8,6 +8,6 @@ public class KdbRequest {
 
     private String functionName;
     private String arguments;
-    private String functionTemplate;
+    private String gatewayFunction;
     private c.Dict credentialDictionary;
 }

src/main/java/uk/co/aquaq/kdb/request/KdbRequestBuilder.java

@@ -11,20 +11,19 @@
 public class KdbRequestBuilder {
 
     private KdbRequestBuilder (){}
+    private static String gatewayFunction;
 
-    private static String functionTemplate;
-
-    @Value("${function}")
-    public void setFunctionTemplate(String functionTemplate) {
-        this.functionTemplate = functionTemplate;
+    @Value("${gateway.function}")
+    public void setGatewayFunction(String gatewayFunctionProp) {
+        gatewayFunction = gatewayFunctionProp;
     }
 
     public static KdbRequest buildKdbRequest(FunctionRequest functionRequest, BasicCredentials basicCredentials){
         KdbRequest kdbRequest = new KdbRequest();
         kdbRequest.setArguments(buildArgString(functionRequest.getArguments()));
         kdbRequest.setFunctionName(functionRequest.getFunction_name());
         kdbRequest.setCredentialDictionary(new c.Dict(new String[]{"user"},new String[]{basicCredentials.getUsername()}));
-        kdbRequest.setFunctionTemplate(functionTemplate);
+        kdbRequest.setGatewayFunction(gatewayFunction);
 
         return kdbRequest;
     }

src/main/java/uk/co/aquaq/kdb/service/KdbService.java

@@ -12,38 +12,39 @@
 import uk.co.aquaq.kdb.request.KdbRequest;
 import uk.co.aquaq.kdb.request.KdbRequestBuilder;
 import uk.co.aquaq.kdb.security.BasicCredentials;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 
 @Service
 public class KdbService {
+
     @Autowired
     private KdbConnectionWrapper kdbConnector;
     private static final Logger logger = LoggerFactory.getLogger(KdbConnectionWrapper.class);
 
     public Object executeFunction(FunctionRequest functionRequest, BasicCredentials credentialValues){
         KdbRequest kdbRequest= KdbRequestBuilder.buildKdbRequest(functionRequest,credentialValues);
-        List<Map<String,String>> results = null;
         try {
             Object functionResult= kdbConnector.executeDeferredSyncFunction(kdbRequest);
-            if(functionResult instanceof c.Flip){
-                c.Flip flip= (c.Flip)kdbConnector.executeDeferredSyncFunction(kdbRequest);
-                FlipConverter flipConverter = new FlipConverter();
-                results= flipConverter.convertFlipToRecordList(flip);
-                return results;
-            }
-            else{
-                return functionResult;
-            }
+            return formatFunctionResult(functionResult);
         } catch (Exception exception) {
             logger.warn( exception.getMessage());
         }
         return null;
     }
 
+    private Object formatFunctionResult(Object functionResult) {
+        if(functionResult instanceof c.Flip){
+            c.Flip flip= (c.Flip)functionResult;
+            FlipConverter flipConverter = new FlipConverter();
+            functionResult= flipConverter.convertFlipToRecordList(flip);
+        }
+
+        return functionResult;
+    }
+
     public List<Map<String, String>> executeQuery(QueryRequest queryRequest){
         if (queryRequest.getType().equals("sync") && queryRequest.getResponse().equals("true")) {
             return syncRead(queryRequest.getQuery());

src/main/resources/application.properties

@@ -14,9 +14,10 @@ kdb.host=localhost
 kdb.port=6007
 kdb.username=admin
 kdb.password=admin
-function={@[value;`.aqrest.exec;{[x;y] value x}] . (x;y)}
+gateway.function={[request;properties] @[value;`.aqrest.exec;{[x;y] value x}] . (request;properties)}
 
 server.port=8080
 freeform.query.mode.enabled=false
 basic.authentication.user=user
 basic.authentication.password=pass
+