Merge pull request #73 from ldbc/consistent-naming-for-birthday

szarnyasg · web-flow · commit a17456f37001 · 2018-08-22T11:06:40.000+02:00
Rename 'birthDay' instances to 'birthday'
diff --git a/src/main/java/ldbc/snb/datagen/generator/DateGenerator.java b/src/main/java/ldbc/snb/datagen/generator/DateGenerator.java
@@ -180,13 +180,13 @@ public long getBirthDay(Random random, long userCreatedDate) {
         return aux_calendar.getTimeInMillis();
     }
 
-    public int getBirthYear(long birthDay) {
-        calendar_.setTimeInMillis(birthDay);
+    public int getBirthYear(long birthday) {
+        calendar_.setTimeInMillis(birthday);
         return calendar_.get(GregorianCalendar.YEAR);
     }
 
-    public int getBirthMonth(long birthDay) {
-        calendar_.setTimeInMillis(birthDay);
+    public int getBirthMonth(long birthday) {
+        calendar_.setTimeInMillis(birthday);
         return calendar_.get(GregorianCalendar.MONTH);
     }
     //If do not know the birthday, first randomly guess the age of user
diff --git a/src/main/java/ldbc/snb/datagen/generator/PersonGenerator.java b/src/main/java/ldbc/snb/datagen/generator/PersonGenerator.java
@@ -90,7 +90,7 @@ private Person generateUser() {
         Person person = new Person();
         person.creationDate(creationDate);
         person.gender((randomFarm.get(RandomGeneratorFarm.Aspect.GENDER).nextDouble() > 0.5) ? (byte) 1 : (byte) 0);
-        person.birthDay(Dictionaries.dates
+        person.birthday(Dictionaries.dates
                                 .getBirthDay(randomFarm.get(RandomGeneratorFarm.Aspect.BIRTH_DAY), creationDate));
         person.browserId(Dictionaries.browsers.getRandomBrowserId(randomFarm.get(RandomGeneratorFarm.Aspect.BROWSER)));
         person.countryId(countryId);
@@ -113,7 +113,7 @@ private Person generateUser() {
         person.firstName(Dictionaries.names.getRandomGivenName(randomFarm.get(RandomGeneratorFarm.Aspect.NAME),
                                                                person.countryId(),
                                                                person.gender() == 1,
-                                                               Dictionaries.dates.getBirthYear(person.birthDay())));
+                                                               Dictionaries.dates.getBirthYear(person.birthday())));
 
         person.lastName(Dictionaries.names.getRandomSurname(randomFarm.get(RandomGeneratorFarm.Aspect.SURNAME), person
                 .countryId()));
@@ -142,7 +142,7 @@ private Person generateUser() {
         } else {
             person.classYear(Dictionaries.dates.getClassYear(randomFarm.get(RandomGeneratorFarm.Aspect.DATE),
                                                              person.creationDate(),
-                                                             person.birthDay()));
+                                                             person.birthday()));
         }
 
         // Set company and workFrom
@@ -154,7 +154,7 @@ private Person generateUser() {
                 long workFrom;
                 workFrom = Dictionaries.dates.getWorkFromYear(randomFarm.get(RandomGeneratorFarm.Aspect.DATE),
                                                               person.classYear(),
-                                                              person.birthDay());
+                                                              person.birthday());
                 long company = Dictionaries.companies.getRandomCompany(randomFarm, person.countryId());
                 person.companies().put(company, workFrom);
             }
@@ -177,7 +177,7 @@ private Person generateUser() {
     }
 
     private boolean isLargePoster(Person p) {
-        return Dictionaries.dates.getBirthMonth(p.birthDay()) == GregorianCalendar.JANUARY;
+        return Dictionaries.dates.getBirthMonth(p.birthday()) == GregorianCalendar.JANUARY;
     }
 
     private void resetState(int blockId) {
diff --git a/src/main/java/ldbc/snb/datagen/objects/Person.java b/src/main/java/ldbc/snb/datagen/objects/Person.java
@@ -61,7 +61,7 @@ public class Person implements Writable {
     private int mainInterest_;
     private int universityLocationId_;
     private byte gender_;
-    private long birthDay_;
+    private long birthday_;
     private boolean isLargePoster_;
     private long randomId_;
 
@@ -218,7 +218,7 @@ public Person(Person p) {
 
         universityLocationId_ = p.universityLocationId();
         gender_ = p.gender();
-        birthDay_ = p.birthDay();
+        birthday_ = p.birthday();
         isLargePoster_ = p.isLargePoster();
         randomId_ = p.randomId();
 
@@ -346,12 +346,12 @@ public void gender(byte gender) {
         gender_ = gender;
     }
 
-    public long birthDay() {
-        return birthDay_;
+    public long birthday() {
+        return birthday_;
     }
 
-    public void birthDay(long birthDay) {
-        birthDay_ = birthDay;
+    public void birthday(long birthday) {
+        birthday_ = birthday;
     }
 
     public boolean isLargePoster() {
@@ -450,7 +450,7 @@ public void readFields(DataInput arg0) throws IOException {
 
         universityLocationId_ = arg0.readInt();
         gender_ = arg0.readByte();
-        birthDay_ = arg0.readLong();
+        birthday_ = arg0.readLong();
         isLargePoster_ = arg0.readBoolean();
         randomId_ = arg0.readLong();
 
@@ -499,7 +499,7 @@ public void write(DataOutput arg0) throws IOException {
         arg0.writeInt(mainInterest_);
         arg0.writeInt(universityLocationId_);
         arg0.writeByte(gender_);
-        arg0.writeLong(birthDay_);
+        arg0.writeLong(birthday_);
         arg0.writeBoolean(isLargePoster_);
         arg0.writeLong(randomId_);
 
diff --git a/src/main/java/ldbc/snb/datagen/serializer/UpdateEventSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/UpdateEventSerializer.java
@@ -218,7 +218,7 @@ public void export(Person person) throws IOException {
         } else {
             data_.add("female");
         }
-        data_.add(Long.toString(person.birthDay()));
+        data_.add(Long.toString(person.birthday()));
         data_.add(Long.toString(person.creationDate()));
         data_.add(person.ipAddress().toString());
         data_.add(Dictionaries.browsers.getName(person.browserId()));
diff --git a/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeMergeForeignPersonSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositeMergeForeignPersonSerializer.java
@@ -144,7 +144,7 @@ protected void serialize(final Person p) {
             arguments.add("female");
         }
 
-        String dateString = Dictionaries.dates.formatDate(p.birthDay());
+        String dateString = Dictionaries.dates.formatDate(p.birthday());
         arguments.add(dateString);
 
         dateString = Dictionaries.dates.formatDateTime(p.creationDate());
diff --git a/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositePersonSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVCompositePersonSerializer.java
@@ -150,7 +150,7 @@ protected void serialize(final Person p) {
             arguments.add("female");
         }
 
-        String dateString = Dictionaries.dates.formatDate(p.birthDay());
+        String dateString = Dictionaries.dates.formatDate(p.birthday());
         arguments.add(dateString);
 
         dateString = Dictionaries.dates.formatDateTime(p.creationDate());
diff --git a/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVMergeForeignPersonSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVMergeForeignPersonSerializer.java
@@ -154,7 +154,7 @@ protected void serialize(final Person p) {
             arguments.add("female");
         }
 
-        String dateString = Dictionaries.dates.formatDate(p.birthDay());
+        String dateString = Dictionaries.dates.formatDate(p.birthday());
         arguments.add(dateString);
 
         dateString = Dictionaries.dates.formatDateTime(p.creationDate());
diff --git a/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVPersonSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVPersonSerializer.java
@@ -160,7 +160,7 @@ protected void serialize(final Person p) {
             arguments.add("female");
         }
 
-        String dateString = Dictionaries.dates.formatDate(p.birthDay());
+        String dateString = Dictionaries.dates.formatDate(p.birthday());
         arguments.add(dateString);
 
         dateString = Dictionaries.dates.formatDateTime(p.creationDate());
diff --git a/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/TurtlePersonSerializer.java b/src/main/java/ldbc/snb/datagen/serializer/snb/interactive/TurtlePersonSerializer.java
@@ -118,7 +118,7 @@ protected void serialize(final Person p) {
                              Turtle.createLiteral("female"));
         }
         Turtle.addTriple(result, false, false, prefix, SNVOC.birthday,
-                         Turtle.createDataTypeLiteral(Dictionaries.dates.formatDate(p.birthDay()), XSD.Date));
+                         Turtle.createDataTypeLiteral(Dictionaries.dates.formatDate(p.birthday()), XSD.Date));
         Turtle.addTriple(result, false, false, prefix, SNVOC.ipaddress,
                          Turtle.createLiteral(p.ipAddress().toString()));
         Turtle.addTriple(result, false, false, prefix, SNVOC.browser,
diff --git a/src/main/java/ldbc/snb/datagen/util/FactorTable.java b/src/main/java/ldbc/snb/datagen/util/FactorTable.java
@@ -262,7 +262,7 @@ public void extractFactors(Person person) {
             incrFirstNameCount(person.firstName());
             String medianName = Dictionaries.names.getMedianGivenName(person.countryId(), person.gender() == 1,
                                                                       Dictionaries.dates
-                                                                              .getBirthYear(person.birthDay()));
+                                                                              .getBirthYear(person.birthday()));
             medianFirstName_.put(person.accountId(), medianName);
         }
     }
diff --git a/src/main/resources/csvSerializers/csv.xml b/src/main/resources/csvSerializers/csv.xml
@@ -5,7 +5,7 @@
         <field>firstName</field>
         <field>lastName</field>
         <field>gender</field>
-        <field>birthDay</field>
+        <field>birthday</field>
         <field>creationDate</field>
         <field>ip</field>
         <field>browser</field>

Original file line number	Diff line number	Diff line change
`@@ -180,13 +180,13 @@ public long getBirthDay(Random random, long userCreatedDate) {`
`180`	`180`	`return aux_calendar.getTimeInMillis();`
`181`	`181`	`}`
`182`	`182`
`183`		`- public int getBirthYear(long birthDay) {`
`184`		`- calendar_.setTimeInMillis(birthDay);`
	`183`	`+ public int getBirthYear(long birthday) {`
	`184`	`+ calendar_.setTimeInMillis(birthday);`
`185`	`185`	`return calendar_.get(GregorianCalendar.YEAR);`
`186`	`186`	`}`
`187`	`187`
`188`		`- public int getBirthMonth(long birthDay) {`
`189`		`- calendar_.setTimeInMillis(birthDay);`
	`188`	`+ public int getBirthMonth(long birthday) {`
	`189`	`+ calendar_.setTimeInMillis(birthday);`
`190`	`190`	`return calendar_.get(GregorianCalendar.MONTH);`
`191`	`191`	`}`
`192`	`192`	`//If do not know the birthday, first randomly guess the age of user`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public void export(Person person) throws IOException {`
`218`	`218`	`} else {`
`219`	`219`	`data_.add("female");`
`220`	`220`	`}`
`221`		`- data_.add(Long.toString(person.birthDay()));`
	`221`	`+ data_.add(Long.toString(person.birthday()));`
`222`	`222`	`data_.add(Long.toString(person.creationDate()));`
`223`	`223`	`data_.add(person.ipAddress().toString());`
`224`	`224`	`data_.add(Dictionaries.browsers.getName(person.browserId()));`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ protected void serialize(final Person p) {`
`144`	`144`	`arguments.add("female");`
`145`	`145`	`}`
`146`	`146`
`147`		`- String dateString = Dictionaries.dates.formatDate(p.birthDay());`
	`147`	`+ String dateString = Dictionaries.dates.formatDate(p.birthday());`
`148`	`148`	`arguments.add(dateString);`
`149`	`149`
`150`	`150`	`dateString = Dictionaries.dates.formatDateTime(p.creationDate());`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ protected void serialize(final Person p) {`
`150`	`150`	`arguments.add("female");`
`151`	`151`	`}`
`152`	`152`
`153`		`- String dateString = Dictionaries.dates.formatDate(p.birthDay());`
	`153`	`+ String dateString = Dictionaries.dates.formatDate(p.birthday());`
`154`	`154`	`arguments.add(dateString);`
`155`	`155`
`156`	`156`	`dateString = Dictionaries.dates.formatDateTime(p.creationDate());`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected void serialize(final Person p) {`
`154`	`154`	`arguments.add("female");`
`155`	`155`	`}`
`156`	`156`
`157`		`- String dateString = Dictionaries.dates.formatDate(p.birthDay());`
	`157`	`+ String dateString = Dictionaries.dates.formatDate(p.birthday());`
`158`	`158`	`arguments.add(dateString);`
`159`	`159`
`160`	`160`	`dateString = Dictionaries.dates.formatDateTime(p.creationDate());`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected void serialize(final Person p) {`
`160`	`160`	`arguments.add("female");`
`161`	`161`	`}`
`162`	`162`
`163`		`- String dateString = Dictionaries.dates.formatDate(p.birthDay());`
	`163`	`+ String dateString = Dictionaries.dates.formatDate(p.birthday());`
`164`	`164`	`arguments.add(dateString);`
`165`	`165`
`166`	`166`	`dateString = Dictionaries.dates.formatDateTime(p.creationDate());`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ protected void serialize(final Person p) {`
`118`	`118`	`Turtle.createLiteral("female"));`
`119`	`119`	`}`
`120`	`120`	`Turtle.addTriple(result, false, false, prefix, SNVOC.birthday,`
`121`		`- Turtle.createDataTypeLiteral(Dictionaries.dates.formatDate(p.birthDay()), XSD.Date));`
	`121`	`+ Turtle.createDataTypeLiteral(Dictionaries.dates.formatDate(p.birthday()), XSD.Date));`
`122`	`122`	`Turtle.addTriple(result, false, false, prefix, SNVOC.ipaddress,`
`123`	`123`	`Turtle.createLiteral(p.ipAddress().toString()));`
`124`	`124`	`Turtle.addTriple(result, false, false, prefix, SNVOC.browser,`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ public void extractFactors(Person person) {`
`262`	`262`	`incrFirstNameCount(person.firstName());`
`263`	`263`	`String medianName = Dictionaries.names.getMedianGivenName(person.countryId(), person.gender() == 1,`
`264`	`264`	`Dictionaries.dates`
`265`		`- .getBirthYear(person.birthDay()));`
	`265`	`+ .getBirthYear(person.birthday()));`
`266`	`266`	`medianFirstName_.put(person.accountId(), medianName);`
`267`	`267`	`}`
`268`	`268`	`}`