Fixed several coding style issues reported by codacy

Author: ArnauPrat

src/main/java/ldbc/snb/datagen/generator/ClusteringKnowsGenerator.java

@@ -332,12 +332,12 @@ private void estimateCCCommunity( ClusteringInfo cInfo, Community c, float prob
         }
     }
 
-    float clusteringCoefficient(ArrayList<Community> communities, ClusteringInfo cInfo ) {
+    private float clusteringCoefficient(ArrayList<Community> communities, ClusteringInfo cInfo ) {
         float CC =  clusteringCoefficient(communities, cInfo,true);
         return CC;
     }
 
-    float clusteringCoefficient( ArrayList<Community> communities, ClusteringInfo cInfo, Boolean countZeros ) {
+    private float clusteringCoefficient( ArrayList<Community> communities, ClusteringInfo cInfo, Boolean countZeros ) {
         float accum = 0.0f;
         int count = 0;
         for (Community c : communities) {
@@ -361,7 +361,7 @@ float clusteringCoefficient( ArrayList<Community> communities, ClusteringInfo cI
         return accum / (float) count;
     }
 
-    void refineCommunities( ClusteringInfo cInfo, ArrayList<Community> communities, float targetCC ) {
+    private void refineCommunities( ClusteringInfo cInfo, ArrayList<Community> communities, float targetCC ) {
         float currentCC = clusteringCoefficient(communities, cInfo);
         int lookAhead = 5;
         int tries = 0;
@@ -386,7 +386,7 @@ float step(int n) {
         return 3.0f/(float)n;
     }
 
-    boolean improveCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
+    private boolean improveCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
         ArrayList<Community>  filtered = new ArrayList<Community>();
         for(Community c : communities ) {
             if(c.p_ < 1.0f ) filtered.add(c);
@@ -401,7 +401,7 @@ boolean improveCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
         return true;
     }
 
-    boolean worsenCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
+    private boolean worsenCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
         ArrayList<Community>  filtered = new ArrayList<Community>();
         for(Community c : communities ) {
             if(c.p_ > min_community_prob_ ) filtered.add(c);
@@ -416,7 +416,7 @@ boolean worsenCC(ClusteringInfo cInfo, ArrayList<Community> communities) {
         return true;
     }
 
-    void createEdgesCommunityCore(ArrayList<Person> persons, Community c) {
+    private void createEdgesCommunityCore(ArrayList<Person> persons, Community c) {
         for ( PersonInfo pI : c.core_) {
             for( PersonInfo other: c.core_) {
                 if(pI.index_ < other.index_ ) {
@@ -433,7 +433,7 @@ void createEdgesCommunityCore(ArrayList<Person> persons, Community c) {
         }
     }
 
-    void createEdgesCommunityPeriphery(ClusteringInfo cInfo, ArrayList<Person> persons, Community c) {
+    private void createEdgesCommunityPeriphery(ClusteringInfo cInfo, ArrayList<Person> persons, Community c) {
 
         //long start = System.currentTimeMillis();
         long [] peripheryBudget = new long[c.periphery_.size()];
@@ -467,7 +467,7 @@ void createEdgesCommunityPeriphery(ClusteringInfo cInfo, ArrayList<Person> perso
         //System.out.println("Time to create core-periphery edges: "+(end-start));
     }
 
-    void fillGraphWithRemainingEdges(ClusteringInfo cInfo, ArrayList<Community> communities, ArrayList<Person> persons) {
+    private void fillGraphWithRemainingEdges(ClusteringInfo cInfo, ArrayList<Community> communities, ArrayList<Person> persons) {
         ArrayList<PersonInfo> stubs = new ArrayList<PersonInfo> ();
         LinkedList<Integer> indexes = new LinkedList<Integer>();
         Integer ii = 0;

src/main/java/ldbc/snb/datagen/generator/DistanceKnowsGenerator.java

@@ -31,8 +31,9 @@ public void generateKnows( ArrayList<Person> persons, int seed, ArrayList<Float>
         }
     }
 
+    @Override
     public void initialize( Configuration conf ) {
-
+        // This is inherited from knows generator and no initialization is required.
     }
 
     boolean know( Person personA, Person personB, int dist, ArrayList<Float> percentages, int step_index ) {

src/main/java/ldbc/snb/datagen/generator/FlashmobPostGenerator.java

@@ -22,13 +22,12 @@
 public class FlashmobPostGenerator extends PostGenerator{
 	private Distribution dateDistribution_;
 	private FlashmobTag[] forumFlashmobTags = null;
-	private long hoursToMillis_;
 	private long flashmobSpan_;
 	private long currentForum = -1;
 	public FlashmobPostGenerator(TextGenerator generator, CommentGenerator commentGenerator, LikeGenerator likeGenerator) {
 		super(generator, commentGenerator, likeGenerator);
 		dateDistribution_ = new Distribution(DatagenParams.flashmobDistFile);
-		hoursToMillis_ = 60*60*1000;
+		long hoursToMillis_ = 60*60*1000;
 		flashmobSpan_ = 72 * hoursToMillis_;
 		dateDistribution_.initialize();
 	}

src/main/java/ldbc/snb/datagen/generator/LDBCDatagen.java

@@ -370,7 +370,6 @@ public static void main(String[] args) /*throws Exception*/ {
             ConfigParser.readConfig(conf, args[0]);
             ConfigParser.readConfig(conf, LDBCDatagen.class.getResourceAsStream("/params.ini"));
 
-            // Create input text file in HDFS
             LDBCDatagen.prepareConfiguration(conf);
             LDBCDatagen.initializeContext(conf);
             LDBCDatagen datagen = new LDBCDatagen();

src/main/java/ldbc/snb/datagen/generator/PersonGenerator.java

@@ -52,10 +52,7 @@ private long composeUserId(long id, long date) {
      * @return True if the person is a large poster. False otherwise.
      */
     private boolean isUserALargePoster(Person user) {
-        if (Dictionaries.dates.getBirthMonth(user.birthDay()) == GregorianCalendar.JANUARY) {
-            return true;
-        }
-        return false;
+        return Dictionaries.dates.getBirthMonth(user.birthDay()) == GregorianCalendar.JANUARY;
     }
 
     private Person generateUser() {

src/main/java/ldbc/snb/datagen/generator/RandomKnowsGenerator.java

@@ -54,7 +54,8 @@ public void generateKnows( ArrayList<Person> persons, int seed, ArrayList<Float>
         }
     }
 
+    @Override
     public void initialize( Configuration conf ) {
-
+        // Method inherited from Knows Generator. This specialization is empty because it does not require initizalization
     }
 }

src/main/java/ldbc/snb/datagen/objects/Person.java

@@ -13,6 +13,31 @@
  */
 public class Person implements Writable {
 
+
+	private long accountId_;
+	private long creationDate_;
+	private long maxNumKnows_;
+	private TreeSet<Knows> knows_;
+	private int browserId_;
+	private IP ipAddress_;
+	private int countryId_;
+	private int cityId_;
+	private long wallId_;
+	private TreeSet<Integer> interests_;
+	private int mainInterest_;
+	private int universityLocationId_;
+	private byte gender_;
+	private long birthDay_;
+	private boolean isLargePoster_;
+	private long randomId_;
+
+	private TreeSet<String> emails_;
+	private ArrayList<Integer> languages_;
+	private String firstName_;
+	private String lastName_;
+	private HashMap<Long, Long> companies_;
+	private long classYear_;
+
 	public static interface PersonSimilarity {
 		public float Similarity(Person personA, Person personB);
 	}
@@ -107,30 +132,6 @@ public void write(DataOutput arg0) throws IOException {
 		}
 	}
 
-	private long accountId_;
-	private long creationDate_;
-	private long maxNumKnows_;
-	private TreeSet<Knows> knows_;
-	private int browserId_;
-	private IP ipAddress_;
-	private int countryId_;
-	private int cityId_;
-	private long wallId_;
-	private TreeSet<Integer> interests_;
-	private int mainInterest_;
-	private int universityLocationId_;
-	private byte gender_;
-	private long birthDay_;
-	private boolean isLargePoster_;
-	private long randomId_;
-
-	private TreeSet<String> emails_;
-	private ArrayList<Integer> languages_;
-	private String firstName_;
-	private String lastName_;
-	private HashMap<Long, Long> companies_;
-	private long classYear_;
-
 	public Person(){
 		knows_ = new TreeSet<Knows>();
 		emails_ = new TreeSet<String>();

src/main/java/ldbc/snb/datagen/serializer/UpdateEventSerializer.java

@@ -60,12 +60,7 @@
  */
 public class UpdateEventSerializer {
 
-	private class UpdateStreamStats {
-		public long minDate_ = Long.MAX_VALUE;
-		public long maxDate_ = Long.MIN_VALUE;
-		public long count_ = 0;
-	}
-	
+
 	private SequenceFile.Writer streamWriter_[];
 	private ArrayList<String> data_;
 	private ArrayList<String> list_;
@@ -78,7 +73,13 @@ private class UpdateStreamStats {
 	private UpdateStreamStats  stats_;
 	private String fileNamePrefix_;
 	private int reducerId_;
-	
+
+	private class UpdateStreamStats {
+		public long minDate_ = Long.MAX_VALUE;
+		public long maxDate_ = Long.MIN_VALUE;
+		public long count_ = 0;
+	}
+
 	public UpdateEventSerializer(Configuration conf, String fileNamePrefix, int reducerId, int numPartitions ) throws IOException{
 		conf_ = conf;
 		reducerId_ = reducerId;
@@ -236,13 +237,11 @@ public void export(Person person) throws IOException {
 
 		beginList();
 		int universityId = person.universityLocationId();
-		if ( universityId != -1){
-			if (person.classYear() != -1 ) {
+		if ( universityId != -1 && person.classYear() != -1 ) {
 				ArrayList<String> studyAtData = new ArrayList<String>();
 				studyAtData.add(Long.toString(Dictionaries.universities.getUniversityFromLocation(universityId)));
 				studyAtData.add(Dictionaries.dates.formatYear(person.classYear()));
 				list_.add(formatStringArray(studyAtData,","));
-			}
 		}
 		endList();
 

src/main/java/ldbc/snb/datagen/serializer/empty/EmptyPersonActivitySerializer.java

@@ -9,40 +9,48 @@
  */
 public class EmptyPersonActivitySerializer extends PersonActivitySerializer {
 
-     public void initialize(Configuration conf, int reducerId) {
-
-     }
-
-     public void close() {
-
-     }
-
-     protected void serialize(final  Forum forum ) {
-
-     }
-
-     protected void serialize(final  Post post ) {
-
-     }
-
-     protected void serialize(final  Comment comment ) {
-
-     }
-
-     protected void serialize(final  Photo photo ) {
-
-     }
-
-     protected void serialize(final  ForumMembership membership ) {
-
-     }
-
-     protected void serialize(final  Like like ) {
-
-     }
-
-     public void reset() {
-
-     }
-
+    @Override
+    public void initialize(Configuration conf, int reducerId) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    public void close() {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  Forum forum ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  Post post ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  Comment comment ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  Photo photo ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  ForumMembership membership ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    protected void serialize(final  Like like ) {
+        //This is left intentionally blank
+    }
+
+    @Override
+    public void reset() {
+        //This is left intentionally blank
+    }
 }