GIRAPH-447: Clean up GiraphConfiguration related things (nitay).

apache · Dec 13, 2012 · 599f70e · 599f70e
1 parent 1c9b260
commit 599f70e
Show file tree

Hide file tree

Showing 129 changed files with 2,877 additions and 2,496 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-447: Clean up GiraphConfiguration related things (nitay)
+
   GIRAPH-445: Max message request size in bytes, initialize buffers to 
   expected size (majakabiljo)
 

diff --git a/...ormats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java b/...ormats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java
@@ -20,7 +20,7 @@
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
-import org.apache.giraph.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
 import org.apache.giraph.graph.VertexInputFormat;
 import org.apache.giraph.graph.VertexReader;
 import org.apache.hadoop.io.Writable;

diff --git a/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java b/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java
@@ -17,7 +17,7 @@
  */
 package org.apache.giraph.io.hbase;
 
-import org.apache.giraph.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
 import org.apache.giraph.graph.VertexInputFormat;
 import org.apache.giraph.graph.VertexReader;
 import org.apache.hadoop.hbase.client.Result;

diff --git a/...ormats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java b/...ormats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java
@@ -18,7 +18,7 @@
 
 package org.apache.giraph.io.hcatalog;
 
-import org.apache.giraph.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
 import org.apache.giraph.graph.Vertex;
 import org.apache.giraph.graph.VertexInputFormat;
 import org.apache.giraph.graph.VertexReader;
@@ -50,7 +50,7 @@
  * {@link GiraphHCatInputFormat#setVertexInput(org.apache.hadoop.mapreduce.Job,
  * org.apache.hcatalog.mapreduce.InputJobInfo)}
  * as you setup your vertex input format with
- * {@link org.apache.giraph.GiraphConfiguration#
+ * {@link org.apache.giraph.conf.GiraphConfiguration#
  * setVertexInputFormatClass(Class)}.
  *
  * @param <I> Vertex id

diff --git a/...rmats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java b/...rmats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java
@@ -43,7 +43,7 @@
  * {@link HCatOutputFormat#setOutput(org.apache.hadoop.mapreduce.Job,
  * org.apache.hcatalog.mapreduce.OutputJobInfo)}
  * as you setup your vertex output format with
- * {@link org.apache.giraph.GiraphConfiguration#
+ * {@link org.apache.giraph.conf.GiraphConfiguration}
  * setVertexOutputFormatClass(Class)}. You must create the output table.
  *
  * @param <I> Vertex id

diff --git a/...formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java b/...formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
@@ -32,7 +32,7 @@
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.giraph.BspCase;
-import org.apache.giraph.GiraphConfiguration;
+import org.apache.giraph.conf.GiraphConfiguration;
 import org.apache.giraph.io.accumulo.edgemarker.AccumuloEdgeInputFormat;
 import org.apache.giraph.io.accumulo.edgemarker.AccumuloEdgeOutputFormat;
 import org.apache.giraph.graph.EdgeListVertex;

diff --git a/...ts-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java b/...ts-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
@@ -20,16 +20,19 @@
 
 
 import org.apache.giraph.BspCase;
-import org.apache.giraph.GiraphConfiguration;
-import org.apache.giraph.io.hbase.edgemarker.TableEdgeInputFormat;
-import org.apache.giraph.io.hbase.edgemarker.TableEdgeOutputFormat;
+import org.apache.giraph.conf.GiraphConfiguration;
 import org.apache.giraph.graph.EdgeListVertex;
 import org.apache.giraph.graph.GiraphJob;
+import org.apache.giraph.io.hbase.edgemarker.TableEdgeInputFormat;
+import org.apache.giraph.io.hbase.edgemarker.TableEdgeOutputFormat;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.MiniHBaseCluster;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
@@ -42,10 +45,10 @@
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.util.GenericOptionsParser;
 import org.apache.log4j.Logger;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
-import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;