Fix FasterXML#52 (manual merge of fix; test can't go in 2.x as it needs Java 8)

Author: cowtowncoder

.travis.yml

@@ -1,14 +1,14 @@
 language: java
 
 jdk:
-  - openjdk7
   - openjdk8
+  - openjdk11
 
 # whitelist
 branches:
   only:
     - master
-    - 2.9
+    - 2.10
 env:
   global:
     - secure: "QNxd7SfYx4lv/q3fJyON9Paefzh1yVMXSR5t+T8QDmASn0A0+KgiMIjBFSF7XZVnlj4fCRR3WxZVL1C2QlS1fis9hMppCVs5E3D6uCEy+9HV8AChPWO/iVciWzfyK6lNC/mq5BbduNmGrif39DWcaZnOiGqz+bC1QPfBSDl3kcjoRdWCKfPVLmsLm27zYIJ+bsk+1hzCKkhnwhYNKkUuO+Qee/2eZAfsxdVNXryaMA03c6kgRa87ZPYegwGm77y7CA6DFxiKDGXkRDkZVSbe/6k1mf44tgrDfhuN+meR+UHnGMvd3UXMh5W2d3fQhRttV4cQ/lD82RbDBJ9p2d14DPDil3xfyP1JBcP2DJ0FkXIMem8xD5/vWh3jb/K7Ot7F8xefkdASK/IOcXnvHlvFb26gZZgYgCHiwF7eqpKxDxoExFFY1Hil62ElNLZYXoxE32xmcxuWcFlrX1Mrm7ueOhAPL9btR0dQhYiCNLXxpriTtNbZX91UfOP+2Xaxepz73yEAuk3xuFhcZcBRC88UE9Y3BNa3zz7CLr9aL5YN/NE62tDpuAtTRB//uG5vWWcp0UP2AjF7Jvflno0wbV114BTbs01FfFOZ4pxXBixdiyfmhz0fGYiEP6tCX8RzFURd76Me7egGj9v7Ei8u4nuKgGr7HC36sB0K2H4W3Ql8gmg="

mrbean/src/main/java/com/fasterxml/jackson/module/mrbean/BeanBuilder.java

@@ -68,8 +68,7 @@ public BeanBuilder implement(boolean failOnUnrecognized)
         // First: find all supertypes:
         implTypes.add(_type);
         BeanUtil.findSuperTypes(_type, Object.class, implTypes);
-        final boolean hasConcrete = !_type.isInterface();
-        
+
         for (JavaType impl : implTypes) {
             TypeResolutionContext ctxt = buildTypeContext(impl);
 
@@ -107,7 +106,7 @@ public BeanBuilder implement(boolean failOnUnrecognized)
                     continue;
                 }
                 // [module-mrbean#11]: try to support overloaded methods
-                if (hasConcrete && hasConcreteOverride(m, _type)) {
+                if (hasConcreteOverride(m, _type)) {
                     continue;
                 }
                 if (failOnUnrecognized) {
@@ -117,14 +116,13 @@ public BeanBuilder implement(boolean failOnUnrecognized)
                 _unsupportedMethods.put(methodName, m);
             }
         }
-
         return this;
     }
 
     /**
      * Method that generates byte code for class that implements abstract
      * types requested so far.
-     * 
+     *
      * @param className Fully-qualified name of the class to generate
      * @return Byte code Class instance built by this builder
      */
@@ -176,7 +174,7 @@ public byte[] build(String className)
     /**
      * Helper method used to detect if an abstract method found in a base class
      * may actually be implemented in a (more) concrete sub-class.
-     * 
+     *
      * @since 2.4
      */
     protected boolean hasConcreteOverride(Method m0, JavaType implementedType)
@@ -196,7 +194,7 @@ protected boolean hasConcreteOverride(Method m0, JavaType implementedType)
         }
         return false;
     }
-    
+
     protected String getPropertyName(String methodName)
     {
         int prefixLen = methodName.startsWith("is") ? 2 : 3;
@@ -220,7 +218,7 @@ protected void addGetter(TypeResolutionContext ctxt, Method m)
         POJOProperty prop = findProperty(ctxt, getPropertyName(m.getName()));
         // only set if not yet set; we start with super class:
         if (prop.getGetter() == null) {
-            prop.setGetter(m);        
+            prop.setGetter(m);
         }
     }
 
@@ -241,7 +239,7 @@ protected POJOProperty findProperty(TypeResolutionContext ctxt, String propName)
         }
         return prop;
     }
-    
+
     protected final static boolean returnsBoolean(Method m)
     {
         Class<?> rt = m.getReturnType();

release-notes/VERSION-2.x

@@ -12,7 +12,8 @@ Modules:
 
 2.10.0 (not yet released)
 
-#79: Add simple module-info for JDK9+, using Moditect
+#52: (mrbean) Interfaces may have non-abstract methods (since java8)
+#79: (all) Add simple module-info for JDK9+, using Moditect
 - Update `asm` version 5.2 -> 7.0 for JDK 11 support
 - Remove SPI metadata for OSGi module as there is no 0-arg constructor, does
   not work