Added usage of common-utility
This commit is contained in:
parent
1e20d87c13
commit
035c7f66e9
|
@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
||||||
## [v4.1.0-SNAPSHOT]
|
## [v4.1.0-SNAPSHOT]
|
||||||
|
|
||||||
- Enhanced gcube-bom version
|
- Enhanced gcube-bom version
|
||||||
|
- Added usage of common-utility to overcome issues with different Smartgears version (i.e. 3 and 4)
|
||||||
|
|
||||||
|
|
||||||
## [v4.0.1]
|
## [v4.0.1]
|
||||||
|
|
5
pom.xml
5
pom.xml
|
@ -50,10 +50,15 @@
|
||||||
<groupId>org.gcube.common</groupId>
|
<groupId>org.gcube.common</groupId>
|
||||||
<artifactId>gxHTTP</artifactId>
|
<artifactId>gxHTTP</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.common</groupId>
|
||||||
|
<artifactId>common-utility</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test Dependencies -->
|
<!-- Test Dependencies -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
|
|
|
@ -6,8 +6,10 @@ import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
|
import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import org.gcube.common.context.ContextUtility;
|
||||||
import org.gcube.common.gxhttp.reference.GXConnection;
|
import org.gcube.common.gxhttp.reference.GXConnection;
|
||||||
import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
|
import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
|
||||||
|
import org.gcube.common.http.GXHTTPUtility;
|
||||||
import org.gcube.informationsystem.contexts.reference.entities.Context;
|
import org.gcube.informationsystem.contexts.reference.entities.Context;
|
||||||
import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
|
import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
|
||||||
import org.gcube.informationsystem.model.reference.properties.Header;
|
import org.gcube.informationsystem.model.reference.properties.Header;
|
||||||
|
@ -18,7 +20,6 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextAlreadyPresentException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextAlreadyPresentException;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextNotFoundException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextNotFoundException;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.rest.ContextPath;
|
import org.gcube.informationsystem.resourceregistry.api.rest.ContextPath;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.rest.ServiceInstance;
|
|
||||||
import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility;
|
import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility;
|
||||||
import org.gcube.informationsystem.serialization.ElementMapper;
|
import org.gcube.informationsystem.serialization.ElementMapper;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -61,7 +62,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
protected List<Context> getAllContextFromServer() throws ResourceRegistryException {
|
protected List<Context> getAllContextFromServer() throws ResourceRegistryException {
|
||||||
try {
|
try {
|
||||||
logger.trace("Going to read {} with UUID {}", Context.NAME);
|
logger.trace("Going to read {} with UUID {}", Context.NAME);
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
||||||
|
@ -100,7 +101,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
|
|
||||||
logger.trace("Going to create {}", contextString);
|
logger.trace("Going to create {}", contextString);
|
||||||
|
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.header("Content-type", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Content-type", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
|
@ -155,7 +156,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
public boolean existFromServer(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
public boolean existFromServer(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
||||||
try {
|
try {
|
||||||
logger.trace("Going to read {} with UUID {}", Context.NAME, uuid);
|
logger.trace("Going to read {} with UUID {}", Context.NAME, uuid);
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
||||||
|
@ -220,7 +221,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Context readCurrentContext() throws ContextNotFoundException, ResourceRegistryException {
|
public Context readCurrentContext() throws ContextNotFoundException, ResourceRegistryException {
|
||||||
String contextFullName = ServiceInstance.getCurrentContextFullName();
|
String contextFullName = ContextUtility.getCurrentContextFullName();
|
||||||
ContextCache contextCache = ContextCache.getInstance();
|
ContextCache contextCache = ContextCache.getInstance();
|
||||||
UUID uuid = contextCache.getUUIDByFullName(contextFullName);
|
UUID uuid = contextCache.getUUIDByFullName(contextFullName);
|
||||||
Context context = null;
|
Context context = null;
|
||||||
|
@ -261,7 +262,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
public String readFromServer(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
public String readFromServer(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
||||||
try {
|
try {
|
||||||
logger.trace("Going to read {} with UUID {}", Context.NAME, uuid);
|
logger.trace("Going to read {} with UUID {}", Context.NAME, uuid);
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
||||||
|
@ -288,7 +289,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
|
|
||||||
UUID uuid = context.getHeader().getUUID();
|
UUID uuid = context.getHeader().getUUID();
|
||||||
|
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.header("Content-type", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Content-type", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
|
@ -354,7 +355,7 @@ public class ResourceRegistryContextClientImpl implements ResourceRegistryContex
|
||||||
public boolean delete(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
public boolean delete(String uuid) throws ContextNotFoundException, ResourceRegistryException {
|
||||||
try {
|
try {
|
||||||
logger.trace("Going to delete {} with UUID {}", Context.NAME, uuid);
|
logger.trace("Going to delete {} with UUID {}", Context.NAME, uuid);
|
||||||
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
|
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPUtility.getGXHTTPStringRequest(address);
|
||||||
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
gxHTTPStringRequest.from(ResourceRegistryContextClient.class.getSimpleName());
|
||||||
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
gxHTTPStringRequest.header("Accept", GXConnection.APPLICATION_JSON_CHARSET_UTF_8);
|
||||||
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
gxHTTPStringRequest.path(ContextPath.CONTEXTS_PATH_PART);
|
||||||
|
|
Loading…
Reference in New Issue