Simplifies state handling further

Postpones cloning of a command to the time when it's actually modified,
then pushes it to the state handler transparently.
Obviates the need to checkout a command for modification vs.
getting it read-only.
Recently introduced CommandReadOnly interface is consequently dropped again.

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
index 72a4337..323ef78 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
@@ -6,18 +6,18 @@ import java.io.IOException;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;\r
 \r
 public class CommandThread extends Thread {\r
 \r
   private static Logger logger = Logger.getLogger(CommandThread.class);\r
-  CommandReadOnly command;\r
+  Pazpar2Command command;\r
   SearchClient client;\r
   private ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
   private StringBuilder response = new StringBuilder("");  \r
   \r
-  public CommandThread (CommandReadOnly command, SearchClient client) {\r
+  public CommandThread (Pazpar2Command command, SearchClient client) {\r
     this.command = command;\r
     this.client = client;\r
   }\r
@@ -72,7 +72,7 @@ public class CommandThread extends Thread {
     return response.toString();\r
   }\r
     \r
-  public CommandReadOnly getCommand() {\r
+  public Pazpar2Command getCommand() {\r
     return command;\r
   }\r
 \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 97f0880..3d7d79c 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -97,9 +97,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     pzresp.reset();\r
     // resets some record and show command parameters without \r
     // changing state or creating state change feedback\r
-    pzreq.getRecordInState().removeParametersSilently();        \r
-    pzreq.getShowInState().setParameterSilently(new CommandParameter("start","=",0));    \r
-    logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommandReadOnly("search").getUrlEncodedParameterValue("query"));\r
+    pzreq.getRecord().removeParametersInState();        \r
+    pzreq.getShow().setParameterInState(new CommandParameter("start","=",0));    \r
+    logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommand("search").getUrlEncodedParameterValue("query"));\r
     doCommand("search");    \r
   }\r
       \r
@@ -128,7 +128,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
           List<CommandThread> threadList = new ArrayList<CommandThread>();\r
           StringTokenizer tokens = new StringTokenizer(commands,",");\r
           while (tokens.hasMoreElements()) {          \r
-            threadList.add(new CommandThread(pzreq.getCommandReadOnly(tokens.nextToken()),searchClient));            \r
+            threadList.add(new CommandThread(pzreq.getCommand(tokens.nextToken()),searchClient));            \r
           }\r
           for (CommandThread thread : threadList) {\r
             thread.start();\r
@@ -171,7 +171,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   public boolean commandsAreValid(String commands) {\r
     if (commands.equals("record")) {\r
-      if (!pzreq.getCommandReadOnly("record").hasParameterSet("id")) {\r
+      if (!pzreq.getCommand("record").hasParameterSet("id")) {\r
         logger.error("Attempt to send record command without the id parameter");\r
         return false;\r
       }\r
@@ -192,7 +192,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   @Override\r
   public boolean hasRecord (String recId) {\r
-    return pzreq.getCommandReadOnly("record").hasParameters() && pzresp.getRecord().getRecId().equals(recId);\r
+    return pzreq.getCommand("record").hasParameters() && pzresp.getRecord().getRecId().equals(recId);\r
   }\r
         \r
   public String getCurrentStateKey () {    \r
@@ -224,7 +224,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   \r
   protected boolean hasQuery() {        \r
-    return pzreq.getCommandReadOnly("search").hasParameterSet("query"); \r
+    return pzreq.getCommand("search").hasParameterSet("query"); \r
   }\r
     \r
     \r
@@ -252,7 +252,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
       logger.debug("Found pending record ID change. Doing record before updating " + commands);\r
       stateMgr.hasPendingStateChange("record",false);\r
-      if (pzreq.getCommandReadOnly("record").hasParameterSet("id")) {\r
+      if (pzreq.getCommand("record").hasParameterSet("id")) {\r
         update("record");\r
       } else {         \r
         pzresp.put("record", new RecordResponse());\r
@@ -261,7 +261,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   }\r
   \r
   protected String doCommand(String commandName) {             \r
-    logger.debug(pzreq.getCommandReadOnly(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommandReadOnly("search").getEncodedQueryString());\r
+    logger.debug(pzreq.getCommand(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommand("search").getEncodedQueryString());\r
     return update(commandName);\r
   }\r
   \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
index 39adf03..a00f2d5 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
@@ -23,7 +23,7 @@ import com.indexdata.masterkey.pazpar2.client.exceptions.ProxyErrorException;
 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.pazpar2.commands.CommandReadOnly;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
 public class Pz2Client implements SearchClient {\r
@@ -81,13 +81,13 @@ public class Pz2Client implements SearchClient {
   }\r
   \r
   @Override\r
-  public void setSearchCommand(CommandReadOnly command) {\r
+  public void setSearchCommand(Pazpar2Command command) {\r
     ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString());\r
     client.setSearchCommand(clientCommand);    \r
   }\r
 \r
   @Override\r
-  public CommandResponse executeCommand(CommandReadOnly command, ByteArrayOutputStream baos) \r
+  public CommandResponse executeCommand(Pazpar2Command command, ByteArrayOutputStream baos) \r
        throws Pazpar2ErrorException, IOException {\r
     ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString());\r
     Pazpar2HttpResponse pz2HttpResponse = client.executeCommand(clientCommand, baos);\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index 3eb0bba..36e472b 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -51,8 +51,8 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public String login(String navigateTo) {\r
     logger.info("doing login");\r
     ((ServiceProxyClient)searchClient).authenticate(user);    \r
-    pzreq.getRecordInState().removeParametersSilently();\r
-    pzreq.getSearchInState().removeParametersSilently();\r
+    pzreq.getRecord().removeParametersInState();\r
+    pzreq.getSearch().removeParametersInState();\r
     pzresp.reset();\r
     return navigateTo;\r
   }\r
@@ -61,8 +61,8 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   public void setServiceProxyUrl(String url) {\r
     logger.info("Setting Service Proxy url: " + url);\r
     serviceProxyUrl = url;\r
-    pzreq.getRecordInState().removeParametersSilently();\r
-    pzreq.getSearchInState().removeParametersSilently();\r
+    pzreq.getRecord().removeParametersInState();\r
+    pzreq.getSearch().removeParametersInState();\r
     pzresp.reset();\r
   }\r
   \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
index acce660..c7d0cf9 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
@@ -7,12 +7,12 @@ import java.io.Serializable;
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
 import com.indexdata.pz2utils4jsf.config.Configurable;\r
 import com.indexdata.pz2utils4jsf.config.Configuration;\r
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 \r
 public interface SearchClient extends Configurable, Serializable {\r
   \r
-  public void setSearchCommand(CommandReadOnly command);\r
-  public CommandResponse executeCommand(CommandReadOnly command, ByteArrayOutputStream baos) throws Pazpar2ErrorException, IOException;\r
+  public void setSearchCommand(Pazpar2Command command);\r
+  public CommandResponse executeCommand(Pazpar2Command command, ByteArrayOutputStream baos) throws Pazpar2ErrorException, IOException;\r
   public SearchClient cloneMe();\r
   public boolean isAuthenticatingClient();  \r
   public Configuration getConfiguration();\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandReadOnly.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandReadOnly.java
deleted file mode 100644 (file)
index 68f334b..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandReadOnly.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2.commands;\r
-\r
-/**\r
- * Interface to Pazpar2Command to be used when the given command\r
- * should not change. Meant to avoid redundant cloning of commands\r
- * for potential state changes. \r
- * \r
- * @author Niels Erik\r
- *\r
- */\r
-public interface CommandReadOnly {\r
-\r
-  public String getName();\r
-  public String getValueWithExpressions();\r
-  public String getEncodedQueryString();\r
-  public boolean hasParameters();\r
-  public boolean hasParameterSet(String parameterName);\r
-  public String getParameterValue(String parameterName);\r
-  public String getUrlEncodedParameterValue(String parameterName);\r
-  \r
-}\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
index 97be62d..b4f67e9 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
@@ -8,7 +8,7 @@ import org.apache.log4j.Logger;
 \r
 import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;\r
 \r
-public class Pazpar2Command implements CommandReadOnly, Serializable  {\r
+public class Pazpar2Command implements Serializable  {\r
   \r
   private static Logger logger = Logger.getLogger(Pazpar2Command.class);\r
   private static final long serialVersionUID = -6825491856480675917L;   \r
@@ -30,7 +30,7 @@ public class Pazpar2Command implements CommandReadOnly, Serializable  {
   public Pazpar2Command copy () {\r
     Pazpar2Command newCommand = new Pazpar2Command(name,stateMgr);\r
     for (String parameterName : parameters.keySet()) {\r
-      newCommand.setParameterSilently(parameters.get(parameterName).copy());      \r
+      newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }    \r
     return newCommand;\r
   }\r
@@ -40,21 +40,29 @@ public class Pazpar2Command implements CommandReadOnly, Serializable  {
   }\r
     \r
   public void setParameter (CommandParameter parameter) {\r
+    Pazpar2Command thisCommand = this.copy();\r
     logger.debug(name + " setting parameter " + parameter.getName() + "=" + parameter.getValueWithExpressions() + " to " + this.getName());\r
-    parameters.put(parameter.getName(),parameter);\r
-    stateMgr.checkIn(this);\r
+    thisCommand.parameters.put(parameter.getName(),parameter);\r
+    stateMgr.checkIn(thisCommand);\r
   }\r
   \r
   public void setParameters (CommandParameter... params) {\r
+    Pazpar2Command thisCommand = this.copy();\r
     for (CommandParameter param : params) {\r
       logger.debug(name + " setting parameter " + param.getName() + "=" + param.getValueWithExpressions() + " to " + this.getName());\r
-      parameters.put(param.getName(),param);\r
+      thisCommand.parameters.put(param.getName(),param);\r
     }\r
-    stateMgr.checkIn(this);\r
+    stateMgr.checkIn(thisCommand);\r
   }\r
   \r
-  \r
-  public void setParameterSilently (CommandParameter parameter) {\r
+  public void setParametersInState (CommandParameter... params) {    \r
+    for (CommandParameter param : params) {\r
+      logger.debug(name + " setting parameter " + param.getName() + "=" + param.getValueWithExpressions() + " to " + this.getName());\r
+      parameters.put(param.getName(),param);\r
+    }    \r
+  }\r
+    \r
+  public void setParameterInState (CommandParameter parameter) {\r
     logger.debug(name + " setting parameter silently " + parameter.getName() + "=" + parameter.getValueWithExpressions() + " to " + this.getName());\r
     parameters.put(parameter.getName(),parameter);    \r
   }\r
@@ -65,16 +73,18 @@ public class Pazpar2Command implements CommandReadOnly, Serializable  {
   }\r
   \r
   public void removeParameter (String name) {\r
-    parameters.remove(name);\r
-    stateMgr.checkIn(this);\r
+    Pazpar2Command thisCommand = this.copy();\r
+    thisCommand.parameters.remove(name);\r
+    stateMgr.checkIn(thisCommand);\r
   }\r
   \r
   public void removeParameters() {\r
-    parameters = new HashMap<String,CommandParameter>();\r
-    stateMgr.checkIn(this);\r
+    Pazpar2Command thisCommand = this.copy();\r
+    thisCommand.parameters = new HashMap<String,CommandParameter>();\r
+    stateMgr.checkIn(thisCommand);\r
   }\r
   \r
-  public void removeParametersSilently() {\r
+  public void removeParametersInState() {\r
     parameters = new HashMap<String,CommandParameter>();    \r
   }\r
 \r
@@ -119,13 +129,11 @@ public class Pazpar2Command implements CommandReadOnly, Serializable  {
     return parameters.toString();\r
   }\r
 \r
-  @Override\r
   public String getParameterValue(String parameterName) {\r
     return getParameter(parameterName).getValueWithExpressions();\r
     \r
   }\r
 \r
-  @Override\r
   public String getUrlEncodedParameterValue(String parameterName) {\r
     return getParameter(parameterName).getEncodedQueryString();\r
   }\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
index bac6787..a0397a9 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
@@ -40,88 +40,43 @@ public class Pazpar2Commands implements Serializable {
   }\r
     \r
   public InitCommand getInit() {\r
-    return (InitCommand) (stateMgr.checkOut(INIT));\r
+    return (InitCommand) (stateMgr.getCommand(INIT));\r
   }\r
   \r
   public PingCommand getPing() {\r
-    return (PingCommand) (stateMgr.checkOut(PING));\r
+    return (PingCommand) (stateMgr.getCommand(PING));\r
   }\r
   \r
   public SettingsCommand getSettings() {\r
-    return (SettingsCommand) (stateMgr.checkOut(SETTINGS));\r
+    return (SettingsCommand) (stateMgr.getCommand(SETTINGS));\r
   }\r
 \r
   public SearchCommand getSearch() {\r
-    return (SearchCommand) (stateMgr.checkOut(SEARCH));\r
+    return (SearchCommand) (stateMgr.getCommand(SEARCH));\r
   }\r
   \r
-  /**\r
-   * Gets a mutable SearchCommand from current state (no checkout)\r
-   * Can be used for updating Search parameters without spawning new state.\r
-   * @return\r
-   */\r
-  public SearchCommand getSearchInState() {\r
-    return (SearchCommand) (stateMgr.getCurrentState().getCommand(SEARCH));\r
-  }\r
-\r
   public StatCommand getStat() {\r
-    return (StatCommand) (stateMgr.checkOut(STAT));\r
+    return (StatCommand) (stateMgr.getCommand(STAT));\r
   }\r
   \r
   public ShowCommand getShow() {\r
-    return (ShowCommand) (stateMgr.checkOut(SHOW));\r
-  }\r
-  \r
-  /**\r
-   * Gets a mutable ShowCommand from current state (no checkout)\r
-   * Can be used for updating show parameters without spawning new state.\r
-   * @return\r
-   */\r
-  public ShowCommand getShowInState () {\r
-    return (ShowCommand) (stateMgr.getCurrentState().getCommand(SHOW));\r
+    return (ShowCommand) (stateMgr.getCommand(SHOW));\r
   }\r
-  \r
-  /**\r
-   * Gets a detached (copied) record command from the current state\r
-   * \r
-   * @return\r
-   */\r
+    \r
   public RecordCommand getRecord() {\r
-    return (RecordCommand) (stateMgr.checkOut(RECORD));\r
+    return (RecordCommand) (stateMgr.getCommand(RECORD));\r
   }\r
 \r
-  /**\r
-   * Gets a mutable RecordCommand from current state (no checkout)\r
-   * Can be used for updating record parameters without spawning new state.\r
-   * @return\r
-   */  \r
-  public RecordCommand getRecordInState() {\r
-    return (RecordCommand)stateMgr.getCurrentState().getCommand(RECORD);\r
-  }\r
-  \r
-  /**\r
-   * Gets a detached (copied) termlist command from the current state\r
-   * \r
-   * @return Mutable termlist command\r
-   */\r
   public TermlistCommand getTermlist() {\r
-    return (TermlistCommand) (stateMgr.checkOut(TERMLIST));\r
+    return (TermlistCommand) (stateMgr.getCommand(TERMLIST));\r
   }\r
   \r
-  /**\r
-   * \r
-   * @return\r
-   */\r
   public BytargetCommand getBytarget() {\r
-    return (BytargetCommand) (stateMgr.checkOut(BYTARGET));\r
+    return (BytargetCommand) (stateMgr.getCommand(BYTARGET));\r
   }\r
   \r
   public Pazpar2Command getCommand(String name) {\r
-    return stateMgr.checkOut(name);\r
-  }\r
-  \r
-  public CommandReadOnly getCommandReadOnly(String name) {\r
     return stateMgr.getCommand(name);\r
   }\r
-    \r
+      \r
 }\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
index a54433d..5e2c03b 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
@@ -22,7 +22,7 @@ public class RecordCommand extends Pazpar2Command {
   public RecordCommand copy () {\r
     RecordCommand newCommand = new RecordCommand(stateMgr);\r
     for (String parameterName : parameters.keySet()) {\r
-      newCommand.setParameterSilently(parameters.get(parameterName).copy());      \r
+      newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }    \r
     return newCommand;\r
   }\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
index 4c6d9c5..9b2cece 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
@@ -193,7 +193,7 @@ public class SearchCommand extends Pazpar2Command {
   public SearchCommand copy () {\r
     SearchCommand newCommand = new SearchCommand(stateMgr);\r
     for (String parameterName : parameters.keySet()) {\r
-      newCommand.setParameterSilently(parameters.get(parameterName).copy());      \r
+      newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }\r
     newCommand.singleTargetFilter = this.singleTargetFilter;\r
     return newCommand;\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/ShowCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/ShowCommand.java
index b783529..12dad19 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/ShowCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/ShowCommand.java
@@ -8,7 +8,7 @@ public class ShowCommand extends Pazpar2Command {
 \r
   public ShowCommand(StateManager stateMgr) {\r
     super("show",stateMgr);\r
-    setParameterSilently(new CommandParameter("start","=","0"));\r
+    setParameterInState(new CommandParameter("start","=","0"));\r
   }\r
 \r
   /**\r
@@ -86,13 +86,11 @@ public class ShowCommand extends Pazpar2Command {
   public int getNum () {\r
     return getParameter("num") != null ? Integer.parseInt(getParameter("num").value) : 0;\r
   }\r
-\r
-\r
   \r
   public ShowCommand copy () {\r
     ShowCommand newCommand = new ShowCommand(stateMgr);\r
     for (String parameterName : parameters.keySet()) {\r
-      newCommand.setParameterSilently(parameters.get(parameterName).copy());      \r
+      newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }    \r
     return newCommand;\r
   }\r

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 5b2e518..8c2c2e2 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
@@ -39,7 +39,6 @@ import com.indexdata.pz2utils4jsf.errors.ConfigurationException;
 import com.indexdata.pz2utils4jsf.pazpar2.CommandResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.SearchClient;\r
 import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;\r
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;\r
 import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.AuthenticationEntity;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;\r
@@ -95,9 +94,9 @@ public class ServiceProxyClient implements SearchClient {
       logger.info("Authenticating [" + user.getProperty("name") + "]");\r
       this.user = (ServiceProxyUser) user;\r
       Pazpar2Command auth = new Pazpar2Command("auth",null);\r
-      auth.setParameters(new CommandParameter("action","=","login"), \r
-                         new CommandParameter("username","=",user.getProperty("name")), \r
-                         new CommandParameter("password","=",user.getProperty("password")));\r
+      auth.setParametersInState(new CommandParameter("action","=","login"), \r
+                                new CommandParameter("username","=",user.getProperty("name")), \r
+                                new CommandParameter("password","=",user.getProperty("password")));\r
       byte[] response = send(auth);\r
       String responseStr = new String(response,"UTF-8");\r
       logger.info(responseStr);      \r
@@ -155,7 +154,7 @@ public class ServiceProxyClient implements SearchClient {
    * @throws ClientProtocolException\r
    * @throws IOException\r
    */\r
-  private byte[] send(CommandReadOnly command) throws ClientProtocolException, IOException {\r
+  private byte[] send(Pazpar2Command command) throws ClientProtocolException, IOException {\r
     String url = serviceUrl + "?" + command.getEncodedQueryString(); \r
     logger.info("Sending request "+url);    \r
     HttpGet httpget = new HttpGet(url);     \r
@@ -192,12 +191,12 @@ public class ServiceProxyClient implements SearchClient {
   }\r
 \r
   @Override\r
-  public void setSearchCommand(CommandReadOnly command) {\r
+  public void setSearchCommand(Pazpar2Command command) {\r
     // Do nothing, Service Proxy is handling this    \r
   }\r
 \r
   @Override\r
-  public CommandResponse executeCommand(CommandReadOnly command,\r
+  public CommandResponse executeCommand(Pazpar2Command command,\r
       ByteArrayOutputStream baos) throws Pazpar2ErrorException, IOException {\r
     byte[] response = send(command);\r
     baos.write(response);\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/state/StateManager.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/state/StateManager.java
index 23d59d1..f1ae6b6 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/state/StateManager.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/state/StateManager.java
@@ -11,7 +11,6 @@ import javax.enterprise.context.SessionScoped;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;\r
 import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
@@ -76,21 +75,8 @@ public class StateManager implements Serializable {
       logger.debug("Command " + command.getName() + " not found to change the state [" + command.getEncodedQueryString() + "]");\r
     }\r
   }\r
-  \r
-  /**\r
-   * Gets a detached copy of a command. For the change manager\r
-   * to become aware of any changes to the copy it must be \r
-   * checked back in with 'checkIn(Pazpar2Command)'\r
-   * \r
-   * @param commandName\r
-   * @return Copy this state's instance of the given command\r
-   */\r
-  public Pazpar2Command checkOut (String commandName) {\r
-    logger.debug("Getting " + commandName + " from state manager.");\r
-    return getCurrentState().getCommand(commandName).copy();\r
-  }\r
-    \r
-  public CommandReadOnly getCommand (String commandName) {\r
+      \r
+  public Pazpar2Command getCommand (String commandName) {\r
     return getCurrentState().getCommand(commandName);\r
   }\r
   \r