Skip to content

Commit 4be5b76

Browse files
committed
Refactored Serializers into clearer folder structure
1 parent 944d933 commit 4be5b76

15 files changed

+39
-35
lines changed

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVInvariantSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/basic/CSVInvariantSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.basic;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.objects.Organization;

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVPersonActivitySerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/basic/CSVPersonActivitySerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.basic;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.objects.*;

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVPersonSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/basic/CSVPersonSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636

3737

38-
package ldbc.snb.datagen.serializer.snb.interactive;
38+
package ldbc.snb.datagen.serializer.snb.csv.basic;
3939

4040
import ldbc.snb.datagen.dictionary.Dictionaries;
4141
import ldbc.snb.datagen.objects.Knows;

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeInvariantSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/composite/CSVCompositeInvariantSerializer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.composite;
3737

3838
import ldbc.snb.datagen.objects.Organization;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
4242
import ldbc.snb.datagen.serializer.InvariantSerializer;
43+
import ldbc.snb.datagen.serializer.snb.csv.basic.CSVInvariantSerializer;
4344
import org.apache.hadoop.conf.Configuration;
4445

4546
import java.io.IOException;
@@ -63,22 +64,22 @@ public void close() {
6364

6465
@Override
6566
protected void serialize(final Place place) {
66-
invariantSerializer.serialize(place);
67+
invariantSerializer.export(place);
6768
}
6869

6970
@Override
7071
protected void serialize(final Organization organization) {
71-
invariantSerializer.serialize(organization);
72+
invariantSerializer.export(organization);
7273
}
7374

7475
@Override
7576
protected void serialize(final TagClass tagClass) {
76-
invariantSerializer.serialize(tagClass);
77+
invariantSerializer.export(tagClass);
7778
}
7879

7980
@Override
8081
protected void serialize(final Tag tag) {
81-
invariantSerializer.serialize(tag);
82+
invariantSerializer.export(tag);
8283
}
8384

8485
@Override

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositePersonActivitySerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/composite/CSVCompositePersonActivitySerializer.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.composite;
3737

3838
import ldbc.snb.datagen.objects.*;
3939
import ldbc.snb.datagen.serializer.PersonActivitySerializer;
40+
import ldbc.snb.datagen.serializer.snb.csv.basic.CSVPersonActivitySerializer;
4041
import org.apache.hadoop.conf.Configuration;
4142

4243
import java.io.IOException;
@@ -60,32 +61,32 @@ public void close() {
6061

6162
@Override
6263
protected void serialize(final Forum forum) {
63-
activitySerializer.serialize(forum);
64+
activitySerializer.export(forum);
6465
}
6566

6667
@Override
6768
protected void serialize(final Post post) {
68-
activitySerializer.serialize(post);
69+
activitySerializer.export(post);
6970
}
7071

7172
@Override
7273
protected void serialize(final Comment comment) {
73-
activitySerializer.serialize(comment);
74+
activitySerializer.export(comment);
7475
}
7576

7677
@Override
7778
protected void serialize(final Photo photo) {
78-
activitySerializer.serialize(photo);
79+
activitySerializer.export(photo);
7980
}
8081

8182
@Override
8283
protected void serialize(final ForumMembership membership) {
83-
activitySerializer.serialize(membership);
84+
activitySerializer.export(membership);
8485
}
8586

8687
@Override
8788
protected void serialize(final Like like) {
88-
activitySerializer.serialize(like);
89+
activitySerializer.export(like);
8990
}
9091

9192
@Override

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositePersonSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/composite/CSVCompositePersonSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636

3737

38-
package ldbc.snb.datagen.serializer.snb.interactive;
38+
package ldbc.snb.datagen.serializer.snb.csv.composite;
3939

4040
import ldbc.snb.datagen.dictionary.Dictionaries;
4141
import ldbc.snb.datagen.objects.Knows;

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeMergeForeignInvariantSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/compositemergeforeign/CSVCompositeMergeForeignInvariantSerializer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign;
3737

3838
import ldbc.snb.datagen.objects.Organization;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
4242
import ldbc.snb.datagen.serializer.InvariantSerializer;
43+
import ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignInvariantSerializer;
4344
import org.apache.hadoop.conf.Configuration;
4445

4546
import java.io.IOException;
@@ -63,22 +64,22 @@ public void close() {
6364

6465
@Override
6566
protected void serialize(final Place place) {
66-
invariantSerializer.serialize(place);
67+
invariantSerializer.export(place);
6768
}
6869

6970
@Override
7071
protected void serialize(final Organization organization) {
71-
invariantSerializer.serialize(organization);
72+
invariantSerializer.export(organization);
7273
}
7374

7475
@Override
7576
protected void serialize(final TagClass tagClass) {
76-
invariantSerializer.serialize(tagClass);
77+
invariantSerializer.export(tagClass);
7778
}
7879

7980
@Override
8081
protected void serialize(final Tag tag) {
81-
invariantSerializer.serialize(tag);
82+
invariantSerializer.export(tag);
8283
}
8384

8485
@Override

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeMergeForeignPersonActivitySerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/compositemergeforeign/CSVCompositeMergeForeignPersonActivitySerializer.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign;
3737

3838
import ldbc.snb.datagen.objects.*;
3939
import ldbc.snb.datagen.serializer.PersonActivitySerializer;
40+
import ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignPersonActivitySerializer;
4041
import org.apache.hadoop.conf.Configuration;
4142

4243
import java.io.IOException;
@@ -60,32 +61,32 @@ public void close() {
6061

6162
@Override
6263
protected void serialize(final Forum forum) {
63-
activitySerializer.serialize(forum);
64+
activitySerializer.export(forum);
6465
}
6566

6667
@Override
6768
protected void serialize(final Post post) {
68-
activitySerializer.serialize(post);
69+
activitySerializer.export(post);
6970
}
7071

7172
@Override
7273
protected void serialize(final Comment comment) {
73-
activitySerializer.serialize(comment);
74+
activitySerializer.export(comment);
7475
}
7576

7677
@Override
7778
protected void serialize(final Photo photo) {
78-
activitySerializer.serialize(photo);
79+
activitySerializer.export(photo);
7980
}
8081

8182
@Override
8283
protected void serialize(final ForumMembership membership) {
83-
activitySerializer.serialize(membership);
84+
activitySerializer.export(membership);
8485
}
8586

8687
@Override
8788
protected void serialize(final Like like) {
88-
activitySerializer.serialize(like);
89+
activitySerializer.export(like);
8990
}
9091

9192
@Override

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeMergeForeignPersonSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/compositemergeforeign/CSVCompositeMergeForeignPersonSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.objects.Knows;

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVMergeForeignInvariantSerializer.java renamed to src/main/java/ldbc/snb/datagen/serializer/snb/csv/mergeforeign/CSVMergeForeignInvariantSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3333
You should have received a copy of the GNU General Public License
3434
along with this program; if not, write to the Free Software
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
36-
package ldbc.snb.datagen.serializer.snb.interactive;
36+
package ldbc.snb.datagen.serializer.snb.csv.mergeforeign;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.objects.Organization;

0 commit comments

Comments
 (0)