removed embedded mapping for production root
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@131363 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
ff6df17384
commit
40459ae18b
|
@ -56,10 +56,10 @@ import eu.trentorise.opendata.jackan.model.CkanUser;
|
||||||
*/
|
*/
|
||||||
public class CKanUtilsImpl implements CKanUtils{
|
public class CKanUtilsImpl implements CKanUtils{
|
||||||
|
|
||||||
// TO BE REMOVED TODO
|
|
||||||
public final static String PRODUCTION_SCOPE_ROOT = "/d4science.research-infrastructures.eu";
|
// public final static String PRODUCTION_SCOPE_ROOT = "/d4science.research-infrastructures.eu";
|
||||||
public final static String PRODUCTION_CKAN_ORGNAME_ROOT = "d4science";
|
// public final static String PRODUCTION_CKAN_ORGNAME_ROOT = "d4science";
|
||||||
public final static String PRODUCTION_LIFERAY_ORGNAME_ROOT = "d4science.research-infrastructures.eu";
|
// public final static String PRODUCTION_LIFERAY_ORGNAME_ROOT = "d4science.research-infrastructures.eu";
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(CKanUtilsImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(CKanUtilsImpl.class);
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ public class CKanUtilsImpl implements CKanUtils{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CKanUserWrapper getUserFromApiKey(String apiKey) {
|
public CKanUserWrapper getUserFromApiKey(String apiKey) {
|
||||||
logger.debug("Request user whose api key is = " + apiKey);
|
logger.debug("Request user whose api key is = " + apiKey.substring(0, 3) + "*************");
|
||||||
|
|
||||||
// checks
|
// checks
|
||||||
checkNotNull(apiKey);
|
checkNotNull(apiKey);
|
||||||
|
@ -779,9 +779,9 @@ public class CKanUtilsImpl implements CKanUtils{
|
||||||
|
|
||||||
// check if this role is already present in ckan for this user within the organization
|
// check if this role is already present in ckan for this user within the organization
|
||||||
String organizationNameToCheck;
|
String organizationNameToCheck;
|
||||||
if(organizationName.equals(PRODUCTION_LIFERAY_ORGNAME_ROOT))
|
// if(organizationName.equals(PRODUCTION_LIFERAY_ORGNAME_ROOT))
|
||||||
organizationNameToCheck = PRODUCTION_CKAN_ORGNAME_ROOT;
|
// organizationNameToCheck = PRODUCTION_CKAN_ORGNAME_ROOT;
|
||||||
else
|
// else
|
||||||
organizationNameToCheck = organizationName.toLowerCase();
|
organizationNameToCheck = organizationName.toLowerCase();
|
||||||
|
|
||||||
boolean alreadyPresent = isRoleAlreadySet(ckanUsername, organizationNameToCheck, correspondentRoleToCheck);
|
boolean alreadyPresent = isRoleAlreadySet(ckanUsername, organizationNameToCheck, correspondentRoleToCheck);
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.datacatalogue.ckanutillibrary;
|
package org.gcube.datacatalogue.ckanutillibrary;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -22,7 +23,7 @@ public class TestCKanLib {
|
||||||
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestCKanLib.class);
|
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestCKanLib.class);
|
||||||
|
|
||||||
private CkanUtilsFactory factory;
|
private CkanUtilsFactory factory;
|
||||||
private String scope = "/gcube/devsec/devVRE";
|
private String scope = "/gcube/devNext/NextNext";
|
||||||
private String testUser = "costantino_perciante";
|
private String testUser = "costantino_perciante";
|
||||||
String subjectId = "aa_father4";
|
String subjectId = "aa_father4";
|
||||||
String objectId = "bb_son4";
|
String objectId = "bb_son4";
|
||||||
|
@ -32,6 +33,15 @@ public class TestCKanLib {
|
||||||
factory = CkanUtilsFactory.getFactory();
|
factory = CkanUtilsFactory.getFactory();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//@Test
|
||||||
|
public void getRole() throws Exception{
|
||||||
|
|
||||||
|
CKanUtilsImpl instance = factory.getUtilsPerScope(scope);
|
||||||
|
instance.getGroupsAndRolesByUser(testUser, Arrays.asList(RolesIntoOrganization.ADMIN, RolesIntoOrganization.EDITOR, RolesIntoOrganization.MEMBER
|
||||||
|
));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
//@Test
|
//@Test
|
||||||
public void datasetsRelationshipCreate() throws Exception{
|
public void datasetsRelationshipCreate() throws Exception{
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue