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

Timestamp:

03/07/14 09:21:20 (10 years ago)

Author:

Twan Goosen

Message:

made service that creates ResourceInfo? objects from resource strings. This is now used by the resource type counting service. Adapted/added unit tests.

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (3 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.config;
 
-import com.google.common.collect.Lists;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
 import eu.clarin.cmdi.vlo.service.SearchResultsDao;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
 import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.impl.ResourceStringConverterImpl;
 import eu.clarin.cmdi.vlo.service.impl.ResourceTypeCountingServiceImpl;
 import eu.clarin.cmdi.vlo.service.impl.SearchResultsDaoImpl;
@@ -31 +32 @@
 import eu.clarin.cmdi.vlo.service.impl.SolrFacetQueryFactoryImpl;
 import java.io.IOException;
-import java.util.ArrayList;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -100 +100 @@
     @Bean
     public ResourceTypeCountingService resourceTypeCountingService() {
-        return new ResourceTypeCountingServiceImpl();
+        return new ResourceTypeCountingServiceImpl(resourceStringConverter());
+    }
+
+    @Bean
+    public ResourceStringConverter resourceStringConverter() {
+        return new ResourceStringConverterImpl();
     }