Adds SP extensions to Pazpar2 commands and parameters

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/sp/ServiceProxyClient.java b/src/main/java/com/indexdata/mkjsf/pazpar2/sp/ServiceProxyClient.java
index 520ca3e..fdf0e97 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/sp/ServiceProxyClient.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/sp/ServiceProxyClient.java
@@ -12,9 +12,6 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import javax.enterprise.context.SessionScoped;\r
-import javax.inject.Inject;\r
-\r
 import org.apache.http.HttpEntity;\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.StatusLine;\r
@@ -43,6 +40,7 @@ import com.indexdata.mkjsf.pazpar2.CommandResponse;
 import com.indexdata.mkjsf.pazpar2.SearchClient;\r
 import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
@@ -76,9 +74,9 @@ public class ServiceProxyClient implements SearchClient {
       config = configReader.getConfiguration(this);      \r
       serviceUrl = config.getMandatory(SERVICE_PROXY_URL);  \r
       this.initDocPaths = getMultiProperty(config.get(SP_INIT_DOC_PATHS));\r
-      checkAuth = new Pazpar2Command("auth",null);\r
+      checkAuth = new AuthCommand(null);\r
       checkAuth.setParameterInState(new CommandParameter("action","=","check"));\r
-      ipAuth = new Pazpar2Command("auth",null);\r
+      ipAuth = new AuthCommand(null);\r
       ipAuth.setParameterInState(new CommandParameter("action","=","ipauth"));\r
     } catch (ConfigurationException c) {\r
       c.printStackTrace();\r
@@ -98,7 +96,7 @@ public class ServiceProxyClient implements SearchClient {
   public boolean authenticate (ServiceProxyUser user) {\r
     try {      \r
       logger.info("Authenticating [" + user.getProperty("name") + "]");            \r
-      Pazpar2Command auth = new Pazpar2Command("auth",null);\r
+      Pazpar2Command auth = new AuthCommand(null);\r
       auth.setParametersInState(new CommandParameter("action","=","login"), \r
                                 new CommandParameter("username","=",user.getProperty("name")), \r
                                 new CommandParameter("password","=",user.getProperty("password")));                                \r