Skip to content

Commit

Permalink
fixing comments from QA
Browse files Browse the repository at this point in the history
  • Loading branch information
@StigNorland
StigNorland committed Dec 1, 2023
1 parent 9aa14e8 commit 8e49273
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion search-commons/src/main/java/no/unit/nva/search2/ResourceQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static no.unit.nva.search2.constant.Defaults.DEFAULT_SORT_ORDER;
import static no.unit.nva.search2.constant.Defaults.DEFAULT_VALUE_PER_PAGE;
import static no.unit.nva.search2.constant.ErrorMessages.INVALID_VALUE_WITH_SORT;
import static no.unit.nva.search2.constant.ResourcePaths.RESOURCES_AGGREGATIONS;
import static no.unit.nva.search2.constant.Resource.RESOURCES_AGGREGATIONS;
import static no.unit.nva.search2.constant.Words.ALL;
import static no.unit.nva.search2.constant.Words.ASTERISK;
import static no.unit.nva.search2.constant.Words.COLON;
Expand Down
2 changes: 1 addition & 1 deletion ...t/nva/search2/constant/ResourcePaths.java → ...o/unit/nva/search2/constant/Resource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import java.util.List;
import org.opensearch.search.aggregations.AbstractAggregationBuilder;

public class ResourcePaths {
public class Resource {

public static final String IDENTIFIER_KEYWORD = IDENTIFIER + DOT + KEYWORD;
public static final String CONTRIBUTORS_AFFILIATION_ID_KEYWORD =
Expand Down
36 changes: 18 additions & 18 deletions search-commons/src/main/java/no/unit/nva/search2/enums/ResourceParameter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
import static no.unit.nva.search2.constant.Patterns.PATTERN_IS_SORT_KEY;
import static no.unit.nva.search2.constant.Patterns.PATTERN_IS_SORT_ORDER_KEY;
import static no.unit.nva.search2.constant.Patterns.PATTERN_IS_URI;
import static no.unit.nva.search2.constant.ResourcePaths.CONTRIBUTORS_AFFILIATION_ID_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.CONTRIBUTORS_IDENTITY_ID;
import static no.unit.nva.search2.constant.ResourcePaths.CONTRIBUTORS_IDENTITY_ORC_ID_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.ENTITY_DESCRIPTION_CONTRIBUTORS_AFFILIATION;
import static no.unit.nva.search2.constant.ResourcePaths.ENTITY_DESCRIPTION_CONTRIBUTORS_IDENTITY;
import static no.unit.nva.search2.constant.ResourcePaths.ENTITY_DESCRIPTION_MAIN_TITLE;
import static no.unit.nva.search2.constant.ResourcePaths.ENTITY_DESCRIPTION_PUBLICATION_DATE_YEAR;
import static no.unit.nva.search2.constant.ResourcePaths.ENTITY_DESCRIPTION_REFERENCE_PUBLICATION_CONTEXT_ISSN;
import static no.unit.nva.search2.constant.ResourcePaths.FUNDINGS_IDENTIFIER_FUNDINGS_SOURCE_IDENTIFIER;
import static no.unit.nva.search2.constant.ResourcePaths.FUNDINGS_SOURCE_IDENTIFIER_FUNDINGS_SOURCE_LABELS;
import static no.unit.nva.search2.constant.ResourcePaths.IDENTIFIER_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.PARENT_PUBLICATION_ID;
import static no.unit.nva.search2.constant.ResourcePaths.PUBLICATION_CONTEXT_ISBN_LIST;
import static no.unit.nva.search2.constant.ResourcePaths.PUBLICATION_CONTEXT_TYPE_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.PUBLICATION_INSTANCE_TYPE;
import static no.unit.nva.search2.constant.ResourcePaths.REFERENCE_DOI_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.RESOURCE_OWNER_OWNER_AFFILIATION_KEYWORD;
import static no.unit.nva.search2.constant.ResourcePaths.RESOURCE_OWNER_OWNER_KEYWORD;
import static no.unit.nva.search2.constant.Resource.CONTRIBUTORS_AFFILIATION_ID_KEYWORD;
import static no.unit.nva.search2.constant.Resource.CONTRIBUTORS_IDENTITY_ID;
import static no.unit.nva.search2.constant.Resource.CONTRIBUTORS_IDENTITY_ORC_ID_KEYWORD;
import static no.unit.nva.search2.constant.Resource.ENTITY_DESCRIPTION_CONTRIBUTORS_AFFILIATION;
import static no.unit.nva.search2.constant.Resource.ENTITY_DESCRIPTION_CONTRIBUTORS_IDENTITY;
import static no.unit.nva.search2.constant.Resource.ENTITY_DESCRIPTION_MAIN_TITLE;
import static no.unit.nva.search2.constant.Resource.ENTITY_DESCRIPTION_PUBLICATION_DATE_YEAR;
import static no.unit.nva.search2.constant.Resource.ENTITY_DESCRIPTION_REFERENCE_PUBLICATION_CONTEXT_ISSN;
import static no.unit.nva.search2.constant.Resource.FUNDINGS_IDENTIFIER_FUNDINGS_SOURCE_IDENTIFIER;
import static no.unit.nva.search2.constant.Resource.FUNDINGS_SOURCE_IDENTIFIER_FUNDINGS_SOURCE_LABELS;
import static no.unit.nva.search2.constant.Resource.IDENTIFIER_KEYWORD;
import static no.unit.nva.search2.constant.Resource.PARENT_PUBLICATION_ID;
import static no.unit.nva.search2.constant.Resource.PUBLICATION_CONTEXT_ISBN_LIST;
import static no.unit.nva.search2.constant.Resource.PUBLICATION_CONTEXT_TYPE_KEYWORD;
import static no.unit.nva.search2.constant.Resource.PUBLICATION_INSTANCE_TYPE;
import static no.unit.nva.search2.constant.Resource.REFERENCE_DOI_KEYWORD;
import static no.unit.nva.search2.constant.Resource.RESOURCE_OWNER_OWNER_AFFILIATION_KEYWORD;
import static no.unit.nva.search2.constant.Resource.RESOURCE_OWNER_OWNER_KEYWORD;
import static no.unit.nva.search2.constant.Words.ASTERISK;
import static no.unit.nva.search2.constant.Words.COLON;
import static no.unit.nva.search2.constant.Words.CREATED_DATE;
Expand Down
12 changes: 6 additions & 6 deletions search-commons/src/main/java/no/unit/nva/search2/enums/ResourceSort.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import no.unit.nva.search2.constant.ResourcePaths;
import no.unit.nva.search2.constant.Resource;
import no.unit.nva.search2.constant.Words;

public enum ResourceSort {
INVALID(EMPTY_STRING),
CATEGORY(ResourcePaths.PUBLICATION_INSTANCE_TYPE),
INSTANCE_TYPE(ResourcePaths.PUBLICATION_INSTANCE_TYPE),
CATEGORY(Resource.PUBLICATION_INSTANCE_TYPE),
INSTANCE_TYPE(Resource.PUBLICATION_INSTANCE_TYPE),
CREATED_DATE(Words.CREATED_DATE),
MODIFIED_DATE(Words.MODIFIED_DATE),
PUBLISHED_DATE(Words.PUBLISHED_DATE),
TITLE(ResourcePaths.ENTITY_DESCRIPTION_MAIN_TITLE_KEYWORD),
UNIT_ID(ResourcePaths.CONTRIBUTORS_AFFILIATION_ID_KEYWORD),
USER("(?i)(user)|(owner)", ResourcePaths.RESOURCE_OWNER_OWNER_KEYWORD);
TITLE(Resource.ENTITY_DESCRIPTION_MAIN_TITLE_KEYWORD),
UNIT_ID(Resource.CONTRIBUTORS_AFFILIATION_ID_KEYWORD),
USER("(?i)(user)|(owner)", Resource.RESOURCE_OWNER_OWNER_KEYWORD);

public static final Set<ResourceSort> VALID_SORT_PARAMETER_KEYS =
Arrays.stream(ResourceSort.values())
Expand Down

0 comments on commit 8e49273

Please sign in to comment.