From 8f43685527a12bf6209dd9b1e154434126ef43b2 Mon Sep 17 00:00:00 2001
From: Joris van der Kallen <jvanderkallen@users.noreply.github.com>
Date: Sat, 4 Jan 2020 15:57:54 +0100
Subject: [PATCH 1/2] Include final fields when converting a POJO to a map

---
 .../src/test/java/feign/form/feign/spring/Dto.java            | 4 +---
 feign-form/src/main/java/feign/form/util/PojoUtil.java        | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/feign-form-spring/src/test/java/feign/form/feign/spring/Dto.java b/feign-form-spring/src/test/java/feign/form/feign/spring/Dto.java
index 2e812db..fbae099 100644
--- a/feign-form-spring/src/test/java/feign/form/feign/spring/Dto.java
+++ b/feign-form-spring/src/test/java/feign/form/feign/spring/Dto.java
@@ -22,19 +22,17 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import org.springframework.web.multipart.MultipartFile;
 
 @Data
-@NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = PRIVATE)
 public class Dto implements Serializable {
 
   private static final long serialVersionUID = -4218390863359894943L;
 
-  String field1;
+  final String field1;
 
   int field2;
 
diff --git a/feign-form/src/main/java/feign/form/util/PojoUtil.java b/feign-form/src/main/java/feign/form/util/PojoUtil.java
index e2b89a5..107bc36 100644
--- a/feign-form/src/main/java/feign/form/util/PojoUtil.java
+++ b/feign-form/src/main/java/feign/form/util/PojoUtil.java
@@ -16,7 +16,6 @@
 
 package feign.form.util;
 
-import static java.lang.reflect.Modifier.isFinal;
 import static java.lang.reflect.Modifier.isStatic;
 import static lombok.AccessLevel.PRIVATE;
 
@@ -63,7 +62,7 @@ public static Map<String, Object> toMap (@NonNull Object object) {
     val setAccessibleAction = new SetAccessibleAction();
     for (val field : type.getDeclaredFields()) {
       val modifiers = field.getModifiers();
-      if (isFinal(modifiers) || isStatic(modifiers)) {
+      if (isStatic(modifiers)) {
         continue;
       }
       setAccessibleAction.setField(field);

From 9007908cc8dd2ed344ed1d170963c28c8f0cac33 Mon Sep 17 00:00:00 2001
From: Joris van der Kallen <jvanderkallen@users.noreply.github.com>
Date: Sat, 4 Jan 2020 16:11:19 +0100
Subject: [PATCH 2/2] Fix build

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 441e3ba..8762519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 language: java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 install:
   ./mvnw --settings .settings.xml install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip -B -V