Merge branch '2.10'

Author: cowtowncoder

.travis.yml

@@ -2,9 +2,9 @@ language: java
 
 jdk:
   - openjdk8
-  - oraclejdk9
+  - openjdk11
 
-# whitelist
+# allow-list to prevent build of all branches
 branches:
   only:
     - master

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

@@ -70,8 +70,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);
 
@@ -109,7 +108,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) {
@@ -119,14 +118,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
      */
@@ -171,7 +169,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)
@@ -191,7 +189,7 @@ protected boolean hasConcreteOverride(Method m0, JavaType implementedType)
         }
         return false;
     }
-    
+
     protected String getPropertyName(String methodName)
     {
         int prefixLen = methodName.startsWith("is") ? 2 : 3;
@@ -215,7 +213,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);
         }
     }
 
@@ -236,7 +234,7 @@ protected POJOProperty findProperty(TypeResolutionContext ctxt, String propName)
         }
         return prop;
     }
-    
+
     protected final static boolean returnsBoolean(Method m)
     {
         Class<?> rt = m.getReturnType();

release-notes/CREDITS-2.x

@@ -48,3 +48,8 @@ Jeffrey Bagdis (jbagdis@github)
 * Reported, contributed fix for #49: Afterburner `MyClassLoader#loadAndResolve()`
   is not idempotent when `tryToUseParent` is true
  (2.9.9)
+
+Harrison Houghton (hrhino@github)
+
+* Suggested, contributed impl for #52: Interfaces may have non-abstract methods (since java8)
+ (2.10.0)

release-notes/VERSION-2.x

@@ -12,7 +12,9 @@ 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)
+ (suggested by Harrison H)
+#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