extract default SchemaClient extraction into static factory method, r…

…ename DefaultSchemaClient to URLQueryingSchemaClient
erosb · Oct 30, 2024 · 37ae35b · 37ae35b
1 parent 9061adf
commit 37ae35b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/main/kotlin/com/github/erosb/jsonsKema/SchemaClient.kt b/src/main/kotlin/com/github/erosb/jsonsKema/SchemaClient.kt
@@ -7,6 +7,16 @@ import java.nio.charset.StandardCharsets
 import java.util.*
 
 fun interface SchemaClient {
+
+    companion object {
+        @JvmStatic
+        fun createDefaultInstance(additionalMappings: Map<URI, String>): SchemaClient = MemoizingSchemaClient(
+            PrepopulatedSchemaClient(
+                ClassPathAwareSchemaClient(URLQueryingSchemaClient()),
+                additionalMappings
+            )
+        )
+    }
     fun get(uri: URI): InputStream
 
     /**
@@ -30,7 +40,7 @@ fun interface SchemaClient {
     }
 }
 
-internal class DefaultSchemaClient : SchemaClient {
+internal class URLQueryingSchemaClient : SchemaClient {
 
     override fun get(uri: URI): InputStream {
         try {

diff --git a/src/main/kotlin/com/github/erosb/jsonsKema/SchemaLoader.kt b/src/main/kotlin/com/github/erosb/jsonsKema/SchemaLoader.kt
@@ -17,12 +17,7 @@ data class SchemaLoaderConfig @JvmOverloads constructor(
     companion object {
         @JvmStatic
         fun createDefaultConfig(additionalMappings: Map<URI, String> = mapOf()) = SchemaLoaderConfig(
-            schemaClient = MemoizingSchemaClient(
-                PrepopulatedSchemaClient(
-                    ClassPathAwareSchemaClient(DefaultSchemaClient()),
-                    additionalMappings
-                )
-            ),
+            schemaClient = SchemaClient.createDefaultInstance(additionalMappings),
             additionalMappings = additionalMappings
         )
     }