Adapt to new API files

polypheny · Oct 4, 2024 · 9b5af76 · 9b5af76
1 parent 3c0528c
commit 9b5af76
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 62 deletions.
diff --git a/src/main/java/org/polypheny/jdbc/multimodel/GraphResult.java b/src/main/java/org/polypheny/jdbc/multimodel/GraphResult.java
@@ -25,10 +25,7 @@
 import org.polypheny.jdbc.PrismInterfaceErrors;
 import org.polypheny.jdbc.PrismInterfaceServiceException;
 import org.polypheny.jdbc.properties.PropertyUtils;
-import org.polypheny.jdbc.types.PolyEdge;
 import org.polypheny.jdbc.types.PolyGraphElement;
-import org.polypheny.jdbc.types.PolyNode;
-import org.polypheny.jdbc.types.PolyPath;
 import org.polypheny.prism.Frame;
 import org.polypheny.prism.Frame.ResultCase;
 import org.polypheny.prism.GraphFrame;
@@ -50,17 +47,7 @@ public GraphResult( Frame frame, PolyStatement polyStatement ) {
 
 
     private void addGraphElements( GraphFrame graphFrame ) {
-        if ( graphFrame.getNodesCount() > 0 ) {
-            graphFrame.getNodesList().forEach( n -> elements.add( new PolyNode( n ) ) );
-            return;
-        }
-        if ( graphFrame.getEdgesCount() > 0 ) {
-            graphFrame.getEdgesList().forEach( n -> elements.add( new PolyEdge( n ) ) );
-            return;
-        }
-        if ( graphFrame.getPathsCount() > 0 ) {
-            graphFrame.getPathsList().forEach( n -> elements.add( new PolyPath( n ) ) );
-        }
+        graphFrame.getElementList().forEach( n -> elements.add( PolyGraphElement.of( n ) ) );
     }
 
 
@@ -126,5 +113,4 @@ public PolyGraphElement next() {
 
     }
 
-
 }
diff --git a/src/main/java/org/polypheny/jdbc/types/PolyEdge.java b/src/main/java/org/polypheny/jdbc/types/PolyEdge.java
@@ -18,13 +18,12 @@
 
 import lombok.Getter;
 import org.polypheny.prism.ProtoEdge;
-import org.polypheny.prism.ProtoValue.ValueCase;
 
 @Getter
 public class PolyEdge extends PolyGraphElement {
 
-    private final String source;
-    private final String target;
+    private final String left;
+    private final String right;
     private final EdgeDirection direction;
 
 
@@ -33,14 +32,9 @@ public PolyEdge( ProtoEdge protoEdge ) {
         this.id = protoEdge.getId();
         this.name = protoEdge.getName();
         this.labels = protoEdge.getLabelsList();
-        protoEdge.getPropertiesList().stream()
-                .filter( e -> e.getKey().getValueCase() == ValueCase.STRING )
-                .forEach( p -> put(
-                        p.getKey().getString().getString(),
-                        new TypedValue( p.getValue() )
-                ) );
-        this.source = protoEdge.getSource();
-        this.target = protoEdge.getTarget();
+        protoEdge.getPropertiesMap().forEach( ( k, v ) -> put( k, new TypedValue( v ) ) );
+        this.left = protoEdge.getSource();
+        this.right = protoEdge.getTarget();
         this.direction = EdgeDirection.valueOf( protoEdge.getDirection().name() );
     }
 

diff --git a/src/main/java/org/polypheny/jdbc/types/PolyGraphElement.java b/src/main/java/org/polypheny/jdbc/types/PolyGraphElement.java
@@ -22,9 +22,10 @@
 import lombok.Getter;
 import org.polypheny.jdbc.PrismInterfaceErrors;
 import org.polypheny.jdbc.PrismInterfaceServiceException;
+import org.polypheny.prism.GraphElement;
 
 @Getter
-public class PolyGraphElement extends HashMap<String, TypedValue> {
+public abstract class PolyGraphElement extends HashMap<String, TypedValue> {
 
     protected String id;
     protected String name;
@@ -39,4 +40,15 @@ public <T> T unwrap( Class<T> aClass ) throws PrismInterfaceServiceException {
     }
 
 
+    public static PolyGraphElement of( GraphElement element ) {
+        switch ( element.getElementCase() ) {
+            case NODE:
+                return new PolyNode( element.getNode() );
+            case EDGE:
+                return new PolyEdge( element.getEdge() );
+            default:
+                throw new RuntimeException( "Unknown graph element of type " + element.getElementCase() );
+        }
+    }
+
 }
diff --git a/src/main/java/org/polypheny/jdbc/types/PolyNode.java b/src/main/java/org/polypheny/jdbc/types/PolyNode.java
@@ -27,12 +27,7 @@ public PolyNode( ProtoNode protoNode ) {
         this.id = protoNode.getId();
         this.name = protoNode.getName();
         this.labels = protoNode.getLabelsList();
-        protoNode.getPropertiesList().stream()
-                .filter( e -> e.getKey().getValueCase() == ValueCase.STRING )
-                .forEach( p -> put(
-                        p.getKey().getString().getString(),
-                        new TypedValue( p.getValue() )
-                ) );
+        protoNode.getPropertiesMap().forEach( ( k, v ) -> put( k, new TypedValue( v ) ) );
     }
 
 }
diff --git a/src/main/java/org/polypheny/jdbc/types/PolyPath.java b/src/main/java/org/polypheny/jdbc/types/PolyPath.java