gCubeSystem
/
gcat
15
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Reorganizing code

This commit is contained in:
luca.frosini 2023-07-13 10:48:33 +02:00
parent e766c3bb92
commit 1913af6663
12 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
View File

@ -13,7 +13,7 @@ import org.gcube.gcat.configuration.isproxies.ISConfigurationProxyFactory;
import org.gcube.gcat.configuration.isproxies.impl.FacetBasedISConfigurationProxyFactory;
import org.gcube.gcat.configuration.isproxies.impl.GCoreISConfigurationProxyFactory;
import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.utils.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/gcat/configuration/service/ServiceCatalogueConfiguration.java
View File

@ -14,7 +14,7 @@ import org.gcube.gcat.api.configuration.CKANDB;
import org.gcube.gcat.api.configuration.CatalogueConfiguration;
import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.persistence.ckan.CKANUser;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
/**
* @author Luca Frosini (ISTI-CNR)

1
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
View File

@ -33,6 +33,7 @@ import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
import org.gcube.gcat.moderation.thread.ModerationThread;
import org.gcube.gcat.oldutils.Validator;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.profile.MetadataUtility;
import org.gcube.gcat.social.SocialPost;
import org.gcube.gcat.utils.URIResolver;

1
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java
View File

@ -17,6 +17,7 @@ import org.gcube.gcat.api.configuration.CKANDB;
import org.gcube.gcat.api.configuration.CatalogueConfiguration;
import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.postgresql.core.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
View File

@ -178,7 +178,7 @@ public class CKANUser extends CKAN {
return toBeUpdated;
}
protected void retrieve() {
public void retrieve() {
setApiKey(CKANUtility.getSysAdminAPI());
try {
if(name == null || name.compareTo("") == 0) {

1
src/main/java/org/gcube/gcat/persistence/ckan/CKANUtility.java
View File

@ -3,6 +3,7 @@ package org.gcube.gcat.persistence.ckan;
import javax.ws.rs.InternalServerErrorException;
import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
/**
* @author Luca Frosini (ISTI - CNR)

3
src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java → src/main/java/org/gcube/gcat/persistence/ckan/cache/CKANUserCache.java vendored
View File

@ -1,4 +1,4 @@
package org.gcube.gcat.persistence.ckan;
package org.gcube.gcat.persistence.ckan.cache;
import java.util.concurrent.TimeUnit;
@ -12,6 +12,7 @@ import javax.cache.spi.CachingProvider;
import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.gcat.persistence.ckan.CKANUser;
/**
* @author Luca Frosini (ISTI - CNR)

2
src/main/java/org/gcube/gcat/profile/ISProfile.java
View File

@ -15,7 +15,7 @@ import org.gcube.datacatalogue.metadatadiscovery.reader.MetadataFormatDiscovery;
import org.gcube.datacatalogue.metadatadiscovery.reader.QueryForResourceUtil;
import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.persistence.ckan.CKANUser;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.utils.Constants;
import org.gcube.informationsystem.publisher.RegistryPublisher;
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;

2
src/main/java/org/gcube/gcat/profile/ResourceRegistryProfile.java
View File

@ -21,7 +21,7 @@ import org.gcube.datacatalogue.metadatadiscovery.reader.MetadataFormatDiscovery;
import org.gcube.datacatalogue.metadatadiscovery.reader.QueryForResourceUtil;
import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.persistence.ckan.CKANUser;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.utils.Constants;
import org.gcube.informationsystem.publisher.RegistryPublisher;
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;

2
src/main/java/org/gcube/gcat/rest/administration/Configuration.java
View File

@ -33,7 +33,7 @@ import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
import org.gcube.gcat.persistence.ckan.CKANUser;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.rest.BaseREST;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/org/gcube/gcat/rest/administration/User.java
View File

@ -21,7 +21,7 @@ import org.gcube.gcat.api.GCatConstants;
import org.gcube.gcat.api.roles.Role;
//import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.persistence.ckan.CKANUser;
import org.gcube.gcat.persistence.ckan.CKANUserCache;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.gcube.gcat.rest.REST;
import com.webcohesion.enunciate.metadata.rs.ResourceGroup;

1
src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java
View File

@ -1,6 +1,7 @@
package org.gcube.gcat.persistence.ckan;
import org.gcube.gcat.ContextTest;
import org.gcube.gcat.persistence.ckan.cache.CKANUserCache;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;