gCubeSystem
/
ckan-connector
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed old uneeded code

This commit is contained in:
Luca Frosini 2022-05-16 11:07:01 +02:00
parent d93000d280
commit 1e6fa8b9f6
4 changed files with 60 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -47,11 +47,11 @@
<version>2.5.2</version> <version>2.5.2</version>
</dependency> </dependency>
<dependency> <!-- <dependency> -->
<groupId>eu.trentorise.opendata</groupId> <!-- <groupId>eu.trentorise.opendata</groupId> -->
<artifactId>jackan</artifactId> <!-- <artifactId>jackan</artifactId> -->
<version>0.4.2</version> <!-- <version>0.4.2</version> -->
</dependency> <!-- </dependency> -->
<!-- smartgears --> <!-- smartgears -->
<dependency> <dependency>

1
src/main/java/org/gcube/data/access/ckanconnector/CKanConnector.java
View File

@ -11,5 +11,4 @@ public class CKanConnector extends ResourceConfig {
packages("org.gcube.data.access.ckanconnector"); packages("org.gcube.data.access.ckanconnector");
} }
} }

14
src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java
View File

@ -14,9 +14,6 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import lombok.extern.slf4j.Slf4j;
import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
@ -26,14 +23,7 @@ import org.python.core.PyObject;
import org.python.core.PyString; import org.python.core.PyString;
import org.python.util.PythonInterpreter; import org.python.util.PythonInterpreter;
import eu.trentorise.opendata.jackan.CkanClient; import lombok.extern.slf4j.Slf4j;
import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpResponse;
import eu.trentorise.opendata.jackan.internal.org.apache.http.HttpStatus;
import eu.trentorise.opendata.jackan.internal.org.apache.http.client.methods.HttpPost;
import eu.trentorise.opendata.jackan.internal.org.apache.http.entity.StringEntity;
import eu.trentorise.opendata.jackan.internal.org.apache.http.impl.client.CloseableHttpClient;
import eu.trentorise.opendata.jackan.internal.org.apache.http.impl.client.HttpClientBuilder;
import eu.trentorise.opendata.jackan.model.CkanUser;
@Path("/") @Path("/")
@Slf4j @Slf4j
@ -93,7 +83,7 @@ public class ConnectorManager {
int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); int internalPort = Integer.parseInt(context.getInitParameter("internalPort"));
String localhostName = "http://127.0.0.1:"+internalPort; String localhostName = "http://127.0.0.1:"+internalPort;
long startCheckUser = System.currentTimeMillis(); long startCheckUser = System.currentTimeMillis();
CkanClient ckanClient = new CkanClient(localhostName, ckanKey); // CkanClient ckanClient = new CkanClient(localhostName, ckanKey);
// try { // try {
// User user = new User(); // User user = new User();

123
src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java
View File

@ -1,28 +1,11 @@
package org.gcube.data.access.ckanconnector; package org.gcube.data.access.ckanconnector;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context; 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 lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.scope.api.ScopeProvider;
import com.google.gson.Gson;
import eu.trentorise.opendata.jackan.CkanClient;
import eu.trentorise.opendata.jackan.exceptions.CkanNotFoundException;
import eu.trentorise.opendata.jackan.model.CkanOrganization;
@Path("organization") @Path("organization")
@Slf4j @Slf4j
@ -30,58 +13,58 @@ public class OrganizationManager {
@Context ServletContext context; @Context ServletContext context;
@PUT // @PUT
@Path("/{name}") // @Path("/{name}")
public Response create(@PathParam("name") String organizationName) { // public Response create(@PathParam("name") String organizationName) {
log.info("create called"); // log.info("create called");
try{ // try{
//
// This is done by smartgears //// This is done by smartgears
// if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) return Response.status(Status.UNAUTHORIZED).build(); //// if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) return Response.status(Status.UNAUTHORIZED).build();
//
String ckanKey = context.getInitParameter("ckanKey"); // String ckanKey = context.getInitParameter("ckanKey");
int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); // int internalPort = Integer.parseInt(context.getInitParameter("internalPort"));
CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey); // CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey);
//
CkanOrganization org = new CkanOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase()); // CkanOrganization org = new CkanOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase());
org.setDisplayName(organizationName); // org.setDisplayName(organizationName);
org.setTitle(organizationName); // org.setTitle(organizationName);
ckanClient.createOrganization(org); // ckanClient.createOrganization(org);
//
log.info("create organizzation {} called from user {} in scope {}",organizationName, AuthorizationProvider.instance.get().getClient().getId(), ScopeProvider.instance.get()); // log.info("create organizzation {} called from user {} in scope {}",organizationName, AuthorizationProvider.instance.get().getClient().getId(), ScopeProvider.instance.get());
return Response.ok().build(); // return Response.ok().build();
}catch(Exception e){ // }catch(Exception e){
log.error("error trying to create organization "+organizationName,e); // log.error("error trying to create organization "+organizationName,e);
return Response.serverError().entity(e.getMessage()).build(); // return Response.serverError().entity(e.getMessage()).build();
} // }
} // }
//
@GET // @GET
@Path("/{name}") // @Path("/{name}")
@Produces(MediaType.APPLICATION_JSON) // @Produces(MediaType.APPLICATION_JSON)
public String get(@PathParam("name") String organizationName) { // public String get(@PathParam("name") String organizationName) {
log.info("get called with name {}", organizationName); // log.info("get called with name {}", organizationName);
//
// This is done by smartgears //// This is done by smartgears
// if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) throw new WebApplicationException("user authentication needed",Response.Status.UNAUTHORIZED); //// if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) throw new WebApplicationException("user authentication needed",Response.Status.UNAUTHORIZED);
//
String ckanKey = context.getInitParameter("ckanKey"); // String ckanKey = context.getInitParameter("ckanKey");
int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); // int internalPort = Integer.parseInt(context.getInitParameter("internalPort"));
//
try{ // try{
CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey); // CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey);
CkanOrganization org = ckanClient.getOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase()); // CkanOrganization org = ckanClient.getOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase());
log.trace("organization {} found",organizationName); // log.trace("organization {} found",organizationName);
return new Gson().toJson(org); // return new Gson().toJson(org);
}catch(CkanNotFoundException e){ // }catch(CkanNotFoundException e){
log.error("organization {} doesn't exist",organizationName); // log.error("organization {} doesn't exist",organizationName);
throw new WebApplicationException("organization "+organizationName+" doesn't exist",Response.Status.NOT_FOUND); // throw new WebApplicationException("organization "+organizationName+" doesn't exist",Response.Status.NOT_FOUND);
} catch (Exception e) { // } catch (Exception e) {
log.error("error trying to contect ckan",e); // log.error("error trying to contect ckan",e);
throw new WebApplicationException("error trying to contect ckan",Response.Status.INTERNAL_SERVER_ERROR); // throw new WebApplicationException("error trying to contect ckan",Response.Status.INTERNAL_SERVER_ERROR);
} // }
//
//
} // }
} }