-
-
Notifications
You must be signed in to change notification settings - Fork 489
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate OAIPMH server to Elasticsearch / Spring MVC #7583
Open
josegar74
wants to merge
9
commits into
geonetwork:main
Choose a base branch
from
GeoCat:oaipmh-server
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
16b562d
Migrate OAIPMH server to Elasticsearch
josegar74 c0849bd
Migrate OAIPMH server to Elasticsearch / Update documentation
josegar74 65a7384
Migrate OAIPMH server API to Spring MVC
josegar74 07cd230
Migrate OAIPMH server to Elasticsearch / fix total calculation
josegar74 4c4943e
OAIPMH server / Sonarlint improvements
josegar74 17a700d
OAIPMH server / Fix base URL
josegar74 726ba00
OAIPMH server / Model API parameters and Sonarlint improvements
josegar74 727e328
OAIPMH server / Remove non valid chars from the value to match the xs…
josegar74 3f291bd
Merge remote-tracking branch 'upstream/main' into oaipmh-server
josegar74 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
core/src/main/java/org/fao/geonet/kernel/oaipmh/OaiPmhParams.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * Copyright (C) 2001-2023 Food and Agriculture Organization of the | ||
| * United Nations (FAO-UN), United Nations World Food Programme (WFP) | ||
| * and United Nations Environment Programme (UNEP) | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| * | ||
| * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, | ||
| * Rome - Italy. email: [email protected] | ||
| */ | ||
|
|
||
| package org.fao.geonet.kernel.oaipmh; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.fao.oaipmh.OaiPmh; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class OaiPmhParams { | ||
| private String verb; | ||
| private String metadataPrefix; | ||
| private String identifier; | ||
| private String set; | ||
| private String from; | ||
| private String until; | ||
| private String resumptionToken; | ||
|
|
||
| public String getVerb() { | ||
| return verb; | ||
| } | ||
|
|
||
| public void setVerb(String verb) { | ||
| this.verb = verb; | ||
| } | ||
|
|
||
| public String getMetadataPrefix() { | ||
| return metadataPrefix; | ||
| } | ||
|
|
||
| public void setMetadataPrefix(String metadataPrefix) { | ||
| this.metadataPrefix = metadataPrefix; | ||
| } | ||
|
|
||
| public String getIdentifier() { | ||
| return identifier; | ||
| } | ||
|
|
||
| public void setIdentifier(String identifier) { | ||
| this.identifier = identifier; | ||
| } | ||
|
|
||
| public String getSet() { | ||
| return set; | ||
| } | ||
|
|
||
| public void setSet(String set) { | ||
| this.set = set; | ||
| } | ||
|
|
||
| public String getFrom() { | ||
| return from; | ||
| } | ||
|
|
||
| public void setFrom(String from) { | ||
| this.from = from; | ||
| } | ||
|
|
||
| public String getUntil() { | ||
| return until; | ||
| } | ||
|
|
||
| public void setUntil(String until) { | ||
| this.until = until; | ||
| } | ||
|
|
||
| public String getResumptionToken() { | ||
| return resumptionToken; | ||
| } | ||
|
|
||
| public void setResumptionToken(String resumptionToken) { | ||
| this.resumptionToken = resumptionToken; | ||
| } | ||
|
|
||
| public Map<String, String> asMap() { | ||
| Map<String, String> params = new HashMap<>(); | ||
|
|
||
| if (StringUtils.isNotEmpty(verb)) { | ||
| params.put(OaiPmh.ParamNames.VERB, verb); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(metadataPrefix)) { | ||
| //--- remove any non letter, number, dot or dash character | ||
| String processedMetadataPrefix = metadataPrefix.replaceAll("[^a-zA-Z0-9.-]", ""); | ||
| params.put(OaiPmh.ParamNames.METADATA_PREFIX, processedMetadataPrefix); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(identifier)) { | ||
| params.put(OaiPmh.ParamNames.IDENTIFIER, identifier); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(set)) { | ||
| params.put(OaiPmh.ParamNames.SET, set); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(from)) { | ||
| params.put(OaiPmh.ParamNames.FROM, from); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(until)) { | ||
| params.put(OaiPmh.ParamNames.UNTIL, until); | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(resumptionToken)) { | ||
| params.put(OaiPmh.ParamNames.RESUMPTION_TOKEN, resumptionToken); | ||
| } | ||
|
|
||
| return params; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fallback seems useless to me since the request will give an error if no
metadataPrefixparameter is given