extract for re-use

Author: hauner

openapi-parser/src/main/java/io/openapiparser/OpenApiParser.java

@@ -5,12 +5,10 @@
 
 package io.openapiparser;
 
-import io.openapiprocessor.jsonschema.converter.StringNotNullConverter;
 import io.openapiprocessor.jsonschema.schema.*;
 
 import java.net.URI;
 
-import static io.openapiparser.Keywords.OPENAPI;
 import static io.openapiprocessor.jsonschema.support.Null.nonNull;
 
 public class OpenApiParser {
@@ -47,20 +45,19 @@ public OpenApiResult parse(URI baseUri, Object document) {
     }
 
     private OpenApiResult parseVersion(URI baseUri, Object document) {
-        String version = getVersion(baseUri, document);
+        OpenApiVersion version = OpenApiVersionParser.parseVersion(document);
 
-        if (isVersion30(version)) {
+        if (version == OpenApiVersion.V30) {
             return parse30(baseUri, document);
 
-        } else if (isVersion31(version)) {
+        } else if (version == OpenApiVersion.V31) {
             return parse31(baseUri, document);
 
-        } else if (isVersion32(version)) {
+        } else if (version == OpenApiVersion.V32) {
             return parse32(baseUri, document);
-
-        } else {
-            throw new UnknownVersionException(version);
         }
+
+        throw new RuntimeException("failed to parser OpenAPI version!");
     }
 
     private OpenApiResult32 parse32(URI baseUri, Object document) {
@@ -103,26 +100,4 @@ private OpenApiResult30 parse30(URI baseUri, Object document) {
                 nonNull(Bucket.createBucket(result.getScope(), document)),
                 documents);
     }
-
-    private String getVersion(URI baseUri, Object document) {
-        Scope scope = Scope.createScope(baseUri, document, SchemaVersion.getLatest());
-        Bucket api = nonNull(Bucket.createBucket(scope, document));
-        return  nonNull(api.convert (OPENAPI, new StringNotNullConverter ()));
-    }
-
-    private boolean isVersion30(String version) {
-        return checkVersion (version, "3.0");
-    }
-
-    private boolean isVersion31(String version) {
-        return checkVersion (version, "3.1");
-    }
-
-    private boolean isVersion32(String version) {
-        return checkVersion (version, "3.2");
-    }
-
-    private boolean checkVersion (String version, String prefix) {
-        return version.startsWith (prefix);
-    }
 }

openapi-parser/src/main/java/io/openapiparser/OpenApiVersionParser.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-parser
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiparser;
+
+import io.openapiprocessor.jsonschema.converter.StringNotNullConverter;
+import io.openapiprocessor.jsonschema.support.Types;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Map;
+
+import static io.openapiparser.Keywords.OPENAPI;
+
+public class OpenApiVersionParser {
+
+    public static OpenApiVersion parseVersion(Object document) {
+        String version = getVersion(document);
+
+        if (isVersion30(version)) {
+            return OpenApiVersion.V31;
+
+        } else if (isVersion31(version)) {
+            return OpenApiVersion.V31;
+
+        } else if (isVersion32(version)) {
+            return OpenApiVersion.V32;
+
+        } else {
+            throw new UnknownVersionException(version);
+        }
+    }
+
+    private static boolean isVersion30(String version) {
+        return checkVersion (version, "3.0");
+    }
+
+    private static boolean isVersion31(String version) {
+        return checkVersion (version, "3.1");
+    }
+
+    private static boolean isVersion32(String version) {
+        return checkVersion (version, "3.2");
+    }
+
+    private static boolean checkVersion (String version, String prefix) {
+        return version.startsWith (prefix);
+    }
+
+    private static String getVersion(Object document) {
+        if (!Types.isMap(document)) {
+            throw new UnknownVersionException(null);
+        }
+
+        Map<String, @Nullable Object> root = Types.asMap(document);
+        StringNotNullConverter converter = new StringNotNullConverter();
+        return converter.convert(OPENAPI, root.get(OPENAPI), "");
+    }
+}