From 9e484eb78ae9a92e4ffc33ccb5574206ccd1e67d Mon Sep 17 00:00:00 2001
From: Anqi <anqi.wang@vesoft.com>
Date: Fri, 31 Mar 2023 00:33:39 +0800
Subject: [PATCH] cherrypick to 3.4 (#517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* check connection by default #401 (#456)

* enhancement:support more type value as parameter in session.value2Nvalue (#511)

* enhancement：support more type value as parameter in session.value2Nvalue

* code style for #511

* code style for #511

* Add maven wrapper (#513)

Co-authored-by: Will Droste <will.droste@brinqa.com>

* recreate session for both session error and connection exception

* fix style check

* sleep for docker restart

---------

Co-authored-by: vchangpengfei <37330503+vchangpengfei@users.noreply.github.com>
Co-authored-by: 大叶 <CorvusY@foxmail.com>
Co-authored-by: Will Droste <will.droste@brinqa.com>
---
 .mvn/wrapper/maven-wrapper.properties         |  18 ++
 .../nebula/client/graph/NebulaSession.java    |   4 +-
 .../nebula/client/graph/SessionPool.java      |  34 ++-
 .../nebula/client/graph/net/NebulaPool.java   |   2 +
 .../nebula/client/graph/net/Session.java      | 170 +++++++----
 .../com/vesoft/nebula/util/ReflectUtil.java   |  85 ++++++
 .../client/graph/data/TestDataFromServer.java |  19 +-
 .../client/graph/net/TestSessionPool.java     |  47 +++
 mvnw                                          | 287 ++++++++++++++++++
 mvnw.cmd                                      | 187 ++++++++++++
 10 files changed, 777 insertions(+), 76 deletions(-)
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100644 client/src/main/java/com/vesoft/nebula/util/ReflectUtil.java
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..dc3affce3
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/NebulaSession.java b/client/src/main/java/com/vesoft/nebula/client/graph/NebulaSession.java
index 0d2e0ef9f..ceed867d1 100644
--- a/client/src/main/java/com/vesoft/nebula/client/graph/NebulaSession.java
+++ b/client/src/main/java/com/vesoft/nebula/client/graph/NebulaSession.java
@@ -73,7 +73,9 @@ public void release() {
             connection.signout(sessionID);
             connection.close();
         } catch (Exception e) {
-            log.warn("release session failed, " + e.getMessage());
+            // not print the warn to avoid confuse for session and connect,
+            // when connection is broken, release will failed, just make connection as null.
+            // log.warn("release session failed, " + e.getMessage());
         }
         connection = null;
     }
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java b/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java
index 2efb63cb5..b0c19eeae 100644
--- a/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java
+++ b/client/src/main/java/com/vesoft/nebula/client/graph/SessionPool.java
@@ -5,6 +5,8 @@
 
 package com.vesoft.nebula.client.graph;
 
+import static com.vesoft.nebula.client.graph.exception.IOErrorException.E_CONNECT_BROKEN;
+
 import com.alibaba.fastjson.JSON;
 import com.vesoft.nebula.ErrorCode;
 import com.vesoft.nebula.client.graph.data.HostAddress;
@@ -138,22 +140,27 @@ public ResultSet execute(String stmt) throws IOErrorException,
         stmtCheck(stmt);
         checkSessionPool();
         NebulaSession nebulaSession = getSession();
-        ResultSet resultSet;
-        try {
-            resultSet = nebulaSession.execute(stmt);
-
-            // re-execute for session error
-            if (isSessionError(resultSet)) {
+        ResultSet resultSet = null;
+        int tryTimes = 3;
+        while (tryTimes-- > 0) {
+            try {
+                resultSet = nebulaSession.execute(stmt);
+                if (!isSessionError(resultSet)) {
+                    useSpace(nebulaSession, resultSet);
+                    return resultSet;
+                } else {
+                    throw new IOErrorException(E_CONNECT_BROKEN, resultSet.getErrorMessage());
+                }
+            } catch (IOErrorException e) {
                 nebulaSession.release();
                 sessionList.remove(nebulaSession);
-                nebulaSession = getSession();
-                resultSet = nebulaSession.execute(stmt);
+                if (tryTimes > 0) {
+                    nebulaSession = createSessionObject(SessionState.USED);
+                } else {
+                    throw e;
+                }
             }
-        } catch (IOErrorException e) {
-            useSpace(nebulaSession, null);
-            throw e;
         }
-        useSpace(nebulaSession, resultSet);
         return resultSet;
     }
 
@@ -339,7 +346,8 @@ public HostAddress getAddress() {
     private void useSpace(NebulaSession nebulaSession, ResultSet resultSet)
             throws IOErrorException {
         if (resultSet == null) {
-            releaseSession(nebulaSession);
+            nebulaSession.release();
+            sessionList.remove(nebulaSession);
             return;
         }
         // space has been drop, close the SessionPool
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/net/NebulaPool.java b/client/src/main/java/com/vesoft/nebula/client/graph/net/NebulaPool.java
index 0ffc6a523..262458622 100644
--- a/client/src/main/java/com/vesoft/nebula/client/graph/net/NebulaPool.java
+++ b/client/src/main/java/com/vesoft/nebula/client/graph/net/NebulaPool.java
@@ -112,6 +112,8 @@ public boolean init(List<HostAddress> addresses, NebulaPoolConfig config)
         objConfig.setMaxTotal(config.getMaxConnSize());
         objConfig.setTestOnBorrow(true);
         objConfig.setTestOnReturn(true);
+        objConfig.setTestOnCreate(true);
+        objConfig.setTestWhileIdle(true);
         objConfig.setTimeBetweenEvictionRunsMillis(config.getIntervalIdle() <= 0
             ? BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS
             : config.getIntervalIdle());
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/net/Session.java b/client/src/main/java/com/vesoft/nebula/client/graph/net/Session.java
index f7fc2af03..aef1e53cf 100644
--- a/client/src/main/java/com/vesoft/nebula/client/graph/net/Session.java
+++ b/client/src/main/java/com/vesoft/nebula/client/graph/net/Session.java
@@ -5,23 +5,34 @@
 
 package com.vesoft.nebula.client.graph.net;
 
-import com.vesoft.nebula.Date;
+import static com.vesoft.nebula.util.ReflectUtil.isCurrentTypeOrParentType;
+
+import com.vesoft.nebula.DataSet;
 import com.vesoft.nebula.DateTime;
 import com.vesoft.nebula.Duration;
+import com.vesoft.nebula.Edge;
 import com.vesoft.nebula.Geography;
 import com.vesoft.nebula.NList;
 import com.vesoft.nebula.NMap;
+import com.vesoft.nebula.NSet;
 import com.vesoft.nebula.NullType;
+import com.vesoft.nebula.Path;
 import com.vesoft.nebula.Time;
 import com.vesoft.nebula.Value;
+import com.vesoft.nebula.Vertex;
 import com.vesoft.nebula.client.graph.data.HostAddress;
 import com.vesoft.nebula.client.graph.data.ResultSet;
 import com.vesoft.nebula.client.graph.exception.IOErrorException;
 import com.vesoft.nebula.graph.ExecutionResponse;
+import com.vesoft.nebula.util.ReflectUtil;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -414,7 +425,6 @@ private static NMap map2Nmap(Map<String, Object> map) throws UnsupportedOperatio
         return nmap;
     }
 
-
     /**
      * convert java value type to nebula thrift value type
      *
@@ -422,60 +432,118 @@ private static NMap map2Nmap(Map<String, Object> map) throws UnsupportedOperatio
      * @return nebula value
      */
     public static Value value2Nvalue(Object value) throws UnsupportedOperationException {
-        Value nvalue = new Value();
-        if (value == null) {
-            nvalue.setNVal(NullType.__NULL__);
-        } else if (value instanceof Boolean) {
-            boolean bval = (Boolean) value;
-            nvalue.setBVal(bval);
-        } else if (value instanceof Integer) {
-            int ival = (Integer) value;
-            nvalue.setIVal(ival);
-        } else if (value instanceof Short) {
-            int ival = (Short) value;
-            nvalue.setIVal(ival);
-        } else if (value instanceof Byte) {
-            int ival = (Byte) value;
-            nvalue.setIVal(ival);
-        } else if (value instanceof Long) {
-            long ival = (Long) value;
-            nvalue.setIVal(ival);
-        } else if (value instanceof Float) {
-            float fval = (Float) value;
-            nvalue.setFVal(fval);
-        } else if (value instanceof Double) {
-            double dval = (Double) value;
-            nvalue.setFVal(dval);
-        } else if (value instanceof String) {
-            byte[] sval = ((String) value).getBytes();
-            nvalue.setSVal(sval);
-        } else if (value instanceof List) {
-            nvalue.setLVal(list2Nlist((List<Object>) value));
-        } else if (value instanceof Map) {
-            nvalue.setMVal(map2Nmap((Map<String, Object>) value));
-        } else if (value instanceof Value) {
-            return (Value) value;
-        } else if (value instanceof Date) {
-            nvalue.setDVal((Date) value);
-        } else if (value instanceof Time) {
-            nvalue.setTVal((Time) value);
-        } else if (value instanceof Duration) {
-            nvalue.setDuVal((Duration) value);
-        } else if (value instanceof DateTime) {
-            nvalue.setDtVal((DateTime) value);
-        } else if (value instanceof Geography) {
-            nvalue.setGgVal((Geography) value);
-        } else {
-            // unsupport other Value type, use this function carefully
-            throw new UnsupportedOperationException(
-                    "Only support convert boolean/float/int/string/map/list to nebula.Value but was"
-                            + value.getClass().getTypeName());
+        try {
+            if (value == null) {
+                Value nullValue = new Value();
+                nullValue.setNVal(NullType.__NULL__);
+                return nullValue;
+            }
+            Class<?> type = value.getClass();
+            Setter<Object> setter = LEAF_TYPE_AND_SETTER.get(type);
+            if (setter != null) {
+                return setter.set(value);
+            }
+            for (Class<?> parentType : COMPLEX_TYPE_AND_SETTER.keySet()) {
+                if (isCurrentTypeOrParentType(type, parentType)) {
+                    return COMPLEX_TYPE_AND_SETTER.get(parentType).set(value);
+                }
+            }
+        } catch (Exception e) {
+            throw new UnsupportedOperationException(e);
         }
-        return nvalue;
+        throw new UnsupportedOperationException(
+          "Only support convert boolean/float/int/string/map/list/date/pojo to nebula.Value but was"
+            + value.getClass().getTypeName());
     }
 
     @Override
     public synchronized void close() {
         release();
     }
+
+    /**
+     * some value setter for java type (basic or nebula special type) that need convert to NValue
+     */
+    public static Map<Class<?>, Setter> LEAF_TYPE_AND_SETTER = 
+        new HashMap<Class<?>, Setter>() {{
+            put(Value.class, (Setter<Value>) (param) -> param);
+            put(Boolean.class, (Setter<Boolean>) Value::bVal);
+            put(Integer.class, (Setter<Integer>) Value::iVal);
+            put(Short.class, (Setter<Short>) Value::iVal);
+            put(Byte.class, (Setter<Short>) Value::iVal);
+            put(Long.class, (Setter<Long>) Value::iVal);
+            put(Float.class, (Setter<Float>) Value::fVal);
+            put(Double.class, (Setter<Double>) Value::fVal);
+            put(byte[].class, (Setter<byte[]>) Value::sVal);
+            put(Byte[].class, (Setter<byte[]>) Value::sVal);
+            put(String.class, (Setter<String>) (param) -> Value.sVal(param.getBytes()));
+            put(com.vesoft.nebula.Date.class, (Setter<com.vesoft.nebula.Date>) Value::dVal);
+            put(Time.class, (Setter<Time>) Value::tVal);
+            put(DateTime.class, (Setter<DateTime>) Value::dtVal);
+            put(Vertex.class, (Setter<Vertex>) Value::vVal);
+            put(Edge.class, (Setter<Edge>) Value::eVal);
+            put(Path.class, (Setter<Path>) Value::pVal);
+            put(NList.class, (Setter<NList>) Value::lVal);
+            put(NMap.class, (Setter<NMap>) Value::mVal);
+            put(NSet.class, (Setter<NSet>) Value::uVal);
+            put(DataSet.class, (Setter<DataSet>) Value::gVal);
+            put(Geography.class, (Setter<Geography>) Value::ggVal);
+            put(Duration.class, (Setter<Duration>) Value::duVal);
+        }};
+
+    /**
+     * some value setter for java type (complex java type include collections or date) that need
+     * convert to NValue
+     */
+    public static Map<Class<?>, Setter> COMPLEX_TYPE_AND_SETTER = 
+        new LinkedHashMap<Class<?>, Setter>() {{
+            put(Collection.class, (Setter<Collection>) (collection) -> {
+                Value value = new Value();
+                List<Object> list = new ArrayList<>();
+                collection.forEach(el -> list.add(value2Nvalue(el)));
+                value.setLVal(list2Nlist(list));
+                return value;
+            });
+
+            put(Map.class, (Setter<Map<String, Object>>) (map) -> {
+                Value value = new Value();
+                Map<String, Object> valueMap = new HashMap<>();
+                map.forEach((k, v) -> {
+                    valueMap.put(k, value2Nvalue(v));
+                });
+                value.setMVal(map2Nmap(valueMap));
+                return value;
+            });
+
+            put(java.util.Date.class, (Setter<java.util.Date>) (date) -> {
+                Calendar calendar = new Calendar.Builder().setInstant(date).build();
+                return Value.dtVal(new DateTime(
+                  new Short(String.valueOf(calendar.get(Calendar.YEAR))),
+                  new Byte(String.valueOf(calendar.get(Calendar.MONTH))),
+                  new Byte(String.valueOf(calendar.get(Calendar.DATE))),
+                  new Byte(String.valueOf(calendar.get(Calendar.HOUR))),
+                  new Byte(String.valueOf(calendar.get(Calendar.MINUTE))),
+                  new Byte(String.valueOf(calendar.get(Calendar.SECOND))),
+                  new Short(String.valueOf(calendar.get(Calendar.MILLISECOND)))
+                ));
+            });
+
+            put(Object.class, (Setter<Object>) (obj) -> {
+                Value value = new Value();
+                Map<String, Object> pojoFields = new HashMap<>();
+                Class<?> paramType = obj.getClass();
+                Field[] declaredFields = paramType.getDeclaredFields();
+                for (Field declaredField : declaredFields) {
+                    pojoFields.put(declaredField.getName(),
+                        value2Nvalue(ReflectUtil.getValue(obj, declaredField)));
+                }
+                value.setMVal(map2Nmap(pojoFields));
+                return value;
+            });
+        }};
+
+    interface Setter<T> {
+
+        Value set(T param);
+    }
 }
diff --git a/client/src/main/java/com/vesoft/nebula/util/ReflectUtil.java b/client/src/main/java/com/vesoft/nebula/util/ReflectUtil.java
new file mode 100644
index 000000000..b03c49d53
--- /dev/null
+++ b/client/src/main/java/com/vesoft/nebula/util/ReflectUtil.java
@@ -0,0 +1,85 @@
+/* Copyright (c) 2023 vesoft inc. All rights reserved.
+ *
+ * This source code is licensed under Apache 2.0 License.
+ */
+
+package com.vesoft.nebula.util;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * The util of reflect
+ *
+ * @author yeweicheng
+ * <br>Now is history!
+ */
+public class ReflectUtil {
+  
+    /**
+     * Break through the access rights of the object 
+     *     and obtain the specified field value.
+     *     
+     * @param o object of field value source
+     * @param field field used for get value
+     * @return field value in obj
+     */
+    public static Object getValue(Object o, Field field) {
+        try {
+            boolean accessible = field.isAccessible();
+            if (accessible) {
+                return field.get(o);
+            } else {
+                field.setAccessible(true);
+                Object value = field.get(o);
+                field.setAccessible(false);
+                return value;
+            }
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    /**
+     * Determine whether parentType is paramType or its parent class or interface
+     * 
+     * @param paramType type to be determined - subclass
+     * @param parentType type to be determined - parent class or interface
+     * @return whether paramType is a subclass or implementation class of parentType
+     */
+    public static boolean isCurrentTypeOrParentType(Class<?> paramType, Class<?> parentType) {
+        if (paramType == parentType) {
+            return true;
+        }
+        Set<Class<?>> parentTypes = getParentTypes(paramType);
+        return parentTypes.contains(parentType);
+    }
+  
+    /**
+     * Get the super class and interface type collection according to paramType.
+     * 
+     * @param paramType subclass type.
+     * @return super class and interface.
+     */
+    public static Set<Class<?>> getParentTypes(Class<?> paramType) {
+        if (paramType == null) {
+            return Collections.EMPTY_SET;
+        }
+        List<Class<?>> interfaces = Arrays.asList(paramType.getInterfaces());
+        Set<Class<?>> parents = new HashSet<>(interfaces);
+    
+        for (Class<?> anInterface : interfaces) {
+            parents.addAll(getParentTypes(anInterface));
+        }
+    
+        Class<?> superclass = paramType.getSuperclass();
+        parents.add(superclass);
+        parents.addAll(getParentTypes(superclass));
+        return parents;
+    }
+}
diff --git a/client/src/test/java/com/vesoft/nebula/client/graph/data/TestDataFromServer.java b/client/src/test/java/com/vesoft/nebula/client/graph/data/TestDataFromServer.java
index ad5e0dde2..26054380d 100644
--- a/client/src/test/java/com/vesoft/nebula/client/graph/data/TestDataFromServer.java
+++ b/client/src/test/java/com/vesoft/nebula/client/graph/data/TestDataFromServer.java
@@ -45,7 +45,7 @@ public void setUp() throws Exception {
         NebulaPoolConfig nebulaPoolConfig = new NebulaPoolConfig();
         nebulaPoolConfig.setMaxConnSize(1);
         Assert.assertTrue(pool.init(Arrays.asList(new HostAddress(
-                "127.0.0.1", 9670)),
+                "127.0.0.1", 9669)),
                 nebulaPoolConfig));
         session = pool.getSession("root", "nebula", true);
         ResultSet resp = session.execute("CREATE SPACE IF NOT EXISTS test_data"
@@ -502,16 +502,13 @@ public void tesDataset() {
             Collections.sort(pathStrings);
             String listString = String.join(", ",
                     pathStrings);
-
-            String expectString = "ColumnName: [p],"
-                    + " Values: [(\"a\" )-[:like@0{}]->(\"f\" )<-[:like@0{}]-(\"c\" )], "
-                    + "ColumnName: [p],"
-                    + " Values: [(\"a\" )-[:like@0{}]->(\"g\" )-[:like@0{}]->(\"c\" )], "
-                    + "ColumnName: [p],"
-                    + " Values: [(\"a\" )<-[:like@0{}]-(\"b\" )<-[:like@0{}]-(\"c\" )], "
-                    + "ColumnName: [p],"
-                    + " Values: [(\"a\" )<-[:like@0{}]-(\"d\" )-[:like@0{}]->(\"c\" )]";
-
+            String expectString = "ColumnName: [p], Values: [(\"a\" :player {})-[:like@0{}]->"
+                    + "(\"f\" :player {})<-[:like@0{}]-(\"c\" :player {})], ColumnName: [p], "
+                    + "Values: [(\"a\" :player {})-[:like@0{}]->(\"g\" :player {})-[:like@0{}]->"
+                    + "(\"c\" :player {})], ColumnName: [p], Values: [(\"a\" :player {})"
+                    + "<-[:like@0{}]-(\"b\" :player {})<-[:like@0{}]-(\"c\" :player {})], "
+                    + "ColumnName: [p], Values: [(\"a\" :player {})<-[:like@0{}]-(\"d\" :player {})"
+                    + "-[:like@0{}]->(\"c\" :player {})]";
             Assert.assertEquals(expectString, listString);
         } catch (IOErrorException
                 | InterruptedException e) {
diff --git a/client/src/test/java/com/vesoft/nebula/client/graph/net/TestSessionPool.java b/client/src/test/java/com/vesoft/nebula/client/graph/net/TestSessionPool.java
index a8b6d223d..e4c7b2d87 100644
--- a/client/src/test/java/com/vesoft/nebula/client/graph/net/TestSessionPool.java
+++ b/client/src/test/java/com/vesoft/nebula/client/graph/net/TestSessionPool.java
@@ -324,4 +324,51 @@ public void testReleaseBrokenSession() {
         }
     }
 
+    @Test
+    public void testBrokenConnectionForSession() {
+        List<HostAddress> addresses = Arrays.asList(new HostAddress(ip, 9669));
+        SessionPoolConfig config = new SessionPoolConfig(addresses, "space_for_session_pool",
+                "root", "nebula");
+        SessionPool sessionPool = new SessionPool(config);
+        assert sessionPool.init();
+
+        Runtime runtime = Runtime.getRuntime();
+        try {
+            try {
+                ResultSet resultSet = sessionPool.execute("SHOW SPACES;");
+                if (!resultSet.isSucceeded()) {
+                    System.out.println("show spaces failed, ErrorCode:"
+                            + resultSet.getErrorCode() + " ErrorMessage："
+                            + resultSet.getErrorMessage());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                assert false;
+            }
+
+            String cmd = "docker restart nebula-docker-compose_graphd0_1";
+            Process p = runtime.exec(cmd);
+            p.waitFor(5, TimeUnit.SECONDS);
+            ProcessUtil.printProcessStatus(cmd, p);
+            Thread.sleep(30000);
+
+            try {
+                ResultSet resultSet = sessionPool.execute("SHOW SPACES;");
+                if (!resultSet.isSucceeded()) {
+                    System.out.println("show spaces failed, ErrorCode:"
+                            + resultSet.getErrorCode() + " ErrorMessage："
+                            + resultSet.getErrorMessage());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                assert false;
+            }
+            sessionPool.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.assertFalse(e.getMessage(), false);
+        }
+
+    }
+
 }
diff --git a/mvnw b/mvnw
new file mode 100755
index 000000000..b7f064624
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,287 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.1.1
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir"; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $wrapperUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        QUIET="--quiet"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        QUIET="--silent"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=`cygpath --path --windows "$javaSource"`
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 000000000..474c9d6b7
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,187 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%