Non-functional changes

2 files changed, 3 insertions, 2 deletions

diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java
index b587a9200ec..3774e64c886 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/ModelImporter.java
@@ -96,7 +96,7 @@ public abstract class ModelImporter implements MlModelImporter {
             for (String outputName : signature.outputs().values()) {
                 try {
                     Optional<TensorFunction> function = importExpression(graph.get(outputName), model);
-                    if (!function.isPresent()) {
+                    if (function.isEmpty()) {
                         signature.skippedOutput(outputName, "No valid output function could be found.");
                     }
                 }
@@ -108,7 +108,7 @@ public abstract class ModelImporter implements MlModelImporter {
     }
 
     private static Optional<TensorFunction> importExpression(IntermediateOperation operation, ImportedModel model) {
-        if (!operation.type().isPresent()) {
+        if (operation.type().isEmpty()) {
             return Optional.empty();
         }
         if (operation.isConstant()) {
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java
index 0a8a797a847..b1c5dc8a0d8 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/OnnxImporter.java
@@ -30,6 +30,7 @@ public class OnnxImporter extends ModelImporter {
     public ImportedModel importModel(String modelName, String modelPath) {
         try (FileInputStream inputStream = new FileInputStream(modelPath)) {
             Onnx.ModelProto model = Onnx.ModelProto.parseFrom(inputStream);
+            // long version = model.getOpsetImport(0).getVersion();  // opset version
             IntermediateGraph graph = GraphImporter.importGraph(modelName, model);
             return convertIntermediateGraphToModel(graph, modelPath);
         } catch (IOException e) {