Downgrades to Java 1.6 to run demo on Debian Wheezy

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / sp / ServiceProxyClient.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
index d9f89fc..e881506 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
@@ -5,6 +5,8 @@ import static com.indexdata.pz2utils4jsf.utils.Utils.nl;
 import java.io.ByteArrayOutputStream;\r
 import java.io.File;\r
 import java.io.IOException;\r
+import java.nio.file.Path;\r
+import java.nio.file.Paths;\r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.List;\r
@@ -25,6 +27,7 @@ import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.scheme.PlainSocketFactory;\r
 import org.apache.http.conn.scheme.Scheme;\r
 import org.apache.http.conn.scheme.SchemeRegistry;\r
+import org.apache.http.entity.ByteArrayEntity;\r
 import org.apache.http.entity.FileEntity;\r
 import org.apache.http.impl.client.DefaultHttpClient;\r
 import org.apache.http.impl.conn.PoolingClientConnectionManager;\r
@@ -54,6 +57,7 @@ public class ServiceProxyClient implements SearchClient {
   public static final String SP_INIT_DOC_PATHS = "SP_INIT_DOC_PATHS";\r
   private String serviceUrl = "undefined";\r
   private String[] initDocPaths = null;\r
+  private Configuration config = null;\r
   \r
   ProxyPz2ResponseHandler handler = new ProxyPz2ResponseHandler();\r
   private HttpClient client;\r
@@ -70,7 +74,7 @@ public class ServiceProxyClient implements SearchClient {
   public void configure (ConfigurationReader configReader) {\r
     logger.info(Utils.objectId(this) + " is configuring using the provided " + Utils.objectId(configReader));\r
     try {\r
-      Configuration config = configReader.getConfiguration(this);      \r
+      config = configReader.getConfiguration(this);      \r
       serviceUrl = config.getMandatory(SERVICE_PROXY_URL);  \r
       this.initDocPaths = getMultiProperty(config.get(SP_INIT_DOC_PATHS));            \r
     } catch (ConfigurationException c) {\r
@@ -160,7 +164,6 @@ public class ServiceProxyClient implements SearchClient {
     byte[] response = client.execute(httpget, handler);    \r
     return response;\r
   }\r
-\r
   \r
   public class ProxyPz2ResponseHandler implements ResponseHandler<byte[]> {\r
     private StatusLine statusLine = null;\r
@@ -233,9 +236,20 @@ public class ServiceProxyClient implements SearchClient {
     logger.info("Looking to post the file in : [" + filePath +"]");\r
     HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
     File initDoc = new File(filePath);\r
+    logger.info("Posting to SP: ");\r
+    Path path = Paths.get(filePath);\r
+    /*\r
+    if (logger.isDebugEnabled()) {\r
+      try (Scanner scanner =  new Scanner(path, "UTF-8")){\r
+        while (scanner.hasNextLine()){\r
+          System.out.println(scanner.nextLine());\r
+        }      \r
+      }     \r
+    }\r
+    */\r
     post.setEntity(new FileEntity(initDoc));\r
     byte[] response = client.execute(post, handler);\r
-    logger.info("Response on POST was: " + new String(response,"UTF-8"));\r
+    logger.info("Response on POST was: " + new String(response,"UTF-8"));    \r
     return response;\r
   }\r
   \r
@@ -245,6 +259,14 @@ public class ServiceProxyClient implements SearchClient {
     return initDocPaths;\r
   }\r
   \r
+  public byte[] postInitDoc(byte[] initDoc) throws IOException {\r
+    HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
+    post.setEntity(new ByteArrayEntity(initDoc));\r
+    byte[] response = client.execute(post, handler);\r
+    logger.info("Response on POST was: " + new String(response,"UTF-8"));    \r
+    return response;\r
+  }\r
+  \r
   public void setServiceProxyUrl (String url) {\r
     serviceUrl = url;\r
   }\r
@@ -252,5 +274,9 @@ public class ServiceProxyClient implements SearchClient {
   public String getServiceProxyUrl () {\r
     return serviceUrl;\r
   }\r
-\r
+  \r
+  public Configuration getConfiguration () {\r
+    return config;\r
+  }\r
+  \r
 }\r