diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 000000000..9373a70d9 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 820517ecf..0480a6504 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,28 @@ - + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.0 + + checkstyle.xml + UTF-8 + true + true + false + false + + + + validate + validate + + check + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/src/main/java/com/baidu/hugegraph/config/OptionSpace.java b/src/main/java/com/baidu/hugegraph/config/OptionSpace.java index 8e633fa26..8c1128c1f 100644 --- a/src/main/java/com/baidu/hugegraph/config/OptionSpace.java +++ b/src/main/java/com/baidu/hugegraph/config/OptionSpace.java @@ -36,13 +36,13 @@ public final class OptionSpace { private static final Logger LOG = Log.logger(OptionSpace.class); - private static final Map> holders; - private static final Map> options; + private static final Map> HOLDERS; + private static final Map> OPTIONS; private static final String INSTANCE_METHOD = "instance"; static { - holders = new ConcurrentHashMap<>(); - options = new ConcurrentHashMap<>(); + HOLDERS = new ConcurrentHashMap<>(); + OPTIONS = new ConcurrentHashMap<>(); } public static void register(String module, String holder) { @@ -98,26 +98,26 @@ public static void register(String module, String holder) { public static void register(String module, OptionHolder holder) { // Check exists - if (holders.containsKey(module)) { + if (HOLDERS.containsKey(module)) { LOG.warn("Already registered option holder: {} ({})", - module, holders.get(module)); + module, HOLDERS.get(module)); } E.checkArgumentNotNull(holder, "OptionHolder can't be null"); - holders.put(module, holder.getClass()); - options.putAll(holder.options()); + HOLDERS.put(module, holder.getClass()); + OPTIONS.putAll(holder.options()); LOG.debug("Registered options for OptionHolder: {}", holder.getClass().getSimpleName()); } public static Set keys() { - return Collections.unmodifiableSet(options.keySet()); + return Collections.unmodifiableSet(OPTIONS.keySet()); } public static boolean containKey(String key) { - return options.containsKey(key); + return OPTIONS.containsKey(key); } public static TypedOption get(String key) { - return options.get(key); + return OPTIONS.get(key); } } diff --git a/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java b/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java index c8fa31ddc..68cd0089e 100644 --- a/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java +++ b/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java @@ -63,10 +63,4 @@ public String format(Date date) { public Object toPattern() { return this.pattern; } - - @Override - public Object clone() { - // No need to clone due to itself is thread safe - return this; - } } diff --git a/src/main/java/com/baidu/hugegraph/rest/RestResult.java b/src/main/java/com/baidu/hugegraph/rest/RestResult.java index b63359193..dc78f1871 100644 --- a/src/main/java/com/baidu/hugegraph/rest/RestResult.java +++ b/src/main/java/com/baidu/hugegraph/rest/RestResult.java @@ -33,7 +33,7 @@ public class RestResult { - private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper MAPPER = new ObjectMapper(); private final int status; private final MultivaluedMap headers; @@ -59,7 +59,7 @@ public String content() { public T readObject(Class clazz) { try { - return mapper.readValue(this.content, clazz); + return MAPPER.readValue(this.content, clazz); } catch (Exception e) { throw new SerializeException( "Failed to deserialize: %s", e, this.content); @@ -69,16 +69,16 @@ public T readObject(Class clazz) { @SuppressWarnings("deprecation") public List readList(String key, Class clazz) { try { - JsonNode root = mapper.readTree(this.content); + JsonNode root = MAPPER.readTree(this.content); JsonNode element = root.get(key); if (element == null) { throw new SerializeException( "Can't find value of the key: %s in json.", key); } - JavaType type = mapper.getTypeFactory() + JavaType type = MAPPER.getTypeFactory() .constructParametrizedType(ArrayList.class, List.class, clazz); - return mapper.convertValue(element, type); + return MAPPER.convertValue(element, type); } catch (IOException e) { throw new SerializeException( "Failed to deserialize %s", e, this.content); @@ -87,11 +87,11 @@ public List readList(String key, Class clazz) { @SuppressWarnings("deprecation") public List readList(Class clazz) { - JavaType type = mapper.getTypeFactory() + JavaType type = MAPPER.getTypeFactory() .constructParametrizedType(ArrayList.class, List.class, clazz); try { - return mapper.readValue(this.content, type); + return MAPPER.readValue(this.content, type); } catch (IOException e) { throw new SerializeException( "Failed to deserialize %s", e, this.content); @@ -105,6 +105,6 @@ public String toString() { } public static void registerModule(Module module) { - mapper.registerModule(module); + MAPPER.registerModule(module); } } diff --git a/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java b/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java index 60938b385..0d7c7c426 100644 --- a/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java +++ b/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java @@ -169,7 +169,9 @@ public static Method method(Class clazz, String methodName, if (superclass != null) { try { return method(superclass, methodName, argsClasses); - } catch (Exception ignored){} + } catch (Exception ignored) { + // pass + } } throw new RuntimeException(String.format( "Can't find method '%s' with args %s of class '%s'", diff --git a/src/main/java/com/baidu/hugegraph/util/CheckSocket.java b/src/main/java/com/baidu/hugegraph/util/CheckSocket.java index 9a6066586..c0dfc8984 100644 --- a/src/main/java/com/baidu/hugegraph/util/CheckSocket.java +++ b/src/main/java/com/baidu/hugegraph/util/CheckSocket.java @@ -37,7 +37,7 @@ public final class CheckSocket { private static final String MSG_USAGE = "Usage: " + CheckSocket.class.getSimpleName() + " hostname port"; - public static void main(String args[]) { + public static void main(String[] args) { if (args.length != 2) { System.err.println(MSG_USAGE); System.exit(E_USAGE); diff --git a/src/main/java/com/baidu/hugegraph/util/NumericUtil.java b/src/main/java/com/baidu/hugegraph/util/NumericUtil.java index 1dafa8b2c..f1b4f88ba 100644 --- a/src/main/java/com/baidu/hugegraph/util/NumericUtil.java +++ b/src/main/java/com/baidu/hugegraph/util/NumericUtil.java @@ -216,7 +216,7 @@ public static Number maxValueOf(Class clazz) { E.checkArgumentNotNull(clazz, "The clazz can't be null"); if (Long.class.isAssignableFrom(clazz) || - Double.class.isAssignableFrom(clazz) ) { + Double.class.isAssignableFrom(clazz)) { return Long.MAX_VALUE; } if (Integer.class.isAssignableFrom(clazz) || diff --git a/src/main/java/com/baidu/hugegraph/util/VersionUtil.java b/src/main/java/com/baidu/hugegraph/util/VersionUtil.java index 92bef3da2..891cab04c 100644 --- a/src/main/java/com/baidu/hugegraph/util/VersionUtil.java +++ b/src/main/java/com/baidu/hugegraph/util/VersionUtil.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; +import java.util.Objects; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -121,7 +122,9 @@ public static String getPomVersion() { if (isr != null) { try { isr.close(); - } catch (Exception ignored) {} + } catch (Exception ignored) { + // pass + } } // Destroy child process @@ -205,6 +208,11 @@ public boolean equals(Object that) { return this.compareTo((Version) that) == 0; } + @Override + public int hashCode() { + return Objects.hash(this.version); + } + @Override public String toString() { return this.version;