hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 21:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dspace-api module per new code style

Browse Source
This commit is contained in:
Tim Donohue
2018-02-14 10:53:46 -06:00
parent 8ffc97f7f9
commit 8a48f782ea
1051 changed files with 53347 additions and 63373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
View File

@@ -7,13 +7,18 @@
*/
package org.dspace.discovery;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections4.ListUtils;
import org.dspace.content.DSpaceObject;
import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
import java.util.*;
/**
* This class represents the result that the discovery search impl returns
*
@@ -25,7 +30,9 @@ public class DiscoverResult {
private int start;
private List<DSpaceObject> dspaceObjects;
private Map<String, List<FacetResult>> facetResults;
/** A map that contains all the documents sougth after, the key is a string representation of the DSpace object */
/**
* A map that contains all the documents sougth after, the key is a string representation of the DSpace object
*/
private Map<String, List<SearchDocument>> searchDocuments;
private int maxResults = -1;
private int searchTime;
@@ -41,7 +48,7 @@ public class DiscoverResult {
}
public void addDSpaceObject(DSpaceObject dso){
public void addDSpaceObject(DSpaceObject dso) {
this.dspaceObjects.add(dso);
}
@@ -73,20 +80,17 @@ public class DiscoverResult {
this.maxResults = maxResults;
}
public int getSearchTime()
{
public int getSearchTime() {
return searchTime;
}
public void setSearchTime(int searchTime)
{
public void setSearchTime(int searchTime) {
this.searchTime = searchTime;
}
public void addFacetResult(String facetField, FacetResult ...facetResults){
public void addFacetResult(String facetField, FacetResult... facetResults) {
List<FacetResult> facetValues = this.facetResults.get(facetField);
if(facetValues == null)
{
if (facetValues == null) {
facetValues = new ArrayList<FacetResult>();
}
facetValues.addAll(Arrays.asList(facetResults));
@@ -97,30 +101,28 @@ public class DiscoverResult {
return facetResults;
}
public List<FacetResult> getFacetResult(String facet){
public List<FacetResult> getFacetResult(String facet) {
return ListUtils.emptyIfNull(facetResults.get(facet));
}
public List<FacetResult> getFacetResult(DiscoverySearchFilterFacet field) {
List<DiscoverResult.FacetResult> facetValues = getFacetResult(field.getIndexFieldName());
//Check if we are dealing with a date, sometimes the facet values arrive as dates !
if(facetValues.size() == 0 && field.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)){
if (facetValues.size() == 0 && field.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) {
facetValues = getFacetResult(field.getIndexFieldName() + ".year");
}
return ListUtils.emptyIfNull(facetValues);
}
public DSpaceObjectHighlightResult getHighlightedResults(DSpaceObject dso)
{
public DSpaceObjectHighlightResult getHighlightedResults(DSpaceObject dso) {
return highlightedResults.get(dso.getHandle());
}
public void addHighlightedResult(DSpaceObject dso, DSpaceObjectHighlightResult highlightedResult)
{
public void addHighlightedResult(DSpaceObject dso, DSpaceObjectHighlightResult highlightedResult) {
this.highlightedResults.put(dso.getHandle(), highlightedResult);
}
public static final class FacetResult{
public static final class FacetResult {
private String asFilterQuery;
private String displayedValue;
private String authorityKey;
@@ -128,7 +130,8 @@ public class DiscoverResult {
private long count;
private String fieldType;
public FacetResult(String asFilterQuery, String displayedValue, String authorityKey, String sortValue, long count, String fieldType) {
public FacetResult(String asFilterQuery, String displayedValue, String authorityKey, String sortValue,
long count, String fieldType) {
this.asFilterQuery = asFilterQuery;
this.displayedValue = displayedValue;
this.authorityKey = authorityKey;
@@ -145,23 +148,20 @@ public class DiscoverResult {
return displayedValue;
}
public String getSortValue()
{
public String getSortValue() {
return sortValue;
}
public long getCount() {
return count;
}
public String getAuthorityKey()
{
public String getAuthorityKey() {
return authorityKey;
}
public String getFilterType()
{
return authorityKey != null?"authority":"equals";
public String getFilterType() {
return authorityKey != null ? "authority" : "equals";
}
public String getFieldType() {
@@ -177,24 +177,20 @@ public class DiscoverResult {
this.spellCheckQuery = spellCheckQuery;
}
public static final class DSpaceObjectHighlightResult
{
public static final class DSpaceObjectHighlightResult {
private DSpaceObject dso;
private Map<String, List<String>> highlightResults;
public DSpaceObjectHighlightResult(DSpaceObject dso, Map<String, List<String>> highlightResults)
{
public DSpaceObjectHighlightResult(DSpaceObject dso, Map<String, List<String>> highlightResults) {
this.dso = dso;
this.highlightResults = highlightResults;
}
public DSpaceObject getDso()
{
public DSpaceObject getDso() {
return dso;
}
public List<String> getHighlightResults(String metadataKey)
{
public List<String> getHighlightResults(String metadataKey) {
return highlightResults.get(metadataKey);
}
@@ -203,10 +199,10 @@ public class DiscoverResult {
}
}
public void addSearchDocument(DSpaceObject dso, SearchDocument searchDocument){
public void addSearchDocument(DSpaceObject dso, SearchDocument searchDocument) {
String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso);
List<SearchDocument> docs = searchDocuments.get(dsoString);
if(docs == null){
if (docs == null) {
docs = new ArrayList<SearchDocument>();
}
docs.add(searchDocument);
@@ -214,16 +210,17 @@ public class DiscoverResult {
}
/**
* Returns all the sought after search document values
* Returns all the sought after search document values
*
* @param dso the dspace object we want our search documents for
* @return the search documents list
*/
public List<SearchDocument> getSearchDocument(DSpaceObject dso){
public List<SearchDocument> getSearchDocument(DSpaceObject dso) {
String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso);
List<SearchDocument> result = searchDocuments.get(dsoString);
if(result == null){
if (result == null) {
return new ArrayList<SearchDocument>();
}else{
} else {
return result;
}
}
@@ -231,16 +228,16 @@ public class DiscoverResult {
/**
* This class contains values from the fields searched for in DiscoveryQuery.java
*/
public static final class SearchDocument{
public static final class SearchDocument {
private Map<String, List<String>> searchFields;
public SearchDocument() {
this.searchFields = new LinkedHashMap<String, List<String>>();
}
public void addSearchField(String field, String ...values){
List<String>searchFieldValues = searchFields.get(field);
if(searchFieldValues == null){
public void addSearchField(String field, String... values) {
List<String> searchFieldValues = searchFields.get(field);
if (searchFieldValues == null) {
searchFieldValues = new ArrayList<String>();
}
searchFieldValues.addAll(Arrays.asList(values));
@@ -251,14 +248,15 @@ public class DiscoverResult {
return searchFields;
}
public List<String> getSearchFieldValues(String field){
if(searchFields.get(field) == null)
public List<String> getSearchFieldValues(String field) {
if (searchFields.get(field) == null) {
return new ArrayList<String>();
else
} else {
return searchFields.get(field);
}
}
public static String getDspaceObjectStringRepresentation(DSpaceObject dso){
public static String getDspaceObjectStringRepresentation(DSpaceObject dso) {
return dso.getType() + ":" + dso.getID();
}
}