Changeset 4979

Timestamp:

04/15/14 09:50:18 (10 years ago)

Author:

Twan Goosen

Message:

implemented URI resolver and wrote test. To do: implement the handle client it depends on.

Location:

vlo/branches/vlo-3.0/vlo-web-app

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (3 diffs)
• src/main/java/eu/clarin/cmdi/vlo/service/HandleClient.java (added)
• src/main/java/eu/clarin/cmdi/vlo/service/impl/HandleClientImpl.java (added)
• src/main/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImpl.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/HandleResolver.java) (1 diff)
• src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java (added)

vlo/branches/vlo-3.0/vlo-web-app/pom.xml

@@ -169 +169 @@
                     </exclusion>
                 </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.17.1</version>
         </dependency>
     </dependencies>

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -18 +18 @@
 
 import com.google.common.collect.ImmutableList;
-import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
-import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
 import com.google.common.collect.Sets;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
+import eu.clarin.cmdi.vlo.service.HandleClient;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
@@ -31 +29 @@
 import eu.clarin.cmdi.vlo.service.UriResolver;
 import eu.clarin.cmdi.vlo.service.XmlTransformationService;
-import eu.clarin.cmdi.vlo.service.impl.HandleResolver;
-import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
-import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
-import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
-import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
+import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
+import eu.clarin.cmdi.vlo.service.impl.HandleClientImpl;
+import eu.clarin.cmdi.vlo.service.impl.UriResolverImpl;
+import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
 import eu.clarin.cmdi.vlo.service.impl.ResourceStringConverterImpl;
 import eu.clarin.cmdi.vlo.service.impl.ResourceTypeCountingServiceImpl;
 import eu.clarin.cmdi.vlo.service.impl.XmlTransformationServiceImpl;
 import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
+import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
 import eu.clarin.cmdi.vlo.service.solr.impl.AutoCompleteServiceImpl;
+import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.impl.SearchResultsDaoImpl;
 import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentQueryFactoryImpl;
@@ -136 +138 @@
     @Bean(name = "resolvingResourceStringConverter")
     public ResourceStringConverter resolvingResourceStringConverter() {
-        return new ResourceStringConverterImpl(handleResolver());
-    }
-
-    @Bean
-    public UriResolver handleResolver() {
-        return new HandleResolver();
+        return new ResourceStringConverterImpl(uriResolver());
+    }
+
+    @Bean
+    public UriResolver uriResolver() {
+        return new UriResolverImpl(handleClient());
+    }
+
+    public HandleClient handleClient() {
+        return new HandleClientImpl();
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImpl.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PREFIX;
+import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PROXY;
+import eu.clarin.cmdi.vlo.service.HandleClient;
 import eu.clarin.cmdi.vlo.service.UriResolver;
 
 /**
+ * Resolves a URI as follows: if the URI starts with the handle scheme or the
+ * handle proxy, the handle is extracted and passed on to this resolver's
+ * {@link HandleClient} and the result of {@link HandleClient#getUrl(java.lang.String)
+ * } is returned; otherwise the original URI is returned.
  *
  * @author twagoo
  */
-public class HandleResolver implements UriResolver {
+public class UriResolverImpl implements UriResolver {
+
+    private final HandleClient handleClient;
+
+    public UriResolverImpl(HandleClient handleClient) {
+        this.handleClient = handleClient;
+    }
 
     @Override
-    public String resolve(String URI) {
-        //TODO: Implement (using handle API?)
-        return "http://resolved.com/file.txt";
+    public String resolve(String uri) {
+        final String handle = getHandle(uri);
+
+        if (handle == null) {
+            return uri;
+        } else {
+            return handleClient.getUrl(handle);
+        }
+
+    }
+
+    private String getHandle(String uri) {
+        final String handle;
+        if (uri.startsWith(HANDLE_PREFIX)) {
+            handle = uri.substring(HANDLE_PREFIX.length());
+        } else if (uri.startsWith(HANDLE_PROXY)) {
+            handle = uri.substring(HANDLE_PROXY.length());
+        } else {
+            handle = null;
+        }
+        return handle;
     }