fix some warnings

Author: javeme

computer-core/src/main/java/com/baidu/hugegraph/computer/core/aggregator/Aggregator.java

@@ -22,7 +22,7 @@
 import com.baidu.hugegraph.computer.core.common.exception.ComputerException;
 import com.baidu.hugegraph.computer.core.graph.value.Value;
 
-public interface Aggregator<V extends Value> {
+public interface Aggregator<V extends Value<?>> {
 
     /**
      * Used by worker to aggregate a new value when compute a vertex, needs to

computer-core/src/main/java/com/baidu/hugegraph/computer/core/aggregator/Aggregator4Master.java

@@ -37,33 +37,30 @@ public interface Aggregator4Master {
      * Register the aggregator with specified name. The name must be unique.
      * Used by algorithm's master-computation to register aggregators.
      */
-    <V extends Value> void registerAggregator(
-                           String name,
-                           Class<? extends Aggregator<V>> aggregatorClass);
+    void registerAggregator(String name, Class<? extends Aggregator<Value<?>>>
+                                         aggregatorClass);
 
     /**
      * Register aggregator with specified value type and a combiner which can
      * combine values with specified value type. The name must be unique.
      * Used by algorithm's master-computation to register aggregators.
      */
-    <V extends Value> void registerAggregator(
-                           String name,
-                           ValueType type,
-                           Class<? extends Combiner<V>> combinerClass);
+    void registerAggregator(String name, ValueType type,
+                            Class<? extends Combiner<Value<?>>> combinerClass);
 
     /**
      * Set the aggregated value by master-computation. The value will be
      * received by workers at next superstep.
      * Throws ComputerException if master does not register the aggregator
      * with specified name.
      */
-    <V extends Value> void aggregatedValue(String name, V value);
+    <V extends Value<?>> void aggregatedValue(String name, V value);
 
     /**
      * Get the aggregated value. The aggregated value is aggregated from
      * workers at this superstep.
      * Throws ComputerException if master does not register the aggregator
      * with specified name.
      */
-    <V extends Value> V aggregatedValue(String name);
+    <V extends Value<?>> V aggregatedValue(String name);
 }

computer-core/src/main/java/com/baidu/hugegraph/computer/core/aggregator/Aggregator4Worker.java

@@ -36,13 +36,13 @@ public interface Aggregator4Worker {
      * with specified name.
      * @param value The value to be aggregated
      */
-    <V extends Value> void aggregateValue(String name, V value);
+    <V extends Value<?>> void aggregateValue(String name, V value);
 
     /**
      * Get the aggregated value before a superstep start. The value is
      * aggregated by master at previous superstep.
      * Throws ComputerException if master does not register the aggregator
      * with specified name.
      */
-    <V extends Value> V aggregatedValue(String name);
+    <V extends Value<?>> V aggregatedValue(String name);
 }

computer-core/src/main/java/com/baidu/hugegraph/computer/core/bsp/EtcdClient.java

@@ -439,7 +439,7 @@ protected KV getKv() {
     }
 
     private static List<byte[]> getResponseValues(GetResponse response) {
-        List<byte[]> values = new ArrayList((int) response.getCount());
+        List<byte[]> values = new ArrayList<>((int) response.getCount());
         for (KeyValue kv : response.getKvs()) {
             values.add(kv.getValue().getBytes());
         }
@@ -468,8 +468,8 @@ public V await(long timeout, long logInterval, Runnable logFunc)
             while (remaining > 0) {
                 logInterval = Math.min(remaining, logInterval);
                 if (this.barrierEvent.await(logInterval)) {
-                    assert result != null;
-                    return result;
+                    assert this.result != null;
+                    return this.result;
                 } else {
                     logFunc.run();
                 }

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/Combiner.java

@@ -31,6 +31,14 @@ default String name() {
         return this.getClass().getName();
     }
 
+    /**
+     * Combine v1 and v2, return the combined value. The combined value may
+     * take use v1 or v2. The value of v1 and v2 may be updated. Should not
+     * use v1 and v2 after combine them.
+     */
+    T combine(T v1, T v2);
+
+
     public static <T> T combineAll(Combiner<T> combiner, Iterator<T> values) {
         if (!values.hasNext()) {
             return null;
@@ -41,11 +49,4 @@ public static <T> T combineAll(Combiner<T> combiner, Iterator<T> values) {
         }
         return result;
     }
-
-    /**
-     * Combine v1 and v2, return the combined value. The combined value may
-     * take use v1 or v2. The value of v1 and v2 may be updated. Should not
-     * use v1 and v2 after combine them.
-     */
-    T combine(T v1, T v2);
 }

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/MergeNewPropertiesCombiner.java

@@ -35,9 +35,9 @@ public class MergeNewPropertiesCombiner implements PropertiesCombiner {
     public Properties combine(Properties v1, Properties v2) {
         E.checkArgumentNotNull(v1, "The combine parameter v1 can't be null");
         E.checkArgumentNotNull(v2, "The combine parameter v2 can't be null");
-        Map<String, Value> v1Map = v1.get();
-        Map<String, Value> v2Map = v2.get();
-        for (Map.Entry<String, Value> entry : v2Map.entrySet()) {
+        Map<String, Value<?>> v1Map = v1.get();
+        Map<String, Value<?>> v2Map = v2.get();
+        for (Map.Entry<String, Value<?>> entry : v2Map.entrySet()) {
              v1Map.putIfAbsent(entry.getKey(), entry.getValue());
         }
         return v1;

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/MergeOldPropertiesCombiner.java

@@ -35,9 +35,9 @@ public class MergeOldPropertiesCombiner implements PropertiesCombiner {
     public Properties combine(Properties v1, Properties v2) {
         E.checkArgumentNotNull(v1, "The combine parameter v1 can't be null");
         E.checkArgumentNotNull(v2, "The combine parameter v2 can't be null");
-        Map<String, Value> v1Map = v1.get();
-        Map<String, Value> v2Map = v2.get();
-        for (Map.Entry<String, Value> entry : v1Map.entrySet()) {
+        Map<String, Value<?>> v1Map = v1.get();
+        Map<String, Value<?>> v2Map = v2.get();
+        for (Map.Entry<String, Value<?>> entry : v1Map.entrySet()) {
             v2Map.putIfAbsent(entry.getKey(), entry.getValue());
         }
         return v2;

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/ValueMaxCombiner.java

@@ -22,13 +22,14 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value;
 import com.baidu.hugegraph.util.E;
 
-public class ValueMaxCombiner <T extends Value> implements Combiner<T> {
+public class ValueMaxCombiner<T extends Value<?>> implements Combiner<T> {
 
     @Override
+    @SuppressWarnings("unchecked")
     public T combine(T v1, T v2) {
         E.checkArgumentNotNull(v1, "The combine parameter v1 can't be null");
         E.checkArgumentNotNull(v2, "The combine parameter v2 can't be null");
-        if (v1.compareTo(v2) >= 0) {
+        if (((Value<Object>) v1).compareTo(v2) >= 0) {
             return v1;
         } else {
             return v2;

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/ValueMinCombiner.java

@@ -22,13 +22,14 @@
 import com.baidu.hugegraph.computer.core.graph.value.Value;
 import com.baidu.hugegraph.util.E;
 
-public class ValueMinCombiner<T extends Value> implements Combiner<T> {
+public class ValueMinCombiner<T extends Value<?>> implements Combiner<T> {
 
     @Override
+    @SuppressWarnings("unchecked")
     public T combine(T v1, T v2) {
         E.checkArgumentNotNull(v1, "The combine parameter v1 can't be null");
         E.checkArgumentNotNull(v2, "The combine parameter v2 can't be null");
-        if (v1.compareTo(v2) <= 0) {
+        if (((Value<Object>) v1).compareTo(v2) <= 0) {
             return v1;
         } else {
             return v2;

computer-core/src/main/java/com/baidu/hugegraph/computer/core/config/Config.java

@@ -24,20 +24,16 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.configuration.MapConfiguration;
-import org.slf4j.Logger;
 
 import com.baidu.hugegraph.computer.core.common.exception.ComputerException;
 import com.baidu.hugegraph.computer.core.graph.value.ValueType;
 import com.baidu.hugegraph.config.ConfigOption;
 import com.baidu.hugegraph.config.HugeConfig;
 import com.baidu.hugegraph.config.TypedOption;
 import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.Log;
 
 public final class Config {
 
-    private static final Logger LOG = Log.logger(Config.class);
-
     private final HugeConfig allConfig;
     private final HotConfig hotConfig;
 
@@ -156,7 +152,7 @@ public String getString(String key, String defaultValue) {
      * to create object.
      */
     public <T> T createObject(ConfigOption<Class<?>> clazzOption) {
-        Class clazz = this.get(clazzOption);
+        Class<?> clazz = this.get(clazzOption);
         if (clazz == Null.class) {
             return null;
         }