fix #450 [master] release 0.2.2 (#451)

Author: slievrly

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+# Fescar
+
+## Fescar Code Style
+Fescar code style Comply with Alibaba Java Coding Guidelines.
+
+Fescar 的编码规范遵从于《阿里巴巴JAVA开发规约》。
+
+
+### Guidelines
+[Alibaba-Java-Coding-Guidelines](https://alibaba.github.io/Alibaba-Java-Coding-Guidelines/) 
+
+[阿里巴巴JAVA开发规约](https://github.com/alibaba/p3c/blob/master/%E9%98%BF%E9%87%8C%E5%B7%B4%E5%B7%B4Java%E5%BC%80%E5%8F%91%E6%89%8B%E5%86%8C%EF%BC%88%E8%AF%A6%E5%B0%BD%E7%89%88%EF%BC%89.pdf)
+
+
+### IDE Plugin Install（not necessary）
+
+*It is not necessary to install, if you want to find a problem when you are coding.*
+
+*不是必须安装，如果你需要在开发的时候实时发现问题的话，你需要安装。*
+
+#### idea IDE
+[p3c-idea-plugin-install](https://github.com/alibaba/p3c/blob/master/idea-plugin/README.md) 
+
+[p3c插件idea IDE上安装方法](https://github.com/alibaba/p3c/blob/master/idea-plugin/README_cn.md)
+
+#### eclipse IDE
+[p3c-eclipse-plugin-install](https://github.com/alibaba/p3c/blob/master/eclipse-plugin/README.md)
+
+[p3c插件eclipse IDE上安装方法](https://github.com/alibaba/p3c/blob/master/eclipse-plugin/README_cn.md)
+
+#### Acknowledgement [Alibaba p3c](https://github.com/alibaba/p3c)

README.md

@@ -65,7 +65,7 @@ For more details about principle and design, please go to [Fescar wiki page](htt
 
 ## Maven dependency
 ```xml
-<fescar.version>0.2.0</fescar.version>
+<fescar.version>0.2.1</fescar.version>
 
 <dependency>
     <groupId>com.alibaba.fescar</groupId>

common/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fescar-all</artifactId>
         <groupId>com.alibaba.fescar</groupId>
-        <version>0.2.1</version>
+        <version>0.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fescar-common</artifactId>
@@ -47,5 +47,15 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

common/src/main/java/com/alibaba/fescar/common/loader/EnhancedServiceLoader.java

@@ -37,11 +37,8 @@
 /**
  * The type Enhanced service loader.
  *
- * @Author: jimin.jm @alibaba-inc.com
- * @Project: fescar -all
- * @DateTime: 2018 /10/10 14:28
- * @FileName: EnhancedServiceLoader
- * @Description:
+ * @author: jimin.jm @alibaba-inc.com
+ * @date: 2018/10/10
  */
 public class EnhancedServiceLoader {
     private static final Logger LOGGER = LoggerFactory.getLogger(EnhancedServiceLoader.class);
@@ -98,7 +95,8 @@ public static <S> S load(Class<S> service, String activateName) throws EnhancedS
      * @return s
      * @throws EnhancedServiceNotFoundException the enhanced service not found exception
      */
-    public static <S> S load(Class<S> service, String activateName, ClassLoader loader) throws EnhancedServiceNotFoundException {
+    public static <S> S load(Class<S> service, String activateName, ClassLoader loader)
+        throws EnhancedServiceNotFoundException {
         return loadFile(service, activateName, loader);
     }
 
@@ -151,7 +149,7 @@ private static <S> S loadFile(Class<S> service, String activateName, ClassLoader
                 for (int i = 0; i < extensions.size(); i++) {
                     Class clz = extensions.get(i);
                     @SuppressWarnings("unchecked")
-                    LoadLevel activate = (LoadLevel) clz.getAnnotation(LoadLevel.class);
+                    LoadLevel activate = (LoadLevel)clz.getAnnotation(LoadLevel.class);
                     if (activate != null && activateName.equals(activate.name())) {
                         activateExtensions.add(clz);
                     }
@@ -161,21 +159,24 @@ private static <S> S loadFile(Class<S> service, String activateName, ClassLoader
             }
 
             if (extensions.isEmpty()) {
-                throw new EnhancedServiceNotFoundException("not found service provider for : " + service.getName() + "[" + activateName
-                    + "] and classloader : " + ObjectUtils.toString(loader));
+                throw new EnhancedServiceNotFoundException(
+                    "not found service provider for : " + service.getName() + "[" + activateName
+                        + "] and classloader : " + ObjectUtils.toString(loader));
             }
-            Class<?> extension = extensions.get(extensions.size() - 1);// 最大的一个
+            Class<?> extension = extensions.get(extensions.size() - 1);
             S result = service.cast(extension.newInstance());
             if (!foundFromCache && LOGGER.isInfoEnabled()) {
-                LOGGER.info("load " + service.getSimpleName() + "[" + activateName + "] extension by class[" + extension.getName() + "]");
+                LOGGER.info("load " + service.getSimpleName() + "[" + activateName + "] extension by class[" + extension
+                    .getName() + "]");
             }
             return result;
         } catch (Throwable e) {
             if (e instanceof EnhancedServiceNotFoundException) {
-                throw (EnhancedServiceNotFoundException) e;
+                throw (EnhancedServiceNotFoundException)e;
             } else {
                 throw new EnhancedServiceNotFoundException(
-                    "not found service provider for : " + service.getName() + " caused by " + ExceptionUtils.getFullStackTrace(e));
+                    "not found service provider for : " + service.getName() + " caused by " + ExceptionUtils
+                        .getFullStackTrace(e));
             }
         }
     }
@@ -193,17 +194,15 @@ private static <S> List<Class> findAllExtensionClass(Class<S> service, String ac
         if (extensions.isEmpty()) {
             return extensions;
         }
-
-        // 做一下排序
         Collections.sort(extensions, new Comparator<Class>() {
             @Override
             public int compare(Class c1, Class c2) {
                 Integer o1 = 0;
                 Integer o2 = 0;
                 @SuppressWarnings("unchecked")
-                LoadLevel a1 = (LoadLevel) c1.getAnnotation(LoadLevel.class);
+                LoadLevel a1 = (LoadLevel)c1.getAnnotation(LoadLevel.class);
                 @SuppressWarnings("unchecked")
-                LoadLevel a2 = (LoadLevel) c2.getAnnotation(LoadLevel.class);
+                LoadLevel a2 = (LoadLevel)c2.getAnnotation(LoadLevel.class);
 
                 if (a1 != null) {
                     o1 = a1.order();
@@ -222,7 +221,8 @@ public int compare(Class c1, Class c2) {
     }
 
     @SuppressWarnings("rawtypes")
-    private static void loadFile(Class<?> service, String dir, ClassLoader classLoader, List<Class> extensions) throws IOException {
+    private static void loadFile(Class<?> service, String dir, ClassLoader classLoader, List<Class> extensions)
+        throws IOException {
         String fileName = dir + service.getName();
         Enumeration<URL> urls;
         if (classLoader != null) {
@@ -249,16 +249,14 @@ private static void loadFile(Class<?> service, String dir, ClassLoader classLoad
                         }
                     }
                 } catch (ClassNotFoundException e) {
-                    // ignore
                 } catch (Throwable e) {
-                    LOGGER.warn(e.getMessage()); // 记录一下失败日志
+                    LOGGER.warn(e.getMessage());
                 } finally {
                     try {
                         if (reader != null) {
                             reader.close();
                         }
                     } catch (IOException ioe) {
-                        // ignore
                     }
                 }
             }

common/src/test/java/com/alibaba/fescar/common/StringUtilsTest.java

@@ -0,0 +1,72 @@
+/*
+ *  Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ *  Licensed 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.
+ */
+
+package com.alibaba.fescar.common;
+
+import com.alibaba.fescar.common.util.StringUtils;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.SQLException;
+import javax.sql.rowset.serial.SerialBlob;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author melon.zhao
+ * @since 2019/2/20
+ */
+public class StringUtilsTest {
+
+    @Test
+    public void testIsEmpty() {
+        Assert.assertEquals(StringUtils.isEmpty(null), true);
+        Assert.assertEquals(StringUtils.isEmpty("abc"), false);
+        Assert.assertEquals(StringUtils.isEmpty(""), true);
+        Assert.assertEquals(StringUtils.isEmpty(" "), false);
+    }
+
+    @Test
+    public void testString2blob() throws SQLException {
+        Assert.assertEquals(StringUtils.string2blob(null), null);
+        String[] strs = new String[]{"abc", "", " "};
+        for (String str : strs) {
+            Assert.assertEquals(StringUtils.string2blob(str), new SerialBlob(str.getBytes()));
+        }
+    }
+
+    @Test
+    public void testBlob2string() throws SQLException {
+        String[] strs = new String[]{"abc", " "};
+        for (String str : strs) {
+            Assert.assertEquals(StringUtils.blob2string(new SerialBlob(str.getBytes())), str);
+        }
+    }
+
+    @Test
+    public void testInputStream2String() {
+        try {
+            InputStream inputStream = StringUtilsTest.class.getClassLoader().getResourceAsStream("test.txt");
+            Assert.assertEquals(StringUtils.inputStream2String(inputStream), "abc\n"
+                + ":\"klsdf\n"
+                + "2ks,x:\".,-3sd˚ø≤ø¬≥");
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

common/src/test/java/com/alibaba/fescar/common/XIDTest.java

@@ -0,0 +1,61 @@
+/*
+ *  Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ *  Licensed 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.
+ */
+
+package com.alibaba.fescar.common;
+
+import java.util.Random;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author melon.zhao
+ * @since 2019/2/22
+ */
+public class XIDTest {
+
+    @Test
+    public void testSetIpAddress() {
+        XID.setIpAddress("127.0.0.1");
+        Assert.assertEquals(XID.getIpAddress(), "127.0.0.1");
+    }
+
+    @Test
+    void testSetPort() {
+        XID.setPort(8080);
+        Assert.assertEquals(XID.getPort(), 8080);
+    }
+
+
+    @Test
+    void testGenerateXID() {
+        long tranId = new Random().nextLong();
+        XID.setPort(8080);
+        XID.setIpAddress("127.0.0.1");
+        Assert.assertEquals(XID.generateXID(tranId), XID.getIpAddress() + ":" + XID.getPort() + ":" + tranId);
+    }
+
+    @Test
+    void testGetServerAddress() {
+        Assert.assertNull(XID.getServerAddress(null));
+        Assert.assertEquals(XID.getServerAddress("127.0.0.1:8080:8577662204289747564"), "127.0.0.1:8080");
+    }
+
+    @Test
+    void testGetTransactionId() {
+        Assert.assertEquals(XID.getTransactionId(null), -1);
+        Assert.assertEquals(XID.getTransactionId("127.0.0.1:8080:8577662204289747564"), 8577662204289747564L);
+    }
+}

common/src/test/resources/test.txt

@@ -0,0 +1,3 @@
+abc
+:"klsdf
+2ks,x:".,-3sd˚ø≤ø¬≥