updating code for opensourcing

Author: Paul-doherty-aquaq

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

@@ -7,9 +7,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import uk.co.aquaq.kdb.request.KdbRequest;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.io.IOException;
 import java.net.UnknownHostException;
 
@@ -28,16 +25,6 @@ public class KdbConnectionWrapper {
     @Value("${kdb.password}")
     private String password;
 
-    @PostConstruct
-    public void postConstruct() {
-        open();
-    }
-
-    @PreDestroy
-    public void preDestroy()  throws IOException {
-        close();
-    }
-
     private void open(){
         try {
             connectionToKdb = new c(hostname, port, getCredentials());
@@ -60,25 +47,39 @@ private void close() throws IOException{
         if (connectionToKdb != null) {
                 connectionToKdb.close();
                 connectionToKdb = null;
-        } else {
-            throw new KdbConnectionException("Cannot close Connection");
         }
     }
 
     public void executeAsyncQuery(String query) throws IOException {
-        connectionToKdb.ks(query);
+        try {
+            connectionToKdb.ks(query);
+        }
+        finally {
+            close();
+        }
     }
 
     public Object executeDeferredSyncFunction(KdbRequest kdbRequest) throws c.KException , IOException{
-        connectionToKdb.ks(kdbRequest.getFunctionTemplate(),
-                new Object[]{kdbRequest.getFunctionName().toCharArray(),
-                        kdbRequest.getArguments().toCharArray()},
-                kdbRequest.getCredentialDictionary());
-
-        return connectionToKdb.k();
+        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;
+        }finally {
+            close();
+        }
     }
 
     public Object syncQuery(String query) throws IOException, c.KException {
-        return c.td(connectionToKdb.k(query));
+        try {
+            open();
+            return c.td(connectionToKdb.k(query));
+        }finally {
+            close();
+        }
     }
 }

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

@@ -1,23 +1,30 @@
 package uk.co.aquaq.kdb.request;
 
 import com.kx.c;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import uk.co.aquaq.kdb.security.BasicCredentials;
 
 import java.util.Iterator;
 import java.util.Map;
-
+@Component
 public class KdbRequestBuilder {
 
     private KdbRequestBuilder (){}
 
-    private static final String FUNCTIONTEMPLATE = ("{@[value;`.aqrest.exec;{[x;y] value x}] . (x;y)}");
+    private static String functionTemplate;
+
+    @Value("${function}")
+    public void setDatabase(String functionTemplate) {
+        this.functionTemplate = functionTemplate;
+    }
 
     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.setFunctionTemplate(functionTemplate);
 
         return kdbRequest;
     }