Accumulated changed from release 0.1.21 to 0.1.26

.github/workflows/maven.yml

@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+#    - name: Update dependency graph
+#      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.gitignore

@@ -21,3 +21,5 @@ build.xml
 nb-configuration.xml
 *.versionsBackup
 .gradle
+.factorypath
+.nondex

CliArg/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jsonex</groupId>
     <artifactId>jcParent</artifactId>
-    <version>0.1.21</version>
+    <version>0.1.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>CliArg</artifactId>

CliArg/src/main/java/org/jsonex/cliarg/CLIParser.java

@@ -1,20 +1,26 @@
 package org.jsonex.cliarg;
 
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.jsonex.core.util.BeanConvertContext;
 import org.jsonex.core.util.ClassUtil;
+import static org.jsonex.core.util.LangUtil.doIf;
+import static org.jsonex.core.util.LangUtil.doIfNotNull;
+import static org.jsonex.core.util.ListUtil.isIn;
 import org.jsonex.jsoncoder.JSONCoder;
 import org.jsonex.jsoncoder.JSONCoderOption;
 import org.jsonex.treedoc.TDNode.Type;
 import org.jsonex.treedoc.json.TDJSONOption;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
-
-import static org.jsonex.core.util.LangUtil.doIf;
-import static org.jsonex.core.util.ListUtil.isIn;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Parse the input command line arguments against the {@link CLISpec}. The parsed result will be stored in the target
@@ -106,7 +112,7 @@ private void parseArg(String arg) {
     }
     Param param = spec.indexedParams.get(paramIndex++);
     missingParams.remove(param.name);
-    param.property.set(target, parseValue(param, arg));
+    doIfNotNull(parseValue(param, arg), v -> param.property.set(target, v));
   }
 
   private Object parseValue(Param param, String value)  {
@@ -124,7 +130,8 @@ private Object parseValue(Param param, String value)  {
           ? JSONCoder.decode(value, cls, opt)
           : JSONCoder.decodeTo(value, param.getProperty().get(target), opt.setMergeArray(true));
     } catch (Exception e) {
-      log.error("Error parsing parameter:" + param.name, e);
+      errorMessages.put(param.name,  value + ";" + e.toString());
+      // log.error("Error parsing parameter:" + param.name, e);
     }
     return null;
   }
@@ -133,9 +140,9 @@ private Object parseValue(Param param, String value)  {
 
   public String getErrorsAsString() {
     StringBuilder sb = new StringBuilder();
-    doIf(!missingParams.isEmpty(), () -> sb.append("\nMissing required arguments:" + missingParams));
-    doIf(!extraArgs.isEmpty(), () -> sb.append("\nUnexpected arguments:" + extraArgs));
-    doIf(!errorMessages.isEmpty(), () -> sb.append("\nError parsing following arguments:" + errorMessages));
+    doIf(!missingParams.isEmpty(), () -> sb.append("\nMissing required arguments:").append(missingParams));
+    doIf(!extraArgs.isEmpty(), () -> sb.append("\nUnexpected arguments:").append(extraArgs));
+    doIf(!errorMessages.isEmpty(), () -> sb.append("\nError parsing following arguments:").append(errorMessages));
     return sb.toString();
   }
 }

CliArg/src/main/java/org/jsonex/cliarg/CLISpec.java

@@ -20,16 +20,18 @@
 import static org.jsonex.core.util.ListUtil.setAt;
 
 /**
+ * <pre>
  * CLI specification based on annotated java bean of `cls`. Following annotations will be processed:
  *
  * Class level:
  *   {@link Name}: Name of the command. (Optional) Default to the class simple name
  *   {@link Summary}: Summary of the command (Optional)
  *   {@link Description}: Description of the command (Optional)
  *   {@link Examples}: Array of string representation of samples usages (Optional)
- *
  * For field level annotations, please refer to class {@link Param}
  *
+ * </pre>
+ *
  * @param <T>
  */
 @Data

CliArg/src/main/java/org/jsonex/cliarg/Param.java

@@ -11,27 +11,28 @@
 import static org.jsonex.core.util.StringUtil.noNull;
 
 /**
- * Represent an command line parameter, it can be either argument or option
- * If index is not null indicate it's argument
- *   Argument default to required unless explicitly specified.
- *   required argument can't follow non-required argument which index less than it
- * If index is null indicates it's an option, option default to not required, unless specified
- *
- * For option of Boolean type, it will be mapped as flag, that means the value of the option can be omitted.
  *
+ * <pre>
+ * Represent a command line parameter, it can be either argument or option
+ * If index is not null indicate it is an argument.
+ *    Argument default to required unless explicitly specified.
+ *    Required argument can't follow non-required argument which index less than it
+ * If index is null indicates it's an option, option default to not required, unless specified
+ *    For option of Boolean type, it will be mapped as flag, that means the value of the option can be omitted.
+
  * For Param of complex type or array/list, the value can be specified as JSON(ex) string, the top level "{" or "[",
  * can be, omitted. The quote for key and value can be omitted.
- *
- * For array parameters, it also possible to specify the values as separate options. The values will be merged
- *
+
+ * For array parameters, it is also possible to specify the values as separate options. The values will be merged
+
  * Following Annotation will be processed for each parameter:
- *
  * {@link Name}  Name of the parameter, optional, default to field name
  * {@link ShortName}  The optional short name
  * {@link Description}  The optional description
  * {@link Index}  Indicate this an indexed parameter
  * {@link Required}  Indicate if this field is required. all the index fields are required unless explicitly indicated.
  *     All the non-index fields are not required unless explicitly indicated.
+ * </pre>
  */
 @Data
 public class Param {

CliArg/src/test/java/org/jsonex/cliarg/CliParserTest.java

@@ -49,15 +49,15 @@ public static class Arg1 {
 
   @Test
   public void testParse() {
-    CLISpec spec = new CLISpec(Arg1.class);
+    CLISpec<Arg1> spec = new CLISpec<>(Arg1.class);
     assertMatchesSnapshot("spec", spec);
 
     log.info("spec:\n" + spec.printUsage());
     assertMatchesSnapshot("usage", spec.printUsage());
 
     String[] args = { "abc", "10", "name:n1,x:1,y:2", "-o", "VAL2", "--optInt", "100",
         "--arrayArg", "str1,str2,'It\\'s escapted'", "--arrayArg", "array as separate option"};
-    CLIParser parser = spec.parse(args, 0);
+    CLIParser<Arg1> parser = spec.parse(args, 0);
     log.info("parsedValue:\n" + parser.target);
     assertMatchesSnapshot("parserTarget", parser.target);
 

CliArg/src/test/resources/org/jsonex/cliarg/__snapshot__/CliParserTest_testParse_parserTarget.json

@@ -1,18 +1,18 @@
 {
-  "strParam":"abc",
+  "arrayArg":[
+    "str1",
+    "str2",
+    "It's escapted",
+    "array as separate option"
+  ],
+  "noShortName":0,
   "numParam":10,
+  "opt":"VAL2",
+  "optInt":100,
   "point":{
     "name":"n1",
     "x":1,
     "y":2
   },
-  "opt":"VAL2",
-  "optInt":100,
-  "noShortName":0,
-  "arrayArg":[
-    "str1",
-    "str2",
-    "It's escapted",
-    "array as separate option"
-  ]
+  "strParam":"abc"
 }

CliArg/src/test/resources/org/jsonex/cliarg/__snapshot__/CliParserTest_testParse_spec.json

@@ -1,64 +1,64 @@
 {
   "cls":"org.jsonex.cliarg.CliParserTest.Arg1",
   "defVal":{
+    "noShortName":0,
     "numParam":0,
     "opt":"VAL1",
-    "optInt":10,
-    "noShortName":0
+    "optInt":10
   },
-  "name":"TestArg1",
-  "summary":"This is a test arg1",
   "description":"Description of test Args",
   "examples":[
     "arg1 2",
     "arg1 4"
   ],
   "firstOptionalIndex":2,
-  "optionParams":[
-    {
-      "name":"opt",
-      "shortName":"o",
-      "description":"Opt",
-      "defVal":"VAL1",
-      "required":true
-    },
+  "indexedParams":[
     {
-      "name":"optInt",
-      "shortName":"i",
-      "defVal":10
+      "description":"Str parameter",
+      "index":0,
+      "name":"strParam"
     },
     {
-      "name":"noShortName",
-      "defVal":0
+      "defVal":0,
+      "description":"number parameter",
+      "index":1,
+      "name":"numParam"
     },
     {
-      "name":"arrayArg",
-      "description":"array of string, you can specify either use ',' separated string (jsonex array, with escape supported), or pass as multiple options"
+      "description":"Object Point",
+      "index":2,
+      "name":"point",
+      "required":false
     }
   ],
-  "indexedParams":[
+  "name":"TestArg1",
+  "optionParams":[
     {
-      "name":"strParam",
-      "index":0,
-      "description":"Str parameter"
+      "defVal":"VAL1",
+      "description":"Opt",
+      "name":"opt",
+      "required":true,
+      "shortName":"o"
     },
     {
-      "name":"numParam",
-      "index":1,
-      "description":"number parameter",
-      "defVal":0
+      "defVal":10,
+      "name":"optInt",
+      "shortName":"i"
     },
     {
-      "name":"point",
-      "index":2,
-      "description":"Object Point",
-      "required":false
+      "defVal":0,
+      "name":"noShortName"
+    },
+    {
+      "description":"array of string, you can specify either use ',' separated string (jsonex array, with escape supported), or pass as multiple options",
+      "name":"arrayArg"
     }
   ],
   "requiredParams":[
     "strParam",
     "numParam",
     "opt"
   ],
+  "summary":"This is a test arg1",
   "usage":"TestArg1 -o {opt} [-i {optInt}] [--noShortName {noShortName}] [--arrayArg {arrayArg}] <strParam> <numParam> [point]"
 }

HiveUDF/pom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jsonex</groupId>
+    <artifactId>jcParent</artifactId>
+    <version>0.1.27</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <artifactId>HiveUDF</artifactId>
+  <name>HiveUDF</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>JSONCoder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>csv</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>SnapshotTest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>SnapshotTest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-exec</artifactId>
+      <version>4.0.0-alpha-2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>