Remove redundant generic type definitions

Author: szarnyasg

src/main/java/ldbc/snb/datagen/LdbcDatagen.java

@@ -88,7 +88,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
 
         String hadoopPrefix = conf.get("ldbc.snb.datagen.serializer.hadoopDir");
         FileSystem fs = FileSystem.get(conf);
-        ArrayList<Float> percentages = new ArrayList<Float>();
+        ArrayList<Float> percentages = new ArrayList<>();
         percentages.add(0.45f);
         percentages.add(0.45f);
         percentages.add(0.1f);
@@ -143,7 +143,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
 
         fs.delete(new Path(DatagenParams.hadoopDir + "/persons"), true);
         printProgress("Merging the different edge files");
-        ArrayList<String> edgeFileNames = new ArrayList<String>();
+        ArrayList<String> edgeFileNames = new ArrayList<>();
         edgeFileNames.add(hadoopPrefix + "/universityEdges");
         edgeFileNames.add(hadoopPrefix + "/interestEdges");
         edgeFileNames.add(hadoopPrefix + "/randomEdges");
@@ -189,8 +189,8 @@ public int runGenerateJob(Configuration conf) throws Exception {
 
             printProgress("Sorting update streams ");
 
-            List<String> personStreamsFileNames = new ArrayList<String>();
-            List<String> forumStreamsFileNames = new ArrayList<String>();
+            List<String> personStreamsFileNames = new ArrayList<>();
+            List<String> forumStreamsFileNames = new ArrayList<>();
             for (int i = 0; i < DatagenParams.numThreads; ++i) {
                 int numPartitions = conf.getInt("ldbc.snb.datagen.serializer.numUpdatePartitions", 1);
                 for (int j = 0; j < numPartitions; ++j) {

src/main/java/ldbc/snb/datagen/dictionary/BrowserDictionary.java

@@ -52,8 +52,8 @@ public class BrowserDictionary {
 
     public BrowserDictionary(double probAnotherBrowser) {
         probAnotherBrowser_ = probAnotherBrowser;
-        browsers_ = new ArrayList<String>();
-        cumulativeDistribution_ = new ArrayList<Double>();
+        browsers_ = new ArrayList<>();
+        cumulativeDistribution_ = new ArrayList<>();
         load(DatagenParams.browserDictonryFile);
     }
 

src/main/java/ldbc/snb/datagen/dictionary/CompanyDictionary.java

@@ -79,11 +79,11 @@ public CompanyDictionary(PlaceDictionary placeDictionary,
 
         this.placeDictionary = placeDictionary;
         this.probUnCorrelatedCompany = probUnCorrelatedCompany;
-        this.companyName = new TreeMap<Long, String>();
-        this.companyCountry = new TreeMap<Long, Integer>();
+        this.companyName = new TreeMap<>();
+        this.companyCountry = new TreeMap<>();
         this.companiesByCountry = new TreeMap<Integer, ArrayList<Long>>();
         for (Integer id : placeDictionary.getCountries()) {
-            this.companiesByCountry.put(id, new ArrayList<Long>());
+            this.companiesByCountry.put(id, new ArrayList<>());
         }
         load(DatagenParams.companiesDictionaryFile);
     }

src/main/java/ldbc/snb/datagen/dictionary/EmailDictionary.java

@@ -70,8 +70,8 @@ private void load(String fileName) {
             BufferedReader emailDictionary = new BufferedReader(
                     new InputStreamReader(getClass().getResourceAsStream(fileName), "UTF-8"));
 
-            emails = new ArrayList<String>();
-            cumulativeDistribution = new ArrayList<Double>();
+            emails = new ArrayList<>();
+            cumulativeDistribution = new ArrayList<>();
 
             String line;
             double cummulativeDist = 0.0;

src/main/java/ldbc/snb/datagen/dictionary/FlashmobTagDictionary.java

@@ -117,7 +117,7 @@ private void initialize() {
         for (int i = 0; i < numFlashmobTags; ++i) {
             ArrayList<FlashmobTag> instances = flashmobTags.get(tags[i]);
             if (instances == null) {
-                instances = new ArrayList<FlashmobTag>();
+                instances = new ArrayList<>();
                 flashmobTags.put(tags[i], instances);
             }
             FlashmobTag flashmobTag = new FlashmobTag();
@@ -174,7 +174,7 @@ private boolean selectFlashmobTag(Random rand, int index) {
      * @param[in] fromDate The date from which to consider the flashmob tags.
      */
     public ArrayList<FlashmobTag> generateFlashmobTags(Random rand, TreeSet<Integer> interests, long fromDate) {
-        ArrayList<FlashmobTag> result = new ArrayList<FlashmobTag>();
+        ArrayList<FlashmobTag> result = new ArrayList<>();
         Iterator<Integer> it = interests.iterator();
         while (it.hasNext()) {
             Integer tag = it.next();

src/main/java/ldbc/snb/datagen/dictionary/IPAddressDictionary.java

@@ -77,7 +77,7 @@ public IPAddressDictionary(PlaceDictionary locationDic) {
      */
     private void load(String mappingFileName, String baseIPdir) {
         String line;
-        HashMap<String, String> countryAbbreMap = new HashMap<String, String>();
+        HashMap<String, String> countryAbbreMap = new HashMap<>();
         try {
             BufferedReader mappingFile = new BufferedReader(new InputStreamReader(getClass()
                                                                                           .getResourceAsStream(mappingFileName), "UTF-8"));
@@ -91,7 +91,7 @@ private void load(String mappingFileName, String baseIPdir) {
 
             ArrayList<Integer> countries = placeDictionary.getCountries();
             for (int i = 0; i < countries.size(); i++) {
-                ipsByCountry.put(countries.get(i), new ArrayList<IP>());
+                ipsByCountry.put(countries.get(i), new ArrayList<>());
 
                 //Get the name of file
                 String fileName = countryAbbreMap.get(placeDictionary.getPlaceName(countries.get(i)));

src/main/java/ldbc/snb/datagen/dictionary/LanguageDictionary.java

@@ -83,7 +83,7 @@ public LanguageDictionary(PlaceDictionary locationDic,
         this.placeDictionary = locationDic;
         this.probEnglish = probEnglish;
         this.probSecondLang = probSecondLang;
-        this.languages = new ArrayList<String>();
+        this.languages = new ArrayList<>();
         this.officalLanguagesByCountry = new HashMap<Integer, ArrayList<Integer>>();
         this.languagesByCountry = new HashMap<Integer, ArrayList<Integer>>();
         load(DatagenParams.languageDictionaryFile);
@@ -96,8 +96,8 @@ public LanguageDictionary(PlaceDictionary locationDic,
     private void load(String fileName) {
         try {
             for (Integer id : placeDictionary.getCountries()) {
-                officalLanguagesByCountry.put(id, new ArrayList<Integer>());
-                languagesByCountry.put(id, new ArrayList<Integer>());
+                officalLanguagesByCountry.put(id, new ArrayList<>());
+                languagesByCountry.put(id, new ArrayList<>());
             }
             BufferedReader dictionary = new BufferedReader(new InputStreamReader(getClass()
                                                                                          .getResourceAsStream(fileName), "UTF-8"));
@@ -146,7 +146,7 @@ public String getLanguageName(int languageId) {
      * @breif Gets a set of random languages from a country.
      */
     public ArrayList<Integer> getLanguages(Random random, int country) {
-        ArrayList<Integer> langSet = new ArrayList<Integer>();
+        ArrayList<Integer> langSet = new ArrayList<>();
         if (officalLanguagesByCountry.get(country).size() != 0) {
             int id = random.nextInt(officalLanguagesByCountry.get(country).size());
             langSet.add(officalLanguagesByCountry.get(country).get(id));

src/main/java/ldbc/snb/datagen/dictionary/NamesDictionary.java

@@ -69,7 +69,7 @@ public NamesDictionary(PlaceDictionary locationDic) {
     private void init() {
         surNamesByLocations = new HashMap<Integer, Vector<String>>();
         for (Integer id : locationDic.getCountries()) {
-            surNamesByLocations.put(id, new Vector<String>());
+            surNamesByLocations.put(id, new Vector<>());
         }
 
         //assume that there is only 2 periods of birthyears
@@ -80,8 +80,8 @@ private void init() {
             givenNamesByLocationsMale.add(new HashMap<Integer, Vector<String>>());
             givenNamesByLocationsFemale.add(new HashMap<Integer, Vector<String>>());
             for (Integer id : locationDic.getCountries()) {
-                givenNamesByLocationsMale.lastElement().put(id, new Vector<String>());
-                givenNamesByLocationsFemale.lastElement().put(id, new Vector<String>());
+                givenNamesByLocationsMale.lastElement().put(id, new Vector<>());
+                givenNamesByLocationsFemale.lastElement().put(id, new Vector<>());
             }
         }
 

src/main/java/ldbc/snb/datagen/dictionary/PlaceDictionary.java

@@ -106,11 +106,11 @@ public int compareTo(PlaceZOrder obj) {
      * @brief Creator.
      */
     public PlaceDictionary() {
-        this.countryNames = new HashMap<String, Integer>();
-        this.cityNames = new HashMap<String, Integer>();
-        this.places = new HashMap<Integer, Place>();
-        this.isPartOf = new HashMap<Integer, Integer>();
-        this.countries = new ArrayList<Integer>();
+        this.countryNames = new HashMap<>();
+        this.cityNames = new HashMap<>();
+        this.places = new HashMap<>();
+        this.isPartOf = new HashMap<>();
+        this.countries = new ArrayList<>();
         this.citiesByCountry = new HashMap<Integer, ArrayList<Integer>>();
         load(DatagenParams.cityDictionaryFile, DatagenParams.countryDictionaryFile);
     }
@@ -128,7 +128,7 @@ public Set<Integer> getPlaces() {
      * @brief Gets a list of the country ids.
      */
     public ArrayList<Integer> getCountries() {
-        return new ArrayList<Integer>(countries);
+        return new ArrayList<>(countries);
     }
 
     /**
@@ -302,7 +302,7 @@ private void readCountries(String fileName) {
             BufferedReader dictionary = new BufferedReader(
                     new InputStreamReader(getClass().getResourceAsStream(fileName), "UTF-8"));
 
-            ArrayList<Float> temporalCumulative = new ArrayList<Float>();
+            ArrayList<Float> temporalCumulative = new ArrayList<>();
 
             String line;
             while ((line = dictionary.readLine()) != null) {
@@ -323,7 +323,7 @@ private void readCountries(String fileName) {
                 temporalCumulative.add(dist);
                 countries.add(place.getId());
 
-                citiesByCountry.put(place.getId(), new ArrayList<Integer>());
+                citiesByCountry.put(place.getId(), new ArrayList<>());
             }
             dictionary.close();
             cumulativeDistribution = new Float[temporalCumulative.size()];
@@ -338,7 +338,7 @@ private void readCountries(String fileName) {
      * @brief Reads a continents file name.
      */
     private void readContinents(String fileName) {
-        HashMap<String, Integer> treatedContinents = new HashMap<String, Integer>();
+        HashMap<String, Integer> treatedContinents = new HashMap<>();
         try {
             BufferedReader dictionary = new BufferedReader(
                     new InputStreamReader(getClass().getResourceAsStream(fileName), "UTF-8"));

src/main/java/ldbc/snb/datagen/dictionary/PopularPlacesDictionary.java

@@ -62,7 +62,7 @@ public PopularPlacesDictionary(PlaceDictionary locationDic) {
         this.placeDictionary = locationDic;
         this.popularPlacesByCountry = new HashMap<Integer, ArrayList<PopularPlace>>();
         for (Integer id : placeDictionary.getCountries()) {
-            this.popularPlacesByCountry.put(id, new ArrayList<PopularPlace>());
+            this.popularPlacesByCountry.put(id, new ArrayList<>());
         }
         load(DatagenParams.popularDictionaryFile);
     }