X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2Client.java;h=39adf03123cff48f031f49ff7cba968bf8cd7c02;hb=7b71381e71db35eed511606e80c0d3e18cab4d2b;hp=26e4a4d36ed5eac51aa4df63bcb50b02e13e0ced;hpb=82d95ea9cf2bdfe5024352d94ad4ced2024f9216;p=mkjsf-moved-to-github.git diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java index 26e4a4d..39adf03 100644 --- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java +++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java @@ -9,9 +9,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.enterprise.context.SessionScoped; -import javax.inject.Named; - import org.apache.log4j.Logger; import com.indexdata.masterkey.config.MissingMandatoryParameterException; @@ -26,9 +23,9 @@ import com.indexdata.masterkey.pazpar2.client.exceptions.ProxyErrorException; import com.indexdata.pz2utils4jsf.config.Configuration; import com.indexdata.pz2utils4jsf.config.ConfigurationReader; import com.indexdata.pz2utils4jsf.errors.ConfigurationException; +import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly; import com.indexdata.pz2utils4jsf.utils.Utils; -@Named @SessionScoped public class Pz2Client implements SearchClient { private static final long serialVersionUID = 5414266730169982028L; @@ -84,13 +81,13 @@ public class Pz2Client implements SearchClient { } @Override - public void setSearchCommand(Pazpar2Command command) { + public void setSearchCommand(CommandReadOnly command) { ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString()); client.setSearchCommand(clientCommand); } @Override - public CommandResponse executeCommand(Pazpar2Command command, ByteArrayOutputStream baos) + public CommandResponse executeCommand(CommandReadOnly command, ByteArrayOutputStream baos) throws Pazpar2ErrorException, IOException { ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString()); Pazpar2HttpResponse pz2HttpResponse = client.executeCommand(clientCommand, baos);