Updated Branches:
  refs/heads/trunk b079e2ba8 -> 34abd6f5b

GIRAPH-606: Configure classes by default when possible (apresta)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/34abd6f5
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/34abd6f5
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/34abd6f5

Branch: refs/heads/trunk
Commit: 34abd6f5b253eda011f6fc180aa8e8d854866bc8
Parents: b079e2b
Author: Alessandro Presta <[email protected]>
Authored: Fri Apr 5 11:20:32 2013 -0700
Committer: Alessandro Presta <[email protected]>
Committed: Mon Apr 8 10:12:19 2013 -0700

----------------------------------------------------------------------
 .../org/apache/giraph/edge/ArrayListEdges.java     |    3 +-
 .../org/apache/giraph/edge/ByteArrayEdges.java     |    3 +-
 .../giraph/edge/ConfigurableVertexEdges.java       |   49 ---------------
 .../java/org/apache/giraph/edge/HashMapEdges.java  |    3 +-
 .../org/apache/giraph/edge/HashMultimapEdges.java  |    3 +-
 .../apache/giraph/edge/LongDoubleArrayEdges.java   |    3 +-
 .../apache/giraph/edge/LongDoubleHashMapEdges.java |    5 +-
 .../org/apache/giraph/edge/LongNullArrayEdges.java |    4 +-
 .../apache/giraph/edge/LongNullHashSetEdges.java   |    4 +-
 .../main/java/org/apache/giraph/graph/Vertex.java  |   33 +++-------
 .../giraph/io/iterables/VertexReaderWrapper.java   |    2 +-
 .../org/apache/giraph/master/BspServiceMaster.java |    6 +-
 .../src/test/java/org/apache/giraph/BspCase.java   |    3 +
 .../java/org/apache/giraph/utils/MockUtils.java    |    6 +-
 14 files changed, 33 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/ArrayListEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/ArrayListEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/ArrayListEdges.java
index dda7568..b6307f1 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/ArrayListEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/ArrayListEdges.java
@@ -19,6 +19,7 @@
 package org.apache.giraph.edge;
 
 import com.google.common.collect.Lists;
+import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 import org.apache.giraph.utils.WritableUtils;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
@@ -37,7 +38,7 @@ import java.util.Iterator;
  * @param <E> Edge value
  */
 public class ArrayListEdges<I extends WritableComparable, E extends Writable>
-    extends ConfigurableVertexEdges<I, E>
+    extends DefaultImmutableClassesGiraphConfigurable<I, Writable, E, Writable>
     implements MutableVertexEdges<I, E> {
   /** List of edges. */
   private ArrayList<Edge<I, E>> edgeList;

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java
index 16748ef..7d38b6e 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/ByteArrayEdges.java
@@ -19,6 +19,7 @@
 package org.apache.giraph.edge;
 
 import com.google.common.collect.UnmodifiableIterator;
+import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 import org.apache.giraph.utils.ExtendedDataInput;
 import org.apache.giraph.utils.ExtendedDataOutput;
 import org.apache.giraph.utils.WritableUtils;
@@ -42,7 +43,7 @@ import java.util.List;
  * @param <E> Edge value
  */
 public class ByteArrayEdges<I extends WritableComparable, E extends Writable>
-    extends ConfigurableVertexEdges<I, E>
+    extends DefaultImmutableClassesGiraphConfigurable<I, Writable, E, Writable>
     implements ReuseObjectsVertexEdges<I, E> {
   /** Serialized edges. */
   private byte[] serializedEdges;

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/ConfigurableVertexEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/ConfigurableVertexEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/ConfigurableVertexEdges.java
deleted file mode 100644
index faa12eb..0000000
--- 
a/giraph-core/src/main/java/org/apache/giraph/edge/ConfigurableVertexEdges.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.giraph.edge;
-
-import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable;
-import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableComparable;
-
-/**
- * Abstract base class for {@link VertexEdges} implementations that require
- * access to the configuration.
- *
- * @param <I> Vertex id
- * @param <E> Edge value
- */
-@SuppressWarnings("unchecked")
-public abstract class ConfigurableVertexEdges<I extends WritableComparable,
-    E extends Writable>
-    implements VertexEdges<I, E>, ImmutableClassesGiraphConfigurable {
-  /** Configuration. */
-  private ImmutableClassesGiraphConfiguration<I, ?, E, ?> configuration;
-
-  @Override
-  public void setConf(ImmutableClassesGiraphConfiguration conf) {
-    configuration = conf;
-  }
-
-  @Override
-  public ImmutableClassesGiraphConfiguration<I, ?, E, ?> getConf() {
-    return configuration;
-  }
-}

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/HashMapEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/edge/HashMapEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/HashMapEdges.java
index 9fa7b64..f3d6046 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/HashMapEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/HashMapEdges.java
@@ -19,6 +19,7 @@
 package org.apache.giraph.edge;
 
 import com.google.common.collect.Maps;
+import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 
@@ -40,7 +41,7 @@ import java.util.Map;
  * @param <E> Edge value
  */
 public class HashMapEdges<I extends WritableComparable, E extends Writable>
-    extends ConfigurableVertexEdges<I, E>
+    extends DefaultImmutableClassesGiraphConfigurable<I, Writable, E, Writable>
     implements StrictRandomAccessVertexEdges<I, E>,
     MutableVertexEdges<I, E> {
   /** Map from target vertex id to edge value. */

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/HashMultimapEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/HashMultimapEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/HashMultimapEdges.java
index 123d49f..8bbfdc1 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/HashMultimapEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/HashMultimapEdges.java
@@ -20,6 +20,7 @@ package org.apache.giraph.edge;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.UnmodifiableIterator;
+import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 
@@ -40,7 +41,7 @@ import java.util.Map;
  * @param <E> Edge value
  */
 public class HashMultimapEdges<I extends WritableComparable, E extends 
Writable>
-    extends ConfigurableVertexEdges<I, E>
+    extends DefaultImmutableClassesGiraphConfigurable<I, Writable, E, Writable>
     implements MultiRandomAccessVertexEdges<I, E> {
   /** Multimap from target vertex id to edge values. */
   private ArrayListMultimap<I, E> edgeMultimap;

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleArrayEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleArrayEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleArrayEdges.java
index 0487d92..6ce85d5 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleArrayEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleArrayEdges.java
@@ -40,7 +40,6 @@ import java.util.Iterator;
  * but edge removals are expensive.
  */
 public class LongDoubleArrayEdges
-    extends ConfigurableVertexEdges<LongWritable, DoubleWritable>
     implements ReuseObjectsVertexEdges<LongWritable, DoubleWritable>,
     MutableVertexEdges<LongWritable, DoubleWritable> {
   /** Array of target vertex ids. */
@@ -139,7 +138,7 @@ public class LongDoubleArrayEdges
       private DoubleIterator edgeValuesIt = edgeValues.iterator();
       /** Representative edge object. */
       private Edge<LongWritable, DoubleWritable> representativeEdge =
-          getConf().createEdge();
+          EdgeFactory.create(new LongWritable(), new DoubleWritable());
 
       @Override
       public boolean hasNext() {

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleHashMapEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleHashMapEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleHashMapEdges.java
index 867a356..908ad25 100644
--- 
a/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleHashMapEdges.java
+++ 
b/giraph-core/src/main/java/org/apache/giraph/edge/LongDoubleHashMapEdges.java
@@ -40,7 +40,6 @@ import java.util.Iterator;
  * {@link LongDoubleArrayEdges}.
  */
 public class LongDoubleHashMapEdges
-    extends ConfigurableVertexEdges<LongWritable, DoubleWritable>
     implements StrictRandomAccessVertexEdges<LongWritable, DoubleWritable>,
     ReuseObjectsVertexEdges<LongWritable, DoubleWritable>,
     MutableVertexEdges<LongWritable, DoubleWritable> {
@@ -90,7 +89,7 @@ public class LongDoubleHashMapEdges
       return null;
     }
     if (representativeEdgeValue == null) {
-      representativeEdgeValue = getConf().createEdgeValue();
+      representativeEdgeValue = new DoubleWritable();
     }
     representativeEdgeValue.set(edgeMap.get(targetVertexId.get()));
     return representativeEdgeValue;
@@ -118,7 +117,7 @@ public class LongDoubleHashMapEdges
           edgeMap.long2DoubleEntrySet().fastIterator();
       /** Representative edge object. */
       private ReusableEdge<LongWritable, DoubleWritable> representativeEdge =
-          getConf().createReusableEdge();
+          EdgeFactory.createReusable(new LongWritable(), new DoubleWritable());
 
       @Override
       public boolean hasNext() {

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/LongNullArrayEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/LongNullArrayEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/LongNullArrayEdges.java
index de4e310..fee27f1 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/LongNullArrayEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/LongNullArrayEdges.java
@@ -37,7 +37,6 @@ import java.util.Iterator;
  * but random access and edge removals are expensive.
  */
 public class LongNullArrayEdges
-    extends ConfigurableVertexEdges<LongWritable, NullWritable>
     implements ReuseObjectsVertexEdges<LongWritable, NullWritable>,
     MutableVertexEdges<LongWritable, NullWritable> {
   /** Array of target vertex ids. */
@@ -133,9 +132,8 @@ public class LongNullArrayEdges
       private int offset = 0;
       /** Representative edge object. */
       private MutableEdge<LongWritable, NullWritable> representativeEdge =
-          getConf().createReusableEdge();
+          EdgeFactory.createReusable(new LongWritable());
 
-      @Override
       public boolean hasNext() {
         return offset < neighbors.size();
       }

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/edge/LongNullHashSetEdges.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/edge/LongNullHashSetEdges.java 
b/giraph-core/src/main/java/org/apache/giraph/edge/LongNullHashSetEdges.java
index 094d471..f374e36 100644
--- a/giraph-core/src/main/java/org/apache/giraph/edge/LongNullHashSetEdges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/edge/LongNullHashSetEdges.java
@@ -38,7 +38,6 @@ import java.util.Iterator;
  * {@link LongNullArrayEdges}.
  */
 public class LongNullHashSetEdges
-    extends ConfigurableVertexEdges<LongWritable, NullWritable>
     implements ReuseObjectsVertexEdges<LongWritable, NullWritable>,
     MutableVertexEdges<LongWritable, NullWritable> {
   /** Hash set of target vertex ids. */
@@ -99,9 +98,8 @@ public class LongNullHashSetEdges
       private LongIterator neighborsIt = neighbors.iterator();
       /** Representative edge object. */
       private ReusableEdge<LongWritable, NullWritable> representativeEdge =
-          getConf().createReusableEdge();
+          EdgeFactory.createReusable(new LongWritable());
 
-      @Override
       public boolean hasNext() {
         return neighborsIt.hasNext();
       }

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/graph/Vertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/Vertex.java 
b/giraph-core/src/main/java/org/apache/giraph/graph/Vertex.java
index 3031274..fda6023 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/Vertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/Vertex.java
@@ -19,8 +19,7 @@
 package org.apache.giraph.graph;
 
 import com.google.common.collect.UnmodifiableIterator;
-import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable;
-import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 import org.apache.giraph.edge.Edge;
 import org.apache.giraph.edge.MultiRandomAccessVertexEdges;
 import org.apache.giraph.edge.MutableEdge;
@@ -51,8 +50,8 @@ import java.util.Iterator;
  */
 public abstract class Vertex<I extends WritableComparable,
     V extends Writable, E extends Writable, M extends Writable>
-    implements WorkerAggregatorUsage, Writable,
-    ImmutableClassesGiraphConfigurable<I, V, E, M> {
+    extends DefaultImmutableClassesGiraphConfigurable<I, V, E, M>
+    implements WorkerAggregatorUsage, Writable {
   /** Vertex id. */
   private I id;
   /** Vertex value. */
@@ -63,8 +62,6 @@ public abstract class Vertex<I extends WritableComparable,
   private boolean halt;
   /** Global graph state **/
   private GraphState<I, V, E, M> graphState;
-  /** Configuration */
-  private ImmutableClassesGiraphConfiguration<I, V, E, M> conf;
 
   /**
    * Initialize id, value, and edges.
@@ -92,7 +89,7 @@ public abstract class Vertex<I extends WritableComparable,
   public void initialize(I id, V value) {
     this.id = id;
     this.value = value;
-    this.edges = conf.createAndInitializeVertexEdges(0);
+    this.edges = getConf().createAndInitializeVertexEdges(0);
   }
 
   /**
@@ -107,7 +104,7 @@ public abstract class Vertex<I extends WritableComparable,
     if (edges instanceof VertexEdges) {
       this.edges = (VertexEdges<I, E>) edges;
     } else {
-      this.edges = conf.createAndInitializeVertexEdges(edges);
+      this.edges = getConf().createAndInitializeVertexEdges(edges);
     }
   }
 
@@ -410,7 +407,7 @@ public abstract class Vertex<I extends WritableComparable,
    */
   public void addVertexRequest(I id, V value, VertexEdges<I, E> edges)
     throws IOException {
-    Vertex<I, V, E, M> vertex = conf.createVertex();
+    Vertex<I, V, E, M> vertex = getConf().createVertex();
     vertex.initialize(id, value, edges);
     graphState.getWorkerClientRequestProcessor().addVertexRequest(vertex);
   }
@@ -423,7 +420,7 @@ public abstract class Vertex<I extends WritableComparable,
    * @param value Vertex value
    */
   public void addVertexRequest(I id, V value) throws IOException {
-    addVertexRequest(id, value, conf.createAndInitializeVertexEdges());
+    addVertexRequest(id, value, getConf().createAndInitializeVertexEdges());
   }
 
   /**
@@ -511,11 +508,11 @@ public abstract class Vertex<I extends WritableComparable,
 
   @Override
   public void readFields(DataInput in) throws IOException {
-    id = conf.createVertexId();
+    id = getConf().createVertexId();
     id.readFields(in);
-    value = conf.createVertexValue();
+    value = getConf().createVertexValue();
     value.readFields(in);
-    edges = conf.createVertexEdges();
+    edges = getConf().createVertexEdges();
     edges.readFields(in);
     halt = in.readBoolean();
   }
@@ -529,16 +526,6 @@ public abstract class Vertex<I extends WritableComparable,
   }
 
   @Override
-  public ImmutableClassesGiraphConfiguration<I, V, E, M> getConf() {
-    return conf;
-  }
-
-  @Override
-  public void setConf(ImmutableClassesGiraphConfiguration<I, V, E, M> conf) {
-    this.conf = conf;
-  }
-
-  @Override
   public String toString() {
     return "Vertex(id=" + getId() + ",value=" + getValue() +
         ",#edges=" + getNumEdges() + ")";

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java
 
b/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java
index 927ec3f..dabc4c4 100644
--- 
a/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java
+++ 
b/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
  */
 public class VertexReaderWrapper<I extends WritableComparable,
     V extends Writable, E extends Writable> extends VertexReader<I, V, E> {
-  /** Wrapped edge reader */
+  /** Wrapped vertex reader */
   private GiraphReader<Vertex<I, V, E, ?>> vertexReader;
   /** {@link VertexReader}-like wrapper of {@link #vertexReader} */
   private IteratorToReaderWrapper<Vertex<I, V, E, ?>> iterator;

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
----------------------------------------------------------------------
diff --git 
a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java 
b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
index 7d02533..affe4ff 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
@@ -423,7 +423,7 @@ public class BspServiceMaster<I extends WritableComparable,
     } catch (KeeperException e) {
       throw new IllegalStateException("getWorkers: KeeperException", e);
     } catch (InterruptedException e) {
-      throw new IllegalStateException("getWorkers: IllegalStateException", e);
+      throw new IllegalStateException("getWorkers: InterruptedException", e);
     }
 
     try {
@@ -435,7 +435,7 @@ public class BspServiceMaster<I extends WritableComparable,
     } catch (KeeperException e) {
       throw new IllegalStateException("getWorkers: KeeperException", e);
     } catch (InterruptedException e) {
-      throw new IllegalStateException("getWorkers: IllegalStateException", e);
+      throw new IllegalStateException("getWorkers: InterruptedException", e);
     }
 
     List<WorkerInfo> currentHealthyWorkerInfoList =
@@ -605,7 +605,7 @@ public class BspServiceMaster<I extends WritableComparable,
     } catch (KeeperException e) {
       throw new IllegalStateException(logPrefix + ": KeeperException", e);
     } catch (InterruptedException e) {
-      throw new IllegalStateException(logPrefix + ": InterrtupedException", e);
+      throw new IllegalStateException(logPrefix + ": InterruptedException", e);
     }
 
     // When creating znodes, in case the master has already run, resume

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/test/java/org/apache/giraph/BspCase.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/BspCase.java 
b/giraph-core/src/test/java/org/apache/giraph/BspCase.java
index 4c74d3f..f3c3358 100644
--- a/giraph-core/src/test/java/org/apache/giraph/BspCase.java
+++ b/giraph-core/src/test/java/org/apache/giraph/BspCase.java
@@ -166,6 +166,9 @@ public class BspCase implements Watcher {
     setupConfiguration(job);
     GiraphConfiguration conf = job.getConfiguration();
     conf.setVertexClass(classes.getVertexClass());
+    conf.setVertexEdgesClass(classes.getVertexEdgesClass());
+    conf.setInputVertexEdgesClass(classes.getInputVertexEdgesClass());
+    conf.setVertexValueFactoryClass(classes.getVertexValueFactoryClass());
     if (classes.hasAggregatorWriterClass()) {
       conf.setAggregatorWriterClass(classes.getAggregatorWriterClass());
     }

http://git-wip-us.apache.org/repos/asf/giraph/blob/34abd6f5/giraph-core/src/test/java/org/apache/giraph/utils/MockUtils.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/utils/MockUtils.java 
b/giraph-core/src/test/java/org/apache/giraph/utils/MockUtils.java
index 3a0e144..0039ad6 100644
--- a/giraph-core/src/test/java/org/apache/giraph/utils/MockUtils.java
+++ b/giraph-core/src/test/java/org/apache/giraph/utils/MockUtils.java
@@ -28,7 +28,6 @@ import org.apache.giraph.graph.GraphState;
 import org.apache.giraph.partition.BasicPartitionOwner;
 import org.apache.giraph.partition.PartitionOwner;
 import org.apache.giraph.edge.ArrayListEdges;
-import org.apache.giraph.edge.ConfigurableVertexEdges;
 import org.apache.giraph.graph.Vertex;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.IntWritable;
@@ -139,8 +138,9 @@ public class MockUtils {
         ImmutableClassesGiraphConfiguration<I, V, E, M> conf =
             new ImmutableClassesGiraphConfiguration<I, V, E, M>(giraphConf);
         vertex.setConf(conf);
-        ConfigurableVertexEdges<I, E> edges = new ArrayListEdges<I, E>();
-        edges.setConf(conf);
+        ArrayListEdges<I, E> edges = new ArrayListEdges<I, E>();
+        edges.setConf((ImmutableClassesGiraphConfiguration<I, Writable, E,
+            Writable>) conf);
         edges.initialize();
 
         ReflectionUtils.setField(vertex, "id", vertexId);

Reply via email to