Cleans up SP extension commands

.. as for straight pz2 commands, request logic is moved from the main
SP extensions bean into individual commands.

Also adds options (pz2 and sp) for adding service command parameters as
parameters to the run() command itself.
Useful for this approach in a form: <submit action="auth.run('action=login')">

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index 6595059..51ab55b 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -12,13 +12,9 @@ import org.apache.log4j.Logger;
 import org.apache.myfaces.custom.fileupload.UploadedFile;\r
 \r
 import com.indexdata.mkjsf.config.ConfigurationReader;\r
-import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
-import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
-import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
-import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @Named("pz2x") @SessionScoped\r
@@ -37,48 +33,14 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     // TODO: \r
     //stateMgr.addStateListener(this);\r
   }\r
-     \r
-  public void authenticate() {    \r
-    if (Pz2Bean.get().getPzresp().getSp().getAuth().unsupportedCommand()) {\r
-      logger.warn("Running seemingly unsupported command [auth] against SP.");\r
-    }\r
-    Pz2Bean.get().resetSearchAndRecordCommands();\r
-    Pz2Bean.get().getPzresp().getSp().resetAuthAndBeyond(true);\r
-    Pz2Bean.get().getPzreq().getSp().getAuth().run();\r
-  }\r
-  \r
-  public void login(String un, String pw) {      \r
-      login(un,pw,"");\r
-  }\r
-  \r
-  public void login(String un, String pw, String navigateTo) {      \r
-    Pz2Bean.get().getPzreq().getSp().getAuth().setUsername(un);\r
-    Pz2Bean.get().getPzreq().getSp().getAuth().setPassword(pw);\r
-    login("");\r
-  }  \r
-    \r
-  @Override  \r
-  public String login(String navigateTo) {\r
-    AuthCommand auth = Pz2Bean.get().getPzreq().getSp().getAuth(); \r
-    auth.setParameterInState(new CommandParameter("action","=","login"));\r
-    authenticate();\r
-    return navigateTo;\r
-  }\r
-    \r
-  public void ipAuthenticate () {  \r
-    AuthCommand auth = Pz2Bean.get().getPzreq().getSp().getAuth(); \r
-    auth.setParameterInState(new CommandParameter("action","=","ipAuth"));\r
-    authenticate();\r
-  }\r
-      \r
+           \r
   public String getInitDocPath () {\r
     return Pz2Bean.get().getSpClient().getConfiguration().get("INIT_DOC_PATH");\r
   }\r
   \r
   @Override\r
   public void setInitFileName(String fileName) {\r
-    this.initDocFileName = fileName;\r
-    \r
+    this.initDocFileName = fileName;    \r
   }\r
 \r
   @Override\r
@@ -138,31 +100,5 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     return initDocUpload;\r
   }\r
   \r
-  public CategoriesResponse getCategories () {       \r
-    String command="categories";\r
-    if (Pz2Bean.get().isServiceProxyService()) {\r
-      if (Pz2Bean.get().getPzresp().getSp().getCategories().unsupportedCommand()) {\r
-        logger.info("Skipping seemingly unsupported command: " + command);  \r
-        return new CategoriesResponse();\r
-      } else {\r
-        SpResponseDataObject response = (SpResponseDataObject) Pz2Bean.get().getPzreq().getSp().getCategories().run();\r
-        if (response.unsupportedCommand()) {\r
-          logger.warn("Command 'categories' not supported by this Service Proxy");          \r
-        } else if (response.hasApplicationError()) {\r
-          logger.error(response.getXml());            \r
-        }  \r
-        try {\r
-            return (CategoriesResponse) response;\r
-        } catch (Exception e) {\r
-            e.printStackTrace();\r
-            logger.debug(response.getXml());\r
-            return new CategoriesResponse();\r
-        }\r
-      }\r
-    } else {\r
-      return new CategoriesResponse();\r
-    }\r
-  }\r
-  \r
-  \r
+   \r
 }\r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyInterface.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyInterface.java
index c2d8c48..3a2e6a2 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyInterface.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyInterface.java
@@ -4,8 +4,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;\r
 \r
 \r
-public interface ServiceProxyInterface  {  \r
-  public String login(String navigateTo);  \r
+public interface ServiceProxyInterface  {      \r
   public void setInitFileName (String fileName);  \r
   public String getInitFileName();\r
   public HttpResponseWrapper postInit() throws UnsupportedEncodingException, IOException;\r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
index 41e3326..fd74c37 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
@@ -3,6 +3,7 @@ package com.indexdata.mkjsf.pazpar2.commands;
 import java.io.Serializable;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
+import java.util.StringTokenizer;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
@@ -39,11 +40,22 @@ public abstract class Pazpar2Command implements Serializable  {
     return name;\r
   }\r
   \r
-  public ResponseDataObject run() {\r
+  public ResponseDataObject run() {    \r
     return run(Pz2Bean.get().getSearchClient(),\r
                Pz2Bean.get().getPzresp());\r
   }\r
   \r
+  public ResponseDataObject runWith(String... parameters) {\r
+    for (String parameter : parameters) {\r
+      StringTokenizer tokenizer = new StringTokenizer(parameter,"=");\r
+      String name = (String) tokenizer.nextElement();\r
+      String value = (String) tokenizer.nextElement();\r
+      CommandParameter commandParameter = new CommandParameter(name,"=",value);\r
+      setParameterInState(commandParameter);\r
+    }\r
+    return run();\r
+  }\r
+  \r
   /**\r
    * For running the command in a thread. Client and Responses must be \r
    * provided because at this point the CDI bean cannot be retrieved \r
@@ -54,7 +66,7 @@ public abstract class Pazpar2Command implements Serializable  {
    * @return\r
    */\r
   public ResponseDataObject run(SearchClient client,Responses pzresp) {\r
-    logger.info("Running " + getCommandName() + " using " + client);    \r
+    logger.debug("Running " + getCommandName() + " using " + client);    \r
     HttpResponseWrapper httpResponse = client.executeCommand(this);\r
     logger.debug("Parsing response for " + getCommandName());\r
     ResponseDataObject responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse) httpResponse);\r
@@ -178,6 +190,10 @@ public abstract class Pazpar2Command implements Serializable  {
     Pz2Bean.get().getStateMgr().checkIn(command);\r
   }\r
   \r
+  public String navigateTo (String target) {\r
+    return target;\r
+  }\r
+  \r
   public abstract ServiceProxyCommand getSp();\r
    \r
   public abstract boolean spOnly();  \r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
index 3c9617e..723bc6a 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
@@ -19,6 +19,8 @@ public class AuthCommand extends Pazpar2Command implements ServiceProxyCommand {
   }\r
   \r
   public SpResponseDataObject run() {\r
+    Pz2Bean.get().resetSearchAndRecordCommands();\r
+    Pz2Bean.get().getPzresp().getSp().resetAuthAndBeyond(true);\r
     ClientCommandResponse response = (ClientCommandResponse) Pz2Bean.get().getSearchClient().executeCommand(this);      \r
     String renamedResponse = renameResponseElement(response.getResponseString(), "auth");    \r
     response.setResponseToParse(renamedResponse);\r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/CategoriesCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/CategoriesCommand.java
index ad5723f..989c21a 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/CategoriesCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/CategoriesCommand.java
@@ -1,14 +1,42 @@
 package com.indexdata.mkjsf.pazpar2.commands.sp;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
+import com.indexdata.mkjsf.pazpar2.Pz2Bean;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
 \r
 public class CategoriesCommand extends Pazpar2Command implements ServiceProxyCommand {\r
 \r
   private static final long serialVersionUID = 5023993689780291641L;\r
+  private static Logger logger = Logger.getLogger(CategoriesCommand.class);\r
 \r
   public CategoriesCommand() {\r
     super("categories");\r
   }\r
+  \r
+  @Override\r
+  public CategoriesResponse run () {\r
+    if (Pz2Bean.get().getPzresp().getSp().getCategories().unsupportedCommand()) {\r
+      logger.info("Skipping seemingly unsupported categories command");  \r
+      return new CategoriesResponse();\r
+    } else {\r
+      if (Pz2Bean.get().isServiceProxyService()) {\r
+        try {\r
+          CategoriesResponse response = (CategoriesResponse) super.run();\r
+          if (response.unsupportedCommand()) {\r
+            logger.warn("Command 'categories' not supported by this Service Proxy");          \r
+          }\r
+          return response;\r
+        } catch (Exception e) {\r
+          e.printStackTrace();\r
+          return new CategoriesResponse();\r
+        }\r
+      } else {\r
+        return new CategoriesResponse();\r
+      }\r
+    }\r
+  }\r
 \r
   @Override\r
   public Pazpar2Command copy() {\r