From a899dd426be7490fd02a7e834db51556f4ce4cd1 Mon Sep 17 00:00:00 2001
From: Karl von Randow <karl@cactuslab.com>
Date: Tue, 30 Aug 2022 08:22:06 +1200
Subject: [PATCH 1/2] Fix Map generic type for Enum template

---
 script/enum-generator/template/Enum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/enum-generator/template/Enum.java b/script/enum-generator/template/Enum.java
index acd6139e..1c1278ce 100644
--- a/script/enum-generator/template/Enum.java
+++ b/script/enum-generator/template/Enum.java
@@ -9,7 +9,7 @@ public enum $name {
 $values;
 
     private int value;
-    private static Map map = new HashMap<$name, Integer>();
+    private static Map<Integer, $name> map = new HashMap<>();
 
     private $name(int i) {
       value = i;

From 6ccf24bd9b37b9d4c4012b54b6fdab8da980c5ac Mon Sep 17 00:00:00 2001
From: Karl von Randow <karl@cactuslab.com>
Date: Tue, 30 Aug 2022 08:28:09 +1200
Subject: [PATCH 2/2] Regenerate enums with fixed Map generic types

---
 src/main/java/com/criteo/vips/enums/VipsAccess.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsAlign.java              | 2 +-
 src/main/java/com/criteo/vips/enums/VipsAngle.java              | 2 +-
 src/main/java/com/criteo/vips/enums/VipsAngle45.java            | 2 +-
 src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java      | 2 +-
 src/main/java/com/criteo/vips/enums/VipsBandFormat.java         | 2 +-
 src/main/java/com/criteo/vips/enums/VipsBlendMode.java          | 2 +-
 src/main/java/com/criteo/vips/enums/VipsCoding.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsCombine.java            | 2 +-
 src/main/java/com/criteo/vips/enums/VipsCombineMode.java        | 2 +-
 src/main/java/com/criteo/vips/enums/VipsCompassDirection.java   | 2 +-
 src/main/java/com/criteo/vips/enums/VipsDemandStyle.java        | 2 +-
 src/main/java/com/criteo/vips/enums/VipsDirection.java          | 2 +-
 src/main/java/com/criteo/vips/enums/VipsExtend.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsFailOn.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java    | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignFlags.java       | 2 +-
 .../java/com/criteo/vips/enums/VipsForeignHeifCompression.java  | 2 +-
 .../java/com/criteo/vips/enums/VipsForeignJpegSubsample.java    | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java   | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java   | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java   | 2 +-
 .../java/com/criteo/vips/enums/VipsForeignTiffCompression.java  | 2 +-
 .../java/com/criteo/vips/enums/VipsForeignTiffPredictor.java    | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java | 2 +-
 src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java  | 2 +-
 src/main/java/com/criteo/vips/enums/VipsImageType.java          | 2 +-
 src/main/java/com/criteo/vips/enums/VipsIntent.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsInteresting.java        | 2 +-
 src/main/java/com/criteo/vips/enums/VipsInterpretation.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsKernel.java             | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java   | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationComplex.java   | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java  | 2 +-
 .../java/com/criteo/vips/enums/VipsOperationComplexget.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationFlags.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationMath.java      | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationMath2.java     | 2 +-
 .../java/com/criteo/vips/enums/VipsOperationMorphology.java     | 2 +-
 .../java/com/criteo/vips/enums/VipsOperationRelational.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsOperationRound.java     | 2 +-
 src/main/java/com/criteo/vips/enums/VipsPCS.java                | 2 +-
 src/main/java/com/criteo/vips/enums/VipsPrecision.java          | 2 +-
 src/main/java/com/criteo/vips/enums/VipsRegionShrink.java       | 2 +-
 src/main/java/com/criteo/vips/enums/VipsSaveable.java           | 2 +-
 src/main/java/com/criteo/vips/enums/VipsSize.java               | 2 +-
 src/main/java/com/criteo/vips/enums/VipsToken.java              | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/criteo/vips/enums/VipsAccess.java b/src/main/java/com/criteo/vips/enums/VipsAccess.java
index 27cf2e8c..4f3984e6 100644
--- a/src/main/java/com/criteo/vips/enums/VipsAccess.java
+++ b/src/main/java/com/criteo/vips/enums/VipsAccess.java
@@ -25,7 +25,7 @@ public enum VipsAccess {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsAccess, Integer>();
+    private static Map<Integer, VipsAccess> map = new HashMap<>();
 
     private VipsAccess(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsAlign.java b/src/main/java/com/criteo/vips/enums/VipsAlign.java
index 45116c1c..71c5389f 100644
--- a/src/main/java/com/criteo/vips/enums/VipsAlign.java
+++ b/src/main/java/com/criteo/vips/enums/VipsAlign.java
@@ -26,7 +26,7 @@ public enum VipsAlign {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsAlign, Integer>();
+    private static Map<Integer, VipsAlign> map = new HashMap<>();
 
     private VipsAlign(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsAngle.java b/src/main/java/com/criteo/vips/enums/VipsAngle.java
index e6a9601e..9d0f56fb 100644
--- a/src/main/java/com/criteo/vips/enums/VipsAngle.java
+++ b/src/main/java/com/criteo/vips/enums/VipsAngle.java
@@ -28,7 +28,7 @@ public enum VipsAngle {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsAngle, Integer>();
+    private static Map<Integer, VipsAngle> map = new HashMap<>();
 
     private VipsAngle(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsAngle45.java b/src/main/java/com/criteo/vips/enums/VipsAngle45.java
index 150f500d..5a3bc012 100644
--- a/src/main/java/com/criteo/vips/enums/VipsAngle45.java
+++ b/src/main/java/com/criteo/vips/enums/VipsAngle45.java
@@ -36,7 +36,7 @@ public enum VipsAngle45 {
     Last(8);
 
     private int value;
-    private static Map map = new HashMap<VipsAngle45, Integer>();
+    private static Map<Integer, VipsAngle45> map = new HashMap<>();
 
     private VipsAngle45(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java b/src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java
index 0c0adc2b..0d39b3ce 100644
--- a/src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java
+++ b/src/main/java/com/criteo/vips/enums/VipsArgumentFlags.java
@@ -37,7 +37,7 @@ public enum VipsArgumentFlags {
     Modify(128);
 
     private int value;
-    private static Map map = new HashMap<VipsArgumentFlags, Integer>();
+    private static Map<Integer, VipsArgumentFlags> map = new HashMap<>();
 
     private VipsArgumentFlags(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsBandFormat.java b/src/main/java/com/criteo/vips/enums/VipsBandFormat.java
index be683b04..38a9ca81 100644
--- a/src/main/java/com/criteo/vips/enums/VipsBandFormat.java
+++ b/src/main/java/com/criteo/vips/enums/VipsBandFormat.java
@@ -42,7 +42,7 @@ public enum VipsBandFormat {
     FormatLast(10);
 
     private int value;
-    private static Map map = new HashMap<VipsBandFormat, Integer>();
+    private static Map<Integer, VipsBandFormat> map = new HashMap<>();
 
     private VipsBandFormat(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsBlendMode.java b/src/main/java/com/criteo/vips/enums/VipsBlendMode.java
index 15b562e0..3d1f807d 100644
--- a/src/main/java/com/criteo/vips/enums/VipsBlendMode.java
+++ b/src/main/java/com/criteo/vips/enums/VipsBlendMode.java
@@ -70,7 +70,7 @@ public enum VipsBlendMode {
     Last(25);
 
     private int value;
-    private static Map map = new HashMap<VipsBlendMode, Integer>();
+    private static Map<Integer, VipsBlendMode> map = new HashMap<>();
 
     private VipsBlendMode(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsCoding.java b/src/main/java/com/criteo/vips/enums/VipsCoding.java
index cc0c6b9c..7ab7924d 100644
--- a/src/main/java/com/criteo/vips/enums/VipsCoding.java
+++ b/src/main/java/com/criteo/vips/enums/VipsCoding.java
@@ -27,7 +27,7 @@ public enum VipsCoding {
     Last(7);
 
     private int value;
-    private static Map map = new HashMap<VipsCoding, Integer>();
+    private static Map<Integer, VipsCoding> map = new HashMap<>();
 
     private VipsCoding(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsCombine.java b/src/main/java/com/criteo/vips/enums/VipsCombine.java
index 770d396c..d179abe9 100644
--- a/src/main/java/com/criteo/vips/enums/VipsCombine.java
+++ b/src/main/java/com/criteo/vips/enums/VipsCombine.java
@@ -26,7 +26,7 @@ public enum VipsCombine {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsCombine, Integer>();
+    private static Map<Integer, VipsCombine> map = new HashMap<>();
 
     private VipsCombine(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsCombineMode.java b/src/main/java/com/criteo/vips/enums/VipsCombineMode.java
index f4bd4304..5aab3f43 100644
--- a/src/main/java/com/criteo/vips/enums/VipsCombineMode.java
+++ b/src/main/java/com/criteo/vips/enums/VipsCombineMode.java
@@ -24,7 +24,7 @@ public enum VipsCombineMode {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsCombineMode, Integer>();
+    private static Map<Integer, VipsCombineMode> map = new HashMap<>();
 
     private VipsCombineMode(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsCompassDirection.java b/src/main/java/com/criteo/vips/enums/VipsCompassDirection.java
index 53443a29..8fad2d29 100644
--- a/src/main/java/com/criteo/vips/enums/VipsCompassDirection.java
+++ b/src/main/java/com/criteo/vips/enums/VipsCompassDirection.java
@@ -38,7 +38,7 @@ public enum VipsCompassDirection {
     Last(9);
 
     private int value;
-    private static Map map = new HashMap<VipsCompassDirection, Integer>();
+    private static Map<Integer, VipsCompassDirection> map = new HashMap<>();
 
     private VipsCompassDirection(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsDemandStyle.java b/src/main/java/com/criteo/vips/enums/VipsDemandStyle.java
index 180ccb67..7d46e5be 100644
--- a/src/main/java/com/criteo/vips/enums/VipsDemandStyle.java
+++ b/src/main/java/com/criteo/vips/enums/VipsDemandStyle.java
@@ -28,7 +28,7 @@ public enum VipsDemandStyle {
     Any(3);
 
     private int value;
-    private static Map map = new HashMap<VipsDemandStyle, Integer>();
+    private static Map<Integer, VipsDemandStyle> map = new HashMap<>();
 
     private VipsDemandStyle(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsDirection.java b/src/main/java/com/criteo/vips/enums/VipsDirection.java
index c9eb77a4..686b15e7 100644
--- a/src/main/java/com/criteo/vips/enums/VipsDirection.java
+++ b/src/main/java/com/criteo/vips/enums/VipsDirection.java
@@ -24,7 +24,7 @@ public enum VipsDirection {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsDirection, Integer>();
+    private static Map<Integer, VipsDirection> map = new HashMap<>();
 
     private VipsDirection(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsExtend.java b/src/main/java/com/criteo/vips/enums/VipsExtend.java
index 6a9f3fb1..de3e43b3 100644
--- a/src/main/java/com/criteo/vips/enums/VipsExtend.java
+++ b/src/main/java/com/criteo/vips/enums/VipsExtend.java
@@ -31,7 +31,7 @@ public enum VipsExtend {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsExtend, Integer>();
+    private static Map<Integer, VipsExtend> map = new HashMap<>();
 
     private VipsExtend(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsFailOn.java b/src/main/java/com/criteo/vips/enums/VipsFailOn.java
index 795b36c5..2bbc87a1 100644
--- a/src/main/java/com/criteo/vips/enums/VipsFailOn.java
+++ b/src/main/java/com/criteo/vips/enums/VipsFailOn.java
@@ -28,7 +28,7 @@ public enum VipsFailOn {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsFailOn, Integer>();
+    private static Map<Integer, VipsFailOn> map = new HashMap<>();
 
     private VipsFailOn(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java b/src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java
index 5d033b0f..f33207a6 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignDzContainer.java
@@ -26,7 +26,7 @@ public enum VipsForeignDzContainer {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzContainer, Integer>();
+    private static Map<Integer, VipsForeignDzContainer> map = new HashMap<>();
 
     private VipsForeignDzContainer(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java b/src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java
index 6345f005..3e77324b 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignDzDepth.java
@@ -26,7 +26,7 @@ public enum VipsForeignDzDepth {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzDepth, Integer>();
+    private static Map<Integer, VipsForeignDzDepth> map = new HashMap<>();
 
     private VipsForeignDzDepth(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java b/src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java
index 65480944..1f2a183d 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignDzLayout.java
@@ -30,7 +30,7 @@ public enum VipsForeignDzLayout {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignDzLayout, Integer>();
+    private static Map<Integer, VipsForeignDzLayout> map = new HashMap<>();
 
     private VipsForeignDzLayout(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignFlags.java b/src/main/java/com/criteo/vips/enums/VipsForeignFlags.java
index c3f817c9..4d048670 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignFlags.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignFlags.java
@@ -28,7 +28,7 @@ public enum VipsForeignFlags {
     All(7);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignFlags, Integer>();
+    private static Map<Integer, VipsForeignFlags> map = new HashMap<>();
 
     private VipsForeignFlags(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignHeifCompression.java b/src/main/java/com/criteo/vips/enums/VipsForeignHeifCompression.java
index f8ceb1e6..27b950af 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignHeifCompression.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignHeifCompression.java
@@ -28,7 +28,7 @@ public enum VipsForeignHeifCompression {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignHeifCompression, Integer>();
+    private static Map<Integer, VipsForeignHeifCompression> map = new HashMap<>();
 
     private VipsForeignHeifCompression(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignJpegSubsample.java b/src/main/java/com/criteo/vips/enums/VipsForeignJpegSubsample.java
index 5f92c514..d4be8bc7 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignJpegSubsample.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignJpegSubsample.java
@@ -26,7 +26,7 @@ public enum VipsForeignJpegSubsample {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignJpegSubsample, Integer>();
+    private static Map<Integer, VipsForeignJpegSubsample> map = new HashMap<>();
 
     private VipsForeignJpegSubsample(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java b/src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java
index 08d8fd50..06527182 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignPngFilter.java
@@ -31,7 +31,7 @@ public enum VipsForeignPngFilter {
     All(248);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignPngFilter, Integer>();
+    private static Map<Integer, VipsForeignPngFilter> map = new HashMap<>();
 
     private VipsForeignPngFilter(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java b/src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java
index 45194c42..29cd2c7a 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignPpmFormat.java
@@ -28,7 +28,7 @@ public enum VipsForeignPpmFormat {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignPpmFormat, Integer>();
+    private static Map<Integer, VipsForeignPpmFormat> map = new HashMap<>();
 
     private VipsForeignPpmFormat(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java b/src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java
index 7fd0d0df..9a3469a8 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignSubsample.java
@@ -26,7 +26,7 @@ public enum VipsForeignSubsample {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignSubsample, Integer>();
+    private static Map<Integer, VipsForeignSubsample> map = new HashMap<>();
 
     private VipsForeignSubsample(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignTiffCompression.java b/src/main/java/com/criteo/vips/enums/VipsForeignTiffCompression.java
index 52a43374..36a179e2 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignTiffCompression.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignTiffCompression.java
@@ -38,7 +38,7 @@ public enum VipsForeignTiffCompression {
     Last(9);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffCompression, Integer>();
+    private static Map<Integer, VipsForeignTiffCompression> map = new HashMap<>();
 
     private VipsForeignTiffCompression(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignTiffPredictor.java b/src/main/java/com/criteo/vips/enums/VipsForeignTiffPredictor.java
index bfa60694..8ec0f42e 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignTiffPredictor.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignTiffPredictor.java
@@ -26,7 +26,7 @@ public enum VipsForeignTiffPredictor {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffPredictor, Integer>();
+    private static Map<Integer, VipsForeignTiffPredictor> map = new HashMap<>();
 
     private VipsForeignTiffPredictor(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java b/src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java
index 50eb850b..1fcc81ad 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignTiffResunit.java
@@ -24,7 +24,7 @@ public enum VipsForeignTiffResunit {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignTiffResunit, Integer>();
+    private static Map<Integer, VipsForeignTiffResunit> map = new HashMap<>();
 
     private VipsForeignTiffResunit(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java b/src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java
index 12feb85f..0f2c17b8 100644
--- a/src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java
+++ b/src/main/java/com/criteo/vips/enums/VipsForeignWebpPreset.java
@@ -32,7 +32,7 @@ public enum VipsForeignWebpPreset {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsForeignWebpPreset, Integer>();
+    private static Map<Integer, VipsForeignWebpPreset> map = new HashMap<>();
 
     private VipsForeignWebpPreset(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsImageType.java b/src/main/java/com/criteo/vips/enums/VipsImageType.java
index f74ea053..b698b9c3 100644
--- a/src/main/java/com/criteo/vips/enums/VipsImageType.java
+++ b/src/main/java/com/criteo/vips/enums/VipsImageType.java
@@ -28,7 +28,7 @@ public enum VipsImageType {
     Partial(7);
 
     private int value;
-    private static Map map = new HashMap<VipsImageType, Integer>();
+    private static Map<Integer, VipsImageType> map = new HashMap<>();
 
     private VipsImageType(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsIntent.java b/src/main/java/com/criteo/vips/enums/VipsIntent.java
index 39daa673..22cf4b51 100644
--- a/src/main/java/com/criteo/vips/enums/VipsIntent.java
+++ b/src/main/java/com/criteo/vips/enums/VipsIntent.java
@@ -28,7 +28,7 @@ public enum VipsIntent {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsIntent, Integer>();
+    private static Map<Integer, VipsIntent> map = new HashMap<>();
 
     private VipsIntent(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsInteresting.java b/src/main/java/com/criteo/vips/enums/VipsInteresting.java
index 2d247104..30937dd6 100644
--- a/src/main/java/com/criteo/vips/enums/VipsInteresting.java
+++ b/src/main/java/com/criteo/vips/enums/VipsInteresting.java
@@ -34,7 +34,7 @@ public enum VipsInteresting {
     Last(7);
 
     private int value;
-    private static Map map = new HashMap<VipsInteresting, Integer>();
+    private static Map<Integer, VipsInteresting> map = new HashMap<>();
 
     private VipsInteresting(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsInterpretation.java b/src/main/java/com/criteo/vips/enums/VipsInterpretation.java
index 5d9603a0..3cf9ae68 100644
--- a/src/main/java/com/criteo/vips/enums/VipsInterpretation.java
+++ b/src/main/java/com/criteo/vips/enums/VipsInterpretation.java
@@ -58,7 +58,7 @@ public enum VipsInterpretation {
     Last(30);
 
     private int value;
-    private static Map map = new HashMap<VipsInterpretation, Integer>();
+    private static Map<Integer, VipsInterpretation> map = new HashMap<>();
 
     private VipsInterpretation(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsKernel.java b/src/main/java/com/criteo/vips/enums/VipsKernel.java
index 739e9ba0..c4430983 100644
--- a/src/main/java/com/criteo/vips/enums/VipsKernel.java
+++ b/src/main/java/com/criteo/vips/enums/VipsKernel.java
@@ -32,7 +32,7 @@ public enum VipsKernel {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsKernel, Integer>();
+    private static Map<Integer, VipsKernel> map = new HashMap<>();
 
     private VipsKernel(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java b/src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java
index 6937fe76..cc6df3e4 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationBoolean.java
@@ -30,7 +30,7 @@ public enum VipsOperationBoolean {
     Last(5);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationBoolean, Integer>();
+    private static Map<Integer, VipsOperationBoolean> map = new HashMap<>();
 
     private VipsOperationBoolean(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationComplex.java b/src/main/java/com/criteo/vips/enums/VipsOperationComplex.java
index 4765611a..dd9acac9 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationComplex.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationComplex.java
@@ -26,7 +26,7 @@ public enum VipsOperationComplex {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplex, Integer>();
+    private static Map<Integer, VipsOperationComplex> map = new HashMap<>();
 
     private VipsOperationComplex(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java b/src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java
index 4961488b..8b2405ef 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationComplex2.java
@@ -22,7 +22,7 @@ public enum VipsOperationComplex2 {
     Last(1);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplex2, Integer>();
+    private static Map<Integer, VipsOperationComplex2> map = new HashMap<>();
 
     private VipsOperationComplex2(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationComplexget.java b/src/main/java/com/criteo/vips/enums/VipsOperationComplexget.java
index 2b9d6cb0..c9aae607 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationComplexget.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationComplexget.java
@@ -24,7 +24,7 @@ public enum VipsOperationComplexget {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationComplexget, Integer>();
+    private static Map<Integer, VipsOperationComplexget> map = new HashMap<>();
 
     private VipsOperationComplexget(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationFlags.java b/src/main/java/com/criteo/vips/enums/VipsOperationFlags.java
index e91abe3b..f153b32f 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationFlags.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationFlags.java
@@ -28,7 +28,7 @@ public enum VipsOperationFlags {
     Deprecated(8);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationFlags, Integer>();
+    private static Map<Integer, VipsOperationFlags> map = new HashMap<>();
 
     private VipsOperationFlags(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationMath.java b/src/main/java/com/criteo/vips/enums/VipsOperationMath.java
index d988ad1c..8092cda8 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationMath.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationMath.java
@@ -52,7 +52,7 @@ public enum VipsOperationMath {
     Last(16);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMath, Integer>();
+    private static Map<Integer, VipsOperationMath> map = new HashMap<>();
 
     private VipsOperationMath(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationMath2.java b/src/main/java/com/criteo/vips/enums/VipsOperationMath2.java
index 3e0ac0f6..cd372ddb 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationMath2.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationMath2.java
@@ -26,7 +26,7 @@ public enum VipsOperationMath2 {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMath2, Integer>();
+    private static Map<Integer, VipsOperationMath2> map = new HashMap<>();
 
     private VipsOperationMath2(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationMorphology.java b/src/main/java/com/criteo/vips/enums/VipsOperationMorphology.java
index 635a7043..8b568e83 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationMorphology.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationMorphology.java
@@ -24,7 +24,7 @@ public enum VipsOperationMorphology {
     Last(2);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationMorphology, Integer>();
+    private static Map<Integer, VipsOperationMorphology> map = new HashMap<>();
 
     private VipsOperationMorphology(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationRelational.java b/src/main/java/com/criteo/vips/enums/VipsOperationRelational.java
index 2d8ad60b..d17cb36c 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationRelational.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationRelational.java
@@ -31,7 +31,7 @@ public enum VipsOperationRelational {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationRelational, Integer>();
+    private static Map<Integer, VipsOperationRelational> map = new HashMap<>();
 
     private VipsOperationRelational(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsOperationRound.java b/src/main/java/com/criteo/vips/enums/VipsOperationRound.java
index c466cae3..00a14703 100644
--- a/src/main/java/com/criteo/vips/enums/VipsOperationRound.java
+++ b/src/main/java/com/criteo/vips/enums/VipsOperationRound.java
@@ -26,7 +26,7 @@ public enum VipsOperationRound {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsOperationRound, Integer>();
+    private static Map<Integer, VipsOperationRound> map = new HashMap<>();
 
     private VipsOperationRound(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsPCS.java b/src/main/java/com/criteo/vips/enums/VipsPCS.java
index d128763a..c6cdcb6d 100644
--- a/src/main/java/com/criteo/vips/enums/VipsPCS.java
+++ b/src/main/java/com/criteo/vips/enums/VipsPCS.java
@@ -24,7 +24,7 @@ public enum VipsPCS {
     csLast(2);
 
     private int value;
-    private static Map map = new HashMap<VipsPCS, Integer>();
+    private static Map<Integer, VipsPCS> map = new HashMap<>();
 
     private VipsPCS(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsPrecision.java b/src/main/java/com/criteo/vips/enums/VipsPrecision.java
index 7312c3b3..5c4cf615 100644
--- a/src/main/java/com/criteo/vips/enums/VipsPrecision.java
+++ b/src/main/java/com/criteo/vips/enums/VipsPrecision.java
@@ -26,7 +26,7 @@ public enum VipsPrecision {
     Last(3);
 
     private int value;
-    private static Map map = new HashMap<VipsPrecision, Integer>();
+    private static Map<Integer, VipsPrecision> map = new HashMap<>();
 
     private VipsPrecision(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsRegionShrink.java b/src/main/java/com/criteo/vips/enums/VipsRegionShrink.java
index a206c3f5..58ef0159 100644
--- a/src/main/java/com/criteo/vips/enums/VipsRegionShrink.java
+++ b/src/main/java/com/criteo/vips/enums/VipsRegionShrink.java
@@ -32,7 +32,7 @@ public enum VipsRegionShrink {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsRegionShrink, Integer>();
+    private static Map<Integer, VipsRegionShrink> map = new HashMap<>();
 
     private VipsRegionShrink(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsSaveable.java b/src/main/java/com/criteo/vips/enums/VipsSaveable.java
index 0389ec48..70cc062e 100644
--- a/src/main/java/com/criteo/vips/enums/VipsSaveable.java
+++ b/src/main/java/com/criteo/vips/enums/VipsSaveable.java
@@ -32,7 +32,7 @@ public enum VipsSaveable {
     Last(6);
 
     private int value;
-    private static Map map = new HashMap<VipsSaveable, Integer>();
+    private static Map<Integer, VipsSaveable> map = new HashMap<>();
 
     private VipsSaveable(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsSize.java b/src/main/java/com/criteo/vips/enums/VipsSize.java
index a4aecab5..9c911a71 100644
--- a/src/main/java/com/criteo/vips/enums/VipsSize.java
+++ b/src/main/java/com/criteo/vips/enums/VipsSize.java
@@ -28,7 +28,7 @@ public enum VipsSize {
     Last(4);
 
     private int value;
-    private static Map map = new HashMap<VipsSize, Integer>();
+    private static Map<Integer, VipsSize> map = new HashMap<>();
 
     private VipsSize(int i) {
       value = i;
diff --git a/src/main/java/com/criteo/vips/enums/VipsToken.java b/src/main/java/com/criteo/vips/enums/VipsToken.java
index 2259cfe5..195e4465 100644
--- a/src/main/java/com/criteo/vips/enums/VipsToken.java
+++ b/src/main/java/com/criteo/vips/enums/VipsToken.java
@@ -29,7 +29,7 @@ public enum VipsToken {
     Comma(5);
 
     private int value;
-    private static Map map = new HashMap<VipsToken, Integer>();
+    private static Map<Integer, VipsToken> map = new HashMap<>();
 
     private VipsToken(int i) {
       value = i;