gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only removed some comments 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@174886 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-12-14 09:58:24 +00:00
parent dce9df60d6
commit 00589289fb
5 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/gcube/datatransfer/resolver/parthenos/ParthenosRequest.java
View File

@ -9,6 +9,8 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* *
@ -22,6 +24,7 @@ import lombok.ToString;
@ToString @ToString
public class ParthenosRequest { public class ParthenosRequest {
@JsonProperty(value="entity_name", required=true)
private String entity_name; private String entity_name;
} }

1
src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java
View File

@ -193,7 +193,6 @@ public class AnalyticsCreateResolver {
if(index>0 && index<operatorId.length()){ if(index>0 && index<operatorId.length()){
fileName+="-"+operatorId.substring(index+1,operatorId.length()); fileName+="-"+operatorId.substring(index+1,operatorId.length());
} }
//String currentTimestamp = dateFormat.format(new Date());
fileName+="-"+System.currentTimeMillis(); fileName+="-"+System.currentTimeMillis();
return fileName; return fileName;
} }

5
src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java
View File

@ -91,7 +91,6 @@ public class CatalogueResolver {
public Response postCatalogue(@Context HttpServletRequest req, CatalogueRequest jsonRequest) { public Response postCatalogue(@Context HttpServletRequest req, CatalogueRequest jsonRequest) {
InnerMethodName.instance.set("postCataloguePublicLink"); InnerMethodName.instance.set("postCataloguePublicLink");
logger.info(CatalogueResolver.class.getSimpleName()+" POST starts..."); logger.info(CatalogueResolver.class.getSimpleName()+" POST starts...");
logger.info("The body contains the request: "+jsonRequest.toString()); logger.info("The body contains the request: "+jsonRequest.toString());
//final CatalogueEntityRequest cer = new CatalogueEntityRequest(); //final CatalogueEntityRequest cer = new CatalogueEntityRequest();
@ -144,13 +143,9 @@ public class CatalogueResolver {
try { try {
String entityContextValue = ResourceCatalogueCodes.valueOfCodeId(entityContext).getValue(); String entityContextValue = ResourceCatalogueCodes.valueOfCodeId(entityContext).getValue();
//ApplicationProfileReaderForCatalogueResolver appPrCatResolver = new ApplicationProfileReaderForCatalogueResolver(vreName, true);
String fullScope = LoadingVREsScopeCache.getCache().get(vreName); String fullScope = LoadingVREsScopeCache.getCache().get(vreName);
logger.info("Read fullScope: "+fullScope + " for VRE_NAME: "+vreName +" from cache created by: "+GetAllInfrastructureVREs.class.getSimpleName()); logger.info("Read fullScope: "+fullScope + " for VRE_NAME: "+vreName +" from cache created by: "+GetAllInfrastructureVREs.class.getSimpleName());
//String fullScope = appPrCatResolver.getHashVreNameScope().get(vreName);
ScopeProvider.instance.set(fullScope); ScopeProvider.instance.set(fullScope);
GatewayCKANCatalogueReference ckanCatalogueReference = CkanCatalogueConfigurationsReader.loadCatalogueEndPoints(); GatewayCKANCatalogueReference ckanCatalogueReference = CkanCatalogueConfigurationsReader.loadCatalogueEndPoints();

17
src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java
View File

@ -198,7 +198,6 @@ public class GeonetworkResolver {
ResponseBuilder responseBuilder = Response ResponseBuilder responseBuilder = Response
.ok(so) .ok(so)
//.header(ConstantsResolver.CONTENT_DISPOSITION,"attachment; filename = \""+fileName+"\"")
.header(ConstantsResolver.CONTENT_TYPE, httpUtils.getLastContentType()); .header(ConstantsResolver.CONTENT_TYPE, httpUtils.getLastContentType());
return responseBuilder.build(); return responseBuilder.build();
@ -228,22 +227,6 @@ public class GeonetworkResolver {
} }
// /* (non-Javadoc)
// * @see javax.servlet.GenericServlet#init()
// */
// @Override
// public void init() throws ServletException {
// super.init();
// timer = new Timer(true);
// timer.schedule(new TimerTask() {
// @Override
// public void run() {
// logger.info("Resetting Geonetwork configuratiors cache...");
// purgeCacheGeonetworkInstances();
// }
// }, CACHE_RESET_DELAY, CACHE_RESET_TIME);
// }
@POST @POST
@Path("{"+PATH_PARAM_SCOPE+"}/{"+PATH_PARAM_MODE+"}/{"+PATH_PARAM_VISIBILITY+"}/{filterKey}/{filterValue}/$${"+PATH_PARAM_REMAINPATH+":(/[^?$]+)?}") @Path("{"+PATH_PARAM_SCOPE+"}/{"+PATH_PARAM_MODE+"}/{"+PATH_PARAM_VISIBILITY+"}/{filterKey}/{filterValue}/$${"+PATH_PARAM_REMAINPATH+":(/[^?$]+)?}")
public Response submitPost(@Context HttpServletRequest req, public Response submitPost(@Context HttpServletRequest req,

2
src/main/java/org/gcube/datatransfer/resolver/services/GisResolver.java
View File

@ -48,6 +48,7 @@ public class GisResolver {
public static final String SCOPE = "scope"; public static final String SCOPE = "scope";
public static final String GEO_EXPLORER_LAYER_UUID = "geo-exp"; public static final String GEO_EXPLORER_LAYER_UUID = "geo-exp";
/** /**
* Submit get. * Submit get.
* *
@ -98,7 +99,6 @@ public class GisResolver {
if(isGisLink){ if(isGisLink){
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
//ServerParameters geonetworkParams = getCachedServerParameters(scope); //ServerParameters geonetworkParams = getCachedServerParameters(scope);
GisLayerItem gisLayerItem = getGisLayerForLayerUUID(scope, gisUUID); GisLayerItem gisLayerItem = getGisLayerForLayerUUID(scope, gisUUID);
logger.info("wms url is: " + gisLayerItem.getFullWmsUrlRequest()); logger.info("wms url is: " + gisLayerItem.getFullWmsUrlRequest());