remove Java7MembersOnlyBeansWrapper

freemarker-jython25/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java

@@ -56,7 +56,6 @@
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.ext.beans.BeansWrapperBuilder;
 import freemarker.ext.beans.BooleanModel;
-import freemarker.ext.beans.Java7MembersOnlyBeansWrapper;
 import freemarker.ext.beans.ResourceBundleModel;
 import freemarker.ext.dom.NodeModel;
 import freemarker.template.Configuration;
@@ -208,13 +207,13 @@ public void setUp() throws Exception {
             dataModel.put("set", ImmutableSet.of("a", "b", "c"));
             dataModel.put("s", "test");
         } else if (simpleTestName.equals("bean-maps")) {
-            BeansWrapper w1 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w2 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w3 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w4 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w5 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w6 = new Java7MembersOnlyBeansWrapper();
-            BeansWrapper w7 = new Java7MembersOnlyBeansWrapper();
+            BeansWrapper w1 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w2 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w3 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w4 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w5 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w6 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+            BeansWrapper w7 = new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
 
             w1.setExposureLevel(BeansWrapper.EXPOSE_PROPERTIES_ONLY);
             w2.setExposureLevel(BeansWrapper.EXPOSE_PROPERTIES_ONLY);

freemarker-jython25/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt

@@ -42,61 +42,79 @@ nothing (3):
   location         : San Francisco
   name             : Chris
 
-all, shadow (28):
+all, shadow (37):
   age              : 27
   class            : class freemarker.test.templatesuite.TemplateTestCase$TestMapBean
   clear            : UNKNOWN
   clone            : UNKNOWN
+  compute          : UNKNOWN
+  computeIfAbsent  : UNKNOWN
+  computeIfPresent : UNKNOWN
   containsKey      : UNKNOWN
   containsValue    : UNKNOWN
   empty            : false
   entrySet         : UNKNOWN
   equals           : UNKNOWN
+  forEach          : UNKNOWN
   get              : UNKNOWN
   getClass         : UNKNOWN
   getLuckyNumber   : UNKNOWN
   getName          : UNKNOWN
+  getOrDefault     : UNKNOWN
   hashCode         : UNKNOWN
   isEmpty          : UNKNOWN
   keySet           : UNKNOWN
   location         : San Francisco
   luckyNumber      : 7
+  merge            : UNKNOWN
   name             : Christopher
   notify           : UNKNOWN
   notifyAll        : UNKNOWN
   put              : UNKNOWN
   putAll           : UNKNOWN
+  putIfAbsent      : UNKNOWN
   remove           : UNKNOWN
+  replace          : UNKNOWN
+  replaceAll       : UNKNOWN
   size             : UNKNOWN
   toString         : UNKNOWN
   values           : UNKNOWN
   wait             : UNKNOWN
 
-all (28):
+all (37):
   age              : 27
   class            : class freemarker.test.templatesuite.TemplateTestCase$TestMapBean
   clear            : UNKNOWN
   clone            : UNKNOWN
+  compute          : UNKNOWN
+  computeIfAbsent  : UNKNOWN
+  computeIfPresent : UNKNOWN
   containsKey      : UNKNOWN
   containsValue    : UNKNOWN
   empty            : false
   entrySet         : UNKNOWN
   equals           : UNKNOWN
+  forEach          : UNKNOWN
   get              : UNKNOWN
   getClass         : UNKNOWN
   getLuckyNumber   : UNKNOWN
   getName          : UNKNOWN
+  getOrDefault     : UNKNOWN
   hashCode         : UNKNOWN
   isEmpty          : UNKNOWN
   keySet           : UNKNOWN
   location         : San Francisco
   luckyNumber      : 7
+  merge            : UNKNOWN
   name             : Chris
   notify           : UNKNOWN
   notifyAll        : UNKNOWN
   put              : UNKNOWN
   putAll           : UNKNOWN
+  putIfAbsent      : UNKNOWN
   remove           : UNKNOWN
+  replace          : UNKNOWN
+  replaceAll       : UNKNOWN
   size             : UNKNOWN
   toString         : UNKNOWN
   values           : UNKNOWN