gCubeSystem
/
resource-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migrate to use ResourceRegistryContextClient to query Contexts. 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@162169 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2018-01-15 12:14:41 +00:00
parent 4336297bcd
commit 54f89d7681
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java
View File

@ -5,8 +5,8 @@ import java.util.UUID;
import org.gcube.informationsystem.model.entity.Context;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient;
import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientFactory;
/**
* Queries submitted within the context resource.
@ -16,7 +16,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
*/
final class Queries {
private final ResourceRegistryClient localRegistryClient = ResourceRegistryClientFactory.create();
private final ResourceRegistryContextClient localRegistryClient = ResourceRegistryContextClientFactory.create();
/**
* Tests if the given context exists
@ -25,9 +25,9 @@ final class Queries {
* @param registryClient
* @return
*/
protected boolean contextExists(UUID uuid, ResourceRegistryClient ... registryClient) {
protected boolean contextExists(UUID uuid, ResourceRegistryContextClient ... registryClient) {
try {
return client(registryClient).exists(Context.NAME, uuid);
return client(registryClient).read(uuid) != null;
} catch (ResourceRegistryException e) {
return false;
}catch (RuntimeException e) {
@ -43,16 +43,16 @@ final class Queries {
* @param registryClient
* @return
*/
protected Context fetchContext(UUID uuid, ResourceRegistryClient ... registryClient) {
protected Context fetchContext(UUID uuid, ResourceRegistryContextClient ... registryClient) {
try {
return client(registryClient).getInstance(Context.class, uuid);
return client(registryClient).read(uuid);
} catch (ResourceRegistryException e) {
e.printStackTrace();
}
return null;
}
private ResourceRegistryClient client(ResourceRegistryClient ... registryClient) {
private ResourceRegistryContextClient client(ResourceRegistryContextClient ... registryClient) {
if (registryClient.length > 0 && Objects.nonNull(registryClient[0]))
return registryClient[0];
else

10
webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java
View File

@ -12,8 +12,8 @@ import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient;
import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientImpl;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@ -69,7 +69,7 @@ public class QueriesTest {
public void testContextExists() {
if (skipTest)
return;
ResourceRegistryClient client = new ResourceRegistryClientImpl(RR);
ResourceRegistryContextClient client = new ResourceRegistryContextClientImpl(RR);
Queries queries = new Queries();
assertFalse("Context does exist, but it should not", queries.contextExists(UUID.randomUUID(),client));
}
@ -78,10 +78,10 @@ public class QueriesTest {
* Test method for {@link org.gcube.resourcemanagement.manager.webapp.context.Queries#fetchContext(UUID, client)}.
*/
@Test
public void testFetchContextExists() {
public void testFetchContext() {
if (skipTest)
return;
ResourceRegistryClient client = new ResourceRegistryClientImpl(RR);
ResourceRegistryContextClient client = new ResourceRegistryContextClientImpl(RR);
Queries queries = new Queries();
assertNotNull("Context does exist, but it should not", queries.fetchContext(UUID.randomUUID(),client));
}