hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2279 from mwoodiupui/DS-4094

Browse Source 
[DS-4094] DiscoveryRestController and DiscoveryRestRepository log as ScopeResolver
This commit is contained in:
Mark H. Wood
2018-12-05 15:23:58 -05:00
committed by GitHub
parent 6bbcc08e59 90a9df75ef
commit 301f804d44
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-spring-rest/src/main/java/org/dspace/app/rest/DiscoveryRestController.java
View File

@@ -12,6 +12,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.app.rest.link.HalLinkService; import org.dspace.app.rest.link.HalLinkService;
import org.dspace.app.rest.model.FacetConfigurationRest; import org.dspace.app.rest.model.FacetConfigurationRest;
@@ -27,7 +28,6 @@ import org.dspace.app.rest.model.hateoas.SearchResultsResource;
import org.dspace.app.rest.model.hateoas.SearchSupportResource; import org.dspace.app.rest.model.hateoas.SearchSupportResource;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.dspace.app.rest.repository.DiscoveryRestRepository; import org.dspace.app.rest.repository.DiscoveryRestRepository;
import org.dspace.app.rest.utils.ScopeResolver;
import org.dspace.app.rest.utils.Utils; import org.dspace.app.rest.utils.Utils;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/" + SearchResultsRest.CATEGORY) @RequestMapping("/api/" + SearchResultsRest.CATEGORY)
public class DiscoveryRestController implements InitializingBean { public class DiscoveryRestController implements InitializingBean {
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ScopeResolver.class); private static final Logger log = LogManager.getLogger();
@Autowired @Autowired
protected Utils utils; protected Utils utils;
@@ -109,7 +109,7 @@ public class DiscoveryRestController implements InitializingBean {
log.trace("Searching with scope: " + StringUtils.trimToEmpty(dsoScope) log.trace("Searching with scope: " + StringUtils.trimToEmpty(dsoScope)
+ ", configuration name: " + StringUtils.trimToEmpty(configurationName) + ", configuration name: " + StringUtils.trimToEmpty(configurationName)
+ ", dsoType: " + StringUtils.trimToEmpty(dsoType) + ", dsoType: " + StringUtils.trimToEmpty(dsoType)
+ ", query: " + StringUtils.trimToEmpty(dsoType) + ", query: " + StringUtils.trimToEmpty(query)
+ ", filters: " + Objects.toString(searchFilters)); + ", filters: " + Objects.toString(searchFilters));
} }
@@ -136,7 +136,7 @@ public class DiscoveryRestController implements InitializingBean {
log.trace("Searching with scope: " + StringUtils.trimToEmpty(dsoScope) log.trace("Searching with scope: " + StringUtils.trimToEmpty(dsoScope)
+ ", configuration name: " + StringUtils.trimToEmpty(configurationName) + ", configuration name: " + StringUtils.trimToEmpty(configurationName)
+ ", dsoType: " + StringUtils.trimToEmpty(dsoType) + ", dsoType: " + StringUtils.trimToEmpty(dsoType)
+ ", query: " + StringUtils.trimToEmpty(dsoType) + ", query: " + StringUtils.trimToEmpty(query)
+ ", filters: " + Objects.toString(searchFilters) + ", filters: " + Objects.toString(searchFilters)
+ ", page: " + Objects.toString(page)); + ", page: " + Objects.toString(page));
} }
@@ -182,7 +182,7 @@ public class DiscoveryRestController implements InitializingBean {
log.trace("Facetting on facet " + facetName + " with scope: " + StringUtils.trimToEmpty(dsoScope) log.trace("Facetting on facet " + facetName + " with scope: " + StringUtils.trimToEmpty(dsoScope)
+ ", dsoType: " + StringUtils.trimToEmpty(dsoType) + ", dsoType: " + StringUtils.trimToEmpty(dsoType)
+ ", prefix: " + StringUtils.trimToEmpty(prefix) + ", prefix: " + StringUtils.trimToEmpty(prefix)
+ ", query: " + StringUtils.trimToEmpty(dsoType) + ", query: " + StringUtils.trimToEmpty(query)
+ ", filters: " + Objects.toString(searchFilters) + ", filters: " + Objects.toString(searchFilters)
+ ", page: " + Objects.toString(page)); + ", page: " + Objects.toString(page));
} }

3
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
import javax.ws.rs.BadRequestException; import javax.ws.rs.BadRequestException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.app.rest.converter.DiscoverConfigurationConverter; import org.dspace.app.rest.converter.DiscoverConfigurationConverter;
import org.dspace.app.rest.converter.DiscoverFacetConfigurationConverter; import org.dspace.app.rest.converter.DiscoverFacetConfigurationConverter;
@@ -48,7 +49,7 @@ import org.springframework.stereotype.Component;
@Component(SearchResultsRest.CATEGORY + "." + SearchResultsRest.NAME) @Component(SearchResultsRest.CATEGORY + "." + SearchResultsRest.NAME)
public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ScopeResolver.class); private static final Logger log = LogManager.getLogger();
@Autowired @Autowired
private DiscoveryConfigurationService searchConfigurationService; private DiscoveryConfigurationService searchConfigurationService;