Release 0.1.27: add LangUtil.seq, with

eBay · Sep 2, 2022 · 0a6fa12 · 0a6fa12
1 parent 71b59d0
commit 0a6fa12
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 9 deletions.
diff --git a/CliArg/pom.xml b/CliArg/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>CliArg</artifactId>

diff --git a/HiveUDF/pom.xml b/HiveUDF/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>HiveUDF</artifactId>

diff --git a/JSONCoder/pom.xml b/JSONCoder/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>JSONCoder</artifactId>

diff --git a/SnapshotTest/pom.xml b/SnapshotTest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>SnapshotTest</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>core</artifactId>

diff --git a/core/src/main/java/org/jsonex/core/util/BeanProperty.java b/core/src/main/java/org/jsonex/core/util/BeanProperty.java
@@ -79,7 +79,7 @@ public Object get(Object obj){
         return field.get(obj);
       }
     } catch(Exception e) {
-      throw new InvokeRuntimeException("error get value:" + name + ", class:" + obj.getClass(), e);
+      throw new InvokeRuntimeException("error get value:" + name + ", class:" + obj.getClass() + ";hasChecker:" + hasChecker, e);
     }
     throw new InvokeRuntimeException("field is not readable: " + name + ", class:" + obj.getClass());
   }

diff --git a/core/src/main/java/org/jsonex/core/util/ClassUtil.java b/core/src/main/java/org/jsonex/core/util/ClassUtil.java
@@ -124,6 +124,11 @@ private static Map<String, BeanProperty> getPropertiesNoCache(Class<?> cls) {
           case has: prop.hasChecker = m; break;
           case set: prop.setter = m; break;
           case is:
+            if (prop.getter == null)
+              prop.getter = m;
+            else
+              prop.hasChecker = m ;
+            break;
           case get:
             if (prop.getter == null)
               prop.getter = m;

diff --git a/core/src/main/java/org/jsonex/core/util/LangUtil.java b/core/src/main/java/org/jsonex/core/util/LangUtil.java
@@ -3,6 +3,7 @@
 import lombok.SneakyThrows;
 import org.jsonex.core.type.Nullable;
 
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -124,4 +125,16 @@ public static <T> T seq(Runnable action1, Runnable action2, T val) {
     action2.run();
     return val;
   }
+
+  /**
+   *  Convert a block of code with local variables definitions into an single expression, it's useful to avoid code block
+   *  in lambda statement.
+   */
+  public static <T, R> R with(T val, Function<T, R> action) {
+    return action.apply(val);
+  }
+
+  public static <T1, T2, R> R with(T1 val1, T2 val2, BiFunction<T1, T2, R> action) {
+    return action.apply(val1, val2);
+  }
 }
diff --git a/core/src/test/java/org/jsonex/core/util/LangUtilTest.java b/core/src/test/java/org/jsonex/core/util/LangUtilTest.java
@@ -65,4 +65,9 @@ static class C {
     assertEquals(val, LangUtil.seq(() -> i[0] += 1, () -> i[0] += 1, val));
     assertEquals(3, i[0]);
   }
+
+  @Test public void testWith() {
+    assertEquals("abcd", LangUtil.with("abc", a -> a + "d"));
+    assertEquals("abcd", LangUtil.with("abc", "d", (a, b) -> a + b));
+  }
 }
diff --git a/csv/pom.xml b/csv/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>csv</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jsonex</groupId>
   <artifactId>jcParent</artifactId>
-  <version>0.1.26</version>
+  <version>0.1.27</version>
   <packaging>pom</packaging>
   <name>JSONCoder Parent</name>
   <description>JSONCoder Parent</description>

diff --git a/treedoc/pom.xml b/treedoc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.26</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>treedoc</artifactId>