Service proxy client and configuration schemes

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ProxyPz2Client.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ProxyPz2Client.java
index 349b0ff..db1fe91 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ProxyPz2Client.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ProxyPz2Client.java
@@ -1,7 +1,13 @@
 package com.indexdata.pz2utils4jsf.pazpar2;\r
 \r
+import static com.indexdata.pz2utils4jsf.utils.Utils.nl;\r
+\r
 import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r
+import java.util.ArrayList;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
 \r
 import javax.enterprise.context.SessionScoped;\r
 import javax.enterprise.inject.Alternative;\r
@@ -14,12 +20,20 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;\r
 import org.apache.http.client.ResponseHandler;\r
 import org.apache.http.client.methods.HttpGet;\r
+import org.apache.http.conn.ClientConnectionManager;\r
+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.impl.client.DefaultHttpClient;\r
+import org.apache.http.impl.conn.PoolingClientConnectionManager;\r
 import org.apache.http.util.EntityUtils;\r
 import org.apache.log4j.Logger;\r
 \r
+import com.indexdata.masterkey.config.MissingMandatoryParameterException;\r
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
-import com.indexdata.pz2utils4jsf.config.Pz2Configurator;\r
+import com.indexdata.pz2utils4jsf.config.Configuration;\r
+import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
+import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
 @Named @SessionScoped @Alternative\r
@@ -27,17 +41,49 @@ public class ProxyPz2Client implements SearchClient {
 \r
   private static final long serialVersionUID = -4031644009579840277L;\r
   private static Logger logger = Logger.getLogger(ProxyPz2Client.class);\r
+  public static final String MODULENAME = "proxyclient";\r
+  private String serviceUrl = "undefined";\r
   \r
   ProxyPz2ResponseHandler handler = new ProxyPz2ResponseHandler();\r
-  HttpClient client = new DefaultHttpClient();  \r
+  private HttpClient client;\r
 \r
-  public ProxyPz2Client(HttpClient client) {\r
+  public ProxyPz2Client () {\r
+    SchemeRegistry schemeRegistry = new SchemeRegistry();\r
+    schemeRegistry.register(new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));\r
+    ClientConnectionManager cm = new PoolingClientConnectionManager(schemeRegistry);\r
+    client = new DefaultHttpClient(cm);\r
   }\r
-  \r
+    \r
   @Override\r
-  public void configure (Pz2Configurator configurator) {\r
-    logger.info(Utils.objectId(this) + " is configuring itself using the provided " + Utils.objectId(configurator));\r
-\r
+  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
+      serviceUrl = config.getMandatory("SERVICE_PROXY_URL");\r
+      authenticate();\r
+    } catch (ConfigurationException c) {\r
+      // TODO Auto-generated catch block\r
+      c.printStackTrace();\r
+    } catch (MissingMandatoryParameterException mmp) {\r
+      mmp.printStackTrace();\r
+    }\r
+  }\r
+  \r
+  public void authenticate () {\r
+    try {\r
+      Pazpar2Command auth = new Pazpar2Command("auth");\r
+      auth.setParameter(new CommandParameter("action","=","login"));\r
+      auth.setParameter(new CommandParameter("username","=","demo"));\r
+      auth.setParameter(new CommandParameter("password","=","demo"));\r
+      send(auth);\r
+    } catch (ClientProtocolException e) {\r
+      // TODO Auto-generated catch block\r
+      e.printStackTrace();\r
+    } catch (IOException e) {\r
+      // TODO Auto-generated catch block\r
+      e.printStackTrace();\r
+    }\r
+    \r
   }\r
   \r
   /**\r
@@ -48,8 +94,8 @@ public class ProxyPz2Client implements SearchClient {
    * @throws IOException\r
    */\r
   private String send(Pazpar2Command command) throws ClientProtocolException, IOException {\r
-    String url = command.getEncodedQueryString(); \r
-    logger.debug("Sending request "+url);    \r
+    String url = serviceUrl + "?" + command.getEncodedQueryString(); \r
+    logger.info("Sending request "+url);    \r
     HttpGet httpget = new HttpGet(url);     \r
     byte[] response = client.execute(httpget, handler);    \r
     return new String(response);\r
@@ -59,13 +105,14 @@ public class ProxyPz2Client implements SearchClient {
   public class ProxyPz2ResponseHandler implements ResponseHandler<byte[]> {\r
     private StatusLine statusLine = null;\r
     public byte[] handleResponse(HttpResponse response) throws ClientProtocolException, IOException {\r
+      byte[] resp = null;\r
       HttpEntity entity = response.getEntity();      \r
       statusLine = response.getStatusLine();\r
       if (entity != null) {        \r
-        return EntityUtils.toByteArray(entity);\r
-      } else {\r
-        return null;\r
-      }\r
+        resp = EntityUtils.toByteArray(entity);        \r
+      } \r
+      EntityUtils.consume(entity);\r
+      return resp;\r
     }\r
     public int getStatusCode() {\r
       return statusLine.getStatusCode();\r
@@ -96,7 +143,28 @@ public class ProxyPz2Client implements SearchClient {
   }\r
 \r
   public ProxyPz2Client cloneMe() {\r
-    return this;\r
+    logger.debug("Cloning StraightPz2Client");\r
+    ProxyPz2Client clone = new ProxyPz2Client();\r
+    clone.client = this.client;\r
+    clone.serviceUrl = this.serviceUrl;\r
+    return clone;\r
+  }\r
+\r
+  @Override\r
+  public Map<String, String> getDefaults() {    \r
+    return new HashMap<String,String>();\r
+  }\r
+\r
+  @Override\r
+  public String getModuleName() {\r
+    return MODULENAME;\r
+  }\r
+  \r
+  @Override\r
+  public List<String> documentConfiguration () {\r
+    List<String> doc = new ArrayList<String>();\r
+    doc.add(nl+ MODULENAME + " was configured to access the Pazpar2 service proxy at: " + serviceUrl);\r
+    return null;\r
   }\r
 \r
 }\r