Skip to content

Commit 1ab0787

Browse files
committed
Enforce Java capitalization conventions
3+ characters are spelt with an uppercase first latter and lowercase for the rest of the letters, e.g. CSV -> Csv, HDFS -> Hdfs, etc.
1 parent d854e5f commit 1ab0787

File tree

50 files changed

+136
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+136
-148
lines changed

base-docker-image/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<configuration>
118118
<archive>
119119
<manifest>
120-
<mainClass>ldbc.snb.datagen.LDBCDatagen</mainClass>
120+
<mainClass>ldbc.snb.datagen.LdbcDatagen</mainClass>
121121
</manifest>
122122
</archive>
123123
<descriptorRefs>

params-csv-basic.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CSVBasicDynamicActivitySerializer
4-
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CSVBasicDynamicPersonSerializer
5-
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CSVBasicStaticSerializer
3+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CsvBasicDynamicActivitySerializer
4+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CsvBasicDynamicPersonSerializer
5+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CsvBasicStaticSerializer
66

77
# To generate RFC 3339-compliant timestamps (https://tools.ietf.org/html/rfc3339), uncomment the following line:
88
#ldbc.snb.datagen.util.formatter.StringDateFormatter.dateTimeFormat:yyyy-MM-dd'T'HH:mm:ss.SSS+00:00
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CSVCompositeMergeForeignDynamicActivitySerializer
4-
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CSVCompositeMergeForeignDynamicPersonSerializer
5-
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CSVCompositeMergeForeignStaticSerializer
3+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CsvCompositeMergeForeignDynamicActivitySerializer
4+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CsvCompositeMergeForeignDynamicPersonSerializer
5+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CsvCompositeMergeForeignStaticSerializer

params-csv-composite.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CSVCompositeDynamicActivitySerializer
4-
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CSVCompositeDynamicPersonSerializer
5-
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CSVCompositeStaticSerializer
3+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CsvCompositeDynamicActivitySerializer
4+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CsvCompositeDynamicPersonSerializer
5+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CsvCompositeStaticSerializer

params-csv-merge-foreign.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CSVMergeForeignDynamicActivitySerializer
4-
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CSVMergeForeignDynamicPersonSerializer
5-
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CSVMergeForeignStaticSerializer
3+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.activity.CsvMergeForeignDynamicActivitySerializer
4+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.dynamicserializer.person.CsvMergeForeignDynamicPersonSerializer
5+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.staticserializer.CsvMergeForeignStaticSerializer

params-graphalytics.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:graphalytics.1
22

33
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyDynamicActivitySerializer
4-
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVDynamicPersonSerializerExtended
4+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.graphalytics.CsvDynamicPersonSerializerExtended
55
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.empty.EmptyStaticSerializer

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<configuration>
118118
<archive>
119119
<manifest>
120-
<mainClass>ldbc.snb.datagen.LDBCDatagen</mainClass>
120+
<mainClass>ldbc.snb.datagen.LdbcDatagen</mainClass>
121121
</manifest>
122122
</archive>
123123
<descriptorRefs>

src/main/java/ldbc/snb/datagen/LDBCDatagen.java renamed to src/main/java/ldbc/snb/datagen/LdbcDatagen.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
5959
import java.util.List;
6060
import java.util.Properties;
6161

62-
public class LDBCDatagen {
62+
public class LdbcDatagen {
6363
private static boolean initialized = false;
6464

6565
public static synchronized void initializeContext(Configuration conf) {
@@ -339,11 +339,11 @@ public static void main(String[] args) throws Exception {
339339
try {
340340
Configuration conf = ConfigParser.initialize();
341341
ConfigParser.readConfig(conf, args[0]);
342-
ConfigParser.readConfig(conf, LDBCDatagen.class.getResourceAsStream("/params_default.ini"));
342+
ConfigParser.readConfig(conf, LdbcDatagen.class.getResourceAsStream("/params_default.ini"));
343343

344-
LDBCDatagen.prepareConfiguration(conf);
345-
LDBCDatagen.initializeContext(conf);
346-
LDBCDatagen datagen = new LDBCDatagen();
344+
LdbcDatagen.prepareConfiguration(conf);
345+
LdbcDatagen.initializeContext(conf);
346+
LdbcDatagen datagen = new LdbcDatagen();
347347
datagen.runGenerateJob(conf);
348348
} catch (Exception e) {
349349
System.err.println("Error during execution");

src/main/java/ldbc/snb/datagen/generator/distribution/MOEZipfDistribution.java renamed to src/main/java/ldbc/snb/datagen/generator/distribution/MoeZipfDistribution.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
4242
/**
4343
* Created by aprat on 4/03/15.
4444
*/
45-
public class MOEZipfDistribution extends DegreeDistribution {
45+
public class MoeZipfDistribution extends DegreeDistribution {
4646

4747
private org.apache.commons.math3.distribution.ZipfDistribution zipf_;
4848
private double ALPHA_ = 1.7;
4949
private double DELTA_ = 1.5;
5050
private Random random_;
5151

5252
public void initialize(Configuration conf) {
53-
ALPHA_ = conf.getDouble("ldbc.snb.datagen.generator.distribution.MOEZipfDistribution.alpha", ALPHA_);
54-
DELTA_ = conf.getDouble("ldbc.snb.datagen.generator.distribution.MOEZipfDistribution.delta", DELTA_);
53+
ALPHA_ = conf.getDouble("ldbc.snb.datagen.generator.distribution.MoeZipfDistribution.alpha", ALPHA_);
54+
DELTA_ = conf.getDouble("ldbc.snb.datagen.generator.distribution.MoeZipfDistribution.delta", DELTA_);
5555
zipf_ = new org.apache.commons.math3.distribution.ZipfDistribution(5000, ALPHA_);
5656
random_ = new Random();
5757
}

src/main/java/ldbc/snb/datagen/generator/generators/knowsgenerators/BTERKnowsGenerator.java renamed to src/main/java/ldbc/snb/datagen/generator/generators/knowsgenerators/BterKnowsGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
5656
/**
5757
* Created by aprat on 12/07/16.
5858
*/
59-
public class BTERKnowsGenerator implements KnowsGenerator {
59+
public class BterKnowsGenerator implements KnowsGenerator {
6060

6161
private int graphSize = 0;
6262
private Random random;
@@ -176,7 +176,7 @@ public void generateKnows(ArrayList<Person> persons, int seed, ArrayList<Float>
176176
try {
177177
BufferedReader reader = new BufferedReader(
178178
new InputStreamReader(getClass()
179-
.getResourceAsStream(conf.get("ldbc.snb.datagen.generator.generators.knowsgenerators.BTERKnowsGenerator.ccDistribution")), "UTF-8"));
179+
.getResourceAsStream(conf.get("ldbc.snb.datagen.generator.generators.knowsgenerators.BterKnowsGenerator.ccDistribution")), "UTF-8"));
180180
String line;
181181
while ((line = reader.readLine()) != null) {
182182
String data[] = line.split(" ");

0 commit comments

Comments
 (0)