From ad66a6ad314f3cf66a7440c3ddeb9d2630b40182 Mon Sep 17 00:00:00 2001
From: "Niels Erik G. Nielsen" <nielserik@indexdata.com>
Date: Sun, 14 Apr 2013 09:11:43 -0400
Subject: [PATCH] Moves parameter expression class to commands package

---
 .../indexdata/pz2utils4jsf/pazpar2/Expression.java |   25 --------------------
 .../indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java    |    4 ++--
 .../pz2utils4jsf/pazpar2/Pz2ProxyBean.java         |    2 +-
 .../pazpar2/commands/CommandParameter.java         |    1 -
 .../pz2utils4jsf/pazpar2/commands/Expression.java  |   25 ++++++++++++++++++++
 .../pazpar2/commands/SearchCommand.java            |    1 -
 6 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Expression.java
 create mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Expression.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Expression.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Expression.java
deleted file mode 100644
index 3b5260a..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Expression.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;
-
-import com.indexdata.pz2utils4jsf.pazpar2.Expression;
-
-public class Expression {
-  
-  String leftEntity;
-  String operator;
-  String rightEntity;
-  public Expression (String leftEntity, String operator, String rightEntity) {
-    this.leftEntity = leftEntity;
-    this.operator = operator;
-    this.rightEntity = rightEntity;    
-  }
-  
-  public Expression copy() {
-    return new Expression(leftEntity,operator,rightEntity);
-  }
-  
-  public String toString() {
-    return leftEntity + operator + rightEntity;
-  }
-  
-
-}
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index d942a4a..9864e06 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -94,6 +94,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   public void doSearch() { 
     stateMgr.hasPendingStateChange("search",false);
     data.reset();
+    // TODO: avoid state proliferation here:
     req.getRecord().removeParameters();
     req.getShow().setParameter(new CommandParameter("start","=",0));    
     logger.debug(Utils.objectId(this) + " is searching using "+req.getCommandReadOnly("search").getUrlEncodedParameterValue("query"));
@@ -236,8 +237,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
       stateMgr.hasPendingStateChange("record",false);
       if (req.getCommandReadOnly("record").hasParameters()) {
         update("record");
-      } else {
-        req.getRecord().removeParameters();  
+      } else {         
         data.put("record", new RecordResponse());
       }
     }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index 7651860..b585485 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -41,7 +41,7 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
                             + Utils.objectId(configurator) + "]" );    
       configureClient(searchClient,configurator);
     } else {
-      logger.info("Pz2ProxyBean:postConstruct: searchClient already instantiated " +
+      logger.debug("Pz2ProxyBean:postConstruct: searchClient already instantiated " +
       		        "during construction of parent object Pz2Bean.");
     }
   }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandParameter.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandParameter.java
index c899251..c8f2201 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandParameter.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/CommandParameter.java
@@ -8,7 +8,6 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import com.indexdata.pz2utils4jsf.pazpar2.Expression;
 import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;
 
 public class CommandParameter implements Serializable {
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Expression.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Expression.java
new file mode 100644
index 0000000..d412ac9
--- /dev/null
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Expression.java
@@ -0,0 +1,25 @@
+package com.indexdata.pz2utils4jsf.pazpar2.commands;
+
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Expression;
+
+public class Expression {
+  
+  String leftEntity;
+  String operator;
+  String rightEntity;
+  public Expression (String leftEntity, String operator, String rightEntity) {
+    this.leftEntity = leftEntity;
+    this.operator = operator;
+    this.rightEntity = rightEntity;    
+  }
+  
+  public Expression copy() {
+    return new Expression(leftEntity,operator,rightEntity);
+  }
+  
+  public String toString() {
+    return leftEntity + operator + rightEntity;
+  }
+  
+
+}
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 7e0d361..1d2cb2b 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
@@ -4,7 +4,6 @@ import javax.enterprise.context.SessionScoped;
 
 import org.apache.log4j.Logger;
 
-import com.indexdata.pz2utils4jsf.pazpar2.Expression;
 import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;
 
 @SessionScoped
-- 
1.7.10.4