Compare commits
102 Commits
feature_27
...
master
5
.project
5
.project
|
|
@ -30,6 +30,11 @@
|
|||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,79 @@
|
|||
|
||||
|
||||
|
||||
<wb-module deploy-name="uri-resolver-2.10.0-SNAPSHOT">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-module deploy-name="uri-resolver-2.10.0">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -64,6 +136,42 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
|
||||
|
||||
|
|
@ -86,6 +194,42 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
|
@ -108,10 +252,85 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
<dependent-module archiveName="uri-resolver-manager-1.8.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/uri-resolver-manager/uri-resolver-manager">
|
||||
<dependent-module archiveName="geoportal-client-1.2.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-client/geoportal-client">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="geoportal-common-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-common/geoportal-common">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -155,6 +374,42 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<property name="java-output-path" value="/uri-resolver/target/classes"/>
|
||||
|
||||
|
||||
|
|
@ -177,6 +432,42 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
|
@ -199,4 +490,40 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</project-modules>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
boot.validation.initialized=true
|
||||
eclipse.preferences.version=1
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -4,9 +4,15 @@
|
|||
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).
|
||||
|
||||
## [v2.10.0-SNAPSHOT]
|
||||
## [v2.10.0]
|
||||
|
||||
- GeoPortal-Resolver enhancement: share link towards Geoportal Data-Entry facility implemented [#27135]
|
||||
- GeoPortal-Resolver enhancement: implemented share link towards Geoportal Data-Entry facility [#27135]
|
||||
- Added Geoportal Exporter as PDF [#27274]
|
||||
- Migrated to `catalogue-util-library` [#27423]
|
||||
- Included new SHUB client library [#27944]
|
||||
- Moved to `gcube-smartgears-bom 2.5.1{-SNAPSHOT}` [#28026]
|
||||
- Bug fixing StorageID resolver [#28276]
|
||||
- Added HealthCheckResponse via `microprofile-health-api` (see https://microprofile.io/specifications/microprofile-health/)
|
||||
|
||||
## [v2.9.0]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# gCube URI Resolver
|
||||
|
||||
The URI Resolver is a RESTful service which gives access via HTTP(s) to different gCube Resolver services and gCube Applications
|
||||
The URI Resolver is a RESTful service which gives access via HTTP(s) to different gCube Resolver services and gCube Applications.
|
||||
|
||||
The URI Resolver production service is available at [D4Science URI Resolver](https://data.d4science.org/)
|
||||
|
||||
## Built With
|
||||
|
||||
|
|
@ -11,7 +13,7 @@ The URI Resolver is a RESTful service which gives access via HTTP(s) to differen
|
|||
|
||||
You can find the URI Resolver documentation at [URI Resolver Wiki Page](https://wiki.gcube-system.org/gcube/URI_Resolver)
|
||||
|
||||
The API documentation accessible by [links](https://wiki.gcube-system.org/gcube/URI_Resolver#Instances) is provided by [Enunciate](https://github.com/stoicflame/enunciate/)
|
||||
The API documentation accessible by this [link](https://wiki.gcube-system.org/gcube/URI_Resolver#Instances) is provided by [Enunciate](https://github.com/stoicflame/enunciate/)
|
||||
|
||||
## Change log
|
||||
|
||||
|
|
|
|||
120
pom.xml
120
pom.xml
|
|
@ -9,7 +9,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.data.transfer</groupId>
|
||||
<artifactId>uri-resolver</artifactId>
|
||||
<version>2.10.0-SNAPSHOT</version>
|
||||
<version>2.10.0</version>
|
||||
<packaging>war</packaging>
|
||||
<description>The URI Resolver is an HTTP URI resolver implemented as a REST service which gives access trough HTTP to different gcube Resolvers and gCube Applications.</description>
|
||||
|
||||
|
|
@ -19,8 +19,44 @@
|
|||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
|
||||
<profiles>
|
||||
<!-- PROD profile -->
|
||||
<profile>
|
||||
<id>uri-resolver-release-profile</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>Release</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<jersey.version>2.24.1</jersey.version>
|
||||
<!-- <gcube-bom>2.4.0</gcube-bom> -->
|
||||
<gcube-smartgears-bom-version>2.5.1</gcube-smartgears-bom-version>
|
||||
<authorization-utils-range>[2.0.0, 3.0.0-SNAPSHOT)</authorization-utils-range>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- DEV profile -->
|
||||
<profile>
|
||||
<id>uri-resolver-snapshot-profile</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>!Release</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- <gcube-bom>2.4.1-SNAPSHOT</gcube-bom> -->
|
||||
<gcube-smartgears-bom-version>2.5.1-SNAPSHOT</gcube-smartgears-bom-version>
|
||||
<authorization-utils-range>[2.0.0, 3.0.0-SNAPSHOT)</authorization-utils-range>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
|
||||
<properties>
|
||||
<jersey.version>2.25.1</jersey.version>
|
||||
<!-- Using 2.8.4 because storagehub-model.1.1.1 uses indirectly this version
|
||||
via jsersey-media-json -->
|
||||
<jackson.version>2.8.4</jackson.version>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<enunciate.version>2.14.0</enunciate.version>
|
||||
|
|
@ -31,13 +67,14 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-smartgears-bom</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<version>${gcube-smartgears-bom-version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -45,6 +82,13 @@
|
|||
<artifactId>common-smartgears</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.microprofile.health</groupId>
|
||||
<artifactId>microprofile-health-api</artifactId>
|
||||
<version>4.0</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-smartgears-app</artifactId>
|
||||
|
|
@ -58,13 +102,13 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.contentmanagement</groupId>
|
||||
<artifactId>storage-manager-wrapper</artifactId>
|
||||
<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
|
||||
<version>[3.0.0, 4.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.contentmanagement</groupId>
|
||||
<artifactId>storage-manager-core</artifactId>
|
||||
<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version>
|
||||
<version>[3.0.0,4.0.0-SNAPSHOT)</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>slf4j-nop</artifactId>
|
||||
|
|
@ -76,7 +120,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.data-publishing</groupId>
|
||||
<artifactId>storagehub-application-persistence</artifactId>
|
||||
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||
<version>[1.0.0, 3.0.0-SNAPSHOT)</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
|
|
@ -89,7 +133,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.data.analysis</groupId>
|
||||
<artifactId>dataminer-invocation-model</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -98,6 +142,12 @@
|
|||
<version>[1.0.0,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>authorization-utils</artifactId>
|
||||
<version>${authorization-utils-range}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
|
|
@ -123,7 +173,6 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>storagehub-client-library</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -132,7 +181,6 @@
|
|||
<version>${jersey.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.core</groupId>
|
||||
<artifactId>jersey-server</artifactId>
|
||||
|
|
@ -140,6 +188,25 @@
|
|||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- java melody -->
|
||||
<dependency>
|
||||
<groupId>net.bull.javamelody</groupId>
|
||||
|
|
@ -187,17 +254,11 @@
|
|||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.14.8</version>
|
||||
</dependency>
|
||||
|
||||
<!-- FOR BUILDING towards JDK_11 -->
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
<version>2.3.0</version>
|
||||
<!-- <version>2.3.0</version> -->
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -205,7 +266,7 @@
|
|||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.4</version>
|
||||
<!-- <version>1.18.4</version> -->
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -242,14 +303,33 @@
|
|||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.data-catalogue</groupId>
|
||||
<artifactId>ckan-util-library</artifactId>
|
||||
<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
|
||||
<groupId>org.gcube.datacatalogue</groupId>
|
||||
<artifactId>catalogue-util-library</artifactId>
|
||||
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- END GIS RESOLVER DEPENDENCIES -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.application</groupId>
|
||||
<artifactId>geoportal-data-mapper</artifactId>
|
||||
<version>[1.1.0, 2.0.0-SNAPSHOT)</version>
|
||||
<!-- Excluding these beacuse geoportal uses [2-3] ranges conflicting with
|
||||
[3-4] used by URI-Resolver -->
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.gcube.contentmanagement</groupId>
|
||||
<artifactId>storage-manager-wrapper</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.gcube.contentmanagement</groupId>
|
||||
<artifactId>storage-manager-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ public class UriResolver extends ResourceConfig {
|
|||
// Register all resources present under the package.
|
||||
packages(CatalogueResolver.class.getPackage().getName(), RequestHandler.class.getPackage().getName(), BackCatalogueResolver.class.getPackage().getName());
|
||||
packages(DataMinerInvocation.class.getPackage().getName());
|
||||
//
|
||||
// register(JspMvcFeature.class);
|
||||
// property(JspMvcFeature.TEMPLATE_BASE_PATH, "/WEB-INF/img");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,15 @@ import java.util.Set;
|
|||
|
||||
import javax.ws.rs.Path;
|
||||
|
||||
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
|
||||
import org.gcube.com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
||||
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import org.glassfish.jersey.server.model.Resource;
|
||||
import org.glassfish.jersey.server.model.ResourceMethod;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.fasterxml.jackson.databind.node.ArrayNode;
|
||||
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -192,8 +193,9 @@ public class UriResolverServices {
|
|||
if(listResourcePath.isEmpty()){
|
||||
log.info("Reference to the List of Resources/Services is empty, creating it...");
|
||||
readResources(applicationClasses);
|
||||
log.info("Hard-Coding the resource/s: "+ConstantsResolver.resourcesHardCoded);
|
||||
listResourcePath.addAll(Arrays.asList(ConstantsResolver.resourcesHardCoded));
|
||||
List<String> listHardCodedResources = Arrays.asList(ConstantsResolver.resourcesHardCoded);
|
||||
log.info("Hard-Coding the resource/s: "+listHardCodedResources);
|
||||
listResourcePath.addAll(listHardCodedResources);
|
||||
}
|
||||
|
||||
return listResourcePath;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import java.util.Map;
|
|||
|
||||
import org.gcube.common.resources.gcore.ServiceEndpoint;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueImpl;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueImpl;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
|
||||
import org.slf4j.Logger;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,11 @@ import javax.xml.parsers.DocumentBuilderFactory;
|
|||
|
||||
import org.gcube.common.resources.gcore.utils.XPathHelper;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueImpl;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueImpl;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
|
||||
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException;
|
||||
import org.gcube.datatransfer.resolver.applicationprofile.ApplicationProfileNotFoundException;
|
||||
import org.gcube.datatransfer.resolver.catalogue.endpoint.CatalogueServiceEndpointReader;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
|
|
@ -30,10 +33,6 @@ import org.slf4j.LoggerFactory;
|
|||
import org.w3c.dom.Node;
|
||||
import org.xml.sax.InputSource;
|
||||
|
||||
import eu.trentorise.opendata.jackan.CkanClient;
|
||||
import eu.trentorise.opendata.jackan.exceptions.CkanException;
|
||||
import eu.trentorise.opendata.jackan.model.CkanDataset;
|
||||
|
||||
|
||||
/**
|
||||
* The Class CkanCatalogueConfigurationsReader.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import java.io.Serializable;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
package org.gcube.datatransfer.resolver.geoportal.exporter;
|
||||
|
||||
import org.gcube.application.geoportaldatamapper.shared.FileReference;
|
||||
|
||||
public class FetchPDF {
|
||||
|
||||
private final int MAX_RETRY = 60;
|
||||
private FileReference fileRef;
|
||||
private String code;
|
||||
|
||||
private int attempt = 0;
|
||||
|
||||
public FetchPDF() {
|
||||
|
||||
}
|
||||
|
||||
public FetchPDF(FileReference fileRef, String code, int attempt) {
|
||||
super();
|
||||
this.fileRef = fileRef;
|
||||
this.code = code;
|
||||
this.attempt = attempt;
|
||||
}
|
||||
|
||||
public int getMAX_RETRY() {
|
||||
return MAX_RETRY;
|
||||
}
|
||||
|
||||
public FileReference getFileRef() {
|
||||
return fileRef;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public int getAttempt() {
|
||||
return attempt;
|
||||
}
|
||||
|
||||
public void setFileRef(FileReference fileRef) {
|
||||
this.fileRef = fileRef;
|
||||
}
|
||||
|
||||
public synchronized int incrementAttempt() {
|
||||
attempt++;
|
||||
return attempt;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("FetchPDF [MAX_RETRY=");
|
||||
builder.append(MAX_RETRY);
|
||||
builder.append(", fileRef=");
|
||||
builder.append(fileRef);
|
||||
builder.append(", code=");
|
||||
builder.append(code);
|
||||
builder.append(", attempt=");
|
||||
builder.append(attempt);
|
||||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
package org.gcube.datatransfer.resolver.geoportal.exporter;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GeoportalJsonResponse {
|
||||
|
||||
//State can be "OK" or "ERROR"
|
||||
String state;
|
||||
String url;
|
||||
String message;
|
||||
}
|
||||
|
|
@ -0,0 +1,171 @@
|
|||
package org.gcube.datatransfer.resolver.geoportal.exporter;
|
||||
|
||||
public class Geoportal_HTML_Page {
|
||||
|
||||
/**
|
||||
* Sets the HTML message.
|
||||
*
|
||||
* @param action the action
|
||||
* @param message the message
|
||||
* @param waiting the waiting
|
||||
* @return the string
|
||||
*/
|
||||
public static String entityHTMLMessage(String action, String message, boolean waiting, String viewPdfURL) {
|
||||
|
||||
//NB the images are located at https://data.d4science.net/qLix
|
||||
String newHTML = "<html>\n"
|
||||
+ "\n"
|
||||
+ " <head>\n"
|
||||
+ " <meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n"
|
||||
+ " <style>\n"
|
||||
+ " html,\n"
|
||||
+ " body {\n"
|
||||
+ " margin: 10px;\n"
|
||||
+ " width: 100%;\n"
|
||||
+ " height: 100%;\n"
|
||||
+ " display: table\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #content {\n"
|
||||
+ " position: absolute;\n"
|
||||
+ " left: 50%;\n"
|
||||
+ " top: 50%;\n"
|
||||
+ " -webkit-transform: translate(-50%, -50%);\n"
|
||||
+ " transform: translate(-50%, -50%);\n"
|
||||
+ " text-align: center;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #title-geo {\n"
|
||||
+ " font-weight: bold;\n"
|
||||
+ " color: black;\n"
|
||||
+ " font-size: 26px;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #message {\n"
|
||||
+ " color: gray;\n"
|
||||
+ " font-size: 24px;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " </style>\n"
|
||||
+ " <script type=\"text/javascript\">\n"
|
||||
+ " async function fetchPDF_URL() {\n"
|
||||
+ " try {\n"
|
||||
+ "\n"
|
||||
+ " const response = await fetch('"+viewPdfURL+"');\n"
|
||||
+ " console.log(\"polling response\");\n"
|
||||
+ " return response.json();\n"
|
||||
+ " } catch (error) {\n"
|
||||
+ " console.error(\"polling error: \" + error);\n"
|
||||
+ " showError(\"Error when exporting PDF :-(\");\n"
|
||||
+ " }\n"
|
||||
+ " }\n"
|
||||
+ " async function playPDFPoll() {\n"
|
||||
+ " const response_object = await fetchPDF_URL();\n"
|
||||
+ " try {\n"
|
||||
+ " console.log(\"json response \" + response_object);\n"
|
||||
+ " if (response_object.state === \"OK\") {\n"
|
||||
+ " if (!(response_object.url === null) && !(response_object.url === undefined)) {\n"
|
||||
+ " window.location.replace(response_object.url);\n"
|
||||
+ " } else {\n"
|
||||
+ " setTimeout(() => {\n"
|
||||
+ " playPDFPoll();\n"
|
||||
+ " }, 1000);\n"
|
||||
+ " }\n"
|
||||
+ " } else {\n"
|
||||
+ " showError(response_object.message);\n"
|
||||
+ " }\n"
|
||||
+ " } catch (error) {\n"
|
||||
+ " console.log(\"no json response \" + response_object);\n"
|
||||
+ " //console.log(\"error \" + error);\n"
|
||||
+ " showError(\"Error when exporting PDF :-(\");\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " function showError(error_msg) {\n"
|
||||
+ " let inner_div = document.getElementById(\"inner-content\");\n"
|
||||
+ " inner_div.innerHTML = error_msg;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " </script>\n"
|
||||
+ " <title>D4Science Geoportal - Action</title>\n"
|
||||
+ " </head>\n"
|
||||
+ "\n"
|
||||
+ " <body onload=\"playPDFPoll()\">";
|
||||
|
||||
newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />";
|
||||
|
||||
newHTML += "<div id=\"content\">";
|
||||
newHTML += "<p id=\"title-geo\">Geoportal</p><br />";
|
||||
newHTML += "<div id=\"inner-content\">";
|
||||
newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>";
|
||||
|
||||
if (waiting) {
|
||||
newHTML += "<img alt=\"D4Science Geoportal Loading Icon\" src=\"https://data.d4science.org/shub/E_a2Y1N2ZIaUhCVlE5R0JXNjJhVXVsTlNyNVJta2ZKZVFMaG52N2gxZm05VWJOb2RFTVBpa0pyV1hsUlg2WXJSTw==\"><br />";
|
||||
}
|
||||
|
||||
newHTML += "<br/><p id=\"message\">" + message + "</p>";
|
||||
newHTML += "</div></div></body></html>";
|
||||
|
||||
return newHTML;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets the HTML message.
|
||||
*
|
||||
* @param action the action
|
||||
* @param message the message
|
||||
* @param waiting the waiting
|
||||
* @return the string
|
||||
*/
|
||||
public static String getErrorPage(String action, String message) {
|
||||
|
||||
String newHTML = "<html>\n"
|
||||
+ "\n"
|
||||
+ " <head>\n"
|
||||
+ " <meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n"
|
||||
+ " <style>\n"
|
||||
+ " html,\n"
|
||||
+ " body {\n"
|
||||
+ " margin: 10px;\n"
|
||||
+ " width: 100%;\n"
|
||||
+ " height: 100%;\n"
|
||||
+ " display: table\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #content {\n"
|
||||
+ " position: absolute;\n"
|
||||
+ " left: 50%;\n"
|
||||
+ " top: 50%;\n"
|
||||
+ " -webkit-transform: translate(-50%, -50%);\n"
|
||||
+ " transform: translate(-50%, -50%);\n"
|
||||
+ " text-align: center;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #title-geo {\n"
|
||||
+ " font-weight: bold;\n"
|
||||
+ " color: black;\n"
|
||||
+ " font-size: 26px;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " #message {\n"
|
||||
+ " color: gray;\n"
|
||||
+ " font-size: 24px;\n"
|
||||
+ " }\n"
|
||||
+ "\n"
|
||||
+ " </style>\n"
|
||||
+ "</head>";
|
||||
|
||||
newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />";
|
||||
|
||||
newHTML += "<div id=\"content\">";
|
||||
newHTML += "<p id=\"title-geo\">Geoportal Exporter</p><br />";
|
||||
newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>";
|
||||
newHTML += "<br/><p id=\"message\">" + message + "</p>";
|
||||
newHTML += "</div></body></html>";
|
||||
|
||||
return newHTML;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -19,14 +19,19 @@ import javax.ws.rs.core.MultivaluedMap;
|
|||
import javax.ws.rs.core.UriBuilder;
|
||||
import javax.ws.rs.ext.Provider;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.authorization.utils.manager.SecretManager;
|
||||
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
|
||||
import org.gcube.common.authorization.utils.secret.GCubeSecret;
|
||||
import org.gcube.common.authorization.utils.secret.JWTSecret;
|
||||
import org.gcube.common.authorization.utils.secret.Secret;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.datatransfer.resolver.ConstantsResolver;
|
||||
import org.gcube.datatransfer.resolver.UriResolverServices;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
/**
|
||||
* The Class RequestHandler.
|
||||
*
|
||||
|
|
@ -44,7 +49,8 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
|
||||
private static final Logger log = LoggerFactory.getLogger(RequestHandler.class);
|
||||
|
||||
@Context ServletContext context;
|
||||
@Context
|
||||
ServletContext context;
|
||||
|
||||
@Context
|
||||
HttpServletRequest webRequest;
|
||||
|
|
@ -55,12 +61,23 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
@Context
|
||||
ResourceContext resourceContext;
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.ws.rs.container.ContainerRequestFilter#filter(javax.ws.rs.container.ContainerRequestContext)
|
||||
/**
|
||||
* Filter.
|
||||
*
|
||||
* @param reqContext the req context
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* javax.ws.rs.container.ContainerRequestFilter#filter(javax.ws.rs.container.
|
||||
* ContainerRequestContext)
|
||||
*/
|
||||
@Override
|
||||
public void filter(ContainerRequestContext reqContext) throws IOException {
|
||||
log.info(RequestHandler.class.getSimpleName() +" Request called");
|
||||
log.debug(RequestHandler.class.getSimpleName() + " Request called");
|
||||
setSecretManager(reqContext);
|
||||
|
||||
if (SecurityTokenProvider.instance.get() == null)
|
||||
SecurityTokenProvider.instance.set(context.getInitParameter(ROOT_APP_TOKEN));
|
||||
|
|
@ -68,7 +85,7 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
if (ScopeProvider.instance.get() == null)
|
||||
ScopeProvider.instance.set(context.getInitParameter(ROOT_SCOPE));
|
||||
|
||||
log.info("Token and Scope Provider set called");
|
||||
log.debug("Token and Scope Provider set called");
|
||||
|
||||
List<String> listOfPath = UriResolverServices.getInstance().getListOfResourcePath(application.getClasses());
|
||||
log.debug("The resources are: {}", listOfPath);
|
||||
|
|
@ -77,15 +94,13 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
log.debug("The path is: {}", path);
|
||||
|
||||
// HOW TO READ THE QUERY STRING
|
||||
/*MultivaluedMap<String, String> queryParameters = reqContext.getUriInfo().getQueryParameters();
|
||||
String queryString = "";
|
||||
try {
|
||||
queryString = Util.toQueryString(queryParameters);
|
||||
}catch (Exception e) {
|
||||
//silent
|
||||
log.warn("Error on reading the query string, trying to continue...");
|
||||
}
|
||||
log.debug("The query string is: {}", queryString);
|
||||
/*
|
||||
* MultivaluedMap<String, String> queryParameters =
|
||||
* reqContext.getUriInfo().getQueryParameters(); String queryString = ""; try {
|
||||
* queryString = Util.toQueryString(queryParameters); }catch (Exception e) {
|
||||
* //silent
|
||||
* log.warn("Error on reading the query string, trying to continue..."); }
|
||||
* log.debug("The query string is: {}", queryString);
|
||||
*/
|
||||
|
||||
if (path == null || path.isEmpty()) {
|
||||
|
|
@ -118,15 +133,18 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
|
||||
// Try to manage as Catalogue Request ctlg, ctlg-p, etc.
|
||||
if (!resourceToRedirectFound) {
|
||||
log.info("Trying to manage as hard-coded case among cases: {}", Arrays.asList(ConstantsResolver.resourcesHardCoded).toString());
|
||||
log.info("Trying to manage as hard-coded case among cases: {}",
|
||||
Arrays.asList(ConstantsResolver.resourcesHardCoded).toString());
|
||||
String[] hardCode = ConstantsResolver.resourcesHardCoded;
|
||||
|
||||
for (String resource : hardCode) {
|
||||
log.trace("Is requested resource '{}' starting with hard-coded resource '{}'?",requestedResourceName,resource);
|
||||
log.trace("Is requested resource '{}' starting with hard-coded resource '{}'?",
|
||||
requestedResourceName, resource);
|
||||
if (requestedResourceName.startsWith(resource)) {
|
||||
log.trace("Yes it starts!");
|
||||
candidateResource = resource;
|
||||
log.info("The candidate resource to manage the request is the hard-coded resource: {}",candidateResource);
|
||||
log.info("The candidate resource to manage the request is the hard-coded resource: {}",
|
||||
candidateResource);
|
||||
resourceToRedirectFound = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -135,7 +153,9 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
}
|
||||
|
||||
} else
|
||||
log.warn("It was not possible to get the resource name from the splitted path {}. No action performed", path);
|
||||
log.warn(
|
||||
"It was not possible to get the resource name from the splitted path {}. No action performed",
|
||||
path);
|
||||
} else {
|
||||
log.warn("It was not possible to split the path {}. No action performed", path);
|
||||
}
|
||||
|
|
@ -144,12 +164,14 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
}
|
||||
|
||||
if (resourceToRedirectFound) {
|
||||
log.debug("The input request '{}' can be managed by the service '{}'. No redirect performed", path, candidateResource);
|
||||
log.debug("The input request '{}' can be managed by the service '{}'. No redirect performed", path,
|
||||
candidateResource);
|
||||
} else {
|
||||
log.info("No resource/service found to manage the input request '{}'", path);
|
||||
String newPath = String.format("/%s/%s", ConstantsResolver.defaultServiceToRedirect, path);
|
||||
// log.debug("The path to redirect is '{}'", newPath);
|
||||
//URI newRequestURI = reqContext.getUriInfo().getBaseUriBuilder().path(newPath).build();
|
||||
// URI newRequestURI =
|
||||
// reqContext.getUriInfo().getBaseUriBuilder().path(newPath).build();
|
||||
UriBuilder uriBuilder = reqContext.getUriInfo().getBaseUriBuilder();
|
||||
// ADDING THE INPUT QUERY STRING
|
||||
MultivaluedMap<String, String> queryParameters = reqContext.getUriInfo().getQueryParameters();
|
||||
|
|
@ -165,17 +187,69 @@ public class RequestHandler implements ContainerRequestFilter, ContainerResponse
|
|||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see javax.ws.rs.container.ContainerResponseFilter#filter(javax.ws.rs.container.ContainerRequestContext, javax.ws.rs.container.ContainerResponseContext)
|
||||
/**
|
||||
* Filter.
|
||||
*
|
||||
* @param requestContext the request context
|
||||
* @param responseContext the response context
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* javax.ws.rs.container.ContainerResponseFilter#filter(javax.ws.rs.container.
|
||||
* ContainerRequestContext, javax.ws.rs.container.ContainerResponseContext)
|
||||
*/
|
||||
@Override
|
||||
public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
|
||||
throws IOException {
|
||||
log.info(RequestHandler.class.getSimpleName() +" Response called");
|
||||
log.debug(RequestHandler.class.getSimpleName() + " Response called");
|
||||
SecurityTokenProvider.instance.reset();
|
||||
ScopeProvider.instance.reset();
|
||||
log.info("Token and Scope Provider reset called");
|
||||
log.debug("Token and Scope Provider reset called");
|
||||
resetScretManager(requestContext, responseContext);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset scret manager.
|
||||
*
|
||||
* @param requestContext the request context
|
||||
* @param responseContext the response context
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
private void resetScretManager(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
|
||||
throws IOException {
|
||||
log.debug("SecreteManager instance remove");
|
||||
SecretManagerProvider.instance.remove();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the secret manager.
|
||||
*
|
||||
* @param requestContext the new secret manager
|
||||
* @throws IOException Signals that an I/O exception has occurred.
|
||||
*/
|
||||
private void setSecretManager(ContainerRequestContext requestContext) throws IOException {
|
||||
log.debug("setSecretManager called");
|
||||
|
||||
SecretManagerProvider.instance.remove();
|
||||
SecretManager secretManager = new SecretManager();
|
||||
|
||||
String token = AccessTokenProvider.instance.get();
|
||||
if (token != null) {
|
||||
Secret secret = new JWTSecret(token);
|
||||
secretManager.addSecret(secret);
|
||||
}
|
||||
|
||||
token = SecurityTokenProvider.instance.get();
|
||||
if (token != null) {
|
||||
Secret secret = new GCubeSecret(token);
|
||||
secretManager.addSecret(secret);
|
||||
}
|
||||
|
||||
SecretManagerProvider.instance.set(secretManager);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -22,7 +22,8 @@ import org.apache.commons.codec.binary.Base64;
|
|||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.common.scope.impl.ScopeBean;
|
||||
import org.gcube.common.scope.impl.ScopeBean.Type;
|
||||
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
import org.gcube.datacatalogue.utillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET;
|
||||
import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
|
||||
import org.gcube.datatransfer.resolver.ConstantsResolver;
|
||||
import org.gcube.datatransfer.resolver.caches.LoadingMapOfDetachedVRE;
|
||||
import org.gcube.datatransfer.resolver.caches.LoadingMapOfScopeCache;
|
||||
|
|
@ -42,8 +43,6 @@ import org.slf4j.LoggerFactory;
|
|||
|
||||
import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
|
||||
|
||||
import eu.trentorise.opendata.jackan.model.CkanDataset;
|
||||
|
||||
/**
|
||||
* The CatalogueResolver is able to get/resolve a link to a "Catalogue Entity"
|
||||
* stored in one of the D4Science Catalogue's instances. A Catalogue Entity is
|
||||
|
|
@ -247,7 +246,7 @@ public class CatalogueResolver {
|
|||
scopeBean = LoadingMapOfScopeCache.get(scopeName);
|
||||
} catch (ExecutionException | InvalidCacheLoadException e) {
|
||||
logger.error(
|
||||
"Error on getting the fullscope from cache for scopeName {}. Tryng to load it from DetachedRE",
|
||||
"Error on getting the fullscope from cache for scopeName {}. Trying to load it from DetachedRE",
|
||||
scopeName);
|
||||
|
||||
boolean isScopeDetached = false;
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@ public class GeonetworkResolver {
|
|||
|
||||
// SPECIFIC HANDLER FOR GEONETWORK REQUEST: /srv/en/mef.export
|
||||
if (remainPath != null && remainPath.compareTo(SRV_EN_MEF_EXPORT) == 0) {
|
||||
logger.info("In case of mef.export, perfoming a custom handler");
|
||||
logger.info("In case of mef.export, performing a custom handler");
|
||||
gnCSWlURL = geonetworkUrl + SRV_EN_MEF_EXPORT;
|
||||
String[] uuidValues = req.getParameterValues(UUID);
|
||||
if (uuidValues != null) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,502 @@
|
|||
package org.gcube.datatransfer.resolver.services;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
import javax.ws.rs.core.StreamingOutput;
|
||||
|
||||
import org.gcube.application.geoportalcommon.GeoportalCommon;
|
||||
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences;
|
||||
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences.SHARE_LINK_TO;
|
||||
import org.gcube.application.geoportaldatamapper.exporter.Geoportal_PDF_Exporter;
|
||||
import org.gcube.application.geoportaldatamapper.shared.ExporterProjectSource;
|
||||
import org.gcube.application.geoportaldatamapper.shared.FileReference;
|
||||
import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.gcube.common.authorization.utils.manager.SecretManager;
|
||||
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
|
||||
import org.gcube.common.authorization.utils.user.User;
|
||||
import org.gcube.datatransfer.resolver.ConstantsResolver;
|
||||
import org.gcube.datatransfer.resolver.geoportal.exporter.FetchPDF;
|
||||
import org.gcube.datatransfer.resolver.geoportal.exporter.GeoportalJsonResponse;
|
||||
import org.gcube.datatransfer.resolver.geoportal.exporter.Geoportal_HTML_Page;
|
||||
import org.gcube.datatransfer.resolver.services.error.ExceptionManager;
|
||||
import org.gcube.datatransfer.resolver.services.exceptions.BadRequestException;
|
||||
import org.gcube.datatransfer.resolver.util.SingleFileStreamingOutput;
|
||||
import org.gcube.datatransfer.resolver.util.Util;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class GeoportalExporter.
|
||||
*
|
||||
* The Geoportal Exporter provides the facilities to export GIS projects stored in
|
||||
* the Geoportal system provided via D4Science VREs.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 16, 2024
|
||||
*/
|
||||
@Path("geoportal")
|
||||
public class GeoportalExporter {
|
||||
|
||||
private static final String JOB_CODE = "jobCode";
|
||||
|
||||
public static final String EXPORT_TYPE = "type";
|
||||
|
||||
public static final String PATH_PROJECT_ID = GeoportalResolver.PATH_PROJECT_ID;
|
||||
public static final String PATH_USECASE_ID = GeoportalResolver.PATH_USECASE_ID;
|
||||
public static final String PATH_VRE_NAME = GeoportalResolver.PATH_VRE_NAME;
|
||||
|
||||
public static final String QUERY_PARAMETER_AS_URL = "as-url";
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(GeoportalExporter.class);
|
||||
private static String helpURI = "https://wiki.gcube-system.org/gcube/URI_Resolver#Geoportal_Resolver";
|
||||
|
||||
private static LinkedHashMap<String, FetchPDF> map = new LinkedHashMap<String, FetchPDF>();
|
||||
|
||||
/**
|
||||
* The Enum ACCEPTED_EXPORT_TYPE.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Apr 22, 2024
|
||||
*/
|
||||
public enum ACCEPTED_EXPORT_TYPE {
|
||||
pdf
|
||||
}
|
||||
|
||||
/**
|
||||
* Export.
|
||||
*
|
||||
* @param req the req
|
||||
* @param export_type the export type. Must be a value of the enum
|
||||
* {#ACCEPTED_EXPORT_TYPE}
|
||||
* @param ucdID the ucd ID
|
||||
* @param projectID the project ID
|
||||
* @param asURL the as URL. If true returns the project exported as an URL
|
||||
* in the response
|
||||
* @return the response. Can be an URL or a Stream of the project exported.
|
||||
* @throws WebApplicationException the web application exception
|
||||
*/
|
||||
@GET
|
||||
@Path("/export/{type}/{usecase_id}/{project_id}")
|
||||
@Produces({ MediaType.TEXT_HTML, MediaType.TEXT_PLAIN, MediaType.APPLICATION_OCTET_STREAM })
|
||||
public Response export(@Context HttpServletRequest req, @PathParam(EXPORT_TYPE) String export_type,
|
||||
@PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID,
|
||||
@QueryParam(QUERY_PARAMETER_AS_URL) @Nullable String asURL) throws WebApplicationException {
|
||||
|
||||
String userAgentName = req.getHeader("User-Agent");
|
||||
|
||||
LOG.info(this.getClass().getSimpleName() + " export - GET starts...");
|
||||
LOG.info("Params: [" + EXPORT_TYPE + ": {}, " + PATH_USECASE_ID + ": {}, " + PATH_PROJECT_ID + ": {}, "
|
||||
+ QUERY_PARAMETER_AS_URL + ": {}]", export_type, ucdID, projectID, asURL);
|
||||
|
||||
checkPathParameterNotNull(req, EXPORT_TYPE, export_type);
|
||||
checkPathParameterNotNull(req, PATH_USECASE_ID, ucdID);
|
||||
checkPathParameterNotNull(req, PATH_PROJECT_ID, projectID);
|
||||
|
||||
boolean getAsURL = false;
|
||||
try {
|
||||
getAsURL = Boolean.parseBoolean(asURL);
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
LOG.info("getAsURL is: {}", getAsURL);
|
||||
|
||||
checkExportType(req, export_type);
|
||||
|
||||
boolean checked = false;
|
||||
|
||||
SecretManager secreteManager = SecretManagerProvider.instance.get();
|
||||
final String context = secreteManager.getContext();
|
||||
if (context == null) {
|
||||
throw ExceptionManager.forbiddenException(req, "Cannot determine context (the scope)", this.getClass(),
|
||||
helpURI);
|
||||
}
|
||||
|
||||
final org.gcube.common.authorization.utils.user.User user = secreteManager.getUser();
|
||||
if (user == null) {
|
||||
throw ExceptionManager.forbiddenException(req, "Cannot determine user", this.getClass(), helpURI);
|
||||
}
|
||||
|
||||
LOG.info("Identified caller {} in context {}", user.getUsername(), context);
|
||||
|
||||
try {
|
||||
Geoportal_PDF_Exporter pdfExporter = new Geoportal_PDF_Exporter();
|
||||
checked = pdfExporter.checkConfig();
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on performing export", e);
|
||||
throw ExceptionManager
|
||||
.internalErrorException(req,
|
||||
"Error the " + Geoportal_PDF_Exporter.class.getSimpleName()
|
||||
+ " seems to be not configured in the context: " + context,
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
// if the configuration exists in the context
|
||||
if (checked) {
|
||||
if (getAsURL) {
|
||||
try {
|
||||
LOG.info("Serving request as getAsURL...");
|
||||
FileReference pdfRef = exportAsPDF(req, ucdID, projectID, null, context, user);
|
||||
String theURL = pdfRef.getStorageVolatileURL().toString();
|
||||
LOG.info("returning URL {}", theURL);
|
||||
return Response.ok(theURL).build();
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on performing export by url", e);
|
||||
throw ExceptionManager.internalErrorException(req,
|
||||
"Sorry, error occurred when generating the project URL. Error is: " + e.getMessage(),
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
if (userAgentName != null) {
|
||||
LOG.info("Serving request as User-Agent {}", userAgentName);
|
||||
final String jobCode = ucdID + "_" + projectID + "_" + System.currentTimeMillis();
|
||||
final FetchPDF fetchPDF = new FetchPDF(null, jobCode, 0);
|
||||
map.put(jobCode, fetchPDF);
|
||||
try {
|
||||
Thread t = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
LOG.info("exportAsPDF called in thread...");
|
||||
FileReference pdfRef = exportAsPDF(req, ucdID, projectID, null, context, user);
|
||||
LOG.info("exportAsPDF setFileRef in thread for code: " + jobCode);
|
||||
fetchPDF.setFileRef(pdfRef);
|
||||
map.put(jobCode, fetchPDF);
|
||||
}
|
||||
|
||||
};
|
||||
t.start();
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on performing export in thread", e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
String serviceViewPDF_URL = String.format("%s/%s/view/%s", Util.getServerURL(req), "geoportal",
|
||||
jobCode);
|
||||
|
||||
String entity = Geoportal_HTML_Page.entityHTMLMessage("Exporting as PDF...",
|
||||
"The project with id: " + projectID, true, serviceViewPDF_URL);
|
||||
|
||||
LOG.info("returning waiting HTML page");
|
||||
return Response.ok(entity).encoding("UTF-8").header(ConstantsResolver.CONTENT_TYPE, "text/html")
|
||||
.build();
|
||||
} else {
|
||||
LOG.info("Serving request as client...");
|
||||
FileReference pdfRef = exportAsPDF(req, ucdID, projectID, null, context, user);
|
||||
// returning as stream
|
||||
InputStream input = pdfRef.getStorageVolatileURL().openStream();
|
||||
StreamingOutput so = new SingleFileStreamingOutput(input);
|
||||
LOG.info("returning project streaming...");
|
||||
return Response.ok(so)
|
||||
.header(ConstantsResolver.CONTENT_DISPOSITION,
|
||||
"inline; filename=\"" + pdfRef.getFileName() + "\"")
|
||||
.header("Content-Type", pdfRef.getContentType()).build();
|
||||
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on performing export", e);
|
||||
throw ExceptionManager.internalErrorException(req, "Sorry, error occurred when exporting the project",
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
} else {
|
||||
return Response
|
||||
.status(Status.NOT_FOUND).entity(GeoportalExporter.class.getSimpleName()
|
||||
+ "seems to be not configured in the context: " + context)
|
||||
.type(MediaType.TEXT_PLAIN).build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Healthcheck. Checks if the export facility is configured in the context (i.e.
|
||||
* the scope read from input token).
|
||||
*
|
||||
* @param req the req
|
||||
* @param export_type the export type
|
||||
* @return an object of type {#GeoportalJsonResponse) that contains the response
|
||||
* @throws WebApplicationException the web application exception
|
||||
*/
|
||||
@GET
|
||||
@Path("/export/{type}/healthcheck")
|
||||
@Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN, MediaType.TEXT_HTML })
|
||||
public Response healthcheck(@Context HttpServletRequest req, @PathParam(EXPORT_TYPE) String export_type)
|
||||
throws WebApplicationException {
|
||||
|
||||
LOG.info(this.getClass().getSimpleName() + " healthcheck - GET starts...");
|
||||
LOG.debug("param is: exportType: {}", export_type);
|
||||
|
||||
checkPathParameterNotNull(req, EXPORT_TYPE, export_type);
|
||||
|
||||
checkExportType(req, export_type);
|
||||
|
||||
try {
|
||||
|
||||
SecretManager cm = SecretManagerProvider.instance.get();
|
||||
String context = cm.getContext();
|
||||
if (context == null) {
|
||||
throw ExceptionManager.forbiddenException(req, "Cannot determine context (the scope)", this.getClass(),
|
||||
helpURI);
|
||||
}
|
||||
org.gcube.common.authorization.utils.user.User user = cm.getUser();
|
||||
LOG.info("Identified caller {} in context {}", user.getUsername(), context);
|
||||
|
||||
Geoportal_PDF_Exporter pdfExporter = new Geoportal_PDF_Exporter();
|
||||
boolean checked = pdfExporter.checkConfig();
|
||||
GeoportalJsonResponse theJson = new GeoportalJsonResponse();
|
||||
if (checked) {
|
||||
theJson.setState("OK");
|
||||
theJson.setMessage(GeoportalExporter.class.getSimpleName() + " Config OK in the context: " + context);
|
||||
String jsonResponse = responseToString(theJson);
|
||||
return Response.ok(jsonResponse).build();
|
||||
} else {
|
||||
theJson.setState("KO");
|
||||
theJson.setMessage(GeoportalExporter.class.getSimpleName() + " Config "
|
||||
+ Status.NOT_FOUND.getReasonPhrase() + " in the context: " + context);
|
||||
String jsonResponse = responseToString(theJson);
|
||||
return Response.status(Status.NOT_FOUND).entity(jsonResponse).build();
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on performing healthcheck", e);
|
||||
throw ExceptionManager.internalErrorException(req,
|
||||
"Error when performing " + GeoportalExporter.class.getSimpleName() + " healthcheck",
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* View job. Check the job export status.
|
||||
*
|
||||
* @param req the req
|
||||
* @param jobCode the job code. The job ID assigned by export facility that
|
||||
* returns a waiting HTML page
|
||||
* @return the response. It is a {#GeoportalJsonResponse} with the status of the
|
||||
* job. An export job completed contains the URL of the project
|
||||
* exported.
|
||||
* @throws WebApplicationException the web application exception
|
||||
*/
|
||||
@GET
|
||||
@Path("/view/{jobCode}")
|
||||
@Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_HTML, MediaType.TEXT_PLAIN })
|
||||
public Response viewJob(@Context HttpServletRequest req, @PathParam(JOB_CODE) String jobCode)
|
||||
throws WebApplicationException {
|
||||
|
||||
LOG.info(this.getClass().getSimpleName() + " viewPDF - GET starts...");
|
||||
LOG.info("viewJob param " + JOB_CODE + ": {}", jobCode);
|
||||
|
||||
FetchPDF fetchedPDF = map.get(jobCode);
|
||||
LOG.info("viewJob FileReference at code {} is {}", jobCode, fetchedPDF);
|
||||
|
||||
String theURL = null;
|
||||
String messagge = null;
|
||||
String state = null;
|
||||
|
||||
GeoportalJsonResponse theJson = new GeoportalJsonResponse();
|
||||
theJson.setState(state);
|
||||
theJson.setUrl(theURL);
|
||||
theJson.setMessage(messagge);
|
||||
|
||||
String jsonReponse = null;
|
||||
|
||||
if (fetchedPDF == null) {
|
||||
theJson.setState(Status.NOT_FOUND.getReasonPhrase());
|
||||
theJson.setMessage("No job found with id: " + jobCode);
|
||||
try {
|
||||
jsonReponse = responseToString(theJson);
|
||||
LOG.info("viewJob returning not found: " + jsonReponse);
|
||||
return Response.status(Status.NOT_FOUND).entity(jsonReponse).build();
|
||||
} catch (JsonProcessingException e) {
|
||||
throw ExceptionManager.internalErrorException(req, "Error when returning "
|
||||
+ GeoportalExporter.class.getSimpleName() + " not found job for " + jobCode, this.getClass(),
|
||||
helpURI);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
try {
|
||||
// File PDF is not available
|
||||
if (fetchedPDF.getFileRef() == null) {
|
||||
int attempt = fetchedPDF.incrementAttempt();
|
||||
if (fetchedPDF.getAttempt() < fetchedPDF.getMAX_RETRY()) {
|
||||
state = "OK";
|
||||
messagge = "Attempt #" + attempt;
|
||||
} else {
|
||||
state = "ERROR";
|
||||
messagge = "Sorry, an error occurred trying to create the PDF. Max retries reached";
|
||||
theJson.setState(state);
|
||||
}
|
||||
// updating map status
|
||||
map.put(jobCode, fetchedPDF);
|
||||
} else {
|
||||
// File PDF is available
|
||||
state = "OK";
|
||||
theURL = fetchedPDF.getFileRef().getStorageVolatileURL().toString();
|
||||
messagge = "PDF created correclty";
|
||||
// removing from map
|
||||
map.put(jobCode, null);
|
||||
}
|
||||
|
||||
theJson.setState(state);
|
||||
theJson.setUrl(theURL);
|
||||
theJson.setMessage(messagge);
|
||||
try {
|
||||
jsonReponse = responseToString(theJson);
|
||||
LOG.info("viewJob returning OK: " + jsonReponse);
|
||||
return Response.ok(jsonReponse).build();
|
||||
} catch (JsonProcessingException e) {
|
||||
throw ExceptionManager.internalErrorException(req,
|
||||
"Error when returning " + GeoportalExporter.class.getSimpleName() + " response for " + jobCode,
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on checking job", e);
|
||||
throw ExceptionManager.internalErrorException(req,
|
||||
"Error when checking " + GeoportalExporter.class.getSimpleName() + " job view for " + jobCode,
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public String responseToString(GeoportalJsonResponse jsonResponse) throws JsonProcessingException {
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
return mapper.writeValueAsString(jsonResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check path parameter not null.
|
||||
*
|
||||
* @param req the req
|
||||
* @param parameter the parameter
|
||||
* @param value the value
|
||||
* @throws BadRequestException the bad request exception
|
||||
*/
|
||||
public void checkPathParameterNotNull(HttpServletRequest req, String parameter, String value)
|
||||
throws BadRequestException {
|
||||
if (value == null || value.isEmpty()) {
|
||||
LOG.error("The path parameter {} not found or empty in the path", parameter);
|
||||
throw ExceptionManager.badRequestException(req,
|
||||
"Mandatory path parameter " + parameter + " not found or empty", this.getClass(), helpURI);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check export type.
|
||||
*
|
||||
* @param req the req
|
||||
* @param export_type the export type
|
||||
* @return the accepted export type
|
||||
* @throws BadRequestException the bad request exception
|
||||
*/
|
||||
public ACCEPTED_EXPORT_TYPE checkExportType(HttpServletRequest req, String export_type) throws BadRequestException {
|
||||
ACCEPTED_EXPORT_TYPE exportType;
|
||||
try {
|
||||
exportType = ACCEPTED_EXPORT_TYPE.valueOf(export_type);
|
||||
} catch (Exception e) {
|
||||
throw ExceptionManager
|
||||
.wrongParameterException(req,
|
||||
"The path parameter " + EXPORT_TYPE + " has a bad value: " + export_type
|
||||
+ ". It must be value of " + ACCEPTED_EXPORT_TYPE.values(),
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
|
||||
return exportType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Export as PDF.
|
||||
*
|
||||
* @param req the req
|
||||
* @param profileID the profile ID
|
||||
* @param projectID the project ID
|
||||
* @param profileTitle the profile title
|
||||
* @param context the context
|
||||
* @param user the user
|
||||
* @return the file reference
|
||||
* @throws WebApplicationException the web application exception
|
||||
*/
|
||||
public FileReference exportAsPDF(HttpServletRequest req, String profileID, String projectID, String profileTitle,
|
||||
String context, User user) throws WebApplicationException {
|
||||
LOG.info("exportAsPDF for profileID: " + profileID + ", projectID: " + projectID + "called");
|
||||
LOG.info("exportAsPDF context is {}, user is {}", context, user);
|
||||
|
||||
FileReference pdfRef = null;
|
||||
try {
|
||||
|
||||
Geoportal_PDF_Exporter gpdfe = new Geoportal_PDF_Exporter();
|
||||
ExporterProjectSource exportSource = new ExporterProjectSource();
|
||||
exportSource.setProfileID(profileID);
|
||||
exportSource.setProfileTitle(profileTitle);
|
||||
exportSource.setProjectID(projectID);
|
||||
exportSource.setScope(context);
|
||||
|
||||
GeoportalItemReferences geoportalItemReferences = new GeoportalItemReferences(projectID, profileID,
|
||||
SHARE_LINK_TO.DATA_VIEWER);
|
||||
GeoportalItemReferences gir = getPublicLinksFor(geoportalItemReferences, context);
|
||||
|
||||
if (user.isApplication()) {
|
||||
exportSource.setGisLink(gir.getOpenLink().getShortURL());
|
||||
exportSource.setAccountname(null);
|
||||
} else {
|
||||
exportSource.setGisLink(gir.getRestrictedLink().getShortURL());
|
||||
exportSource.setAccountname(user.getUsername());
|
||||
}
|
||||
|
||||
pdfRef = gpdfe.createPDFFile(exportSource);
|
||||
|
||||
} catch (Exception e1) {
|
||||
LOG.error("Error occurred when exporting the project", e1);
|
||||
throw ExceptionManager.internalErrorException(req, "Sorry, an error occurred when exporting the project",
|
||||
this.getClass(), helpURI);
|
||||
}
|
||||
return pdfRef;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the public links for.
|
||||
*
|
||||
* @param item the item
|
||||
* @param context the context
|
||||
* @return the public links for
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public GeoportalItemReferences getPublicLinksFor(GeoportalItemReferences item, String context) throws Exception {
|
||||
LOG.info("getPublicLinksFor called for: " + item);
|
||||
|
||||
try {
|
||||
|
||||
if (item == null)
|
||||
throw new Exception("Bad request, the item is null");
|
||||
|
||||
if (item.getProjectID() == null)
|
||||
throw new Exception("Bad request, the projectID is null");
|
||||
|
||||
if (item.getProfileID() == null)
|
||||
throw new Exception("Bad request, the profileID is null");
|
||||
|
||||
GeoportalCommon gc = new GeoportalCommon();
|
||||
return gc.getPublicLinksFor(context, item, true);
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on getPublicLinksFor for: " + item, e);
|
||||
throw new Exception("Share link not available for this item. Try later or contact the support. Error: "
|
||||
+ e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -47,18 +47,18 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
|
|||
*
|
||||
* Apr 03, 2024
|
||||
*/
|
||||
@Path("/geo")
|
||||
@Path("geo")
|
||||
public class GeoportalResolver {
|
||||
|
||||
public static final String GEO_DE = "de"; // data-entry
|
||||
public static final String GEO = "geo"; // geoportal
|
||||
public static final String GEO_DV = "dv"; // data-viewer
|
||||
|
||||
private static final String QP_RESOLVE_AS = "res";
|
||||
private static final String PATH_PROJECT_ID = "project_id";
|
||||
private static final String PATH_USECASE_ID = "usecase_id";
|
||||
private static final String PATH_VRE_NAME = "vre_name";
|
||||
private static final String PATH_TARGET_APP = "targetAppId";
|
||||
public static final String QP_RESOLVE_AS = "res";
|
||||
public static final String PATH_PROJECT_ID = "project_id";
|
||||
public static final String PATH_USECASE_ID = "usecase_id";
|
||||
public static final String PATH_VRE_NAME = "vre_name";
|
||||
public static final String PATH_TARGET_APP = "targetAppId";
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(GeoportalResolver.class);
|
||||
private static String helpURI = "https://wiki.gcube-system.org/gcube/URI_Resolver#Geoportal_Resolver";
|
||||
|
|
@ -70,7 +70,7 @@ public class GeoportalResolver {
|
|||
*
|
||||
* Mar 24, 2023
|
||||
*/
|
||||
private static enum RESOLVE_AS {
|
||||
public static enum RESOLVE_AS {
|
||||
PUBLIC, PRIVATE
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,119 @@
|
|||
/**
|
||||
*
|
||||
*/
|
||||
package org.gcube.datatransfer.resolver.services;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.StreamingOutput;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.gcube.datatransfer.resolver.services.error.ExceptionManager;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* The Class StaticImageController.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* May 2, 2024
|
||||
*/
|
||||
@Path("img")
|
||||
public class StaticImageController {
|
||||
|
||||
private static Logger logger = LoggerFactory.getLogger(StaticImageController.class);
|
||||
|
||||
// /**
|
||||
// * To doc.
|
||||
// *
|
||||
// * @param req the req
|
||||
// * @return the input stream
|
||||
// * @throws WebApplicationException the web application exception
|
||||
// */
|
||||
// @GET
|
||||
// @Path("/{any: .*}")
|
||||
// @Produces({ "image/png", "image/jpg", "image/gif" })
|
||||
// public InputStream toFile(@Context HttpServletRequest req) throws WebApplicationException {
|
||||
// logger.info(StaticImageController.class.getSimpleName() + " toFile called");
|
||||
//
|
||||
// String pathInfo = req.getPathInfo();
|
||||
// logger.debug("pathInfo {}", pathInfo);
|
||||
// try {
|
||||
//
|
||||
// logger.info("going to {}", pathInfo);
|
||||
//
|
||||
// String realPath = req.getServletContext().getRealPath(pathInfo);
|
||||
// return new FileInputStream(new File(realPath));
|
||||
//
|
||||
// } catch (Exception e) {
|
||||
//
|
||||
// if (!(e instanceof WebApplicationException)) {
|
||||
// // UNEXPECTED EXCEPTION managing it as WebApplicationException
|
||||
// String error = pathInfo + " not found. Please, contact the support!";
|
||||
// throw ExceptionManager.internalErrorException(req, error, this.getClass(), null);
|
||||
// }
|
||||
// // ALREADY MANAGED AS WebApplicationException
|
||||
// logger.error("Exception:", e);
|
||||
// throw (WebApplicationException) e;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
|
||||
/**
|
||||
* To file out.
|
||||
*
|
||||
* @param req the req
|
||||
* @return the streaming output
|
||||
* @throws WebApplicationException the web application exception
|
||||
*/
|
||||
@GET
|
||||
@Path("/{any: .*}")
|
||||
@Produces({ "image/png", "image/jpg", "image/gif" })
|
||||
public StreamingOutput toFileOut(@Context HttpServletRequest req) throws WebApplicationException {
|
||||
logger.info(StaticImageController.class.getSimpleName() + " toFileOut called");
|
||||
String pathInfo = req.getPathInfo();
|
||||
logger.debug("pathInfo {}", pathInfo);
|
||||
try {
|
||||
final String realPath = req.getServletContext().getRealPath(pathInfo);
|
||||
logger.info("going to {}", pathInfo);
|
||||
return new StreamingOutput() {
|
||||
@Override
|
||||
public void write(OutputStream os) throws IOException, WebApplicationException {
|
||||
FileInputStream fileIS = null;
|
||||
try {
|
||||
fileIS = new FileInputStream(new File(realPath));
|
||||
IOUtils.copy(fileIS, os);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
if(fileIS!=null)
|
||||
fileIS.close();
|
||||
} catch (Exception e2) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
} catch (Exception e) {
|
||||
|
||||
if (!(e instanceof WebApplicationException)) {
|
||||
// UNEXPECTED EXCEPTION managing it as WebApplicationException
|
||||
String error = pathInfo + " not found. Please, contact the support!";
|
||||
throw ExceptionManager.internalErrorException(req, error, this.getClass(), null);
|
||||
}
|
||||
// ALREADY MANAGED AS WebApplicationException
|
||||
logger.error("Exception:", e);
|
||||
throw (WebApplicationException) e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14,10 +14,10 @@ import javax.ws.rs.WebApplicationException;
|
|||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.Response.ResponseBuilder;
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
import javax.ws.rs.core.StreamingOutput;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.http.HttpStatus;
|
||||
import org.gcube.contentmanagement.blobstorage.resource.MyFile;
|
||||
import org.gcube.contentmanagement.blobstorage.service.IClient;
|
||||
import org.gcube.contentmanager.storageclient.wrapper.AccessType;
|
||||
|
|
@ -169,6 +169,9 @@ public class StorageIDResolver {
|
|||
//Reading the content size
|
||||
size = metaFile.getSize();
|
||||
LOG.debug("Read size {} from {}", size, StorageMetadataFile.class.getSimpleName());
|
||||
}else {
|
||||
//Bug fixing #28276
|
||||
throw ExceptionManager.notFoundException(httpRequest, "Error on accessing the "+STORAGE_ID+ " '"+storageId+"'. Is it a valid id?", StorageIDResolver.class, help);
|
||||
}
|
||||
|
||||
//CHECKING TO DEFAULT METADATA
|
||||
|
|
@ -222,7 +225,7 @@ public class StorageIDResolver {
|
|||
//THIS IS FOR HPROXY CHECK
|
||||
if(hproxycheck){
|
||||
LOG.trace("returning status 200 for Hproxy check");
|
||||
ResponseBuilder response = Response.status(HttpStatus.SC_OK);
|
||||
ResponseBuilder response = Response.status(Status.OK);
|
||||
return response.build();
|
||||
}
|
||||
|
||||
|
|
@ -313,7 +316,7 @@ public class StorageIDResolver {
|
|||
if(c>0){
|
||||
LOG.info("at least 1 byte read, returning status 200");
|
||||
IOUtils.closeQuietly(streamToWrite);
|
||||
response = Response.status(HttpStatus.SC_OK);
|
||||
response = Response.status(Status.OK);
|
||||
}else
|
||||
throw ExceptionManager.notFoundException(httpRequest, "The file with id: "+storageId+" is missing in the storage", StorageIDResolver.class, help);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
package org.gcube.datatransfer.resolver.services;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
|
||||
import org.eclipse.microprofile.health.HealthCheck;
|
||||
import org.eclipse.microprofile.health.HealthCheckResponse;
|
||||
import org.eclipse.microprofile.health.HealthCheckResponse.Status;
|
||||
import org.eclipse.microprofile.health.Liveness;
|
||||
|
||||
/**
|
||||
* The Class UriResolverHealthCheck.
|
||||
*
|
||||
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||
*
|
||||
* Oct 15, 2024
|
||||
*/
|
||||
@Path("health")
|
||||
public class UriResolverHealthCheck implements HealthCheck {
|
||||
|
||||
@GET
|
||||
@Path("")
|
||||
@Produces({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
|
||||
public Response check() {
|
||||
|
||||
HealthCheckResponse hcr = call();
|
||||
return Response.ok().entity(hcr).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Call.
|
||||
*
|
||||
* @return the health check response
|
||||
*/
|
||||
@Liveness
|
||||
@Override
|
||||
public HealthCheckResponse call() {
|
||||
|
||||
return new HealthCheckResponse("uri-resolver", Status.UP, Optional.empty());
|
||||
}
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@ public class UriResolverIndex {
|
|||
String indexFile = "/WEB-INF/jsp/index.jsp";
|
||||
|
||||
try {
|
||||
logger.info(UriResolverIndex.class.getSimpleName() + " called");
|
||||
logger.debug(UriResolverIndex.class.getSimpleName() + " called");
|
||||
String realPath = req.getServletContext().getRealPath(indexFile);
|
||||
return new FileInputStream(new File(realPath));
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
|
|
@ -14,11 +14,12 @@ import javax.ws.rs.core.Context;
|
|||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
|
||||
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import org.gcube.datatransfer.resolver.UriResolverServices;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
|
||||
|
||||
/**
|
||||
* The UriResolverResources. Show the resources as a JSON
|
||||
|
|
|
|||
|
|
@ -7,4 +7,5 @@
|
|||
<include>/knime/create/*</include>
|
||||
<include>/wekeo/gettoken/*</include>
|
||||
<include>/oat/get/*</include>
|
||||
<include>/geoportal/export/*</include>
|
||||
</application>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
|
|
@ -12,7 +12,6 @@ import org.gcube.spatial.data.geonetwork.LoginLevel;
|
|||
import org.gcube.spatial.data.geonetwork.configuration.Configuration;
|
||||
import org.gcube.spatial.data.geonetwork.model.Account;
|
||||
import org.gcube.spatial.data.geonetwork.model.Account.Type;
|
||||
import org.junit.Test;
|
||||
|
||||
import it.geosolutions.geonetwork.util.GNSearchRequest;
|
||||
import it.geosolutions.geonetwork.util.GNSearchResponse;
|
||||
|
|
|
|||
|
|
@ -3,10 +3,6 @@
|
|||
*/
|
||||
package gis;
|
||||
|
||||
import it.geosolutions.geonetwork.util.GNSearchRequest;
|
||||
import it.geosolutions.geonetwork.util.GNSearchResponse;
|
||||
import resources.GetAllInfrastructureScopes;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.FileWriter;
|
||||
import java.io.PrintWriter;
|
||||
|
|
@ -18,7 +14,10 @@ import org.gcube.common.scope.api.ScopeProvider;
|
|||
import org.gcube.spatial.data.geonetwork.GeoNetwork;
|
||||
import org.gcube.spatial.data.geonetwork.GeoNetworkPublisher;
|
||||
import org.gcube.spatial.data.geonetwork.LoginLevel;
|
||||
import org.junit.Test;
|
||||
|
||||
import it.geosolutions.geonetwork.util.GNSearchRequest;
|
||||
import it.geosolutions.geonetwork.util.GNSearchResponse;
|
||||
import resources.GetAllInfrastructureScopes;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
import org.gcube.common.encryption.StringEncrypter;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.common.resources.gcore.ServiceEndpoint;
|
||||
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -63,7 +63,9 @@ public class RuntimeResourceReader {
|
|||
ScopeProvider.instance.set(scope);
|
||||
|
||||
SimpleQuery query = queryFor(ServiceEndpoint.class);
|
||||
if (platformName != null)
|
||||
query.addCondition("$resource/Profile/Platform/Name/text() eq '" + platformName + "'");
|
||||
if (category != null)
|
||||
query.addCondition("$resource/Profile/Category/text() eq '" + category + "'");
|
||||
if (endPoint != null && !endPoint.isEmpty())
|
||||
query.addCondition("$resource/Profile/AccessPoint/Interface/Endpoint/text() eq '" + endPoint + "'");
|
||||
|
|
@ -128,19 +130,20 @@ public class RuntimeResourceReader {
|
|||
// String scope = "/pred4s/preprod/preVRE";
|
||||
// String scope = "/d4science.research-infrastructures.eu/D4OS/GNA";
|
||||
// String scope = "/gcube/devsec/devVRE";
|
||||
String scope = "/d4science.research-infrastructures.eu/gCubeApps/ProtectedAreaImpactMaps";
|
||||
// String scope = "/d4science.research-infrastructures.eu/gCubeApps/Esquiline";
|
||||
String scope = "/d4science.research-infrastructures.eu/D4OS/ARIADNEplus_Project";
|
||||
// String scope = "/d4science.research-infrastructures.eu/D4OS/ARIADNEplus_Project";
|
||||
|
||||
String platformName = "geonetwork";
|
||||
String category = "Gis";
|
||||
|
||||
// String platformName = "GeoServer";
|
||||
// String platformName = "geonetwork";
|
||||
// String category = "Gis";
|
||||
|
||||
String platformName = "GeoServer";
|
||||
String category = null;
|
||||
|
||||
// String platformName = "postgis";
|
||||
// String category = "Database";
|
||||
|
||||
// String platformName = "postgresql";
|
||||
// String platformName = "postgres";
|
||||
// String category = "Database";
|
||||
|
||||
// String platformName = "mongodb";
|
||||
|
|
|
|||
|
|
@ -3,10 +3,6 @@
|
|||
*/
|
||||
package gis;
|
||||
|
||||
import it.geosolutions.geonetwork.util.GNSearchRequest;
|
||||
import it.geosolutions.geonetwork.util.GNSearchResponse;
|
||||
import resources.GetAllInfrastructureScopes;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.FileWriter;
|
||||
import java.io.PrintWriter;
|
||||
|
|
@ -16,13 +12,9 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.spatial.data.geonetwork.GeoNetwork;
|
||||
import org.gcube.spatial.data.geonetwork.GeoNetworkPublisher;
|
||||
import org.gcube.spatial.data.geonetwork.LoginLevel;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.itextpdf.text.log.SysoCounter;
|
||||
import resources.GetAllInfrastructureScopes;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -15,11 +15,13 @@ import java.nio.file.StandardCopyOption;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.http.HttpStatus;
|
||||
import org.gcube.datatransfer.resolver.applicationprofile.ApplicationProfileReader;
|
||||
import org.gcube.datatransfer.resolver.util.HTTPCallsUtils;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
@ -59,7 +61,7 @@ public class TestResolvers {
|
|||
System.out.println("header fields: "+con.getHeaderFields());
|
||||
String fileName = getFilename(con.getHeaderFields());
|
||||
System.out.println("Response status is: "+status);
|
||||
if(status==HttpStatus.SC_OK){
|
||||
if(status==Status.OK.getStatusCode()){
|
||||
Path target = Files.createTempFile(FilenameUtils.getBaseName(fileName), "."+FilenameUtils.getExtension(fileName));
|
||||
try (InputStream in = con.getInputStream()) {
|
||||
Files.copy(in, target, StandardCopyOption.REPLACE_EXISTING);
|
||||
|
|
@ -103,7 +105,7 @@ public class TestResolvers {
|
|||
//printHeaders(con.getHeaderFields());
|
||||
String fileName = getFilename(con.getHeaderFields());
|
||||
System.out.println("Response status is: "+status);
|
||||
if(status==HttpStatus.SC_OK){
|
||||
if(status==Status.OK.getStatusCode()){
|
||||
Path target = Files.createTempFile(FilenameUtils.getBaseName(fileName), "."+FilenameUtils.getExtension(fileName));
|
||||
try (InputStream in = con.getInputStream()) {
|
||||
Files.copy(in, target, StandardCopyOption.REPLACE_EXISTING);
|
||||
|
|
@ -146,7 +148,7 @@ public class TestResolvers {
|
|||
status = con.getResponseCode();
|
||||
//printHeaders(con.getHeaderFields());
|
||||
System.out.println("Response status is: "+status);
|
||||
if(status==HttpStatus.SC_OK){
|
||||
if(status==Status.OK.getStatusCode()){
|
||||
System.out.println("\nFile to URL: "+url +" is reachable via doHEAD");
|
||||
System.out.println(IOUtils.toString(con.getInputStream()));
|
||||
}else{
|
||||
|
|
@ -187,7 +189,7 @@ public class TestResolvers {
|
|||
con.connect();
|
||||
status = con.getResponseCode();
|
||||
System.out.println("Response status is: "+status);
|
||||
if(status==HttpStatus.SC_OK){
|
||||
if(status==Status.OK.getStatusCode()){
|
||||
System.out.println("Response: \n"+getContentReponse(con.getInputStream()));
|
||||
}else{
|
||||
System.out.println("\nError on resolving the Catalogue URL: "+toURL);
|
||||
|
|
@ -323,7 +325,7 @@ public class TestResolvers {
|
|||
status = con.getResponseCode();
|
||||
//printHeaders(con.getHeaderFields());
|
||||
System.out.println("Response status is: "+status);
|
||||
if(status==HttpStatus.SC_SEE_OTHER){
|
||||
if(status==Status.SEE_OTHER.getStatusCode()){
|
||||
System.out.println("\nResponse to URL: "+url);
|
||||
System.out.println(IOUtils.toString(con.getInputStream()));
|
||||
}else{
|
||||
|
|
|
|||
Loading…
Reference in New Issue