gCubeSystem
/
catalogue-util-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactored to org.gcube.datacatalogue.utillibrary

This commit is contained in:
Francesco Mangiacrapa 2021-02-12 16:08:18 +01:00
parent 1e342b33f3
commit 31b12b587d
72 changed files with 206 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -27,6 +27,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

13
.project
View File

@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
@ -15,9 +20,17 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

5
.settings/org.eclipse.wst.common.component Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="catalogue-util-library">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
</wb-module>
</project-modules>

5
.settings/org.eclipse.wst.common.project.facet.core.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="1.8"/>
<installed facet="jst.utility" version="1.0"/>
</faceted-project>

2
CHANGELOG.md
View File

@ -5,6 +5,6 @@ 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). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v0.2.0-SNAPSHOT] - 2021-02-11 ## [v0.3.0-SNAPSHOT] - 2021-02-11
[#19378] First Release [#19378] First Release

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.datacatalogue</groupId> <groupId>org.gcube.datacatalogue</groupId>
<artifactId>catalogue-util-library</artifactId> <artifactId>catalogue-util-library</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.3.0-SNAPSHOT</version>
<name>Ckan utility library</name> <name>Ckan utility library</name>
<description> <description>

0
src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml → src/main/java/org/gcube/datacatalogue/utillibrary/CkanUtilLibrary.gwt.xml
View File

16
src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java → src/main/java/org/gcube/datacatalogue/utillibrary/ckan/ExtendCkanClient.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.ckan; package org.gcube.datacatalogue.utillibrary.ckan;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -14,12 +14,12 @@ import javax.annotation.Nullable;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.client.fluent.Response; import org.apache.http.client.fluent.Response;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -27,8 +27,6 @@ import com.google.common.base.Charsets;
import com.google.common.io.CharStreams; import com.google.common.io.CharStreams;
/** /**
* The Class ExtendCkanClient. * The Class ExtendCkanClient.
* *

8
src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/MarshUnmarshCkanObject.java → src/main/java/org/gcube/datacatalogue/utillibrary/ckan/MarshUnmarshCkanObject.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.ckan; package org.gcube.datacatalogue.utillibrary.ckan;
import java.io.IOException; import java.io.IOException;
@ -6,9 +6,9 @@ import org.gcube.com.fasterxml.jackson.core.JsonParseException;
import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; import org.gcube.com.fasterxml.jackson.databind.JsonMappingException;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;

14
src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/PatchedCkan.java → src/main/java/org/gcube/datacatalogue/utillibrary/ckan/PatchedCkan.java
View File

@ -1,11 +1,11 @@
package org.gcube.datacatalogue.ckanutillibrary.ckan; package org.gcube.datacatalogue.utillibrary.ckan;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException;
/** /**
* The Interface PatchedCkan. * The Interface PatchedCkan.

4
src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java → src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.db; package org.gcube.datacatalogue.utillibrary.db;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -11,7 +11,7 @@ import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/gcat/GCatCaller.java → src/main/java/org/gcube/datacatalogue/utillibrary/gcat/GCatCaller.java
View File

@ -1,7 +1,7 @@
/* /*
* *
*/ */
package org.gcube.datacatalogue.ckanutillibrary.gcat; package org.gcube.datacatalogue.utillibrary.gcat;
import java.net.MalformedURLException; import java.net.MalformedURLException;

24
src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CheckedCkanClient.java → src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CheckedCkanClient.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.jackan; package org.gcube.datacatalogue.utillibrary.jackan;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.checkNotEmpty; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.checkNotEmpty;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -27,15 +27,15 @@ import java.util.UUID;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResourceBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResourceBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanNotFoundException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanNotFoundException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanValidationException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanValidationException;
/** /**
* This client performs additional checks when writing to CKAN to ensure written * This client performs additional checks when writing to CKAN to ensure written

52
src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanClient.java → src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanClient.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.jackan; package org.gcube.datacatalogue.utillibrary.jackan;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.checkNotEmpty; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.checkNotEmpty;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.removeTrailingSlash; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.removeTrailingSlash;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -49,29 +49,29 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonInclude.Include;
import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature; import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetRelationship; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetRelationship;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanError; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanError;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroupOrgBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroupOrgBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanPair; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanPair;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResourceBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResourceBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTag; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTag;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTagBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTagBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUserBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUserBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanVocabulary; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanVocabulary;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanVocabularyBase; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanVocabularyBase;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanAuthorizationException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanAuthorizationException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanNotFoundException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanNotFoundException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanValidationException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanValidationException;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanQuery.java → src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanQuery.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.jackan; package org.gcube.datacatalogue.utillibrary.jackan;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/JackanModule.java → src/main/java/org/gcube/datacatalogue/utillibrary/jackan/JackanModule.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.jackan; package org.gcube.datacatalogue.utillibrary.jackan;
import static org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient.formatTimestamp; import static org.gcube.datacatalogue.utillibrary.jackan.CkanClient.formatTimestamp;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
@ -33,7 +33,7 @@ import org.gcube.com.fasterxml.jackson.databind.PropertyNamingStrategy;
import org.gcube.com.fasterxml.jackson.databind.SerializerProvider; import org.gcube.com.fasterxml.jackson.databind.SerializerProvider;
import org.gcube.com.fasterxml.jackson.databind.module.SimpleModule; import org.gcube.com.fasterxml.jackson.databind.module.SimpleModule;
import org.gcube.com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.gcube.com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/SearchResults.java → src/main/java/org/gcube/datacatalogue/utillibrary/jackan/SearchResults.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.jackan; package org.gcube.datacatalogue.utillibrary.jackan;
import java.util.List; import java.util.List;

4
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/ApplicationProfileScopePerUrlReader.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
import static org.gcube.resources.discovery.icclient.ICFactory.client; import static org.gcube.resources.discovery.icclient.ICFactory.client;
@ -11,7 +11,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.gcube.common.portal.PortalContext; import org.gcube.common.portal.PortalContext;
import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.resources.gcore.utils.XPathHelper;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.datacatalogue.ckanutillibrary.shared.ex.ApplicationProfileNotFoundException; import org.gcube.datacatalogue.utillibrary.shared.ex.ApplicationProfileNotFoundException;
import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.Query; import org.gcube.resources.discovery.client.queries.api.Query;
import org.gcube.resources.discovery.client.queries.impl.QueryBox; import org.gcube.resources.discovery.client.queries.impl.QueryBox;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/CKANTokenBean.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/CKANTokenBean.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
/** /**
* The Class CKANTokenBean. * The Class CKANTokenBean.

16
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogue.java
View File

@ -1,15 +1,15 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.gcube.datacatalogue.ckanutillibrary.shared.LandingPages; import org.gcube.datacatalogue.utillibrary.shared.LandingPages;
import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; import org.gcube.datacatalogue.utillibrary.shared.ResourceBean;
import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
/** /**

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueFactory.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

46
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -29,28 +29,28 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.common.scope.impl.ScopeBean.Type; import org.gcube.common.scope.impl.ScopeBean.Type;
import org.gcube.datacatalogue.ckanutillibrary.ckan.ExtendCkanClient; import org.gcube.datacatalogue.utillibrary.ckan.ExtendCkanClient;
import org.gcube.datacatalogue.ckanutillibrary.ckan.MarshUnmarshCkanObject; import org.gcube.datacatalogue.utillibrary.ckan.MarshUnmarshCkanObject;
import org.gcube.datacatalogue.ckanutillibrary.ckan.MarshUnmarshCkanObject.METHOD; import org.gcube.datacatalogue.utillibrary.ckan.MarshUnmarshCkanObject.METHOD;
import org.gcube.datacatalogue.ckanutillibrary.db.DBCaller; import org.gcube.datacatalogue.utillibrary.db.DBCaller;
import org.gcube.datacatalogue.ckanutillibrary.gcat.GCatCaller; import org.gcube.datacatalogue.utillibrary.gcat.GCatCaller;
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.ckanutillibrary.server.utils.CKANConveter; import org.gcube.datacatalogue.utillibrary.server.utils.CKANConveter;
import org.gcube.datacatalogue.ckanutillibrary.server.utils.CatalogueUtilMethods; import org.gcube.datacatalogue.utillibrary.server.utils.CatalogueUtilMethods;
import org.gcube.datacatalogue.ckanutillibrary.server.utils.GCubeUtils; import org.gcube.datacatalogue.utillibrary.server.utils.GCubeUtils;
import org.gcube.datacatalogue.ckanutillibrary.server.utils.GCubeUtils.GCUBE_SCOPE_LEVEL; import org.gcube.datacatalogue.utillibrary.server.utils.GCubeUtils.GCUBE_SCOPE_LEVEL;
import org.gcube.datacatalogue.ckanutillibrary.server.utils.url.EntityContext; import org.gcube.datacatalogue.utillibrary.server.utils.url.EntityContext;
import org.gcube.datacatalogue.ckanutillibrary.shared.LandingPages; import org.gcube.datacatalogue.utillibrary.shared.LandingPages;
import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; import org.gcube.datacatalogue.utillibrary.shared.ResourceBean;
import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg;
import org.gcube.datacatalogue.ckanutillibrary.shared.State; import org.gcube.datacatalogue.utillibrary.shared.State;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;

10
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueRunningCluster.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server; package org.gcube.datacatalogue.utillibrary.server;
import static org.gcube.resources.discovery.icclient.ICFactory.client; import static org.gcube.resources.discovery.icclient.ICFactory.client;
import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
@ -22,10 +22,10 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.Property; import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.resources.gcore.utils.XPathHelper;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.datacatalogue.ckanutillibrary.shared.ex.ApplicationProfileNotFoundException; import org.gcube.datacatalogue.utillibrary.shared.ex.ApplicationProfileNotFoundException;
import org.gcube.datacatalogue.ckanutillibrary.shared.ex.NoApplicationProfileMasterException; import org.gcube.datacatalogue.utillibrary.shared.ex.NoApplicationProfileMasterException;
import org.gcube.datacatalogue.ckanutillibrary.shared.ex.NoDataCatalogueRuntimeResourceException; import org.gcube.datacatalogue.utillibrary.shared.ex.NoDataCatalogueRuntimeResourceException;
import org.gcube.datacatalogue.ckanutillibrary.shared.ex.ServiceEndPointException; import org.gcube.datacatalogue.utillibrary.shared.ex.ServiceEndPointException;
import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.Query; import org.gcube.resources.discovery.client.queries.api.Query;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.gcube.resources.discovery.client.queries.api.SimpleQuery;

16
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CKANConveter.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils; package org.gcube.datacatalogue.utillibrary.server.utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -6,13 +6,13 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.gcube.datacatalogue.ckanutillibrary.ckan.ExtendCkanClient; import org.gcube.datacatalogue.utillibrary.ckan.ExtendCkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; import org.gcube.datacatalogue.utillibrary.shared.ResourceBean;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanPair; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanPair;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTag; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTag;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CatalogueUtilMethods.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CatalogueUtilMethods.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils; package org.gcube.datacatalogue.utillibrary.server.utils;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GCubeUtils.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GCubeUtils.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils; package org.gcube.datacatalogue.utillibrary.server.utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GenericUtils.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GenericUtils.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils; package org.gcube.datacatalogue.utillibrary.server.utils;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SessionCatalogueAttributes.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils; package org.gcube.datacatalogue.utillibrary.server.utils;
/** /**
* A list of attributes that are saved into http session. * A list of attributes that are saved into http session.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java → src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/url/EntityContext.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.server.utils.url; package org.gcube.datacatalogue.utillibrary.server.utils.url;
/** /**
* Entity context for uri resolver * Entity context for uri resolver

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CKanUserWrapper.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/CKanUserWrapper.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CkanDatasetRelationship.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/CkanDatasetRelationship.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/DatasetRelationships.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/DatasetRelationships.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
/** /**
* Allowed relationships between packages(datasets). Some of them are not supported yet due to the problem * Allowed relationships between packages(datasets). Some of them are not supported yet due to the problem

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/LandingPages.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/LandingPages.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ResourceBean.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ResourceBean.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/RolesCkanGroupOrOrg.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
/** /**
* Roles that user can have into organizations/groups. * Roles that user can have into organizations/groups.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/State.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/State.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
/** /**
* The current state of this group/user * The current state of this group/user

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/Statistics.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/Statistics.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared; package org.gcube.datacatalogue.utillibrary.shared;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ApplicationProfileNotFoundException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ApplicationProfileNotFoundException.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared.ex; package org.gcube.datacatalogue.utillibrary.shared.ex;
@SuppressWarnings("serial") @SuppressWarnings("serial")
/** /**

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoApplicationProfileMasterException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoApplicationProfileMasterException.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared.ex; package org.gcube.datacatalogue.utillibrary.shared.ex;
/** /**
* Thrown when there are more than one application profile, but none of them was set as master * Thrown when there are more than one application profile, but none of them was set as master

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared.ex; package org.gcube.datacatalogue.utillibrary.shared.ex;
/** /**
* No Data Catalogue node found. * No Data Catalogue node found.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ServiceEndPointException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ServiceEndPointException.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared.ex; package org.gcube.datacatalogue.utillibrary.shared.ex;
/** /**
* Exception thrown when it is not possible retrieve information from the ServiceEndpoint * Exception thrown when it is not possible retrieve information from the ServiceEndpoint

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/TooManyRunningClustersException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/TooManyRunningClustersException.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.shared.ex; package org.gcube.datacatalogue.utillibrary.shared.ex;
/** /**
* Too many clusters in this scope exception. * Too many clusters in this scope exception.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanActivity.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanActivity.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List; import java.util.List;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanCapacity.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanCapacity.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* Actually they are lower case in ckan, but 'public' and 'private' clash with * Actually they are lower case in ckan, but 'public' and 'private' clash with

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDataset.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDataset.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.sql.Timestamp; import java.sql.Timestamp;

4
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetBase.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetRelationship.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetRelationship.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* *

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanError.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanError.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroup.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroup.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* Class to explicitly model a Ckan group, which is <i> not </i> an organization, * Class to explicitly model a Ckan group, which is <i> not </i> an organization,

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrg.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrg.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.sql.Timestamp; import java.sql.Timestamp;

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrgBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrgBase.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty;
import java.util.List; import java.util.List;
@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; import org.gcube.com.fasterxml.jackson.annotation.JsonProperty;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.gcube.datacatalogue.ckanutillibrary.jackan.JackanModule; import org.gcube.datacatalogue.utillibrary.jackan.JackanModule;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanLicense.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanLicense.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; import org.gcube.com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanOrganization.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanOrganization.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanPair.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanPair.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.util.Objects; import java.util.Objects;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResource.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResource.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import javax.annotation.Nullable; import javax.annotation.Nullable;

4
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResourceBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResourceBase.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.io.File; import java.io.File;
import java.sql.Timestamp; import java.sql.Timestamp;
@ -25,7 +25,7 @@ import javax.annotation.Nullable;
import org.gcube.com.fasterxml.jackson.annotation.JsonAnyGetter; import org.gcube.com.fasterxml.jackson.annotation.JsonAnyGetter;
import org.gcube.com.fasterxml.jackson.annotation.JsonAnySetter; import org.gcube.com.fasterxml.jackson.annotation.JsonAnySetter;
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException;
import org.slf4j.Logger; import org.slf4j.Logger;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResponse.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResponse.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* *

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanState.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanState.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* Possible states of a Dataset or Resource - only active datasets show up in * Possible states of a Dataset or Resource - only active datasets show up in

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTag.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTag.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.sql.Timestamp; import java.sql.Timestamp;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTagBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTagBase.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* A Ckan Tag. Tags can be free or belong to a controlled vocabulary. * A Ckan Tag. Tags can be free or belong to a controlled vocabulary.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTrackingSummary.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTrackingSummary.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
/** /**
* Just don't know what it is. * Just don't know what it is.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUser.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUser.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List; import java.util.List;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUserBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUserBase.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabulary.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabulary.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.util.List; import java.util.List;

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabularyBase.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabularyBase.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; package org.gcube.datacatalogue.utillibrary.shared.jackan.model;
import java.util.List; import java.util.List;

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
/** /**
* Exception raised when the user is not authorized to call the action. * Exception raised when the user is not authorized to call the action.

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanException.java
View File

@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
/** /**
* Runtime exception for ckan-related problems. For possible cases description, see {@link eu.trentorise.opendata.jackan.model.CkanError CkanError} * Runtime exception for ckan-related problems. For possible cases description, see {@link eu.trentorise.opendata.jackan.model.CkanError CkanError}

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
/** /**
* Thrown when Ckan tells us something was not found. Notice this is not related * Thrown when Ckan tells us something was not found. Notice this is not related

6
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanValidationException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanValidationException.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; import org.gcube.datacatalogue.utillibrary.jackan.CkanClient;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse;
/** /**
* Thrown when Ckan tells us something was not in the proper format. * Thrown when Ckan tells us something was not in the proper format.

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanException.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
/** /**

2
src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java → src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions;
/** /**
* A runtime exception to raise when something is not found. Note this is not * A runtime exception to raise when something is not found. Note this is not

18
src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java → src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java
View File

@ -1,4 +1,4 @@
package org.gcube.datacatalogue.ckanutillibrary.test; package org.gcube.datacatalogue.utillibrary.test;
import java.util.ArrayList; import java.util.ArrayList;
@ -10,14 +10,14 @@ import java.util.Random;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.datacatalogue.ckanutillibrary.server.ApplicationProfileScopePerUrlReader; import org.gcube.datacatalogue.utillibrary.server.ApplicationProfileScopePerUrlReader;
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueFactory; import org.gcube.datacatalogue.utillibrary.server.DataCatalogueFactory;
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueImpl; import org.gcube.datacatalogue.utillibrary.server.DataCatalogueImpl;
import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; import org.gcube.datacatalogue.utillibrary.shared.ResourceBean;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization;
import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;