Changeset 298

Timestamp:

02/05/10 22:24:19 (2 years ago)

Author:

jgao

Message:

BridgeRest?: cache supportedSrc/TgtDataSources and attributeSet; support spaces in organism name.

Files:

• trunk/corelib/src/org/bridgedb/webservice/bridgerest/BridgeRest.java (modified) (5 diffs)

trunk/corelib/src/org/bridgedb/webservice/bridgerest/BridgeRest.java

@@ -55 +55 @@
                 /** {@inheritDoc} */
                 public IDMapper connect(String location) throws IDMapperException  {
-                        return new BridgeRest(location);
+                        // replace all spaces by "%20" to access organisms such as "Arabidopsis theliana"
+                        return new BridgeRest(location.replaceAll(" ", "%20"));
                 }
         }
@@ -143 +144 @@
                         throws IDMapperException 
                 {
-                        return loadDataSources("sourceDataSources");
+                        if (supportedSrcDataSources==null) {
+                                supportedSrcDataSources = loadDataSources("sourceDataSources");
+                        }
+                        return supportedSrcDataSources;
                 }
 
@@ -150 +154 @@
                         throws IDMapperException 
                 {
-                        return loadDataSources("targetDataSources");
+                        if (supportedTgtDataSources==null) {
+                                supportedTgtDataSources = loadDataSources("targetDataSources");
+                        }
+                        return supportedTgtDataSources;
                 }
 
@@ -180 +187 @@
 
         private final IDMapperCapabilities capabilities;
+
+        private Set<DataSource> supportedSrcDataSources = null;
+        private Set<DataSource> supportedTgtDataSources = null;
+        private Set<String> attributeSet = null;
 
         /**
@@ -446 +457 @@
         /** {@inheritDoc} */
         public Set<String> getAttributeSet() throws IDMapperException {
-                try {
-                        Set<String> results = new HashSet<String>();
-
-                        BufferedReader in = new UrlBuilder ("attributeSet")
-                                .openReader();
-                        String line;
-                        while ((line = in.readLine()) != null) {
-                                results.add(line);
-                        }
-                        in.close();
-                        return results;
-                } catch (IOException ex) {
-                        throw new IDMapperException (ex);
-                } 
+                if (attributeSet==null) {
+                        try {
+                                Set<String> results = new HashSet<String>();
+
+                                BufferedReader in = new UrlBuilder ("attributeSet")
+                                        .openReader();
+                                String line;
+                                while ((line = in.readLine()) != null) {
+                                        results.add(line);
+                                }
+                                in.close();
+                                attributeSet = results;
+                        } catch (IOException ex) {
+                                throw new IDMapperException (ex);
+                        }
+                }
+
+                return attributeSet;
         }