Compare commits
18 Commits
13
.classpath
13
.classpath
|
@ -6,6 +6,12 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
|
@ -13,12 +19,6 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
|
@ -30,5 +30,6 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="/home/francescomangiacrapa/config-work-isti/log4jconfiguration"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
57
CHANGELOG.md
57
CHANGELOG.md
|
@ -3,18 +3,63 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [v1.7.0]
|
||||
|
||||
- Integrated the new Geoportal-Resolver [#24842]
|
||||
|
||||
## [v1.6.0] - 2022-07-26
|
||||
|
||||
**New**
|
||||
|
||||
- [#23157] Enhanced to manage the CatalogueResolver with input query string
|
||||
- Moved to gcube-bom.2.0.2
|
||||
|
||||
## [v1.5.0] - 2021-11-05
|
||||
|
||||
#### Enhancement
|
||||
|
||||
* [22385] Integrated with Catalogue Resolver and SHUB Resolver
|
||||
|
||||
## [v1.4.2] - 2021-04-21
|
||||
|
||||
### Bug fixes
|
||||
#### Bug fixes
|
||||
|
||||
[#21240] Generates broken gis-link
|
||||
* [#21240] Generates broken gis-link
|
||||
|
||||
|
||||
## [1-4-1] - 2020-05-06
|
||||
## [v1.4.1] - 2020-05-06
|
||||
|
||||
### Bug fixes
|
||||
|
||||
[#19215] UriResolverManager: request to DL (the shortener) must be encoded
|
||||
* [Bug #19215] UriResolverManager: request to DL (the shortener) must be encoded
|
||||
|
||||
|
||||
## [v1.4.0] - 2019-11-26
|
||||
|
||||
* Migrated to git
|
||||
|
||||
|
||||
## [v1.3.0] - 2016-09-27
|
||||
|
||||
* [Bug #4941] Removed jumps of scope
|
||||
|
||||
|
||||
## [v1.2.0] - 2016-06-28
|
||||
|
||||
|
||||
|
||||
## [v1.1.0] - 2016-06-24
|
||||
|
||||
* Removed maven-portal-bom as dependency
|
||||
|
||||
|
||||
## [v1.1.0] - 2015-05-04
|
||||
|
||||
* Updated to support several Access Point for each Resolver
|
||||
|
||||
* Introduced Entry Names in Uri-Resolver-Map
|
||||
|
||||
|
||||
## [v1.0.0] - 2014-10-13
|
||||
|
||||
* First Release
|
||||
|
||||
|
||||
|
|
19
pom.xml
19
pom.xml
|
@ -11,17 +11,17 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>uri-resolver-manager</artifactId>
|
||||
<version>1.4.2</version>
|
||||
<version>1.7.0</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>uri-resolver-manager</name>
|
||||
<description>The URI Resolver Manager</description>
|
||||
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Francesco Mangiacrapa</name>
|
||||
|
@ -37,9 +37,6 @@
|
|||
<properties>
|
||||
<distroDirectory>${project.basedir}/distro</distroDirectory>
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwtVersion>2.5.1</gwtVersion>
|
||||
<!-- GWT needs at least java 1.5 -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
|
@ -49,7 +46,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>2.0.1</version>
|
||||
<version>2.3.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -101,13 +98,19 @@
|
|||
<version>20090211</version>
|
||||
</dependency>
|
||||
|
||||
<!-- LOGGER -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- JUNIT -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
@ -14,10 +14,12 @@ import org.gcube.portlets.user.uriresolvermanager.entity.Resolver;
|
|||
import org.gcube.portlets.user.uriresolvermanager.entity.ServiceAccessPoint;
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.ServiceParameter;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.NotImplementedException;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
||||
import org.gcube.portlets.user.uriresolvermanager.readers.RuntimeResourceReader;
|
||||
import org.gcube.portlets.user.uriresolvermanager.readers.UriResolverMapReader;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil.URI_PART;
|
||||
import org.gcube.portlets.user.urlshortener.UrlShortener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
@ -25,21 +27,10 @@ import org.slf4j.LoggerFactory;
|
|||
/**
|
||||
* The Class UriResolverManager.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* Sep 6, 2016
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Sep 6, 2016
|
||||
*/
|
||||
public class UriResolverManager {
|
||||
|
||||
/**
|
||||
* Time to reload Runtime Resource Configuration
|
||||
*/
|
||||
//public static int RESET_DELAY = 15*60*1000; //15 MINUTES
|
||||
|
||||
/**
|
||||
* Time to reload Runtime Resource Configuration
|
||||
*/
|
||||
//public static int RESET_TIME = RESET_DELAY; //15 MINUTES
|
||||
|
||||
private UriResolverMapReader uriResolverMapReader;
|
||||
private Map<String, Resolver> applicationTypes;
|
||||
private String applicationType;
|
||||
|
@ -77,34 +68,36 @@ public class UriResolverManager {
|
|||
return usingReader;
|
||||
}
|
||||
|
||||
public static final Logger logger = LoggerFactory.getLogger(UriResolverManager.class);
|
||||
|
||||
public static final Logger LOG = LoggerFactory.getLogger(UriResolverManager.class);
|
||||
|
||||
/**
|
||||
* Instantiates a new uri resolver manager.
|
||||
* Precondition: set the scope into ScopeProvider {@link ScopeProvider#get()}
|
||||
* The scope is used to look up the generic resource with name: {@link UriResolverMapReader#URI_RESOLVER_MAP_RESOURCE_NAME}, secondary type: {@link UriResolverMapReader#URIRESOLVERMAP_SECONDARY_TYPE} from IS to map ApplicationType with its Resolver
|
||||
* Instantiates a new uri resolver manager. Precondition: set the scope into
|
||||
* ScopeProvider {@link ScopeProvider#get()} The scope is used to look up the
|
||||
* generic resource with name:
|
||||
* {@link UriResolverMapReader#URI_RESOLVER_MAP_RESOURCE_NAME}, secondary type:
|
||||
* {@link UriResolverMapReader#URIRESOLVERMAP_SECONDARY_TYPE} from IS to map
|
||||
* ApplicationType with its Resolver
|
||||
*
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @throws IllegalArgumentException the illegal argument exception
|
||||
*/
|
||||
public UriResolverManager() throws UriResolverMapException, IllegalArgumentException{
|
||||
public UriResolverManager() throws UriResolverMapException, IllegalArgumentException {
|
||||
try {
|
||||
|
||||
String scope = ScopeProvider.instance.get();
|
||||
logger.info("UriResolverManager is using scope: "+scope+", read from ScopeProvider");
|
||||
LOG.info("UriResolverManager is using scope: " + scope + ", read from ScopeProvider");
|
||||
|
||||
if(scope == null)
|
||||
if (scope == null)
|
||||
throw new UriResolverMapException("Scope is null, set scope into ScopeProvider!");
|
||||
|
||||
this.uriResolverMapReader = new UriResolverMapReader();
|
||||
this.applicationTypes = uriResolverMapReader.getApplicationTypes();
|
||||
//this.setTimerUriResolverReader(RESET_DELAY, RESET_TIME);
|
||||
} catch (UriResolverMapException e){
|
||||
logger.error("UriResolverMapException: ",e);
|
||||
// this.setTimerUriResolverReader(RESET_DELAY, RESET_TIME);
|
||||
} catch (UriResolverMapException e) {
|
||||
LOG.error("UriResolverMapException: ", e);
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.error("UriResolverManager: ",e);
|
||||
LOG.error("UriResolverManager: ", e);
|
||||
throw new UriResolverMapException("Map Application Type - Resources not found in IS");
|
||||
}
|
||||
}
|
||||
|
@ -116,40 +109,42 @@ public class UriResolverManager {
|
|||
* @throws IllegalArgumentException the illegal argument exception
|
||||
*/
|
||||
public void setApplicationType(String applicationType) throws IllegalArgumentException {
|
||||
if(!this.applicationTypes.containsKey(applicationType)){
|
||||
throw new IllegalArgumentException("Application type '"+applicationType +"' not found in Application Types: "+getApplicationTypes());
|
||||
if (!this.applicationTypes.containsKey(applicationType)) {
|
||||
throw new IllegalArgumentException("Application type '" + applicationType
|
||||
+ "' not found in Application Types: " + getApplicationTypes());
|
||||
|
||||
}
|
||||
this.applicationType = applicationType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Instance a UriResolverManager
|
||||
* Precondition: set the scope provider {@link ScopeProvider.instance.get()}
|
||||
* The scope is used to look up the generic resource {@link UriResolverMapReader#URI_RESOLVER_MAP} available in the infrastructure to map ApplicationType with its Resolver
|
||||
* Instance a UriResolverManager Precondition: set the scope provider
|
||||
* {@link ScopeProvider.instance.get()} The scope is used to look up the generic
|
||||
* resource {@link UriResolverMapReader#URI_RESOLVER_MAP} available in the
|
||||
* infrastructure to map ApplicationType with its Resolver
|
||||
*
|
||||
* @param applicationType a (valid) key Application Type {@link UriResolverManager#getApplicationTypes()}
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @param applicationType a (valid) key Application Type
|
||||
* {@link UriResolverManager#getApplicationTypes()}
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @throws IllegalArgumentException the illegal argument exception
|
||||
*/
|
||||
public UriResolverManager(String applicationType) throws UriResolverMapException, IllegalArgumentException{
|
||||
public UriResolverManager(String applicationType) throws UriResolverMapException, IllegalArgumentException {
|
||||
this();
|
||||
setApplicationType(applicationType);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param applicationType the application type
|
||||
* @param parameters the map of the parameters sent as HTTP query string
|
||||
* @param shortLink if true the link is shorted otherwise none
|
||||
* @param parameters the map of the parameters sent as HTTP query string
|
||||
* @param shortLink if true the link is shorted otherwise none
|
||||
* @return the link
|
||||
* @throws IllegalArgumentException the illegal argument exception
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
*/
|
||||
public String getLink(String applicationType, Map<String, String> parameters, boolean shortLink) throws IllegalArgumentException, UriResolverMapException{
|
||||
public String getLink(String applicationType, Map<String, String> parameters, boolean shortLink)
|
||||
throws IllegalArgumentException, UriResolverMapException {
|
||||
this.applicationType = applicationType;
|
||||
return getLink(parameters, shortLink);
|
||||
}
|
||||
|
@ -157,114 +152,154 @@ public class UriResolverManager {
|
|||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param parameters the map of the parameters sent as HTTP query string
|
||||
* @param shortLink if true the link is shorted otherwise none
|
||||
* @param parameters the map of the parameters sent as HTTP query
|
||||
* string
|
||||
* @param queryStringParameters the query string parameters
|
||||
* @param shortLink if true the link is shortened otherwise none
|
||||
* @return the link
|
||||
* @throws IllegalArgumentException the illegal argument exception
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
* @throws UriResolverMapException the uri resolver map exception
|
||||
*/
|
||||
public String getLink(Map<String, String> parameters, boolean shortLink) throws IllegalArgumentException, UriResolverMapException{
|
||||
public String getLink(Map<String, String> parameters, boolean shortLink)
|
||||
throws IllegalArgumentException, UriResolverMapException {
|
||||
|
||||
if(applicationType==null)
|
||||
if (applicationType == null)
|
||||
throw new IllegalArgumentException("Application type is null");
|
||||
|
||||
Resolver resolver = this.applicationTypes.get(applicationType);
|
||||
String link;
|
||||
String link = null;
|
||||
|
||||
if(parameters==null)
|
||||
if (parameters == null)
|
||||
throw new IllegalArgumentException("Input Map parameters is null");
|
||||
|
||||
try {
|
||||
|
||||
//lockReader();
|
||||
// lockReader();
|
||||
|
||||
if(reader==null){
|
||||
logger.info("Runtime Resource Reader is null, istancing...");
|
||||
if (reader == null) {
|
||||
LOG.info("Runtime Resource Reader is null, istancing...");
|
||||
reader = new RuntimeResourceReader(resolver.getResourceName());
|
||||
}
|
||||
|
||||
if(resolver.getEntryName()==null || resolver.getEntryName().isEmpty()){
|
||||
logger.warn("The entryname to "+resolver.getResourceName() +" is null or empty, reading first Access Point!!");
|
||||
if (resolver.getEntryName() == null || resolver.getEntryName().isEmpty()) {
|
||||
LOG.warn("The entryname to " + resolver.getResourceName()
|
||||
+ " is null or empty, reading first Access Point!!");
|
||||
serviceAccessPoint = reader.getServiceAccessPoints().get(0);
|
||||
}else{
|
||||
logger.warn("Reading Access Point for Entry Name: "+resolver.getEntryName());
|
||||
} else {
|
||||
LOG.warn("Reading Access Point for Entry Name: " + resolver.getEntryName());
|
||||
serviceAccessPoint = reader.getServiceAccessPointForEntryName(resolver.getEntryName());
|
||||
if(serviceAccessPoint==null)
|
||||
throw new UriResolverMapException("Entry Name "+resolver.getEntryName() +" not found in Resource name: "+resolver.getResourceName());
|
||||
if (serviceAccessPoint == null)
|
||||
throw new UriResolverMapException("Entry Name " + resolver.getEntryName()
|
||||
+ " not found in Resource name: " + resolver.getResourceName());
|
||||
}
|
||||
|
||||
List<ServiceParameter> resourceParameters = serviceAccessPoint.getServiceParameters();
|
||||
|
||||
//CHECK PARAMETERS
|
||||
LOG.debug("Service parameters are: " + resourceParameters);
|
||||
// CHECK PARAMETERS
|
||||
for (ServiceParameter serviceParameter : resourceParameters) {
|
||||
if(serviceParameter.isMandatory()){
|
||||
if(!parameters.containsKey(serviceParameter.getKey())){
|
||||
throw new IllegalArgumentException("Mandatory service key (parameter) '"+serviceParameter.getKey() +"' not found into input map");
|
||||
if (serviceParameter.isMandatory()) {
|
||||
if (!parameters.containsKey(serviceParameter.getKey())) {
|
||||
throw new IllegalArgumentException("Mandatory service key (parameter) '"
|
||||
+ serviceParameter.getKey() + "' not found into input map");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String baseURI = serviceAccessPoint.getServiceUrl();
|
||||
//Encoding only the query string
|
||||
|
||||
String linkDecoded = null;
|
||||
String queryString = null;
|
||||
if(!shortLink) {
|
||||
//not shortening so returning the link with the query string with only the parameters encoded
|
||||
queryString = UrlEncoderUtil.encodeQuery(parameters);
|
||||
String toReturn = String.format("%s?%s", baseURI,queryString);
|
||||
logger.info("returning link with encoded parameters in the query string: "+toReturn);
|
||||
return toReturn;
|
||||
|
||||
// SPECIALIZED IMPLEMENTATION OF RESOLVER
|
||||
try {
|
||||
link = resolver.getLink(baseURI, parameters);
|
||||
LOG.debug("Read specialized getLink: " + link);
|
||||
if (shortLink) {
|
||||
link = resolver.shortLink(link, parameters);
|
||||
}
|
||||
|
||||
return link;
|
||||
} catch (NotImplementedException e) {
|
||||
LOG.info("Specialized getLink not implemented, going to default implementation");
|
||||
}
|
||||
|
||||
queryString = UrlEncoderUtil.toQueryString(parameters);
|
||||
linkDecoded = String.format("%s?%s", baseURI,queryString);
|
||||
link = linkDecoded;
|
||||
logger.info("Created HTTP URI request (link): "+link);
|
||||
if(shortLink){
|
||||
try{
|
||||
String queryStringEncoded = UrlEncoderUtil.encodeString(queryString);
|
||||
link = String.format("%s?%s", baseURI,queryStringEncoded);
|
||||
logger.info("Encoded link is: "+link);
|
||||
logger.info("Shortner start..");
|
||||
UrlShortener shortener = new UrlShortener();
|
||||
String shortedLink = shortener.shorten(link);
|
||||
logger.info("Shorted link is: "+shortedLink);
|
||||
if(shortedLink!=null && shortedLink.equals(link)) {
|
||||
//here the short link and the input link are identical
|
||||
//so the shortening did not work
|
||||
//I'm returning the decoded link because it is directly consumable via browser
|
||||
logger.debug("Shorted link is equal to input link, returning decoded link: "+linkDecoded);
|
||||
link = linkDecoded;
|
||||
}else {
|
||||
//here the link is really shorted
|
||||
logger.debug("The link is really shorted, returning it");
|
||||
link = shortedLink;
|
||||
|
||||
// GENERIC IMPLEMENTATION OF RESOLVER. DEFAULT IMPLEMENTATION APPLYING...
|
||||
if (link == null) {
|
||||
// not shortening so returning the link with the query string with only the
|
||||
// parameters encoded
|
||||
LOG.info("Specialized getLink is null, applying DEFAULT implementation via GET request on base URI and encoded query-string");
|
||||
String queryString = UrlEncoderUtil.encodeQuery(parameters);
|
||||
link = String.format("%s?%s", baseURI, queryString);
|
||||
// LOG.info("returning base URI with encoded parameters in the query string: " +
|
||||
// linkEncoded);
|
||||
// return toReturn;
|
||||
} else {
|
||||
LOG.info("Specialized getLink is not null");
|
||||
}
|
||||
|
||||
String linkNotShort = link;
|
||||
LOG.info("Created HTTP link: " + link);
|
||||
// Short link required
|
||||
if (shortLink) {
|
||||
try {
|
||||
LOG.info("Short link requested, so encoding query string is required...");
|
||||
|
||||
URI_PART uriParts = UrlEncoderUtil.getURIParts(link);
|
||||
if (uriParts.getQueryString() != null && !uriParts.getQueryString().isEmpty()) {
|
||||
LOG.info("QueryString part " + uriParts.getQueryString() + " is not null, encoding it");
|
||||
String queryStringEncoded = UrlEncoderUtil.encodeString(uriParts.getQueryString());
|
||||
link = String.format("%s?%s", uriParts.getBaseURI(), queryStringEncoded);
|
||||
}
|
||||
|
||||
}catch(Exception e){
|
||||
logger.warn("An error occurred during link shortening: ",e);
|
||||
//here I'm returning the decoded link in case of error on shortening it
|
||||
link = linkDecoded;
|
||||
LOG.info("Encoded link is: " + link);
|
||||
LOG.info("Shortner starts..");
|
||||
String shortenedLink = shortTheLink(link);
|
||||
if (shortenedLink != null && shortenedLink.equals(link)) {
|
||||
// here the short link and the input link are identical
|
||||
// so the shortening did not work
|
||||
// I'm returning the decoded link because it is directly consumable via browser
|
||||
LOG.info("Short link is equal to long link, returning long link: " + linkNotShort);
|
||||
link = linkNotShort;
|
||||
} else {
|
||||
// here the link is really shortened
|
||||
LOG.debug("The link is really short, returning it");
|
||||
link = shortenedLink;
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.warn("An error occurred during link shortening: ", e);
|
||||
// here I'm returning the decoded link in case of error on shortening it
|
||||
link = linkNotShort;
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException e){
|
||||
logger.error("Uri Resolver IllegalArgumentException: ", e);
|
||||
} catch (IllegalArgumentException e) {
|
||||
LOG.error("Uri Resolver IllegalArgumentException: ", e);
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.error("Uri Resolver Exception: ", e);
|
||||
throw new UriResolverMapException("Uri Resolver error: " +e.getMessage());
|
||||
LOG.error("Uri Resolver Exception: ", e);
|
||||
throw new UriResolverMapException("Uri Resolver error: " + e.getMessage());
|
||||
}
|
||||
|
||||
LOG.info("Returning HTTP(s) link: " + link);
|
||||
return link;
|
||||
}
|
||||
|
||||
private String shortTheLink(String sourceLink) {
|
||||
|
||||
String toReturnLink = sourceLink;
|
||||
try {
|
||||
UrlShortener shortener = new UrlShortener();
|
||||
String shortLink = shortener.shorten(sourceLink);
|
||||
LOG.info("Short link is: " + shortLink);
|
||||
toReturnLink = shortLink;
|
||||
} catch (Exception e) {
|
||||
LOG.warn("Returning source link, an error occurred during link shortening: ", e);
|
||||
}
|
||||
return toReturnLink;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the application types.
|
||||
*
|
||||
* @return the Application Types available
|
||||
*/
|
||||
public Set<String> getApplicationTypes(){
|
||||
public Set<String> getApplicationTypes() {
|
||||
return this.applicationTypes.keySet();
|
||||
}
|
||||
|
||||
|
@ -274,37 +309,40 @@ public class UriResolverManager {
|
|||
* @param resolver the resolver
|
||||
* @return the list
|
||||
* @throws IllegalArgumentException the illegal argument exception
|
||||
* @throws Exception the exception
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public List<ServiceParameter> discoveryServiceParameters(Resolver resolver) throws IllegalArgumentException, Exception{
|
||||
public List<ServiceParameter> discoveryServiceParameters(Resolver resolver)
|
||||
throws IllegalArgumentException, Exception {
|
||||
try {
|
||||
|
||||
String scope = ScopeProvider.instance.get();
|
||||
logger.info("SiscoveryServiceParameters is using scope: "+scope+", read from ScopeProvider");
|
||||
LOG.info("DiscoveryServiceParameters is using scope: " + scope + ", read from ScopeProvider");
|
||||
|
||||
if(scope == null)
|
||||
if (scope == null)
|
||||
throw new UriResolverMapException("Scope is null, set scope into ScopeProvider!");
|
||||
|
||||
if(resolver == null)
|
||||
if (resolver == null)
|
||||
throw new IllegalArgumentException("Resolver is null, set Resolver");
|
||||
|
||||
RuntimeResourceReader reader = new RuntimeResourceReader(resolver.getResourceName());
|
||||
|
||||
ServiceAccessPoint serviceAccessPoint = null;
|
||||
if(resolver.getEntryName()==null || resolver.getEntryName().isEmpty()){
|
||||
logger.warn("The entryname to "+resolver.getResourceName() +" is null or empty, reading first Access Point!!");
|
||||
if (resolver.getEntryName() == null || resolver.getEntryName().isEmpty()) {
|
||||
LOG.warn("The entryname to " + resolver.getResourceName()
|
||||
+ " is null or empty, reading first Access Point!!");
|
||||
serviceAccessPoint = reader.getServiceAccessPoints().get(0);
|
||||
}else{
|
||||
logger.info("Reading Access Point for entryname: "+resolver.getEntryName());
|
||||
} else {
|
||||
LOG.info("Reading Access Point for entryname: " + resolver.getEntryName());
|
||||
serviceAccessPoint = reader.getServiceAccessPointForEntryName(resolver.getEntryName());
|
||||
if(serviceAccessPoint==null)
|
||||
throw new UriResolverMapException("Entry Name "+resolver.getEntryName() +" not found in Resource name: "+resolver.getResourceName());
|
||||
if (serviceAccessPoint == null)
|
||||
throw new UriResolverMapException("Entry Name " + resolver.getEntryName()
|
||||
+ " not found in Resource name: " + resolver.getResourceName());
|
||||
}
|
||||
|
||||
return serviceAccessPoint.getServiceParameters();
|
||||
} catch (Exception e) {
|
||||
logger.error("Uri Resolver error: ", e);
|
||||
throw new UriResolverMapException("Uri Resolver error: " +e.getMessage());
|
||||
LOG.error("Uri Resolver error: ", e);
|
||||
throw new UriResolverMapException("Uri Resolver error: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -314,7 +352,7 @@ public class UriResolverManager {
|
|||
* @param applicationType the application type
|
||||
* @return the resolver
|
||||
*/
|
||||
public Resolver getResolver(String applicationType){
|
||||
public Resolver getResolver(String applicationType) {
|
||||
return this.applicationTypes.get(applicationType);
|
||||
}
|
||||
|
||||
|
@ -323,14 +361,14 @@ public class UriResolverManager {
|
|||
*
|
||||
* @return a map Application Type - Resolver
|
||||
*/
|
||||
public Map<String, Resolver> getCapabilities(){
|
||||
public Map<String, Resolver> getCapabilities() {
|
||||
return this.applicationTypes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the timer uri resolver reader.
|
||||
*
|
||||
* @param delay the delay
|
||||
* @param delay the delay
|
||||
* @param period the period
|
||||
*/
|
||||
public void setTimerUriResolverReader(long delay, long period) {
|
||||
|
@ -342,45 +380,31 @@ public class UriResolverManager {
|
|||
timer.schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
logger.info("Timer Reset Runtime Resource running..");
|
||||
LOG.info("Timer Reset Runtime Resource running..");
|
||||
int counters = countReaders();
|
||||
if(counters==0){
|
||||
logger.info("Reader not locked, resetting");
|
||||
if (counters == 0) {
|
||||
LOG.info("Reader not locked, resetting");
|
||||
reader = null;
|
||||
}else
|
||||
logger.info("Reader locked, counters is/are:"+counters+", skipping");
|
||||
} else
|
||||
LOG.info("Reader locked, counters is/are:" + counters + ", skipping");
|
||||
|
||||
}
|
||||
}, delay, period);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Cancel timer uri resolver reader.
|
||||
*/
|
||||
public void cancelTimerUriResolverReader(){
|
||||
if(timer!=null)
|
||||
public void cancelTimerUriResolverReader() {
|
||||
if (timer != null)
|
||||
timer.cancel();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Invalid uri resolver reader.
|
||||
*/
|
||||
public void invalidUriResolverReader(){
|
||||
public void invalidUriResolverReader() {
|
||||
reader = null;
|
||||
}
|
||||
|
||||
/*
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
UriResolverManager manager = new UriResolverManager();
|
||||
System.out.println(manager.getCapabilities());
|
||||
System.out.println(manager.getApplicationTypes());
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
|
|
@ -0,0 +1,115 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.entity;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.NotImplementedException;
|
||||
|
||||
/**
|
||||
* The Class Resolver.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it May 4, 2015
|
||||
*/
|
||||
public class GenericResolver implements Resolver {
|
||||
|
||||
private String resourceName;
|
||||
private String entryName;
|
||||
|
||||
/**
|
||||
* Instantiates a new resolver.
|
||||
*
|
||||
* @param resourceName the resource name
|
||||
* @param entryName the entry name
|
||||
*/
|
||||
public GenericResolver(String resourceName, String entryName) {
|
||||
super();
|
||||
this.resourceName = resourceName;
|
||||
this.entryName = entryName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the resource name.
|
||||
*
|
||||
* @return the resourceName
|
||||
*/
|
||||
public String getResourceName() {
|
||||
return resourceName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the entry name.
|
||||
*
|
||||
* @return the entryName
|
||||
*/
|
||||
public String getEntryName() {
|
||||
return entryName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the resource name.
|
||||
*
|
||||
* @param resourceName the resourceName to set
|
||||
*/
|
||||
public void setResourceName(String resourceName) {
|
||||
this.resourceName = resourceName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the entry name.
|
||||
*
|
||||
* @param entryName the entryName to set
|
||||
*/
|
||||
public void setEntryName(String entryName) {
|
||||
this.entryName = entryName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param baseURI the base URI
|
||||
* @param parameters the parameters
|
||||
* @return the link
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String getLink(String baseURI, Map<String, String> parameters) throws Exception {
|
||||
throw new NotImplementedException("getLink method not implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* Short link.
|
||||
*
|
||||
* @param theLink the the link
|
||||
* @param parameters the parameters
|
||||
* @return the string
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String shortLink(String theLink, Map<String, String> parameters) throws Exception {
|
||||
throw new NotImplementedException("shortLink method not implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* To string.
|
||||
*
|
||||
* @return the string
|
||||
*/
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.lang.Object#toString()
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("Resolver [resourceName=");
|
||||
builder.append(resourceName);
|
||||
builder.append(", entryName=");
|
||||
builder.append(entryName);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -1,78 +1,48 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.entity;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* The Class Resolver.
|
||||
* The Interface Resolver.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* May 4, 2015
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Nov 5, 2021
|
||||
*/
|
||||
public class Resolver {
|
||||
|
||||
private String resourceName;
|
||||
private String entryName;
|
||||
|
||||
/**
|
||||
* Instantiates a new resolver.
|
||||
*
|
||||
* @param resourceName the resource name
|
||||
* @param entryName the entry name
|
||||
*/
|
||||
public Resolver(String resourceName, String entryName) {
|
||||
super();
|
||||
this.resourceName = resourceName;
|
||||
this.entryName = entryName;
|
||||
}
|
||||
|
||||
public interface Resolver {
|
||||
|
||||
/**
|
||||
* Gets the resource name.
|
||||
*
|
||||
* @return the resourceName
|
||||
* @return the resource name
|
||||
*/
|
||||
public String getResourceName() {
|
||||
return resourceName;
|
||||
}
|
||||
|
||||
public String getResourceName();
|
||||
|
||||
/**
|
||||
* Gets the entry name.
|
||||
*
|
||||
* @return the entryName
|
||||
* @return the entry name
|
||||
*/
|
||||
public String getEntryName() {
|
||||
return entryName;
|
||||
}
|
||||
|
||||
public String getEntryName();
|
||||
|
||||
/**
|
||||
* Sets the resource name.
|
||||
* Gets the link.
|
||||
*
|
||||
* @param resourceName the resourceName to set
|
||||
* @param baseURI the base URI
|
||||
* @param parameters the parameters
|
||||
* @return the link
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public void setResourceName(String resourceName) {
|
||||
this.resourceName = resourceName;
|
||||
}
|
||||
|
||||
public String getLink(String baseURI, Map<String, String> parameters) throws Exception;
|
||||
|
||||
/**
|
||||
* Sets the entry name.
|
||||
* Short link.
|
||||
*
|
||||
* @param entryName the entryName to set
|
||||
* @param theLink the the link
|
||||
* @param parameters the parameters
|
||||
* @return the string
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public void setEntryName(String entryName) {
|
||||
this.entryName = entryName;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see java.lang.Object#toString()
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("Resolver [resourceName=");
|
||||
builder.append(resourceName);
|
||||
builder.append(", entryName=");
|
||||
builder.append(entryName);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
public String shortLink(String theLink, Map<String, String> parameters) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.exception;
|
||||
|
||||
/**
|
||||
* The Class NotImplementedException.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Nov 5, 2021
|
||||
*/
|
||||
public class NotImplementedException extends Exception {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = -7350078577553202213L;
|
||||
|
||||
/**
|
||||
* Instantiates a new not implemented exception.
|
||||
*/
|
||||
public NotImplementedException() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new not implemented exception.
|
||||
*
|
||||
* @param message the message
|
||||
*/
|
||||
public NotImplementedException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
}
|
|
@ -22,12 +22,10 @@ import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
/**
|
||||
* The Class RuntimeResourceReader.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* Apr 30, 2015
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Apr 30, 2015
|
||||
*/
|
||||
public class RuntimeResourceReader {
|
||||
|
||||
|
@ -39,7 +37,6 @@ public class RuntimeResourceReader {
|
|||
|
||||
private String entryName;
|
||||
|
||||
|
||||
/**
|
||||
* Instantiates a new runtime resource reader.
|
||||
*
|
||||
|
@ -54,49 +51,53 @@ public class RuntimeResourceReader {
|
|||
/**
|
||||
* Read resource.
|
||||
*
|
||||
* @param scope the scope
|
||||
* @param scope the scope
|
||||
* @param resourceName the resource name
|
||||
* @return the application URI
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
private void readResource(String resourceName) throws Exception {
|
||||
|
||||
try{
|
||||
try {
|
||||
String scope = ScopeProvider.instance.get();
|
||||
logger.info("Tentative read resource: "+resourceName+", scope: "+scope);
|
||||
logger.info("Trying to read resource: " + resourceName + ", in the scope: " + scope);
|
||||
|
||||
this.resourceName = resourceName;
|
||||
|
||||
SimpleQuery query = queryFor(ServiceEndpoint.class);
|
||||
query.addCondition("$resource/Profile/Name/string() eq '"+resourceName+"'");
|
||||
query.addCondition("$resource/Profile/Name/string() eq '" + resourceName + "'");
|
||||
|
||||
DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class);
|
||||
|
||||
List<ServiceEndpoint> r = client.submit(query);
|
||||
if (r == null || r.isEmpty()) throw new Exception("Cannot retrieve the runtime resource with name: "+resourceName +" in the scope: "+scope);
|
||||
if (r == null || r.isEmpty())
|
||||
throw new Exception(
|
||||
"Cannot retrieve the runtime resource with name: " + resourceName + " in the scope: " + scope);
|
||||
|
||||
ServiceEndpoint se = r.get(0);
|
||||
if(se.profile()==null){
|
||||
String msg = "Runtime reosource with resource name: "+resourceName +" is null in the scope: "+scope;
|
||||
if (se.profile() == null) {
|
||||
String msg = "Runtime reosource with resource name: " + resourceName + " is null in the scope: "
|
||||
+ scope;
|
||||
logger.error(msg);
|
||||
throw new Exception(msg);
|
||||
}
|
||||
|
||||
Group<AccessPoint> accessPoints = se.profile().accessPoints();
|
||||
if(accessPoints.size()==0) throw new Exception("Accesspoint in resource "+resourceName+" not found");
|
||||
if (accessPoints.size() == 0)
|
||||
throw new Exception("Accesspoint in resource " + resourceName + " not found");
|
||||
|
||||
Iterator<AccessPoint> acIt = accessPoints.iterator();
|
||||
serviceAccessPoints = new ArrayList<ServiceAccessPoint>(accessPoints.size());
|
||||
|
||||
while(acIt.hasNext()){
|
||||
while (acIt.hasNext()) {
|
||||
|
||||
AccessPoint ap = acIt.next();
|
||||
|
||||
Group<Property> properties = ap.properties();
|
||||
|
||||
if(properties.size()==0){
|
||||
logger.warn("Properties in resource "+resourceName+" not found");
|
||||
}else{
|
||||
if (properties.size() == 0) {
|
||||
logger.warn("Properties in resource " + resourceName + " not found");
|
||||
} else {
|
||||
|
||||
List<ServiceParameter> serviceParameters = new ArrayList<ServiceParameter>(properties.size());
|
||||
|
||||
|
@ -111,17 +112,19 @@ public class RuntimeResourceReader {
|
|||
|
||||
serviceAccessPoints.add(new ServiceAccessPoint(ap.name(), ap.address(), serviceParameters));
|
||||
}
|
||||
}
|
||||
// parameters.setUser(ap.username()); //username
|
||||
//
|
||||
// String decryptedPassword = StringEncrypter.getEncrypter().decrypt(ap.password());
|
||||
//
|
||||
// parameters.setPassword(decryptedPassword); //password
|
||||
// Group<Property> properties = ap.properties();
|
||||
|
||||
}catch (Exception e) {
|
||||
logger.error("Sorry, an error occurred on reading the resource "+resourceName+ " Runtime Resource",e);
|
||||
throw new Exception("Sorry, an error occurred on reading the resource "+resourceName+ " Runtime Reosurce");
|
||||
}
|
||||
logger.debug("Found properties: " + serviceAccessPoints);
|
||||
// parameters.setUser(ap.username()); //username
|
||||
// String decryptedPassword =
|
||||
// StringEncrypter.getEncrypter().decrypt(ap.password());
|
||||
// parameters.setPassword(decryptedPassword); //password
|
||||
// Group<Property> properties = ap.properties();
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("Sorry, an error occurred on reading the resource " + resourceName + " Runtime Resource", e);
|
||||
throw new Exception(
|
||||
"Sorry, an error occurred on reading the resource " + resourceName + " Runtime Reosurce");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -131,10 +134,10 @@ public class RuntimeResourceReader {
|
|||
* @param entryName the entry name
|
||||
* @return the service access point for entry name
|
||||
*/
|
||||
public ServiceAccessPoint getServiceAccessPointForEntryName(String entryName){
|
||||
public ServiceAccessPoint getServiceAccessPointForEntryName(String entryName) {
|
||||
|
||||
for (ServiceAccessPoint serviceAccessPoint : serviceAccessPoints) {
|
||||
if(serviceAccessPoint.getEntryName().equals(entryName))
|
||||
if (serviceAccessPoint.getEntryName().equals(entryName))
|
||||
return serviceAccessPoint;
|
||||
}
|
||||
return null;
|
||||
|
@ -167,7 +170,9 @@ public class RuntimeResourceReader {
|
|||
return serviceAccessPoints;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.lang.Object#toString()
|
||||
*/
|
||||
@Override
|
||||
|
@ -184,8 +189,6 @@ public class RuntimeResourceReader {
|
|||
return builder.toString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
// public static void main(String[] args) {
|
||||
// try {
|
||||
// RuntimeResourceReader rr = new RuntimeResourceReader("/gcube", "Gis-Resolver");
|
||||
|
|
|
@ -12,7 +12,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
|
|||
|
||||
import org.gcube.common.resources.gcore.utils.XPathHelper;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.GenericResolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.Resolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.CatalogueResolverCallBuilder;
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.SHUBResolverCallBuilder;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
import org.gcube.resources.discovery.client.queries.api.Query;
|
||||
import org.gcube.resources.discovery.client.queries.impl.QueryBox;
|
||||
|
@ -21,12 +24,10 @@ import org.slf4j.LoggerFactory;
|
|||
import org.w3c.dom.Node;
|
||||
import org.xml.sax.InputSource;
|
||||
|
||||
|
||||
/**
|
||||
* The Class UriResolverMapReader.
|
||||
*
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* May 4, 2015
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it May 4, 2015
|
||||
*/
|
||||
public class UriResolverMapReader {
|
||||
|
||||
|
@ -36,14 +37,14 @@ public class UriResolverMapReader {
|
|||
public static final String URIRESOLVERMAP_SECONDARY_TYPE = "UriResolverMap";
|
||||
public static final String URI_RESOLVER_MAP_RESOURCE_NAME = "Uri-Resolver-Map";
|
||||
|
||||
// private Logger logger = LoggerFactory.getLogger(UriResolverMapReader.class);
|
||||
//TODO TEMP SOLUTION IN ORDER TO PRINT USING ALSO LOG4J INTO GEOEXPLORER PORTLET
|
||||
// private Logger LOG = LoggerFactory.getLogger(UriResolverMapReader.class);
|
||||
// TODO TEMP SOLUTION IN ORDER TO PRINT USING ALSO LOG4J INTO GEOEXPLORER
|
||||
// PORTLET
|
||||
private Logger logger = LoggerFactory.getLogger(UriResolverMapReader.class);
|
||||
private String secondaryType;
|
||||
private String scope;
|
||||
private String resourceName;
|
||||
private Map<String, Resolver> applicationTypes; //A map ApplicationType - Resolver
|
||||
|
||||
private Map<String, Resolver> applicationTypes; // A map ApplicationType - Resolver
|
||||
|
||||
/**
|
||||
* Instantiates a new uri resolver map reader.
|
||||
|
@ -57,67 +58,85 @@ public class UriResolverMapReader {
|
|||
readProfileFromInfrastrucure();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* this method looks up the generic resource among the ones available in the infrastructure using scope provider {@link ScopeProvider.instance.get()}
|
||||
* resource name {@value #URI_RESOLVER_MAP_RESOURCE_NAME} and secondaryType {@value #URIRESOLVERMAP_SECONDARY_TYPE}
|
||||
* this method looks up the generic resource among the ones available in the
|
||||
* infrastructure using scope provider {@link ScopeProvider.instance.get()}
|
||||
* resource name {@value #URI_RESOLVER_MAP_RESOURCE_NAME} and secondaryType
|
||||
* {@value #URIRESOLVERMAP_SECONDARY_TYPE}
|
||||
*
|
||||
* @return the applicationProfile profile
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
private void readProfileFromInfrastrucure() throws Exception {
|
||||
|
||||
String queryString = getGcubeGenericQueryString(secondaryType, resourceName);
|
||||
String queryString = getGcubeGenericQueryString(secondaryType, resourceName);
|
||||
|
||||
logger.info("Trying to fetch in the scope: "+ScopeProvider.instance.get()+" the Generic Resouce with name: "+resourceName + " secondary type: "+secondaryType);
|
||||
logger.info(queryString);
|
||||
try {
|
||||
logger.info("Trying to fetch in the scope: " + ScopeProvider.instance.get() + " the Generic Resouce with name: "
|
||||
+ resourceName + " secondary type: " + secondaryType);
|
||||
logger.info(queryString);
|
||||
try {
|
||||
|
||||
Query q = new QueryBox(queryString);
|
||||
logger.debug("new query box works");
|
||||
Query q = new QueryBox(queryString);
|
||||
logger.debug("new query box works");
|
||||
|
||||
DiscoveryClient<String> client = client();
|
||||
logger.info("submitting query is: "+queryString);
|
||||
List<String> appUriResolverMap = client.submit(q);
|
||||
logger.debug("submit query works");
|
||||
DiscoveryClient<String> client = client();
|
||||
logger.info("submitting query is: " + queryString);
|
||||
List<String> appUriResolverMap = client.submit(q);
|
||||
logger.debug("submit query works");
|
||||
|
||||
if (appUriResolverMap == null || appUriResolverMap.size() == 0){
|
||||
logger.error("ApplicationProfile with secondaryType: "+secondaryType+" and name: "+resourceName+" is not registered in the infrastructure, scope: "+ScopeProvider.instance.get());
|
||||
throw new ApplicationProfileException("ApplicationProfile with secondaryType: "+secondaryType+" and name: "+resourceName+" is not registered in the scope: "+ScopeProvider.instance.get());
|
||||
}else {
|
||||
logger.info("Building map applications type - resource");
|
||||
logger.debug("Building new DocumentBuilder..");
|
||||
String elem = appUriResolverMap.get(0);
|
||||
DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
|
||||
Node node = docBuilder.parse(new InputSource(new StringReader(elem))).getDocumentElement();
|
||||
logger.debug("Building new XPathHelper..");
|
||||
XPathHelper helper = new XPathHelper(node);
|
||||
List<String> currValue = null;
|
||||
logger.debug("Evaluating XPath..");
|
||||
currValue = helper.evaluate("/Resource/Profile/Body/access_point/application_type/text()");
|
||||
if (currValue != null && currValue.size() > 0) {
|
||||
logger.info("Application Types are: "+currValue.size());
|
||||
applicationTypes = new HashMap<String, Resolver>(currValue.size());
|
||||
if (appUriResolverMap == null || appUriResolverMap.size() == 0) {
|
||||
logger.error("ApplicationProfile with secondaryType: " + secondaryType + " and name: " + resourceName
|
||||
+ " is not registered in the infrastructure, scope: " + ScopeProvider.instance.get());
|
||||
throw new ApplicationProfileException(
|
||||
"ApplicationProfile with secondaryType: " + secondaryType + " and name: " + resourceName
|
||||
+ " is not registered in the scope: " + ScopeProvider.instance.get());
|
||||
} else {
|
||||
logger.info("Building map applications type - resource");
|
||||
logger.debug("Building new DocumentBuilder..");
|
||||
String elem = appUriResolverMap.get(0);
|
||||
DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
|
||||
Node node = docBuilder.parse(new InputSource(new StringReader(elem))).getDocumentElement();
|
||||
logger.debug("Building new XPathHelper..");
|
||||
XPathHelper helper = new XPathHelper(node);
|
||||
List<String> currValue = null;
|
||||
logger.debug("Evaluating XPath..");
|
||||
currValue = helper.evaluate("/Resource/Profile/Body/access_point/application_type/text()");
|
||||
if (currValue != null && currValue.size() > 0) {
|
||||
logger.info("Application Types are: " + currValue.size());
|
||||
applicationTypes = new HashMap<String, Resolver>(currValue.size());
|
||||
// List<String> appTypes = currValue;
|
||||
//FOR EACH APPLICATION TYPE
|
||||
for (String at : currValue) {
|
||||
logger.info("Application Type "+at);
|
||||
// FOR EACH APPLICATION TYPE
|
||||
for (String at : currValue) {
|
||||
logger.info("Application Type " + at);
|
||||
// currValue = helper.evaluate("/Resource/Profile/Body/EndPoint[Scope='"+scope.toString()+"']/Scope/text()");
|
||||
List<String> resources = helper.evaluate("/Resource/Profile/Body/access_point[application_type='"+at+"']/resource/text()");
|
||||
List<String> entryNames = helper.evaluate("/Resource/Profile/Body/access_point[application_type='"+at+"']/entryname/text()");
|
||||
if(resources!=null && resources.size()>0){
|
||||
Resolver resolver = new Resolver(resources.get(0), entryNames.get(0));
|
||||
applicationTypes.put(at, resolver);
|
||||
logger.info("Stored: "+at +" -> Resolver: "+ resolver);
|
||||
}else
|
||||
logger.warn("Skipping Type "+at+" mapping to runtime resource not found!");
|
||||
}
|
||||
List<String> resources = helper.evaluate(
|
||||
"/Resource/Profile/Body/access_point[application_type='" + at + "']/resource/text()");
|
||||
List<String> entryNames = helper.evaluate(
|
||||
"/Resource/Profile/Body/access_point[application_type='" + at + "']/entryname/text()");
|
||||
if (resources != null && resources.size() > 0) {
|
||||
String resoureName = resources.get(0);
|
||||
String entryName = entryNames.get(0);
|
||||
Resolver resolver;
|
||||
if (entryName.equalsIgnoreCase("ctlg")) {
|
||||
resolver = new CatalogueResolverCallBuilder(resoureName, entryName);
|
||||
} else if (entryName.equalsIgnoreCase("shub")) {
|
||||
resolver = new SHUBResolverCallBuilder(resoureName, entryName);
|
||||
} else {
|
||||
resolver = new GenericResolver(resoureName, entryName);
|
||||
}
|
||||
applicationTypes.put(at, resolver);
|
||||
logger.info("Stored: " + at + " -> Resolver: " + resolver);
|
||||
} else
|
||||
logger.warn("Skipping Type " + at + " mapping to runtime resource not found!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("Error while trying to fetch Generic Resource with secondaryType: "+secondaryType+" and name "+resourceName+" from the infrastructure", e);
|
||||
throw new ApplicationProfileException("Error while trying to fetch Generic Resourc with secondaryType: "+secondaryType+" and name "+resourceName+" from the infrastructure");
|
||||
logger.error("Error while trying to fetch Generic Resource with secondaryType: " + secondaryType
|
||||
+ " and name " + resourceName + " from the infrastructure", e);
|
||||
throw new ApplicationProfileException("Error while trying to fetch Generic Resourc with secondaryType: "
|
||||
+ secondaryType + " and name " + resourceName + " from the infrastructure");
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -126,15 +145,14 @@ public class UriResolverMapReader {
|
|||
* Gets the gcube generic query string.
|
||||
*
|
||||
* @param secondaryType the secondary type
|
||||
* @param name the name
|
||||
* @param name the name
|
||||
* @return the gcube generic query string
|
||||
*/
|
||||
public static String getGcubeGenericQueryString(String secondaryType, String name){
|
||||
public static String getGcubeGenericQueryString(String secondaryType, String name) {
|
||||
|
||||
return "for $profile in collection('/db/Profiles/GenericResource')//Resource " +
|
||||
"where $profile/Profile/SecondaryType/string() eq '"+secondaryType+"' and $profile/Profile/Name/string() " +
|
||||
" eq '" + name + "'" +
|
||||
"return $profile";
|
||||
return "for $profile in collection('/db/Profiles/GenericResource')//Resource "
|
||||
+ "where $profile/Profile/SecondaryType/string() eq '" + secondaryType
|
||||
+ "' and $profile/Profile/Name/string() " + " eq '" + name + "'" + "return $profile";
|
||||
|
||||
}
|
||||
|
||||
|
@ -156,7 +174,6 @@ public class UriResolverMapReader {
|
|||
return secondaryType;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the scope.
|
||||
*
|
||||
|
@ -175,7 +192,9 @@ public class UriResolverMapReader {
|
|||
return resourceName;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.lang.Object#toString()
|
||||
*/
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,217 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.resolvers;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.GenericResolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
import org.gcube.portlets.user.urlshortener.UrlShortener;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class CatalogueResolverCallBuilder.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Nov 5, 2021
|
||||
*/
|
||||
public class CatalogueResolverCallBuilder extends GenericResolver {
|
||||
|
||||
private static final int _60SEC = 60000;
|
||||
public static final Logger LOG = LoggerFactory.getLogger(CatalogueResolverCallBuilder.class);
|
||||
|
||||
/**
|
||||
* Instantiates a new catalogue resolver wrapper.
|
||||
*
|
||||
* @param resourceName the resource name
|
||||
* @param entryName the entry name
|
||||
*/
|
||||
public CatalogueResolverCallBuilder(String resourceName, String entryName) {
|
||||
super(resourceName, entryName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param baseURI the base URI
|
||||
* @param parameters the parameters
|
||||
* @return the link
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String getLink(String baseURI, Map<String, String> parameters) throws Exception {
|
||||
LOG.debug("called getLink: " + baseURI + " parameters: " + parameters);
|
||||
|
||||
HttpURLConnection con = null;
|
||||
String theResponse = null;
|
||||
try {
|
||||
|
||||
URL urlObj = new URL(baseURI);
|
||||
con = (HttpURLConnection) urlObj.openConnection();
|
||||
con.setRequestMethod("POST");
|
||||
con.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
|
||||
// con.setRequestProperty("Accept", "application/json");
|
||||
|
||||
con.setDoOutput(true);
|
||||
con.setReadTimeout(_60SEC);
|
||||
con.setConnectTimeout(_60SEC);
|
||||
|
||||
JSONObject jObj = new org.json.JSONObject();
|
||||
for (String key : parameters.keySet()) {
|
||||
jObj.put(key, parameters.get(key));
|
||||
}
|
||||
|
||||
// if (queryStringParameters != null) {
|
||||
// String queryString = UrlEncoderUtil.toQueryString(queryStringParameters);
|
||||
// jObj.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString);
|
||||
// }
|
||||
|
||||
String toJSON = jObj.toString();
|
||||
LOG.info("Submitting JSON: " + toJSON);
|
||||
Integer code = null;
|
||||
try {
|
||||
|
||||
OutputStream os = con.getOutputStream();
|
||||
os.write(toJSON.getBytes("UTF-8"));
|
||||
os.close();
|
||||
|
||||
code = con.getResponseCode();
|
||||
theResponse = readResponse(con.getInputStream());
|
||||
|
||||
if (!((200 <= code) && (code <= 208))) {
|
||||
throw new Exception("CatalogueResolver returned code: " + code + ". Response is: " + theResponse);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
theResponse = readResponse(con.getInputStream());
|
||||
LOG.error("CatalogueResolver returned code: " + code + ". Response is: " + theResponse);
|
||||
throw e;
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error(CatalogueResolverCallBuilder.class.getSimpleName() + " error: ", e);
|
||||
throw e;
|
||||
} finally {
|
||||
try {
|
||||
if (con != null)
|
||||
con.disconnect();
|
||||
} catch (Exception e) {
|
||||
// silent
|
||||
}
|
||||
}
|
||||
LOG.info("Got Link: " + theResponse);
|
||||
return theResponse;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Short link.
|
||||
*
|
||||
* @param theLink the the link
|
||||
* @param parameters the parameters
|
||||
* @return the string
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String shortLink(String theLink, Map<String, String> parameters) throws Exception {
|
||||
LOG.info("specific shortLink called");
|
||||
|
||||
String linkDecoded = theLink;
|
||||
|
||||
String[] queryStringArray = theLink.split("\\?");
|
||||
if(queryStringArray.length>1) {
|
||||
String queryString = queryStringArray[1];
|
||||
String queryStringEncoded = UrlEncoderUtil.encodeQuery(queryString);
|
||||
theLink = String.format("%s?%s", queryStringArray[0], queryStringEncoded);
|
||||
}
|
||||
|
||||
// if (parameters != null) {
|
||||
// LOG.debug("Trying to read the parameter: " + CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER);
|
||||
// String queryStringParmeters = parameters.get(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER);
|
||||
// if (queryStringParmeters != null) {
|
||||
// LOG.debug(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER + " found");
|
||||
// queryString = UrlEncoderUtil.encodeQuery(queryStringParmeters);
|
||||
// }
|
||||
// }
|
||||
|
||||
try {
|
||||
// LOG.debug(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER + " encoded is: " + queryString);
|
||||
// if (queryString != null) {
|
||||
// String queryStringEncoded = UrlEncoderUtil.encodeString(queryString);
|
||||
// theLink = String.format("%s?%s", theLink, queryStringEncoded);
|
||||
// }
|
||||
LOG.info("Encoded link is: " + theLink);
|
||||
LOG.info("Shortner starts..");
|
||||
String shortLink = shortTheLink(theLink);
|
||||
LOG.info("Shorted link is: " + shortLink);
|
||||
if (shortLink != null && shortLink.equals(theLink)) {
|
||||
// here the short link and the input link are identical
|
||||
// so the shortening did not work
|
||||
// I'm returning the decoded link because it is directly consumable via browser
|
||||
LOG.debug("Shorted link is equal to input link, returning decoded link: " + linkDecoded);
|
||||
theLink = linkDecoded;
|
||||
} else {
|
||||
// here the link is really shorted
|
||||
LOG.debug("The link is really short, returning it");
|
||||
theLink = shortLink;
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.warn("An error occurred during link shortening: ", e);
|
||||
// here I'm returning the decoded link in case of error on shortening it
|
||||
theLink = linkDecoded;
|
||||
}
|
||||
|
||||
return theLink;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Short the link.
|
||||
*
|
||||
* @param link the link
|
||||
* @return the string
|
||||
*/
|
||||
private String shortTheLink(String link) {
|
||||
|
||||
String toReturnLink = link;
|
||||
try {
|
||||
UrlShortener shortener = new UrlShortener();
|
||||
String shortedLink = shortener.shorten(link);
|
||||
LOG.info("Shorted link is: " + shortedLink);
|
||||
toReturnLink = shortedLink;
|
||||
} catch (Exception e) {
|
||||
LOG.warn("Returning source link, an error occurred during link shortening: ", e);
|
||||
}
|
||||
return toReturnLink;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read response.
|
||||
*
|
||||
* @param ris the ris
|
||||
* @return the string
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
private String readResponse(InputStream ris) throws IOException {
|
||||
// Receive the response from the server
|
||||
InputStream in = new BufferedInputStream(ris);
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
|
||||
StringBuilder result = new StringBuilder();
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
result.append(line);
|
||||
}
|
||||
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,217 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.resolvers;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.GenericResolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
import org.gcube.portlets.user.urlshortener.UrlShortener;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class GeoportalResolverCallBuilder.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Mar 27, 2023
|
||||
*/
|
||||
public class GeoportalResolverCallBuilder extends GenericResolver {
|
||||
|
||||
private static final int _60SEC = 60000;
|
||||
public static final Logger LOG = LoggerFactory.getLogger(GeoportalResolverCallBuilder.class);
|
||||
|
||||
/**
|
||||
* Instantiates a new geoportal resolver call builder.
|
||||
*
|
||||
* @param resourceName the resource name
|
||||
* @param entryName the entry name
|
||||
*/
|
||||
public GeoportalResolverCallBuilder(String resourceName, String entryName) {
|
||||
super(resourceName, entryName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param baseURI the base URI
|
||||
* @param parameters the parameters
|
||||
* @return the link
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String getLink(String baseURI, Map<String, String> parameters) throws Exception {
|
||||
LOG.debug("called getLink: " + baseURI + " parameters: " + parameters);
|
||||
|
||||
HttpURLConnection con = null;
|
||||
String theResponse = null;
|
||||
try {
|
||||
|
||||
URL urlObj = new URL(baseURI);
|
||||
con = (HttpURLConnection) urlObj.openConnection();
|
||||
con.setRequestMethod("POST");
|
||||
con.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
|
||||
// con.setRequestProperty("Accept", "application/json");
|
||||
|
||||
con.setDoOutput(true);
|
||||
con.setReadTimeout(_60SEC);
|
||||
con.setConnectTimeout(_60SEC);
|
||||
|
||||
JSONObject jObj = new org.json.JSONObject();
|
||||
for (String key : parameters.keySet()) {
|
||||
jObj.put(key, parameters.get(key));
|
||||
}
|
||||
|
||||
// if (queryStringParameters != null) {
|
||||
// String queryString = UrlEncoderUtil.toQueryString(queryStringParameters);
|
||||
// jObj.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString);
|
||||
// }
|
||||
|
||||
String toJSON = jObj.toString();
|
||||
LOG.info("Submitting JSON: " + toJSON);
|
||||
Integer code = null;
|
||||
try {
|
||||
|
||||
OutputStream os = con.getOutputStream();
|
||||
os.write(toJSON.getBytes("UTF-8"));
|
||||
os.close();
|
||||
|
||||
code = con.getResponseCode();
|
||||
theResponse = readResponse(con.getInputStream());
|
||||
|
||||
if (!((200 <= code) && (code <= 208))) {
|
||||
throw new Exception("CatalogueResolver returned code: " + code + ". Response is: " + theResponse);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
theResponse = readResponse(con.getInputStream());
|
||||
LOG.error("CatalogueResolver returned code: " + code + ". Response is: " + theResponse);
|
||||
throw e;
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error(GeoportalResolverCallBuilder.class.getSimpleName() + " error: ", e);
|
||||
throw e;
|
||||
} finally {
|
||||
try {
|
||||
if (con != null)
|
||||
con.disconnect();
|
||||
} catch (Exception e) {
|
||||
// silent
|
||||
}
|
||||
}
|
||||
LOG.info("Got Link: " + theResponse);
|
||||
return theResponse;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Short link.
|
||||
*
|
||||
* @param theLink the the link
|
||||
* @param parameters the parameters
|
||||
* @return the string
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String shortLink(String theLink, Map<String, String> parameters) throws Exception {
|
||||
LOG.info("specific shortLink called");
|
||||
|
||||
String linkDecoded = theLink;
|
||||
|
||||
String[] queryStringArray = theLink.split("\\?");
|
||||
if (queryStringArray.length > 1) {
|
||||
String queryString = queryStringArray[1];
|
||||
String queryStringEncoded = UrlEncoderUtil.encodeQuery(queryString);
|
||||
theLink = String.format("%s?%s", queryStringArray[0], queryStringEncoded);
|
||||
}
|
||||
|
||||
// if (parameters != null) {
|
||||
// LOG.debug("Trying to read the parameter: " + CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER);
|
||||
// String queryStringParmeters = parameters.get(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER);
|
||||
// if (queryStringParmeters != null) {
|
||||
// LOG.debug(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER + " found");
|
||||
// queryString = UrlEncoderUtil.encodeQuery(queryStringParmeters);
|
||||
// }
|
||||
// }
|
||||
|
||||
try {
|
||||
// LOG.debug(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER + " encoded is: " + queryString);
|
||||
// if (queryString != null) {
|
||||
// String queryStringEncoded = UrlEncoderUtil.encodeString(queryString);
|
||||
// theLink = String.format("%s?%s", theLink, queryStringEncoded);
|
||||
// }
|
||||
LOG.info("Encoded link is: " + theLink);
|
||||
LOG.info("Shortner starts..");
|
||||
String shortLink = shortTheLink(theLink);
|
||||
LOG.info("Shorted link is: " + shortLink);
|
||||
if (shortLink != null && shortLink.equals(theLink)) {
|
||||
// here the short link and the input link are identical
|
||||
// so the shortening did not work
|
||||
// I'm returning the decoded link because it is directly consumable via browser
|
||||
LOG.debug("Shorted link is equal to input link, returning decoded link: " + linkDecoded);
|
||||
theLink = linkDecoded;
|
||||
} else {
|
||||
// here the link is really shorted
|
||||
LOG.debug("The link is really short, returning it");
|
||||
theLink = shortLink;
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.warn("An error occurred during link shortening: ", e);
|
||||
// here I'm returning the decoded link in case of error on shortening it
|
||||
theLink = linkDecoded;
|
||||
}
|
||||
|
||||
return theLink;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Short the link.
|
||||
*
|
||||
* @param link the link
|
||||
* @return the string
|
||||
*/
|
||||
private String shortTheLink(String link) {
|
||||
|
||||
String toReturnLink = link;
|
||||
try {
|
||||
UrlShortener shortener = new UrlShortener();
|
||||
String shortedLink = shortener.shorten(link);
|
||||
LOG.info("Shorted link is: " + shortedLink);
|
||||
toReturnLink = shortedLink;
|
||||
} catch (Exception e) {
|
||||
LOG.warn("Returning source link, an error occurred during link shortening: ", e);
|
||||
}
|
||||
return toReturnLink;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read response.
|
||||
*
|
||||
* @param ris the ris
|
||||
* @return the string
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
private String readResponse(InputStream ris) throws IOException {
|
||||
// Receive the response from the server
|
||||
InputStream in = new BufferedInputStream(ris);
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
|
||||
StringBuilder result = new StringBuilder();
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
result.append(line);
|
||||
}
|
||||
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -1,22 +0,0 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.resolvers;
|
||||
|
||||
|
||||
/**
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* @Oct 14, 2014
|
||||
*
|
||||
*/
|
||||
public class GisResolverManager implements LinkResolver{
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.gcube.portlets.user.uriresolvermanager.LinkResolver#getLink()
|
||||
*/
|
||||
public String getLink() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.resolvers;
|
||||
|
||||
/**
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
* @Oct 14, 2014
|
||||
*
|
||||
*/
|
||||
public interface LinkResolver {
|
||||
String getLink();
|
||||
}
|
|
@ -0,0 +1,66 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.resolvers;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.GenericResolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class SHUBResolverCallBuilder.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Nov 8, 2021
|
||||
*/
|
||||
public class SHUBResolverCallBuilder extends GenericResolver {
|
||||
|
||||
public static final Logger LOG = LoggerFactory.getLogger(SHUBResolverCallBuilder.class);
|
||||
|
||||
/**
|
||||
* Instantiates a new catalogue resolver wrapper.
|
||||
*
|
||||
* @param resourceName the resource name
|
||||
* @param entryName the entry name
|
||||
*/
|
||||
public SHUBResolverCallBuilder(String resourceName, String entryName) {
|
||||
super(resourceName, entryName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the link.
|
||||
*
|
||||
* @param baseURI the base URI
|
||||
* @param parameters the parameters
|
||||
* @return the link
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public String getLink(String baseURI, Map<String, String> parameters) throws Exception {
|
||||
LOG.debug("called getLink: " + baseURI + " parameters: "+parameters);
|
||||
String toReturn = null;
|
||||
try {
|
||||
|
||||
String idValue = parameters.get("id");
|
||||
String pathURI = baseURI;
|
||||
if (idValue != null) {
|
||||
pathURI = String.format("%s/%s", pathURI, idValue);
|
||||
parameters.remove("id");
|
||||
}
|
||||
|
||||
toReturn = pathURI;
|
||||
String queryString = UrlEncoderUtil.encodeQuery(parameters);
|
||||
if(!queryString.isEmpty())
|
||||
toReturn = String.format("%s?%s", pathURI, queryString);
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error(SHUBResolverCallBuilder.class.getSimpleName() + " error: ", e);
|
||||
throw e;
|
||||
}
|
||||
LOG.info("Got Link: " + toReturn);
|
||||
return toReturn;
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,97 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.resolvers.query;
|
||||
|
||||
/**
|
||||
* The Class CatalogueResolverQueryString.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 26, 2022
|
||||
*/
|
||||
public class CatalogueResolverQueryString {
|
||||
|
||||
/**
|
||||
* The Enum MODERATION_OP.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 26, 2022
|
||||
*/
|
||||
public static enum MODERATION_OP {
|
||||
show
|
||||
}
|
||||
|
||||
private final String itemName;
|
||||
private String itemId;
|
||||
private String itemStatus;
|
||||
private MODERATION_OP moderation;
|
||||
|
||||
/**
|
||||
* Instantiates a new catalogue resolver query string.
|
||||
*
|
||||
* @param builder the builder
|
||||
*/
|
||||
CatalogueResolverQueryString(CatalogueResolverQueryStringBuilder builder) {
|
||||
this.itemName = builder.getItemName();
|
||||
this.itemId = builder.getItemId();
|
||||
this.itemStatus = builder.getItemStatus();
|
||||
this.moderation = builder.getModeration();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item id.
|
||||
*
|
||||
* @return the item id
|
||||
*/
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the moderation.
|
||||
*
|
||||
* @return the moderation
|
||||
*/
|
||||
public MODERATION_OP getModeration() {
|
||||
return moderation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item name.
|
||||
*
|
||||
* @return the item name
|
||||
*/
|
||||
public String getItemName() {
|
||||
return itemName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item status.
|
||||
*
|
||||
* @return the item status
|
||||
*/
|
||||
public String getItemStatus() {
|
||||
return itemStatus;
|
||||
}
|
||||
|
||||
/**
|
||||
* To string.
|
||||
*
|
||||
* @return the string
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("CatalogueResolverQueryString [itemName=");
|
||||
builder.append(itemName);
|
||||
builder.append(", itemId=");
|
||||
builder.append(itemId);
|
||||
builder.append(", itemStatus=");
|
||||
builder.append(itemStatus);
|
||||
builder.append(", moderation=");
|
||||
builder.append(moderation);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,176 @@
|
|||
/*
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.resolvers.query;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryString.MODERATION_OP;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class CatalogueResolverQueryStringBuilder.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 26, 2022
|
||||
*/
|
||||
public final class CatalogueResolverQueryStringBuilder {
|
||||
|
||||
// DEFAULT PARAMETERS
|
||||
public static final String DEFAULT_STATUS = "pending";
|
||||
public static final String DEFAULT_MODERATION_OP = MODERATION_OP.show.name();
|
||||
|
||||
public static final Logger LOG = LoggerFactory.getLogger(CatalogueResolverQueryStringBuilder.class);
|
||||
public static final String MODERATION_PARAMETER = "moderation";
|
||||
public static final String ITEM_NAME_PARAMETER = "item_name";
|
||||
public static final String ITEM_ID_PARAMETER = "item_id";
|
||||
public static final String STATUS_PARAMETER = "status";
|
||||
|
||||
public static final String QUERY_STRING_PARAMETER = "query_string";
|
||||
|
||||
private final String itemName;
|
||||
private String itemId;
|
||||
private String itemStatus;
|
||||
private MODERATION_OP moderation;
|
||||
|
||||
/**
|
||||
* Instantiates a new catalogue resolver query string builder.
|
||||
*
|
||||
* @param itemName the item name
|
||||
*/
|
||||
public CatalogueResolverQueryStringBuilder(String itemName) {
|
||||
this.itemName = itemName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Item id.
|
||||
*
|
||||
* @param itemId the item id
|
||||
* @return the catalogue resolver query string builder
|
||||
*/
|
||||
public CatalogueResolverQueryStringBuilder itemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Moderation.
|
||||
*
|
||||
* @param moderation the moderation
|
||||
* @return the catalogue resolver query string builder
|
||||
*/
|
||||
public CatalogueResolverQueryStringBuilder moderation(MODERATION_OP moderation) {
|
||||
this.moderation = moderation;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Item status.
|
||||
*
|
||||
* @param itemStatus the item status
|
||||
* @return the catalogue resolver query string builder
|
||||
*/
|
||||
public CatalogueResolverQueryStringBuilder itemStatus(String itemStatus) {
|
||||
this.itemStatus = itemStatus;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item name.
|
||||
*
|
||||
* @return the item name
|
||||
*/
|
||||
public String getItemName() {
|
||||
return itemName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item id.
|
||||
*
|
||||
* @return the item id
|
||||
*/
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item status.
|
||||
*
|
||||
* @return the item status
|
||||
*/
|
||||
public String getItemStatus() {
|
||||
return itemStatus;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the moderation.
|
||||
*
|
||||
* @return the moderation
|
||||
*/
|
||||
public MODERATION_OP getModeration() {
|
||||
return moderation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the query parameters.
|
||||
*
|
||||
* @return the map
|
||||
*/
|
||||
public Map<String, String> buildQueryParameters() {
|
||||
|
||||
CatalogueResolverQueryString crQS = new CatalogueResolverQueryString(this);
|
||||
|
||||
if (crQS.getItemName() == null || crQS.getItemName().isEmpty()) {
|
||||
throw new IllegalArgumentException("The " + ITEM_NAME_PARAMETER + " cannot be null or empty");
|
||||
}
|
||||
|
||||
Map<String, String> query = new HashMap<String, String>();
|
||||
query.put(ITEM_NAME_PARAMETER, crQS.getItemName());
|
||||
|
||||
if (crQS.getItemId() != null) {
|
||||
query.put(ITEM_ID_PARAMETER, crQS.getItemId());
|
||||
}
|
||||
|
||||
if (crQS.getItemStatus() != null) {
|
||||
query.put(STATUS_PARAMETER, crQS.getItemStatus());
|
||||
} else {
|
||||
query.put(STATUS_PARAMETER, DEFAULT_STATUS);
|
||||
}
|
||||
|
||||
if (crQS.getModeration() != null) {
|
||||
query.put(MODERATION_PARAMETER, crQS.getModeration().name());
|
||||
} else {
|
||||
query.put(MODERATION_PARAMETER, DEFAULT_MODERATION_OP);
|
||||
}
|
||||
|
||||
return query;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the query parameters to query string.
|
||||
*
|
||||
* @return the string
|
||||
*/
|
||||
public String buildQueryParametersToQueryString() {
|
||||
|
||||
Map<String, String> mapParameters = buildQueryParameters();
|
||||
return UrlEncoderUtil.toQueryString(mapParameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the query obj.
|
||||
*
|
||||
* @return the catalogue resolver query string
|
||||
*/
|
||||
public CatalogueResolverQueryString buildQueryObj() {
|
||||
|
||||
return new CatalogueResolverQueryString(this);
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,81 @@
|
|||
package org.gcube.portlets.user.uriresolvermanager.resolvers.query;
|
||||
|
||||
/**
|
||||
* The Class GeoportalResolverQueryString.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Mar 27, 2023
|
||||
*/
|
||||
public class GeoportalResolverQueryString {
|
||||
|
||||
private final String itemType;
|
||||
private String itemId;
|
||||
private String gcubeScope;
|
||||
private String resolveAs;
|
||||
|
||||
/**
|
||||
* Instantiates a new geoportal resolver query string.
|
||||
*
|
||||
* @param builder the builder
|
||||
*/
|
||||
public GeoportalResolverQueryString(GeoportalResolverQueryStringBuilder builder) {
|
||||
this.itemType = builder.getItemType();
|
||||
this.itemId = builder.getItemId();
|
||||
this.gcubeScope = builder.getGcubeScope();
|
||||
this.resolveAs = builder.getResolveAs() != null ? builder.getResolveAs().getParamValue() : null;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item type.
|
||||
*
|
||||
* @return the item type
|
||||
*/
|
||||
public String getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item id.
|
||||
*
|
||||
* @return the item id
|
||||
*/
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the gcube scope.
|
||||
*
|
||||
* @return the gcube scope
|
||||
*/
|
||||
public String getGcubeScope() {
|
||||
return gcubeScope;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the resolver as.
|
||||
*
|
||||
* @return the resolver as
|
||||
*/
|
||||
public String getResolveAs() {
|
||||
return resolveAs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("GeoportalResolverQueryString [itemType=");
|
||||
builder.append(itemType);
|
||||
builder.append(", itemId=");
|
||||
builder.append(itemId);
|
||||
builder.append(", gcubeScope=");
|
||||
builder.append(gcubeScope);
|
||||
builder.append(", resolveAs=");
|
||||
builder.append(resolveAs);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,160 @@
|
|||
/*
|
||||
*
|
||||
*/
|
||||
package org.gcube.portlets.user.uriresolvermanager.resolvers.query;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class GeoportalResolverQueryStringBuilder.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Mar 27, 2023
|
||||
*/
|
||||
public final class GeoportalResolverQueryStringBuilder {
|
||||
|
||||
public static final Logger LOG = LoggerFactory.getLogger(GeoportalResolverQueryStringBuilder.class);
|
||||
public static final String ITEM_TYPE_PARAMETER = "item_type";
|
||||
public static final String ITEM_ID_PARAMETER = "item_id";
|
||||
public static final String GCUBE_SCOPE_PARAMETER = "gcube_scope";
|
||||
public static final String RESOLVE_AS_PARAMETER = "res";
|
||||
|
||||
private String itemType;
|
||||
private String itemId;
|
||||
private String gcubeScope;
|
||||
private RESOLVE_AS resolveAs;
|
||||
|
||||
/**
|
||||
* The Enum RESOLVE_AS_PARAMETER.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Mar 28, 2023
|
||||
*/
|
||||
public static enum RESOLVE_AS {
|
||||
PUBLIC("public"), PRIVATE("private");
|
||||
|
||||
String paramValue;
|
||||
|
||||
/**
|
||||
* Instantiates a new resolve as.
|
||||
*
|
||||
* @param paramValue the param value
|
||||
*/
|
||||
RESOLVE_AS(String paramValue) {
|
||||
this.paramValue = paramValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the param value.
|
||||
*
|
||||
* @return the param value
|
||||
*/
|
||||
public String getParamValue() {
|
||||
return paramValue;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new geoportal resolver query string builder.
|
||||
*
|
||||
* @param itemType the item type
|
||||
* @param itemId the item id
|
||||
*/
|
||||
public GeoportalResolverQueryStringBuilder(String itemType, String itemId) {
|
||||
this.itemType = itemType;
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Scope.
|
||||
*
|
||||
* @param gcubeScope the gcube scope
|
||||
* @return the geoportal resolver query string builder
|
||||
*/
|
||||
public GeoportalResolverQueryStringBuilder scope(String gcubeScope) {
|
||||
this.gcubeScope = gcubeScope;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolver as.
|
||||
*
|
||||
* @param resolveAs the resolve as
|
||||
* @return the geoportal resolver query string builder
|
||||
*/
|
||||
public GeoportalResolverQueryStringBuilder resolverAs(RESOLVE_AS resolveAs) {
|
||||
this.resolveAs = resolveAs;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item type.
|
||||
*
|
||||
* @return the item type
|
||||
*/
|
||||
public String getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the item id.
|
||||
*
|
||||
* @return the item id
|
||||
*/
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the gcube scope.
|
||||
*
|
||||
* @return the gcube scope
|
||||
*/
|
||||
public String getGcubeScope() {
|
||||
return gcubeScope;
|
||||
}
|
||||
|
||||
public RESOLVE_AS getResolveAs() {
|
||||
return resolveAs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the query parameters.
|
||||
*
|
||||
* @return the map
|
||||
*/
|
||||
public Map<String, String> buildQueryParameters() {
|
||||
|
||||
GeoportalResolverQueryString crQS = new GeoportalResolverQueryString(this);
|
||||
|
||||
if (crQS.getItemType() == null || crQS.getItemType().isEmpty()) {
|
||||
throw new IllegalArgumentException("The " + ITEM_TYPE_PARAMETER + " cannot be null or empty");
|
||||
}
|
||||
|
||||
if (crQS.getItemId() == null || crQS.getItemId().isEmpty()) {
|
||||
throw new IllegalArgumentException("The " + ITEM_ID_PARAMETER + " cannot be null or empty");
|
||||
}
|
||||
|
||||
if (crQS.getGcubeScope() == null || crQS.getGcubeScope().isEmpty()) {
|
||||
throw new IllegalArgumentException("The " + GCUBE_SCOPE_PARAMETER + " cannot be null or empty");
|
||||
}
|
||||
|
||||
Map<String, String> query = new HashMap<String, String>();
|
||||
query.put(ITEM_TYPE_PARAMETER, crQS.getItemType());
|
||||
query.put(ITEM_ID_PARAMETER, crQS.getItemId());
|
||||
query.put(GCUBE_SCOPE_PARAMETER, crQS.getGcubeScope());
|
||||
if (crQS.getResolveAs() != null) {
|
||||
query.put(RESOLVE_AS_PARAMETER, crQS.getResolveAs());
|
||||
}
|
||||
|
||||
return query;
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -5,13 +5,11 @@ package org.gcube.portlets.user.uriresolvermanager.util;
|
|||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
// TODO: Auto-generated Javadoc
|
||||
/**
|
||||
* The Class UrlEncoderUtil.
|
||||
*
|
||||
|
@ -62,7 +60,7 @@ public class UrlEncoderUtil {
|
|||
String encodedQuery = "";
|
||||
|
||||
if (theString == null || theString.isEmpty())
|
||||
return theString;
|
||||
return encodedQuery;
|
||||
|
||||
try {
|
||||
encodedQuery = URLEncoder.encode(theString, charset);
|
||||
|
@ -153,22 +151,52 @@ public class UrlEncoderUtil {
|
|||
return string;
|
||||
}
|
||||
|
||||
/**
|
||||
* The main method.
|
||||
*
|
||||
* @param args the arguments
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
public static URI_PART getURIParts(String uri) {
|
||||
|
||||
// System.out.println(UrlEncoderUtil.encodeQuery("request=GetStyles", "layers=test Name", "service=WMS", "version=1.1.1"));
|
||||
if (uri == null || uri.isEmpty())
|
||||
return null;
|
||||
|
||||
HashMap<String, String> parameters = new HashMap<String, String>();
|
||||
String[] uriSections = uri.split("\\?");
|
||||
if (uriSections.length == 1) {
|
||||
return new URI_PART(uriSections[0], null);
|
||||
} else if (uriSections.length == 2) {
|
||||
return new URI_PART(uriSections[0], uriSections[1]);
|
||||
}
|
||||
|
||||
parameters.put("request", "GetStyles");
|
||||
parameters.put("layers", "test Name");
|
||||
parameters.put("version", "1.1.1");
|
||||
return null;
|
||||
|
||||
System.out.println(UrlEncoderUtil.encodeQuery(parameters));
|
||||
}
|
||||
|
||||
public static class URI_PART {
|
||||
String baseURI;
|
||||
String queryString;
|
||||
|
||||
public URI_PART() {
|
||||
}
|
||||
|
||||
public URI_PART(String baseURI, String queryString) {
|
||||
this.baseURI = baseURI;
|
||||
this.queryString = queryString;
|
||||
}
|
||||
|
||||
public String getBaseURI() {
|
||||
return baseURI;
|
||||
}
|
||||
|
||||
public String getQueryString() {
|
||||
return queryString;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("URI_PART [baseURI=");
|
||||
builder.append(baseURI);
|
||||
builder.append(", queryString=");
|
||||
builder.append(queryString);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
/resources/
|
|
@ -54,7 +54,7 @@ public class HttpRequestUtil {
|
|||
}else
|
||||
logger.warn("status code is "+code+" - on url connection: "+urlConn);
|
||||
|
||||
// logger.trace("result: "+result);
|
||||
// LOG.trace("result: "+result);
|
||||
|
||||
} else {
|
||||
logger.error("error - not a http request!");
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
||||
import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -15,23 +13,54 @@ public class UriResolverManagerMain {
|
|||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube");
|
||||
UriResolverManager resolver = new UriResolverManager("GIS");
|
||||
System.out.println(resolver.getCapabilities());
|
||||
System.out.println(resolver.getApplicationTypes());
|
||||
|
||||
String theLink = "https://data.dev.d4science.org/ctlg/devVRE/sarda-sarda";
|
||||
String[] queryStringArray = theLink.split("\\?");
|
||||
if(queryStringArray.length>1) {
|
||||
String queryString = queryStringArray[1];
|
||||
String queryStringEncoded = UrlEncoderUtil.encodeQuery(queryString);
|
||||
theLink = String.format("%s?%s", queryStringArray[0], queryStringEncoded);
|
||||
}
|
||||
|
||||
System.out.println(theLink);
|
||||
|
||||
// ScopeProvider.instance.set("/gcube");
|
||||
// UriResolverManager resolver = new UriResolverManager("GIS");
|
||||
// System.out.println(resolver.getCapabilities());
|
||||
// System.out.println(resolver.getApplicationTypes());
|
||||
// System.out.println(resolver.discoveryServiceParameters(resolver.getResolver("SMP-ID")));
|
||||
|
||||
// Map<String, String> params = new HashMap<String, String>();
|
||||
// params.put("gis-UUID", "5ac49f44-999f-4efe-a32b-af71da2b39ac");
|
||||
// params.put("scope", "/gcube/devsec/devVRE");
|
||||
// String shortLink = resolver.getLink(params, true);
|
||||
// System.out.println(shortLink); //true, link is shorted otherwise none
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
}catch (Exception e) {
|
||||
//// System.out.println(shortLink); //true, link is shorted otherwise none
|
||||
// } catch (UriResolverMapException e) {
|
||||
// e.printStackTrace();
|
||||
// } catch (IllegalArgumentException e) {
|
||||
// e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The main method.
|
||||
*
|
||||
* @param args the arguments
|
||||
*/
|
||||
// public static void main(String[] args) {
|
||||
//
|
||||
//// System.out.println(UrlEncoderUtil.encodeQuery("request=GetStyles", "layers=test Name", "service=WMS", "version=1.1.1"));
|
||||
//
|
||||
// HashMap<String, String> parameters = new HashMap<String, String>();
|
||||
//
|
||||
// parameters.put("request", "GetStyles");
|
||||
// parameters.put("layers", "test Name");
|
||||
// parameters.put("version", "1.1.1");
|
||||
//
|
||||
// System.out.println(UrlEncoderUtil.encodeQuery(parameters));
|
||||
//
|
||||
// }
|
||||
|
||||
}
|
||||
|
|
|
@ -1,14 +1,17 @@
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.Resolver;
|
||||
import org.gcube.portlets.user.uriresolvermanager.entity.ServiceParameter;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException;
|
||||
import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryStringBuilder;
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.GeoportalResolverQueryStringBuilder;
|
||||
import org.gcube.portlets.user.uriresolvermanager.resolvers.query.GeoportalResolverQueryStringBuilder.RESOLVE_AS;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||
|
@ -18,86 +21,237 @@ import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapExcept
|
|||
public class UriResolverManagerTest {
|
||||
|
||||
//@Test
|
||||
public void testUriResolverManger(){
|
||||
public void testUriResolverManger() {
|
||||
UriResolverManager manager;
|
||||
try {
|
||||
ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab");
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
manager = new UriResolverManager();
|
||||
System.out.println(manager.getCapabilities());
|
||||
System.out.println(manager.getApplicationTypes());
|
||||
System.out.println("Capabiities: " + manager.getCapabilities());
|
||||
System.out.println("ApplicationTypes: " + manager.getApplicationTypes());
|
||||
for (String applicationType : manager.getApplicationTypes()) {
|
||||
Resolver resolver = manager.getResolver(applicationType);
|
||||
System.out.println("ApplicationType: " + applicationType + " has: " + resolver);
|
||||
List<ServiceParameter> serviceParameters = manager.discoveryServiceParameters(resolver);
|
||||
System.out.println("Parameters: " + serviceParameters);
|
||||
}
|
||||
} catch (UriResolverMapException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testCTLG() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("CTLG");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gcube_scope", "/gcube/devsec/devVRE");
|
||||
params.put("entity_context", "dataset");
|
||||
params.put("entity_name", "sarda-sarda");
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void testGIS() {
|
||||
public void testCTLGWithQueryString() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/pred4s/preprod/preVRE");
|
||||
UriResolverManager resolver = new UriResolverManager("GIS");
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("CTLG");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gis-UUID", "1a657005-29c6-4528-a115-69640c4c2900");
|
||||
params.put("scope", "/pred4s/preprod/preVRE");
|
||||
String shortLink = resolver.getLink(params, false);
|
||||
System.out.println(shortLink); //true, link is shorted otherwise none
|
||||
params.put("gcube_scope", "/gcube/devsec/devVRE");
|
||||
params.put("entity_context", "dataset");
|
||||
params.put("entity_name", "sarda-sarda");
|
||||
params.put("query_string", "param1=value1&parm2=value2");
|
||||
// METHOD 1 - Query String as parameter of the getLink method
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
|
||||
// METHOD 2 - Query String as parameter passed in the params
|
||||
// String queryString = QueryStringUtil.toQueryString(queryStringParameters);
|
||||
// params.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
}catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// @Test
|
||||
//@Test
|
||||
public void testCTLGGenerateLinkForModeration() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("CTLG");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gcube_scope", "/gcube/devsec/devVRE");
|
||||
params.put("entity_context", "organization");
|
||||
params.put("entity_name", "devvre");
|
||||
|
||||
CatalogueResolverQueryStringBuilder builder = new CatalogueResolverQueryStringBuilder(
|
||||
"test-moderation-1649068829317");
|
||||
//builder.itemStatus("approved").moderation(MODERATION_OP.show);
|
||||
|
||||
String queryString = builder.buildQueryParametersToQueryString();
|
||||
params.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString);
|
||||
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//@Test
|
||||
public void testGeoportalCreateLink() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube");
|
||||
UriResolverManager resolver;
|
||||
|
||||
String gcubeScope = "/gcube/devsec/devVRE";
|
||||
String itemId = "63d011c4dcac4551b9a6b930";
|
||||
String itemType = "profiledConcessioni";
|
||||
|
||||
resolver = new UriResolverManager("GEO");
|
||||
|
||||
//Method 1
|
||||
// Map<String, String> params = new HashMap<String, String>();
|
||||
// params.put(GeoportalResolverQueryStringBuilder.GCUBE_SCOPE_PARAMETER, gcubeScope);
|
||||
// params.put(GeoportalResolverQueryStringBuilder.ITEM_ID_PARAMETER, itemId);
|
||||
// params.put(GeoportalResolverQueryStringBuilder.ITEM_TYPE_PARAMETER, itemType);
|
||||
// params.put(GeoportalResolverQueryStringBuilder.RESOLVE_AS_PARAMETER, GeoportalResolverQueryStringBuilder.RESOLVE_AS.PUBLIC.getParamValue());
|
||||
|
||||
//Method 2
|
||||
GeoportalResolverQueryStringBuilder builder = new GeoportalResolverQueryStringBuilder(itemType,itemId);
|
||||
builder.scope(gcubeScope);
|
||||
builder.resolverAs(RESOLVE_AS.PUBLIC);
|
||||
//builder.resolverAs(RESOLVE_AS.PRIVATE);
|
||||
Map<String, String> params = builder.buildQueryParameters();
|
||||
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// @Test IS OK
|
||||
public void testSHUB() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("SHUB");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("id", "1dac6703-8eb0-4838-83a8-5006f5074e9b");
|
||||
params.put("content-disposition", "inline");
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testGIS() {
|
||||
|
||||
try {
|
||||
String scope = "/pred4s/preprod/preVRE";
|
||||
String UUID = "da165110-88fd-11da-a88f-000d939bc5d8";
|
||||
ScopeProvider.instance.set(scope);
|
||||
UriResolverManager resolver = new UriResolverManager("GIS");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gis-UUID", UUID);
|
||||
params.put("scope", scope);
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testSMP() {
|
||||
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver = new UriResolverManager("SMP");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("smp-uri","smp://Wikipedia_logo_silver.png?5ezvFfBOLqaqBlwCEtAvz4ch5BUu1ag3yftpCvV gayz9bAtSsnO1/sX6pemTKbDe0qbchLexXeWgGcJlskYE8td9QSDXSZj5VSl9kdN9SN0/LRYaWUZuP4Q1J7lEiwkU4GKPsiD6PDRVcT4QAqTEy5hSIbr6o4Y");
|
||||
params.put("smp-uri",
|
||||
"smp://Wikipedia_logo_silver.png?5ezvFfBOLqaqBlwCEtAvz4ch5BUu1ag3yftpCvV gayz9bAtSsnO1/sX6pemTKbDe0qbchLexXeWgGcJlskYE8td9QSDXSZj5VSl9kdN9SN0/LRYaWUZuP4Q1J7lEiwkU4GKPsiD6PDRVcT4QAqTEy5hSIbr6o4Y");
|
||||
params.put("fileName", "wikipediaLogo");
|
||||
params.put("contentType", "");
|
||||
String shortLink = resolver.getLink(params, true); //true, link is shorted otherwise none
|
||||
String shortLink = resolver.getLink(params, true); // true, link is shorted otherwise none
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
}catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Thread safe
|
||||
*/
|
||||
// @Test
|
||||
public void testSMPID(){
|
||||
// @Test
|
||||
public void testSMPID() {
|
||||
|
||||
try {
|
||||
try {
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("SMP-ID");
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("geo-exp","553f9265e4b0567b75021fce");
|
||||
params.put("geo-exp", "553f9265e4b0567b75021fce");
|
||||
// params.put("fileName", "dog");
|
||||
// params.put("contentType", "image/jpg");
|
||||
String shortLink = resolver.getLink(params, true); //true, link is shorted otherwise none
|
||||
String shortLink = resolver.getLink(params, true); // true, link is shorted otherwise none
|
||||
System.out.println(shortLink);
|
||||
} catch (UriResolverMapException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
}catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -105,45 +259,45 @@ public class UriResolverManagerTest {
|
|||
/**
|
||||
* Thread safe
|
||||
*/
|
||||
//@Test
|
||||
public void test2(){
|
||||
// @Test
|
||||
public void test2() {
|
||||
|
||||
// create thread to print counter value
|
||||
Thread t = new Thread(new Runnable() {
|
||||
|
||||
//create thread to print counter value
|
||||
Thread t = new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
while (true) {
|
||||
try {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
while (true) {
|
||||
try {
|
||||
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVRE");
|
||||
UriResolverManager resolver;
|
||||
resolver = new UriResolverManager("GIS");
|
||||
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gis-UUID", "eb1a1b63-f324-47ee-9522-b8f5803e19ec");
|
||||
params.put("scope", "/gcube/devsec/devVRE");
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink); //true, link is shorted otherwise none
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("gis-UUID", "eb1a1b63-f324-47ee-9522-b8f5803e19ec");
|
||||
params.put("scope", "/gcube/devsec/devVRE");
|
||||
String shortLink = resolver.getLink(params, true);
|
||||
System.out.println(shortLink); // true, link is shorted otherwise none
|
||||
|
||||
System.out.println("Thread "+Thread.currentThread().getId() +" reading counter is: " + resolver.countReaders());
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException ex) {
|
||||
ex.printStackTrace();
|
||||
}catch (UriResolverMapException e) {
|
||||
System.out.println("Thread " + Thread.currentThread().getId() + " reading counter is: "
|
||||
+ resolver.countReaders());
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException ex) {
|
||||
ex.printStackTrace();
|
||||
} catch (UriResolverMapException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (IllegalArgumentException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
t.start();
|
||||
t.start();
|
||||
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
|
|
Loading…
Reference in New Issue