More work on commands, statemgmt, EL references

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 48aa236..cdb1a6b 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -6,8 +6,9 @@ import java.util.Map;
 import java.util.StringTokenizer;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 \r
+import javax.annotation.PostConstruct;\r
 import javax.enterprise.context.SessionScoped;\r
-import javax.inject.Named;\r
+import javax.inject.Inject;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
@@ -17,6 +18,9 @@ import com.indexdata.pz2utils4jsf.errors.ConfigurationError;
 import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
 import com.indexdata.pz2utils4jsf.errors.ErrorHelper;\r
 import com.indexdata.pz2utils4jsf.errors.ErrorInterface;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Commands;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseData;\r
@@ -27,17 +31,21 @@ import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;\r
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateListener;\r
 import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
-@Named @SessionScoped  \r
-public class Pz2Session implements Pz2Interface {\r
+@ForStraightPz2\r
+public class Pz2Session implements Pz2Interface, StateListener {\r
     \r
   private static final long serialVersionUID = 3947514708343320514L;\r
   private static Logger logger = Logger.getLogger(Pz2Session.class);\r
   \r
   protected Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
-  protected StateManager stateManager = new StateManager();\r
+  \r
+  @Inject StateManager stateMgr;\r
+  @Inject Pazpar2Commands req;\r
+  \r
   protected ErrorHelper errorHelper = null;\r
   \r
   protected List<ErrorInterface> configurationErrors = null;\r
@@ -46,7 +54,14 @@ public class Pz2Session implements Pz2Interface {
   protected ResultsPager pager = null; \r
     \r
   public Pz2Session () {\r
-    logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]");      \r
+    logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]");        \r
+  }\r
+  \r
+  @PostConstruct\r
+  public void listenToStateManager() {\r
+    logger.debug("in post-construct of Pz2Session stateMgr is " + stateMgr);\r
+    logger.debug("in post-construct req is " + req);\r
+    stateMgr.addStateListener(this);\r
   }\r
     \r
   public void configureClient(SearchClient searchClient, ConfigurationReader configReader) {\r
@@ -76,7 +91,7 @@ public class Pz2Session implements Pz2Interface {
   }\r
 \r
   public void doSearch() { \r
-    stateManager.hasPendingStateChange("search",false);\r
+    stateMgr.hasPendingStateChange("search",false);\r
     resetDataObjects();\r
     removeCommand("record");\r
     setCommandParameter("show",new CommandParameter("start","=",0));    \r
@@ -158,7 +173,7 @@ public class Pz2Session implements Pz2Interface {
     if (term != null && term.length()>0) {   \r
       Pazpar2Command command = getCommand("search");\r
       command.getParameter("query").addExpression(new Expression(facetKey,"=",term));\r
-      stateManager.checkIn(command);\r
+      stateMgr.checkIn(command);\r
       doSearch();\r
     }            \r
   }\r
@@ -174,7 +189,7 @@ public class Pz2Session implements Pz2Interface {
   public void removeFacet(String facetKey, String term) {\r
     Pazpar2Command command = getCommand("search");\r
     command.getParameter("query").removeExpression(new Expression(facetKey,"=",term));\r
-    stateManager.checkIn(command);\r
+    stateMgr.checkIn(command);\r
     doSearch();\r
   }\r
   \r
@@ -294,11 +309,11 @@ public class Pz2Session implements Pz2Interface {
   \r
   \r
   public String getCurrentStateKey () {    \r
-    return stateManager.getCurrentState().getKey();\r
+    return stateMgr.getCurrentState().getKey();\r
   }\r
       \r
   public void setCurrentStateKey(String key) {       \r
-    stateManager.setCurrentStateKey(key);\r
+    stateMgr.setCurrentStateKey(key);\r
   }\r
   \r
   public boolean hasConfigurationErrors () {\r
@@ -357,7 +372,8 @@ public class Pz2Session implements Pz2Interface {
   }\r
   \r
   protected boolean hasQuery() {\r
-    return getCommand("search").getParameter("query") != null && getCommand("search").getParameter("query").getValueWithExpressions().length()>0;\r
+    logger.debug("req is " + req);\r
+    return req.getSearch().getParameter("query") != null && req.getSearch().getParameter("query").getValueWithExpressions().length()>0;\r
   }\r
     \r
   public boolean hasRecords () {\r
@@ -383,20 +399,20 @@ public class Pz2Session implements Pz2Interface {
   }\r
   \r
   protected void handleQueryStateChanges (String commands) {\r
-    if (stateManager.hasPendingStateChange("search") && hasQuery()) { \r
+    if (stateMgr.hasPendingStateChange("search") && hasQuery()) { \r
       logger.debug("Found pending search change. Doing search before updating " + commands);      \r
       doSearch();\r
     } \r
-    if (stateManager.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
+    if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
       logger.debug("Found pending record ID change. Doing record before updating " + commands);\r
-      stateManager.hasPendingStateChange("record",false);\r
+      stateMgr.hasPendingStateChange("record",false);\r
       if (getCommand("record").hasParameters()) {\r
         update("record");\r
       } else {\r
         removeCommand("record");  \r
         dataObjects.put("record", new RecordResponse());\r
       }\r
-    }    \r
+    }\r
   }\r
 \r
   protected String getActiveClients() {    \r
@@ -423,27 +439,27 @@ public class Pz2Session implements Pz2Interface {
    * @return\r
    */\r
   protected Pazpar2Command getCommand(String name) {\r
-    return stateManager.checkOut(name);\r
+    return stateMgr.checkOut(name);\r
   }\r
   \r
   protected void setCommandParameter(String commandName, CommandParameter parameter) {\r
     logger.debug("Setting parameter for " + commandName + ": " + parameter);\r
     Pazpar2Command command = getCommand(commandName);\r
     command.setParameter(parameter);\r
-    stateManager.checkIn(command);    \r
+    stateMgr.checkIn(command);    \r
   }\r
   \r
   \r
   protected void removeCommandParameter(String commandName, String parameterName) {\r
     Pazpar2Command command = getCommand(commandName);\r
     command.removeParameter(parameterName);\r
-    stateManager.checkIn(command);    \r
+    stateMgr.checkIn(command);    \r
   }\r
   \r
   protected void removeCommand (String commandName) {\r
     Pazpar2Command command = getCommand(commandName);\r
     command.removeParameters();\r
-    stateManager.checkIn(command);\r
+    stateMgr.checkIn(command);\r
   }\r
     \r
   protected String getCommandParameterValue (String commandName, String parameterName, String defaultValue) {    \r
@@ -481,7 +497,7 @@ public class Pz2Session implements Pz2Interface {
   }\r
 \r
   protected String doCommand(String commandName) {     \r
-    Pazpar2Command command = getCommand(commandName);    \r
+    Pazpar2Command command = req.getCommand(commandName);    \r
     logger.debug(command.getEncodedQueryString() + ": Results for "+ getCommand("search").getEncodedQueryString());\r
     return update(commandName);\r
   }\r
@@ -510,5 +526,14 @@ public class Pz2Session implements Pz2Interface {
   public boolean hasFilter () {\r
     return getFilter().length()>0;\r
   }\r
+\r
+  @Override\r
+  public void stateUpdate(String commandName) {\r
+    logger.debug("State change reported for [" + commandName + "]");\r
+    if (commandName.equals("show")) {\r
+      logger.debug("Updating show");\r
+      update(commandName);\r
+    }\r
+  }\r
   \r
 }\r