committing changes to open source

Author: Paul-doherty-aquaq

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

@@ -7,6 +7,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import uk.co.aquaq.kdb.request.KdbRequest;
+
 import java.io.IOException;
 import java.net.UnknownHostException;
 
@@ -15,7 +16,6 @@
 public class KdbConnectionWrapper {
 
     private static final Logger logger = LoggerFactory.getLogger(KdbConnectionWrapper.class);
-    private c connectionToKdb;
     @Value("${kdb.host}")
     private String hostname;
     @Value("${kdb.port}")
@@ -25,9 +25,9 @@ public class KdbConnectionWrapper {
     @Value("${kdb.password}")
     private String password;
 
-    private void open(){
+    private c open(){
         try {
-            connectionToKdb = new c(hostname, port, getCredentials());
+            return new c(hostname, port, getCredentials());
         } catch (UnknownHostException unknownHostException) {
             String message = String.format("Unable to contact KDB host %s. Original message: %s", hostname, unknownHostException.getMessage());
             logger.error(message);
@@ -43,43 +43,38 @@ private String getCredentials() {
         return (username != null ? username : "") + ':' + (password != null ? password : "");
     }
 
-    private void close() throws IOException{
-        if (connectionToKdb != null) {
-                connectionToKdb.close();
-                connectionToKdb = null;
-        }
-    }
+
 
     public void executeAsyncQuery(String query) throws IOException {
+        c connectionToKdb=open();
         try {
             connectionToKdb.ks(query);
         }
         finally {
-            close();
+            connectionToKdb.close();
+
         }
     }
 
     public Object executeDeferredSyncFunction(KdbRequest kdbRequest) throws c.KException , IOException{
+        c connectionToKdb=open();
         try {
-            open();
             connectionToKdb.ks(kdbRequest.getFunctionTemplate(),
                     new Object[]{kdbRequest.getFunctionName().toCharArray(),
                             kdbRequest.getArguments().toCharArray()},
                     kdbRequest.getCredentialDictionary());
-            Object  response=connectionToKdb.k();
-           logger.warn(kdbRequest.hashCode()+"response:"+response.toString());
-            return response;
+            return  connectionToKdb.k();
         }finally {
-            close();
+            connectionToKdb.close();
         }
     }
 
     public Object syncQuery(String query) throws IOException, c.KException {
+        c connectionToKdb=open();
         try {
-            open();
             return c.td(connectionToKdb.k(query));
         }finally {
-            close();
+            connectionToKdb.close();
         }
     }
 }

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

@@ -15,7 +15,7 @@ private KdbRequestBuilder (){}
     private static String functionTemplate;
 
     @Value("${function}")
-    public void setDatabase(String functionTemplate) {
+    public void setFunctionTemplate(String functionTemplate) {
         this.functionTemplate = functionTemplate;
     }
 

src/main/java/uk/co/aquaq/kdb/security/SecurityConfiguration.java

@@ -33,7 +33,6 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception
         auth.inMemoryAuthentication()
                 .withUser(user).password(password).authorities("ROLE_USER");
     }
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.cors()

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

@@ -26,10 +26,20 @@ public class KdbService {
 
     public Object executeFunction(FunctionRequest functionRequest, BasicCredentials credentialValues){
         KdbRequest kdbRequest= KdbRequestBuilder.buildKdbRequest(functionRequest,credentialValues);
+        List<Map<String,String>> results = null;
         try {
-            return kdbConnector.executeDeferredSyncFunction(kdbRequest);
+            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;
+            }
         } catch (Exception exception) {
-            logger.warn(exception.getMessage());
+            logger.warn( exception.getMessage());
         }
         return null;
     }

src/main/resources/application.properties

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