Bump java-directory to v0.31.0

aserto-dev · Feb 21, 2024 · 54c913d · 54c913d
1 parent 2620295
commit 54c913d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.aserto</groupId>
             <artifactId>java-directory</artifactId>
-            <version>0.30.2</version>
+            <version>0.31.0</version>
         </dependency>
 
         <!-- Used for unit testing -->

diff --git a/src/main/java/com/aserto/directory/v3/DirectoryClient.java b/src/main/java/com/aserto/directory/v3/DirectoryClient.java
@@ -1,6 +1,5 @@
 package com.aserto.directory.v3;
 
-import com.aserto.directory.importer.v3.Opcode;
 import com.aserto.utils.MessageChunker;
 import com.aserto.directory.common.v3.ObjectIdentifier;
 import com.aserto.directory.common.v3.PaginationRequest;

diff --git a/src/test/java/DirectoryClientTest.java b/src/test/java/DirectoryClientTest.java
@@ -1,5 +1,4 @@
 import com.aserto.ChannelBuilder;
-import com.aserto.directory.common.v3.ObjectDependency;
 import com.aserto.directory.exporter.v3.ExportResponse;
 import com.aserto.directory.exporter.v3.Option;
 import com.aserto.directory.importer.v3.Opcode;
@@ -54,13 +53,16 @@ class DirectoryClientTest {
             "    relations:\n" +
             "      ### display_name: user#manager ###\n" +
             "      manager: user\n" +
+            "      friend: user\n" +
             "\n" +
             "  ### display_name: Identity ###\n" +
             "  identity:\n" +
             "    relations:\n" +
             "      ### display_name: identity#identifier ###\n" +
             "      identifier: user\n" +
             "\n" +
+            "  test_type:\n" +
+            "\n" +
             "  ### display_name: Group ###\n" +
             "  group:\n" +
             "    relations:\n" +
@@ -290,19 +292,17 @@ void testCheckManager() throws UninitilizedClientException {
     void testGetGraph() {
         // Arrange
         GetGraphRequest getGraphRequest = GetGraphRequest.newBuilder()
-                .setAnchorType("user")
-                .setAnchorId("[email protected]")
                 .setObjectType("user")
                 .setObjectId("[email protected]")
+                .setRelation("manager")
+                .setSubjectType("user")
+                .setSubjectId("[email protected]")
                 .build();
 
-                List<ObjectDependency> objectDependencyList = Arrays.asList(
-                    ObjectDependency.newBuilder()
+                List<ObjectIdentifier> objectDependencyList = Arrays.asList(
+                    ObjectIdentifier.newBuilder()
                             .setObjectType("user")
-                            .setObjectId("[email protected]")
-                            .setRelation("manager")
-                            .setSubjectType("user")
-                            .setSubjectId("[email protected]")
+                            .setObjectId("[email protected]")
                             .build()
                 );
 
@@ -319,7 +319,7 @@ void testGetGraph() {
     void setObjectTest() throws UninitilizedClientException {
         // Arrange
         Object object = Directory.buildObject("test_type", "test_id");
-
+        
         // Act
         SetObjectResponse setObjectResponse = directoryClient.setObject("test_type", "test_id");
 

diff --git a/src/test/java/utils/Topaz.java b/src/test/java/utils/Topaz.java
@@ -42,7 +42,7 @@ public void stop() throws IOException, InterruptedException {
     }
 
     private void start() throws IOException, InterruptedException {
-        ProcessBuilder pb = new ProcessBuilder("topaz","start");
+        ProcessBuilder pb = new ProcessBuilder("topaz","start", "--container-version", "model-v2.3");
         pb.inheritIO();
         Process process = pb.start();
         process.waitFor();