Changeset 4983
- Timestamp:
- 04/15/14 14:18:41 (10 years ago)
- Location:
- vlo/branches/vlo-3.0/vlo-web-app/src
- Files:
-
- 4 added
- 4 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java
r4979 r4983 23 23 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection; 24 24 import eu.clarin.cmdi.vlo.service.FieldFilter; 25 import eu.clarin.cmdi.vlo.service. HandleClient;25 import eu.clarin.cmdi.vlo.service.handle.HandleClient; 26 26 import eu.clarin.cmdi.vlo.service.PageParametersConverter; 27 27 import eu.clarin.cmdi.vlo.service.ResourceStringConverter; … … 30 30 import eu.clarin.cmdi.vlo.service.XmlTransformationService; 31 31 import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter; 32 import eu.clarin.cmdi.vlo.service. impl.HandleClientImpl;32 import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient; 33 33 import eu.clarin.cmdi.vlo.service.impl.UriResolverImpl; 34 34 import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter; … … 42 42 import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory; 43 43 import eu.clarin.cmdi.vlo.service.solr.impl.AutoCompleteServiceImpl; 44 import eu.clarin.cmdi.vlo.service. solr.impl.QueryFacetsSelectionParametersConverter;44 import eu.clarin.cmdi.vlo.service.impl.QueryFacetsSelectionParametersConverter; 45 45 import eu.clarin.cmdi.vlo.service.solr.impl.SearchResultsDaoImpl; 46 46 import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentQueryFactoryImpl; … … 147 147 148 148 public HandleClient handleClient() { 149 return new Handle ClientImpl();149 return new HandleRestApiClient(); 150 150 } 151 151 -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/handle/HandleClient.java
r4979 r4983 16 16 */ 17 17 18 package eu.clarin.cmdi.vlo.service ;18 package eu.clarin.cmdi.vlo.service.handle; 19 19 20 20 /** -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/handle/impl/HandleRestApiClient.java
r4981 r4983 15 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 package eu.clarin.cmdi.vlo.service. impl;17 package eu.clarin.cmdi.vlo.service.handle.impl; 18 18 19 19 import com.sun.jersey.api.client.Client; … … 22 22 import com.sun.jersey.api.client.UniformInterfaceException; 23 23 import com.sun.jersey.api.client.WebResource; 24 import eu.clarin.cmdi.vlo.service. HandleClient;24 import eu.clarin.cmdi.vlo.service.handle.HandleClient; 25 25 import javax.ws.rs.core.MediaType; 26 26 import org.apache.wicket.ajax.json.JSONArray; … … 38 38 * @author twagoo 39 39 */ 40 public class Handle ClientImplimplements HandleClient {40 public class HandleRestApiClient implements HandleClient { 41 41 42 private final static Logger logger = LoggerFactory.getLogger(Handle ClientImpl.class);42 private final static Logger logger = LoggerFactory.getLogger(HandleRestApiClient.class); 43 43 44 44 private final String handleApiBaseUrl; … … 47 47 * constructs a client with the default handle REST API base URL 48 48 */ 49 public Handle ClientImpl() {49 public HandleRestApiClient() { 50 50 //TODO: get from config 51 51 this("http://hdl.handle.net/api/handles/"); … … 57 57 * directly appended to this) 58 58 */ 59 public Handle ClientImpl(String handleApiBaseUrl) {59 public HandleRestApiClient(String handleApiBaseUrl) { 60 60 this.handleApiBaseUrl = handleApiBaseUrl; 61 61 } -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java
r4968 r4983 15 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 package eu.clarin.cmdi.vlo.service. solr.impl;17 package eu.clarin.cmdi.vlo.service.impl; 18 18 19 19 import com.google.common.collect.Maps; -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImpl.java
r4980 r4983 17 17 package eu.clarin.cmdi.vlo.service.impl; 18 18 19 import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient; 19 20 import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PREFIX; 20 21 import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PROXY; 21 import eu.clarin.cmdi.vlo.service. HandleClient;22 import eu.clarin.cmdi.vlo.service.handle.HandleClient; 22 23 import eu.clarin.cmdi.vlo.service.UriResolver; 23 24 import org.slf4j.Logger; … … 34 35 public class UriResolverImpl implements UriResolver { 35 36 36 private final static Logger logger = LoggerFactory.getLogger(Handle ClientImpl.class);37 private final static Logger logger = LoggerFactory.getLogger(HandleRestApiClient.class); 37 38 38 39 private final HandleClient handleClient; -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/handle/impl/HandleRestApiClientRunner.java
r4982 r4983 15 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 package eu.clarin.cmdi.vlo.service. impl;17 package eu.clarin.cmdi.vlo.service.handle.impl; 18 18 19 import eu.clarin.cmdi.vlo.service.HandleClient; 19 import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient; 20 import eu.clarin.cmdi.vlo.service.handle.HandleClient; 20 21 21 22 /** … … 24 25 * @author twagoo 25 26 */ 26 public class Handle ClientRunner {27 public class HandleRestApiClientRunner { 27 28 28 29 public final static String HANDLE = "1839/00-0000-0000-0000-0000-4"; … … 33 34 */ 34 35 public static void main(String[] args) { 35 final HandleClient client = new Handle ClientImpl();36 final HandleClient client = new HandleRestApiClient(); 36 37 37 38 System.out.println("Requesting handle..."); -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java
r4968 r4983 17 17 package eu.clarin.cmdi.vlo.service.impl; 18 18 19 import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;20 19 import com.google.common.collect.Maps; 21 20 import eu.clarin.cmdi.vlo.pojo.FacetSelection; -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/UriResolverImplTest.java
r4979 r4983 17 17 package eu.clarin.cmdi.vlo.service.impl; 18 18 19 import eu.clarin.cmdi.vlo.service. HandleClient;19 import eu.clarin.cmdi.vlo.service.handle.HandleClient; 20 20 import org.jmock.Expectations; 21 21 import static org.jmock.Expectations.returnValue;
Note: See TracChangeset
for help on using the changeset viewer.