X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FPazpar2Command.java;h=73fd075f9eae8733cb08f090f7c89df82dd53413;hb=bcb39bd9bde8071ac3a6741ce5d51ed9e763ba9c;hp=4fbe1591d78f77e5ca9b1f7caf7acf7a21b3e25a;hpb=ccb28ae8d5d46d29c40bd8b1637522c212b80636;p=mkjsf-moved-to-github.git

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 4fbe159..73fd075 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
@@ -6,36 +6,26 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;
 import com.indexdata.mkjsf.pazpar2.state.StateManager;
 
-public class Pazpar2Command implements Serializable  {
+public abstract class Pazpar2Command implements Serializable  {
   
   private static Logger logger = Logger.getLogger(Pazpar2Command.class);
   private static final long serialVersionUID = -6825491856480675917L;   
-  private String name = "";
+  protected String name = "";
   protected Map<String,CommandParameter> parameters = new HashMap<String,CommandParameter>();
   
-  StateManager stateMgr;
+  protected StateManager stateMgr;
     
   public Pazpar2Command (String name, StateManager stateMgr) {
     this.name = name;
-    if (stateMgr == null) {
-      // Sets throw-away state
-      this.stateMgr = new StateManager();
-    } else {
-      this.stateMgr = stateMgr;
-    }
+    this.stateMgr = stateMgr;
   }
       
-  public Pazpar2Command copy () {
-    Pazpar2Command newCommand = new Pazpar2Command(name,stateMgr);
-    for (String parameterName : parameters.keySet()) {
-      newCommand.setParameterInState(parameters.get(parameterName).copy());      
-    }    
-    return newCommand;
-  }
+  public abstract Pazpar2Command copy ();
   
-  public String getName() {
+  public String getCommandName() {
     return name;
   }
     
@@ -43,7 +33,7 @@ public class Pazpar2Command implements Serializable  {
     Pazpar2Command copy = this.copy();
     logger.debug(name + " command: setting parameter [" + parameter.getName() + "=" + parameter.getValueWithExpressions() + "]");
     copy.parameters.put(parameter.getName(),parameter);
-    stateMgr.checkIn(copy);
+    checkInState(copy);
   }
   
   public void setParameters (CommandParameter... params) {
@@ -52,7 +42,7 @@ public class Pazpar2Command implements Serializable  {
       logger.debug(name + " command: setting parameter [" + param.getName() + "=" + param.getValueWithExpressions() + "]");
       copy.parameters.put(param.getName(),param);
     }
-    stateMgr.checkIn(copy);
+    checkInState(copy);
   }
   
   public void setParametersInState (CommandParameter... params) {    
@@ -75,13 +65,13 @@ public class Pazpar2Command implements Serializable  {
   public void removeParameter (String name) {
     Pazpar2Command copy = this.copy();
     copy.parameters.remove(name);
-    stateMgr.checkIn(copy);
+    checkInState(copy);
   }
   
   public void removeParameters() {
     Pazpar2Command copy = this.copy();
     copy.parameters = new HashMap<String,CommandParameter>();
-    stateMgr.checkIn(copy);
+    checkInState(copy);
   }
   
   public void removeParametersInState() {
@@ -93,14 +83,16 @@ public class Pazpar2Command implements Serializable  {
     return (parameters.keySet().size()>0);
   }
   
-  public boolean hasParameterSet(String parameterName) {
-    return (parameters.get(parameterName) != null);
+  public boolean hasParameterValue(String parameterName) {
+    return (parameters.get(parameterName) != null && parameters.get(parameterName).hasValue());
   }
   
   public String getEncodedQueryString () {
     StringBuilder queryString = new StringBuilder("command="+name);
     for (CommandParameter parameter : parameters.values()) {
-       queryString.append("&"+parameter.getEncodedQueryString());       
+      if (parameter.hasValue()) {
+        queryString.append("&"+parameter.getEncodedQueryString());
+      }
     }
     return queryString.toString();
   } 
@@ -108,7 +100,9 @@ public class Pazpar2Command implements Serializable  {
   public String getValueWithExpressions() {    
     StringBuilder value = new StringBuilder("");
     for (CommandParameter parameter : parameters.values()) {
-      value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions());       
+      if (parameter.hasValue()) {
+        value.append("&" + parameter.getName() + parameter.operator + parameter.getValueWithExpressions());
+      }
    }
     return value.toString();
   }
@@ -130,7 +124,7 @@ public class Pazpar2Command implements Serializable  {
   }
 
   public String getParameterValue(String parameterName) {
-    return getParameter(parameterName).getValueWithExpressions();
+    return getParameter(parameterName)==null ? "" : getParameter(parameterName).getValueWithExpressions();
     
   }
 
@@ -144,5 +138,16 @@ public class Pazpar2Command implements Serializable  {
   
   public String getSession() {
     return getParameterValue("session");
-  }  
+  } 
+  
+  private void checkInState(Pazpar2Command command) {
+    if (stateMgr != null) {
+      stateMgr.checkIn(command);
+    } else {
+      logger.info("Command '" + command.getCommandName() + "' not affecting state (history) as no state manager was defined for this command.");
+    }
+  }
+  
+  public abstract ServiceProxyCommand getSp();
+  
 }