Generalizes and distinguishes - pz2 and sp. Adds auth.

[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 bec9874..d506678 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -36,14 +36,14 @@ public class Pz2Session implements Pz2Interface {
   private static final long serialVersionUID = 3947514708343320514L;\r
   private static Logger logger = Logger.getLogger(Pz2Session.class);\r
   \r
-  private Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
-  private QueryStates queryStates = new QueryStates();\r
-  private ErrorHelper errorHelper = null;\r
-  \r
-  private List<ErrorInterface> configurationErrors = null;\r
-  private SearchClient searchClient = null;   \r
-  private TargetFilter targetFilter = null;  \r
-  private ResultsPager pager = null; \r
+  protected Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
+  protected QueryStates queryStates = new QueryStates();\r
+  protected ErrorHelper errorHelper = null;\r
+  \r
+  protected List<ErrorInterface> configurationErrors = null;\r
+  protected SearchClient searchClient = null;   \r
+  protected TargetFilter targetFilter = null;  \r
+  protected ResultsPager pager = null; \r
     \r
   public Pz2Session () {\r
     logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]");      \r
@@ -62,7 +62,7 @@ public class Pz2Session implements Pz2Interface {
       // To avoid that, a context free client is cloned from the context \r
       // dependent one. \r
       // If propagation to threads gets supported, the cloning can go. \r
-      this.searchClient = searchClient.cloneMe();\r
+      this.searchClient = searchClient.cloneMe();   \r
       \r
     } catch (ConfigurationException e) {\r
       configurationErrors.add(new ConfigurationError("Search Client","Configuration",e.getMessage(),new ErrorHelper(configReader)));          \r
@@ -70,7 +70,7 @@ public class Pz2Session implements Pz2Interface {
     logger.info(configReader.document());\r
     resetDataObjects();\r
   }\r
-    \r
+      \r
   public void doSearch(String query) {\r
     setCommandParameter("search",new CommandParameter("query","=",query));     \r
     doSearch();\r
@@ -336,11 +336,11 @@ public class Pz2Session implements Pz2Interface {
   }\r
 \r
     \r
-  private boolean hasTargetFilter(TargetFilter targetFilter) {\r
+  protected boolean hasTargetFilter(TargetFilter targetFilter) {\r
     return hasTargetFilter() && targetFilter.equals(this.targetFilter);\r
   }\r
   \r
-  private boolean hasQuery() {\r
+  protected boolean hasQuery() {\r
     return !(getCommand("search").getParameter("query") == null);\r
   }\r
     \r
@@ -366,7 +366,7 @@ public class Pz2Session implements Pz2Interface {
     return errorHelper;\r
   }\r
   \r
-  private void handleQueryStateChanges (String commands) {\r
+  protected void handleQueryStateChanges (String commands) {\r
     if (queryStates.hasPendingStateChange("search")) { \r
       logger.debug("Found pending search change. Doing search before updating " + commands);\r
       doSearch();\r
@@ -383,7 +383,7 @@ public class Pz2Session implements Pz2Interface {
     }    \r
   }\r
 \r
-  private String getActiveClients() {    \r
+  protected String getActiveClients() {    \r
     if (getShow()!=null) {\r
       logger.debug("Active clients: "+getShow().getActiveClients());\r
       return getShow().getActiveClients();\r
@@ -392,25 +392,25 @@ public class Pz2Session implements Pz2Interface {
     }\r
   }\r
 \r
-  private Pazpar2Command getCommand(String name) {\r
+  protected Pazpar2Command getCommand(String name) {\r
     return queryStates.getCurrentState().getCommand(name);\r
   }\r
   \r
-  private void setCommandParameter(String commandName, CommandParameter parameter) {\r
+  protected void setCommandParameter(String commandName, CommandParameter parameter) {\r
     logger.debug("Setting parameter for " + commandName + ": " + parameter);\r
     queryStates.getCurrentState().setCommandParameter(commandName, parameter, queryStates);    \r
   }\r
   \r
   \r
-  private void removeCommandParameter(String commandName, String parameterName) {\r
+  protected void removeCommandParameter(String commandName, String parameterName) {\r
     queryStates.getCurrentState().removeCommandParameter(commandName,parameterName,queryStates);    \r
   }\r
   \r
-  private void removeCommand (String commandName) {\r
+  protected void removeCommand (String commandName) {\r
     queryStates.getCurrentState().removeCommand(commandName, queryStates);\r
   }\r
     \r
-  private String getCommandParameterValue (String commandName, String parameterName, String defaultValue) {    \r
+  protected String getCommandParameterValue (String commandName, String parameterName, String defaultValue) {    \r
     Pazpar2Command command = getCommand(commandName);\r
     if (command != null) {\r
       CommandParameter parameter = command.getParameter(parameterName);\r
@@ -421,7 +421,7 @@ public class Pz2Session implements Pz2Interface {
     return defaultValue;    \r
   }\r
   \r
-  private String getCommandParameterValueSimple (String commandName, String parameterName, String defaultValue) {    \r
+  protected String getCommandParameterValueSimple (String commandName, String parameterName, String defaultValue) {    \r
     Pazpar2Command command = getCommand(commandName);\r
     if (command != null) {\r
       CommandParameter parameter = command.getParameter(parameterName);\r
@@ -433,7 +433,7 @@ public class Pz2Session implements Pz2Interface {
   }\r
 \r
   \r
-  private int getCommandParameterValue (String commandName, String parameterName, int defaultValue) {\r
+  protected int getCommandParameterValue (String commandName, String parameterName, int defaultValue) {\r
     Pazpar2Command command = getCommand(commandName);\r
     if (command != null) {\r
       CommandParameter parameter = command.getParameter(parameterName);\r
@@ -444,13 +444,13 @@ public class Pz2Session implements Pz2Interface {
     return defaultValue;    \r
   }\r
 \r
-  private String doCommand(String commandName) {      \r
+  protected String doCommand(String commandName) {     \r
     Pazpar2Command command = getCommand(commandName);    \r
     logger.debug(command.getEncodedQueryString() + ": Results for "+ getCommand("search").getEncodedQueryString());\r
-    return update(commandName);      \r
+    return update(commandName);\r
   }\r
   \r
-  private void resetDataObjects() {\r
+  protected void resetDataObjects() {\r
     logger.debug("Resetting show,stat,termlist,bytarget,search response objects.");\r
     dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
     dataObjects.put("show", new ShowResponse());\r