diff --git a/NOTICE b/NOTICE index 917c0ca7318e1db26bdf63fb87bc8d5ae0d120f8..29b889bdec68d573020a006e3cbf8b8426ff0441 100644 --- a/NOTICE +++ b/NOTICE @@ -20,13 +20,15 @@ The following software have components provided under the terms of this license: - ASM based accessors helper used by json-smart (from ) - Adapter: RxJava (from ) - Admin Directory API directory_v1-rev77-1.22.0 (from ) +- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/) - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/) - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/) - Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/) -- Apache Commons Configuration (from http://commons.apache.org/configuration/) +- Apache Commons Configuration (from http://commons.apache.org/proper/commons-configuration/) - Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Pool (from http://commons.apache.org/proper/commons-pool/) +- Apache Commons Text (from http://commons.apache.org/proper/commons-text/) - Apache Groovy (from http://groovy-lang.org) - Apache Groovy (from http://groovy-lang.org) - Apache Groovy (from http://groovy-lang.org) @@ -61,7 +63,6 @@ The following software have components provided under the terms of this license: - Cloud Storage JSON API v1-rev58-1.21.0 (from ) - Commons IO (from http://commons.apache.org/io/) - Commons IO (from http://commons.apache.org/io/) -- Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from ) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) @@ -145,8 +146,8 @@ The following software have components provided under the terms of this license: - Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) -- Mockito (from http://mockito.org) - Mockito (from http://www.mockito.org) +- Mockito (from http://mockito.org) - Netty Reactive Streams Implementation (from ) - Netty/All-in-One (from ) - Netty/Buffer (from http://netty.io/) @@ -463,7 +464,6 @@ GPL-2.0-only ======================================================================== The following software have components provided under the terms of this license: -- Commons Lang (from http://commons.apache.org/lang/) - JavaBeans Activation Framework (from ) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -523,7 +523,6 @@ LGPL-2.1-only ======================================================================== The following software have components provided under the terms of this license: -- Commons Lang (from http://commons.apache.org/lang/) - Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) diff --git a/provider/entitlements-v2-azure/pom.xml b/provider/entitlements-v2-azure/pom.xml index 25ce046e7d457674bdf3cf2d76f0c3a5e8c05aa9..8a83337462e198cb53104faaeff86c54a5dc5dbc 100644 --- a/provider/entitlements-v2-azure/pom.xml +++ b/provider/entitlements-v2-azure/pom.xml @@ -14,7 +14,7 @@ 0.9.0-rc2 - 3.4.10 + 3.5.0 3.15.3 1.7.0 0.7.1 diff --git a/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilService.java b/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilService.java index 4c03f5a478341421c94d54b5731e9655f675b036..76ba6cbf5e80662aebeae2bdd77d9c8a7996f993 100644 --- a/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilService.java +++ b/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilService.java @@ -33,7 +33,7 @@ public class GraphTraversalSourceUtilService { traversal = traversal.property(entry.getKey(), entry.getValue()); } } - traversal = traversal.to(graphTraversalSource.V().has(VertexPropertyNames.NODE_ID, addEdgeDto.getToNodeId()) + traversal = traversal.to(__.V().has(VertexPropertyNames.NODE_ID, addEdgeDto.getToNodeId()) .has(VertexPropertyNames.DATA_PARTITION_ID, addEdgeDto.getDpOfToNodeId())); gremlinConnector.addEdge(traversal); } diff --git a/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/spi/gremlin/connection/ClusterGremlinConnector.java b/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/spi/gremlin/connection/ClusterGremlinConnector.java index 8b40f1ae8f0b2364dcadb373cd7907ad507c3674..f62a712ac0aa5b9c2329d79f69c02d3528c01905 100644 --- a/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/spi/gremlin/connection/ClusterGremlinConnector.java +++ b/provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/spi/gremlin/connection/ClusterGremlinConnector.java @@ -121,7 +121,7 @@ public class ClusterGremlinConnector implements GremlinConnector { } private List submitTraversalAsQueryString(Traversal traversal) { - String query = GroovyTranslator.of(G).translate(traversal.asAdmin().getBytecode()); + String query = GroovyTranslator.of(G).translate(traversal.asAdmin().getBytecode()).getScript(); return getResultList(client.submit(query)); } diff --git a/provider/entitlements-v2-azure/src/test/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilServiceTest.java b/provider/entitlements-v2-azure/src/test/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilServiceTest.java index c1fd2c31e9e44703caf2d87deca3aa734d74cb17..3c0ab22340bc0ca2d83e59bf3200af57ab0afbab 100644 --- a/provider/entitlements-v2-azure/src/test/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilServiceTest.java +++ b/provider/entitlements-v2-azure/src/test/java/org/opengroup/osdu/entitlements/v2/azure/service/GraphTraversalSourceUtilServiceTest.java @@ -84,6 +84,7 @@ public class GraphTraversalSourceUtilServiceTest { .dpOfToNodeId("dp2") .dpOfFromNodeId("dp") .edgeProperties(Collections.singletonMap(EdgePropertyNames.ROLE, Role.OWNER.getValue())) + .edgeLabel("edge-label") .build(); graphTraversalSourceUtilService.addEdge(addEdgeDto); @@ -124,6 +125,7 @@ public class GraphTraversalSourceUtilServiceTest { .dpOfToNodeId("dp") .dpOfFromNodeId("dp") .edgeProperties(Collections.singletonMap(EdgePropertyNames.ROLE, Role.OWNER.getValue())) + .edgeLabel("edge-label") .build(); graphTraversalSourceUtilService.addEdge(addEdgeDto); @@ -162,6 +164,7 @@ public class GraphTraversalSourceUtilServiceTest { .dpOfToNodeId("dp") .dpOfFromNodeId("dp") .edgeProperties(Collections.singletonMap(EdgePropertyNames.ROLE, Role.MEMBER.getValue())) + .edgeLabel("edge-label") .build(); graphTraversalSourceUtilService.addEdge(addEdgeDto);