Refactored LDBCDatagen (Main class) to be top level within Packages

miratepuffin · miratepuffin · commit 1d4023ada817 · 2019-09-27T09:17:21.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -117,7 +117,7 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>ldbc.snb.datagen.generator.LDBCDatagen</mainClass>
+              <mainClass>ldbc.snb.datagen.LDBCDatagen</mainClass>
             </manifest>
           </archive>
           <descriptorRefs>
diff --git a/src/main/java/ldbc/snb/datagen/LDBCDatagen.java b/src/main/java/ldbc/snb/datagen/LDBCDatagen.java
@@ -33,9 +33,10 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
-package ldbc.snb.datagen.generator;
+package ldbc.snb.datagen;
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
+import ldbc.snb.datagen.generator.DatagenParams;
 import ldbc.snb.datagen.hadoop.*;
 import ldbc.snb.datagen.objects.Person;
 import ldbc.snb.datagen.util.ConfigParser;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopDynamicPersonSerializer.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopDynamicPersonSerializer.java
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
 import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.objects.Knows;
 import ldbc.snb.datagen.objects.Person;
 import ldbc.snb.datagen.serializer.DynamicPersonSerializer;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopFileRanker.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopFileRanker.java
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.hadoop;
 
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopKnowsGenerator.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopKnowsGenerator.java
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 package ldbc.snb.datagen.hadoop;
 
 import ldbc.snb.datagen.generator.KnowsGenerator;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.objects.Person;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopMergeFriendshipFiles.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopMergeFriendshipFiles.java
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.hadoop;
 
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.objects.Knows;
 import ldbc.snb.datagen.objects.Person;
 import org.apache.hadoop.conf.Configuration;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonActivityGenerator.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonActivityGenerator.java
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
 import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.generator.PersonActivityGenerator;
 import ldbc.snb.datagen.objects.Knows;
 import ldbc.snb.datagen.objects.Person;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonGenerator.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonGenerator.java
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 package ldbc.snb.datagen.hadoop;
 
 import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.generator.PersonGenerator;
 import ldbc.snb.datagen.objects.Person;
 import org.apache.hadoop.conf.Configuration;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonSortAndSerializer.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopPersonSortAndSerializer.java
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
 import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.objects.Knows;
 import ldbc.snb.datagen.objects.Person;
 import ldbc.snb.datagen.serializer.DynamicPersonSerializer;
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/HadoopStaticSerializer.java b/src/main/java/ldbc/snb/datagen/hadoop/HadoopStaticSerializer.java
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
 import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.objects.Organization;
 import ldbc.snb.datagen.objects.Place;
 import ldbc.snb.datagen.objects.Tag;
diff --git a/src/main/java/ldbc/snb/datagen/util/ConfigParser.java b/src/main/java/ldbc/snb/datagen/util/ConfigParser.java
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.util;
 
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import org.apache.hadoop.conf.Configuration;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/test/java/ldbc/snb/datagen/test/LDBCDatagenTest.java b/src/test/java/ldbc/snb/datagen/test/LDBCDatagenTest.java
@@ -1,7 +1,7 @@
 package ldbc.snb.datagen.test;
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.test.csv.*;
 import ldbc.snb.datagen.util.ConfigParser;
 import org.apache.hadoop.conf.Configuration;
diff --git a/src/test/java/ldbc/snb/datagen/test/dictionaries/PlaceDictionaryTest.java b/src/test/java/ldbc/snb/datagen/test/dictionaries/PlaceDictionaryTest.java
@@ -1,7 +1,7 @@
 package ldbc.snb.datagen.test.dictionaries;
 
 import ldbc.snb.datagen.dictionary.PlaceDictionary;
-import ldbc.snb.datagen.generator.LDBCDatagen;
+import ldbc.snb.datagen.LDBCDatagen;
 import ldbc.snb.datagen.util.ConfigParser;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
