Further simplifications in generic parameters

Author: szarnyasg

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

@@ -68,7 +68,7 @@ public class IPAddressDictionary {
     public IPAddressDictionary(PlaceDictionary locationDic) {
 
         this.placeDictionary = locationDic;
-        this.ipsByCountry = new TreeMap<Integer, List<IP>>();
+        this.ipsByCountry = new TreeMap<>();
         load(DatagenParams.countryAbbrMappingFile, DatagenParams.IPZONE_DIRECTORY);
     }
 

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

@@ -62,8 +62,8 @@ public class TagMatrix {
      */
 
     public TagMatrix() {
-        cumulative = new TreeMap<Integer, List<Double>>();
-        relatedTags = new TreeMap<Integer, List<Integer>>();
+        cumulative = new TreeMap<>();
+        relatedTags = new TreeMap<>();
         nonZeroTags = new ArrayList<>();
         load(DatagenParams.tagMatrixFile);
 

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

@@ -91,7 +91,7 @@ public UniversityDictionary(PlaceDictionary locationDic,
         this.startIndex = startIndex;
         this.universityName = new TreeMap<>();
         this.universityCity = new TreeMap<>();
-        this.universitiesByCountry = new TreeMap<Integer, List<Long>>();
+        this.universitiesByCountry = new TreeMap<>();
         for (Integer id : locationDic.getCountries()) {
             universitiesByCountry.put(id, new ArrayList<>());
         }

src/main/java/ldbc/snb/datagen/util/FactorTable.java

@@ -343,7 +343,7 @@ public void extractFactors(Like like) {
 
     public void writePersonFactors(OutputStream writer) {
         try {
-            Map<Integer, List<String>> countryNames = new TreeMap<Integer, List<String>>();
+            Map<Integer, List<String>> countryNames = new TreeMap<>();
             for (Map.Entry<Long, PersonCounts> c : personCounts_.entrySet()) {
                 if (c.getValue().name() != null) {
                     List<String> names = countryNames.get(c.getValue().country());