Renames Pz2Bean to Pz2Service

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index c5b93ea..d11a55b 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -9,15 +9,16 @@ import javax.inject.Inject;
 import javax.inject.Named;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.apache.myfaces.custom.fileupload.UploadedFile;\r
 \r
 import com.indexdata.mkjsf.config.ConfigurationReader;\r
-import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;\r
-import com.indexdata.mkjsf.pazpar2.data.Responses;\r
-import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @Named("pz2x") @SessionScoped\r
-public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializable {\r
+public class ServiceProxyExtensions implements ServiceProxyInterface, Serializable {\r
     \r
   private static final long serialVersionUID = 4221824985678758225L;\r
   private static Logger logger = Logger.getLogger(ServiceProxyExtensions.class);  \r
@@ -25,56 +26,21 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
   private String initDocResponse = "";  \r
   private InitDocUpload initDocUpload; \r
     \r
-  @Inject ConfigurationReader configurator;  \r
-  @Inject ServiceProxyUser user;    \r
-  @Inject Pz2Bean pz2;\r
-  @Inject Pazpar2Commands pzreq;\r
-  @Inject Responses pzresp;\r
-\r
-  \r
+  @Inject ConfigurationReader configurator;    \r
+    \r
   public ServiceProxyExtensions() {\r
     this.initDocUpload = new InitDocUpload(this);\r
     // TODO: \r
     //stateMgr.addStateListener(this);\r
   }\r
-    \r
-  public void login(String un, String pw) {\r
-    if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {\r
-      logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");\r
-    } else {\r
-      logger.info("doing un/pw login");\r
-      user.setName(un);\r
-      user.setPassword(pw);\r
-      login("dummy");\r
-    }\r
-  }\r
-\r
-  @Override\r
-  public String login(String navigateTo) {\r
-    logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());\r
-    pz2.getSpClient().authenticate(user);\r
-    pz2.resetSearchAndResults();\r
-    return navigateTo;\r
-  }\r
-  \r
-  public void ipAuthenticate (ServiceProxyUser user) {\r
-    if (!user.isIpAuthenticated()) {\r
-      if (user.isAuthenticated()) {\r
-        user.clear();\r
-      }\r
-      pz2.resetSearchAndResults();\r
-      pz2.getSpClient().ipAuthenticate(user);\r
-    }\r
-  }\r
-    \r
+           \r
   public String getInitDocPath () {\r
-    return pz2.getSpClient().getConfiguration().get("INIT_DOC_PATH");\r
+    return Pz2Service.get().getSpClient().getConfiguration().get("INIT_DOC_PATH");\r
   }\r
   \r
   @Override\r
   public void setInitFileName(String fileName) {\r
-    this.initDocFileName = fileName;\r
-    \r
+    this.initDocFileName = fileName;    \r
   }\r
 \r
   @Override\r
@@ -84,18 +50,20 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
 \r
   @Override\r
   public ClientCommandResponse postInit() throws UnsupportedEncodingException, IOException {    \r
-    String initDocPath = pz2.getSpClient().getInitDocPaths().get(0);\r
-    logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());\r
-    logger.info("Path: " + initDocPath);\r
-    pz2.resetSearchAndResults();\r
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName());    \r
+    String initDocPath = Pz2Service.get().getSpClient().getInitDocPaths().get(0);\r
+    logger.info("Paths: " + Pz2Service.get().getSpClient().getInitDocPaths());\r
+    logger.info("Path: " + initDocPath);   \r
+    Pz2Service.get().resetSearchAndRecordCommands();\r
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);\r
+    ClientCommandResponse response = Pz2Service.get().getSpClient().postInitDoc(initDocPath + getInitFileName());    \r
     return response;\r
   }\r
   \r
   @Override\r
-  public ClientCommandResponse postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    \r
-    pz2.resetSearchAndResults();\r
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    \r
+  public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    \r
+    Pz2Service.get().resetSearchAndRecordCommands();\r
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);\r
+    HttpResponseWrapper response = Pz2Service.get().getSpClient().postInitDoc(initDoc,includeDebug);    \r
     return response;\r
   }\r
 \r
@@ -104,8 +72,33 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
     return initDocResponse;\r
   }\r
   \r
+  public void setUploadedInitDoc (UploadedFile uploadedFile) {\r
+    initDocUpload.setUploadedFile(uploadedFile);\r
+  }\r
+  \r
+  public UploadedFile getUploadedInitDoc () {\r
+    return initDocUpload.getUploadedFile();\r
+  }\r
+  \r
+  public void submitInitDoc () throws IOException {\r
+    ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();\r
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);    \r
+    Pz2Service.get().getPzresp().put("init", responseObject);\r
+  }\r
+  \r
+  public void setIncludeInitDocDebug(boolean bool) {\r
+    logger.info(Utils.objectId(this) + " setting debug to " + bool);\r
+    initDocUpload.setIncludeDebug(bool);\r
+  }\r
+\r
+  public boolean getIncludeInitDocDebug() {\r
+    return initDocUpload.getIncludeDebug();\r
+  }\r
+  \r
+  // TODO: Remove when obsolete\r
   public InitDocUpload getInitDocUpload () {\r
     return initDocUpload;\r
   }\r
   \r
+   \r
 }\r