add: Binder#Format#of(String)

oaplatform · Aug 29, 2023 · 7a85bdd · 7a85bdd
1 parent caa06c5
commit 7a85bdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/oap-stdlib/src/main/java/oap/json/Binder.java b/oap-stdlib/src/main/java/oap/json/Binder.java
@@ -68,6 +68,7 @@
 import oap.reflect.TypeRef;
 import oap.util.Dates;
 import oap.util.function.Try;
+import org.jetbrains.annotations.NotNull;
 import org.joda.time.ReadableInstant;
 
 import java.io.IOException;
@@ -639,12 +640,17 @@ public enum Format {
             this.binder = binder;
         }
 
+        @NotNull
         public static Format of( URL url, boolean withSystemProperties ) {
             var path = url.toString().toLowerCase();
+            return of( path, withSystemProperties );
+        }
+
+        @NotNull
+        public static Format of( String path, boolean withSystemProperties ) {
             if( path.endsWith( "json" ) ) return JSON;
             else if( path.endsWith( "yaml" ) || path.endsWith( "yml" ) ) return YAML;
             return withSystemProperties ? HOCON : HOCON_WO_SYSTEM_PROPERTIES;
         }
     }
-
 }
diff --git a/oap-stdlib/src/main/java/oap/reflect/Coercions.java b/oap-stdlib/src/main/java/oap/reflect/Coercions.java
@@ -69,13 +69,13 @@ public final class Coercions {
 
     static {
         functions.put( "path", Try.biMap( ( path, reflection ) ->
-            Binder.hoconWithoutSystemProperties.unmarshal( reflection, Path.of( path ) ) ) );
+                Binder.Format.of( path, false ).binder.unmarshal( reflection, Path.of( path ) ) ) );
         functions.put( "file", Try.biMap( ( path, reflection ) ->
-            Binder.hoconWithoutSystemProperties.unmarshal( reflection, Path.of( path ) ) ) );
+            Binder.Format.of( path, false ).binder.unmarshal( reflection, Path.of( path ) ) ) );
         functions.put( "url", Try.biMap( ( url, reflection ) ->
-            Binder.hoconWithoutSystemProperties.unmarshal( reflection, new URL( url ) ) ) );
+            Binder.Format.of( url, false ).binder.unmarshal( reflection, new URL( url ) ) ) );
         functions.put( "classpath", Try.biMap( ( cp, reflection ) ->
-            Binder.hoconWithoutSystemProperties.unmarshal( reflection, Coercions.class.getResource( cp ) ) ) );
+            Binder.Format.of( cp, false ).binder.unmarshal( reflection, Coercions.class.getResource( cp ) ) ) );
         functions.put( "str", Try.biMap( ( str, reflection ) ->
             Binder.hoconWithoutSystemProperties.unmarshal( reflection, str ) ) );
         functions.put( "hocon", Try.biMap( ( str, reflection ) ->

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
     </repositories>
 
     <properties>
-        <oap.project.version>18.11.5.28</oap.project.version>
+        <oap.project.version>18.11.5.29</oap.project.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>