diff --git a/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java
index 18ff1b459..c7e42d714 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java
@@ -31,7 +31,7 @@ public class ChangeKeyItem extends AbstractJsonMapping implements Serializable {
     @JsonProperty("key")
     private String key;
     @JsonProperty("items")
-    private List<ChangedItem> changedItems = new ArrayList<ChangedItem>();
+    private List<ChangedItem> changedItems = new ArrayList<>();
 
     public String getKey() {
         return key;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java
index b6f3fb6a7..d1c77bbe2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java
@@ -45,7 +45,7 @@ public class CollectionInfo extends AbstractJsonMapping implements Serializable,
     @JsonProperty("backdrop_path")
     private String backdropPath;
     @JsonProperty("parts")
-    private List<Collection> parts = new ArrayList<Collection>();
+    private List<Collection> parts = new ArrayList<>();
 
     public String getBackdropPath() {
         return backdropPath;
diff --git a/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
index 6a814adde..8606b4a11 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
@@ -37,9 +37,9 @@ public abstract class AbstractWrapperBase extends AbstractJsonMapping {
      */
     public <E extends Enum<E>> List<E> getTypeList(Class<E> clz, E[] typeList) {
         if (typeList.length > 0) {
-            return new ArrayList<E>(Arrays.asList(typeList));
+            return new ArrayList<>(Arrays.asList(typeList));
         } else {
-            return new ArrayList<E>(EnumSet.allOf(clz));
+            return new ArrayList<>(EnumSet.allOf(clz));
         }
     }
 
diff --git a/src/main/java/com/omertron/themoviedbapi/results/ResultList.java b/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
index a58f013d8..34318be1e 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
@@ -41,9 +41,9 @@ public final class ResultList<T> extends AbstractWrapperIdPages {
 
     public ResultList(List<T> resultList) {
         if (resultList == null) {
-            results = new ArrayList<T>();
+            results = new ArrayList<>();
         } else {
-            results = new ArrayList<T>(resultList);
+            results = new ArrayList<>(resultList);
         }
     }
 
diff --git a/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java b/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
index 6e6391c1d..32b895c53 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
@@ -42,9 +42,9 @@ public final class ResultsMap<K, V> extends AbstractWrapperIdPages {
 
     public ResultsMap(Map<K, V> resultsMap) {
         if (resultsMap == null) {
-            results = new HashMap<K, V>();
+            results = new HashMap<>();
         } else {
-            results = new HashMap<K, V>(resultsMap);
+            results = new HashMap<>(resultsMap);
         }
     }
 
diff --git a/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
index 4a39c0365..a919ccb1d 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
@@ -27,7 +27,7 @@ import java.util.List;
 public class WrapperChanges extends AbstractWrapperBase {
 
     @JsonProperty("changes")
-    private List<ChangeKeyItem> changedItems = new ArrayList<ChangeKeyItem>();
+    private List<ChangeKeyItem> changedItems = new ArrayList<>();
 
     public List<ChangeKeyItem> getChangedItems() {
         return changedItems;
diff --git a/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
index 2e233122e..257dca1b1 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
@@ -21,7 +21,6 @@ package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.results.ResultList;
 import java.util.List;
 
 /**
@@ -45,7 +44,7 @@ public class WrapperGenericList<T> extends AbstractWrapperAll {
     }
 
     public ResultList<T> getResultsList() {
-        ResultList<T> resultsList = new ResultList<T>(results);
+        ResultList<T> resultsList = new ResultList<>(results);
         setResultProperties(resultsList);
         return resultsList;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
index a03b530b3..36ed315d7 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
@@ -79,13 +79,13 @@ public class WrapperImages extends AbstractWrapperAll {
      * @return
      */
     public List<Artwork> getAll(ArtworkType... artworkList) {
-        List<Artwork> artwork = new ArrayList<Artwork>();
+        List<Artwork> artwork = new ArrayList<>();
         List<ArtworkType> types;
 
         if (artworkList.length > 0) {
-            types = new ArrayList<ArtworkType>(Arrays.asList(artworkList));
+            types = new ArrayList<>(Arrays.asList(artworkList));
         } else {
-            types = new ArrayList<ArtworkType>(Arrays.asList(ArtworkType.values()));
+            types = new ArrayList<>(Arrays.asList(ArtworkType.values()));
         }
 
         // Add all the posters to the list
diff --git a/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
index 609c875ab..1e920f233 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
@@ -45,7 +45,7 @@ public class WrapperVideos extends AbstractWrapperId {
     @JsonSetter("quicktime")
     public void setQuickTime(List<Trailer> trailers) {
         if (this.videos == null) {
-            this.videos = new ArrayList<Video>();
+            this.videos = new ArrayList<>();
         }
 
         for (Trailer t : trailers) {
@@ -56,7 +56,7 @@ public class WrapperVideos extends AbstractWrapperId {
     @JsonSetter("youtube")
     public void setYouTube(List<Trailer> trailers) {
         if (this.videos == null) {
-            this.videos = new ArrayList<Video>();
+            this.videos = new ArrayList<>();
         }
 
         for (Trailer t : trailers) {
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
index f368011ba..e3c0a71e9 100644
--- a/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
+++ b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
@@ -48,7 +48,7 @@ public class ApiUrl {
     private final String apiKey;
     private final MethodBase method;
     private MethodSub submethod = MethodSub.NONE;
-    private static final List<Param> IGNORE_PARAMS = new ArrayList<Param>();
+    private static final List<Param> IGNORE_PARAMS = new ArrayList<>();
 
     static {
         IGNORE_PARAMS.add(Param.ID);
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/PostTools.java b/src/main/java/com/omertron/themoviedbapi/tools/PostTools.java
index c917f5d6b..50a3c5bc8 100644
--- a/src/main/java/com/omertron/themoviedbapi/tools/PostTools.java
+++ b/src/main/java/com/omertron/themoviedbapi/tools/PostTools.java
@@ -35,7 +35,7 @@ public class PostTools {
     // Jackson JSON configuration
     protected static final ObjectMapper MAPPER = new ObjectMapper();
 
-    private final Map<String, Object> values = new HashMap<String, Object>();
+    private final Map<String, Object> values = new HashMap<>();
 
     public PostTools() {
     }
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java
index aec3fda54..d2de53da5 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 public class TmdbNetworksTest extends AbstractTests {
 
     private static TmdbNetworks instance;
-    private static final List<TestID> testIDs = new ArrayList<TestID>();
+    private static final List<TestID> testIDs = new ArrayList<>();
 
     public TmdbNetworksTest() {
     }
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
index b981c9d11..9039968fc 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
 public class TmdbSeasonsTest extends AbstractTests {
 
     private static TmdbSeasons instance;
-    private static final List<TestID> TV_IDS = new ArrayList<TestID>();
+    private static final List<TestID> TV_IDS = new ArrayList<>();
 
     public TmdbSeasonsTest() {
     }
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
index b162152d4..e711e8f5a 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java
@@ -64,7 +64,7 @@ import org.junit.Test;
 public class TmdbTVTest extends AbstractTests {
 
     private static TmdbTV instance;
-    private static final List<TestID> TV_IDS = new ArrayList<TestID>();
+    private static final List<TestID> TV_IDS = new ArrayList<>();
 
     public TmdbTVTest() {
     }