Exposing configuration for use in upper layers

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
index bc10fab..26e4a4d 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
@@ -37,6 +37,7 @@ public class Pz2Client implements SearchClient {
   private Pazpar2ClientConfiguration cfg = null;\r
   public static final String MODULENAME = "pz2client";\r
   public static Map<String,String> DEFAULTS = new HashMap<String,String>();\r
+  Configuration config = null;\r
   \r
   static {    \r
     DEFAULTS.put("PROXY_MODE","1");\r
@@ -51,7 +52,7 @@ public class Pz2Client implements SearchClient {
   public void configure(ConfigurationReader configReader) throws ConfigurationException {    \r
     logger.info(Utils.objectId(this) + " is configuring using the provided " + Utils.objectId(configReader));\r
     try {\r
-      Configuration config = configReader.getConfiguration(this);\r
+      config = configReader.getConfiguration(this);\r
       cfg = new Pazpar2ClientConfiguration(new ConfigurationGetter(config));\r
     } catch (ProxyErrorException pe) {\r
       logger.error("Could not configure Pazpar2 client: " + pe.getMessage());\r
@@ -144,5 +145,9 @@ public class Pz2Client implements SearchClient {
     doc.add(nl+ MODULENAME + " was configured to access Pazpar2 at : " + cfg.PAZPAR2_URL);    \r
     return new ArrayList<String>();\r
   }\r
+  \r
+  public Configuration getConfiguration () {\r
+    return config;\r
+  }\r
 \r
 }\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
index cc45e76..b0d188f 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SearchClient.java
@@ -6,6 +6,7 @@ import java.io.Serializable;
 \r
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
 import com.indexdata.pz2utils4jsf.config.Configurable;\r
+import com.indexdata.pz2utils4jsf.config.Configuration;\r
 \r
 public interface SearchClient extends Configurable, Serializable {\r
   \r
@@ -13,4 +14,5 @@ public interface SearchClient extends Configurable, Serializable {
   public CommandResponse executeCommand(Pazpar2Command command, ByteArrayOutputStream baos) throws Pazpar2ErrorException, IOException;\r
   public SearchClient cloneMe();\r
   public boolean isAuthenticatingClient();  \r
+  public Configuration getConfiguration();\r
 }\r