Compare commits
No commits in common. "master" and "feature/20306" have entirely different histories.
master
...
feature/20
|
@ -11,7 +11,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
- Refactored code to support IS Model reorganization (e.g naming, packages)
|
||||
- Refactored code to support renaming of Embedded class to Property [#13274]
|
||||
- Starting to use the new Encrypted property type [#12812]
|
||||
- Updated smart-executor-bom
|
||||
|
||||
|
||||
## [v1.3.0] [r4.13.0] - 2018-11-20
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -36,7 +36,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.vremanagement</groupId>
|
||||
<artifactId>smart-executor-bom</artifactId>
|
||||
<version>3.1.0-SNAPSHOT</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
|
|
@ -154,13 +154,13 @@ public abstract class GCoreResourceMapper<GR extends org.gcube.common.resources.
|
|||
boolean update = false;
|
||||
|
||||
try {
|
||||
update = resourceRegistryClient.existInstance(rClass, uuid);
|
||||
update = resourceRegistryClient.exists(rClass, uuid);
|
||||
} catch (NotFoundException e) {
|
||||
update = false;
|
||||
} catch (AvailableInAnotherContextException e) {
|
||||
// This code should never be reached because this should be fixed in
|
||||
// map function
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(r, false);
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(r);
|
||||
try {
|
||||
Thread.sleep(100);
|
||||
} catch (Exception ee) {
|
||||
|
|
|
@ -27,7 +27,7 @@ import org.json.XML;
|
|||
/**
|
||||
* @author Luca Frosini (ISTI - CNR)
|
||||
*/
|
||||
public class GenericResourceExporter extends GCoreResourceMapper<GenericResource, Configuration> {
|
||||
public class GenericResourceExporter extends GCoreResourceMapper<GenericResource,Configuration> {
|
||||
|
||||
public static final String FIXED_VERSION = "1.0.0";
|
||||
public static final String FULL_BODY = "FULL_BODY";
|
||||
|
@ -47,11 +47,11 @@ public class GenericResourceExporter extends GCoreResourceMapper<GenericResource
|
|||
SimpleFacet simpleFacet = null;
|
||||
|
||||
try {
|
||||
readFromIS = resourceRegistryClient.existInstance(rClass, uuid);
|
||||
readFromIS = resourceRegistryClient.exists(rClass, uuid);
|
||||
} catch(NotFoundException e) {
|
||||
readFromIS = false;
|
||||
} catch(AvailableInAnotherContextException e) {
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(Configuration.NAME, uuid, false);
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(Configuration.NAME, uuid);
|
||||
Thread.sleep(100);
|
||||
readFromIS = true;
|
||||
}
|
||||
|
|
|
@ -79,11 +79,11 @@ public class ServiceEndpointExporter extends GCoreResourceMapper<ServiceEndpoint
|
|||
NetworkingFacet networkingFacet = null;
|
||||
|
||||
try {
|
||||
readFromIS = resourceRegistryClient.existInstance(rClass, uuid);
|
||||
readFromIS = resourceRegistryClient.exists(rClass, uuid);
|
||||
} catch(NotFoundException e) {
|
||||
readFromIS = false;
|
||||
} catch(AvailableInAnotherContextException e) {
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(EService.NAME, uuid, false);
|
||||
resourceRegistryPublisher.addResourceToCurrentContext(EService.NAME, uuid);
|
||||
Thread.sleep(100);
|
||||
readFromIS = true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue