Changeset 4983


Ignore:
Timestamp:
04/15/14 14:18:41 (10 years ago)
Author:
Twan Goosen
Message:

package and class name refactoring in eu.clarin.cmdi.vlo.service

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  
    2323import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
    2424import eu.clarin.cmdi.vlo.service.FieldFilter;
    25 import eu.clarin.cmdi.vlo.service.HandleClient;
     25import eu.clarin.cmdi.vlo.service.handle.HandleClient;
    2626import eu.clarin.cmdi.vlo.service.PageParametersConverter;
    2727import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
     
    3030import eu.clarin.cmdi.vlo.service.XmlTransformationService;
    3131import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
    32 import eu.clarin.cmdi.vlo.service.impl.HandleClientImpl;
     32import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient;
    3333import eu.clarin.cmdi.vlo.service.impl.UriResolverImpl;
    3434import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
     
    4242import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
    4343import eu.clarin.cmdi.vlo.service.solr.impl.AutoCompleteServiceImpl;
    44 import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
     44import eu.clarin.cmdi.vlo.service.impl.QueryFacetsSelectionParametersConverter;
    4545import eu.clarin.cmdi.vlo.service.solr.impl.SearchResultsDaoImpl;
    4646import eu.clarin.cmdi.vlo.service.solr.impl.SolrDocumentQueryFactoryImpl;
     
    147147
    148148    public HandleClient handleClient() {
    149         return new HandleClientImpl();
     149        return new HandleRestApiClient();
    150150    }
    151151
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/handle/HandleClient.java

    r4979 r4983  
    1616 */
    1717
    18 package eu.clarin.cmdi.vlo.service;
     18package eu.clarin.cmdi.vlo.service.handle;
    1919
    2020/**
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/handle/impl/HandleRestApiClient.java

    r4981 r4983  
    1515 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1616 */
    17 package eu.clarin.cmdi.vlo.service.impl;
     17package eu.clarin.cmdi.vlo.service.handle.impl;
    1818
    1919import com.sun.jersey.api.client.Client;
     
    2222import com.sun.jersey.api.client.UniformInterfaceException;
    2323import com.sun.jersey.api.client.WebResource;
    24 import eu.clarin.cmdi.vlo.service.HandleClient;
     24import eu.clarin.cmdi.vlo.service.handle.HandleClient;
    2525import javax.ws.rs.core.MediaType;
    2626import org.apache.wicket.ajax.json.JSONArray;
     
    3838 * @author twagoo
    3939 */
    40 public class HandleClientImpl implements HandleClient {
     40public class HandleRestApiClient implements HandleClient {
    4141
    42     private final static Logger logger = LoggerFactory.getLogger(HandleClientImpl.class);
     42    private final static Logger logger = LoggerFactory.getLogger(HandleRestApiClient.class);
    4343
    4444    private final String handleApiBaseUrl;
     
    4747     * constructs a client with the default handle REST API base URL
    4848     */
    49     public HandleClientImpl() {
     49    public HandleRestApiClient() {
    5050        //TODO: get from config
    5151        this("http://hdl.handle.net/api/handles/");
     
    5757     * directly appended to this)
    5858     */
    59     public HandleClientImpl(String handleApiBaseUrl) {
     59    public HandleRestApiClient(String handleApiBaseUrl) {
    6060        this.handleApiBaseUrl = handleApiBaseUrl;
    6161    }
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java

    r4968 r4983  
    1515 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1616 */
    17 package eu.clarin.cmdi.vlo.service.solr.impl;
     17package eu.clarin.cmdi.vlo.service.impl;
    1818
    1919import 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  
    1717package eu.clarin.cmdi.vlo.service.impl;
    1818
     19import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient;
    1920import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PREFIX;
    2021import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PROXY;
    21 import eu.clarin.cmdi.vlo.service.HandleClient;
     22import eu.clarin.cmdi.vlo.service.handle.HandleClient;
    2223import eu.clarin.cmdi.vlo.service.UriResolver;
    2324import org.slf4j.Logger;
     
    3435public class UriResolverImpl implements UriResolver {
    3536
    36     private final static Logger logger = LoggerFactory.getLogger(HandleClientImpl.class);
     37    private final static Logger logger = LoggerFactory.getLogger(HandleRestApiClient.class);
    3738
    3839    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  
    1515 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1616 */
    17 package eu.clarin.cmdi.vlo.service.impl;
     17package eu.clarin.cmdi.vlo.service.handle.impl;
    1818
    19 import eu.clarin.cmdi.vlo.service.HandleClient;
     19import eu.clarin.cmdi.vlo.service.handle.impl.HandleRestApiClient;
     20import eu.clarin.cmdi.vlo.service.handle.HandleClient;
    2021
    2122/**
     
    2425 * @author twagoo
    2526 */
    26 public class HandleClientRunner {
     27public class HandleRestApiClientRunner {
    2728
    2829    public final static String HANDLE = "1839/00-0000-0000-0000-0000-4";
     
    3334     */
    3435    public static void main(String[] args) {
    35         final HandleClient client = new HandleClientImpl();
     36        final HandleClient client = new HandleRestApiClient();
    3637
    3738        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  
    1717package eu.clarin.cmdi.vlo.service.impl;
    1818
    19 import eu.clarin.cmdi.vlo.service.solr.impl.QueryFacetsSelectionParametersConverter;
    2019import com.google.common.collect.Maps;
    2120import 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  
    1717package eu.clarin.cmdi.vlo.service.impl;
    1818
    19 import eu.clarin.cmdi.vlo.service.HandleClient;
     19import eu.clarin.cmdi.vlo.service.handle.HandleClient;
    2020import org.jmock.Expectations;
    2121import static org.jmock.Expectations.returnValue;
Note: See TracChangeset for help on using the changeset viewer.