Fixes NPE in renaming auth response (triggered by SP change)

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
index 67780e5..31b2d89 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
@@ -7,10 +7,11 @@ import com.indexdata.mkjsf.pazpar2.Pz2Service;
 import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.AuthResponse;\r
 import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
 \r
 /**\r
- * Represents a Service Proxy <code>auth</code> command. \r
+ * Represents a Service Proxy <code>auth</code> command, can be accessed by <code>pzreq.sp.auth</code> \r
  * \r
  * <p>Authenticates a user against a Pazpar2 Service Proxy</p>\r
  * \r
@@ -32,7 +33,7 @@ public class AuthCommand extends Pazpar2Command implements ServiceProxyCommand {
     ClientCommandResponse response = (ClientCommandResponse) Pz2Service.get().getSearchClient().executeCommand(this);      \r
     String renamedResponse = renameResponseElement(response.getResponseString(), "auth");    \r
     response.setResponseToParse(renamedResponse);\r
-    SpResponseDataObject responseObject = (SpResponseDataObject) ResponseParser.getParser().getDataObject(response);    \r
+    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(response);    \r
     if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
       Pz2Service.get().getPzresp().put(getCommandName(), responseObject);\r
     }\r
@@ -52,8 +53,8 @@ public class AuthCommand extends Pazpar2Command implements ServiceProxyCommand {
    * @return\r
    */\r
   private String renameResponseElement(String responseString, String newName) {\r
-    responseString = responseString.replace("<response>", "<" + newName + ">");\r
-    responseString = responseString.replace("</response>", "</" + newName + ">");\r
+    responseString = responseString.replace("<response", "<" + newName);\r
+    responseString = responseString.replace("</response", "</" + newName);\r
     return responseString;\r
   }\r
 \r