Repository: incubator-freemarker Updated Branches: refs/heads/3 529cdd86f -> dceec32ed
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithShortedMethods.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithShortedMethods.java b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithShortedMethods.java deleted file mode 100644 index 2074b0b..0000000 --- a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithShortedMethods.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.freemarker.core.model.impl; - - -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Version; - -/** - * Used so that the order in which the methods are added to the introspection cache is deterministic. - */ -public abstract class DefaultObjectWrapperWithShortedMethods extends DefaultObjectWrapper { - - public DefaultObjectWrapperWithShortedMethods(boolean desc) { - super(Configuration.VERSION_3_0_0); - setMethodSorter(new AlphabeticalMethodSorter(desc)); - } - - public DefaultObjectWrapperWithShortedMethods(Version incompatibleImprovements, boolean desc) { - super(incompatibleImprovements); - setMethodSorter(new AlphabeticalMethodSorter(desc)); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithSortedMethods.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithSortedMethods.java b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithSortedMethods.java deleted file mode 100644 index d7b74c3..0000000 --- a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperWithSortedMethods.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.freemarker.core.model.impl; - -import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.Version; - -public class DefaultObjectWrapperWithSortedMethods extends DefaultObjectWrapper { - - public DefaultObjectWrapperWithSortedMethods(boolean desc) { - this(Configuration.VERSION_3_0_0, desc); - } - - public DefaultObjectWrapperWithSortedMethods(Version incompatibleImprovements, boolean desc) { - super(incompatibleImprovements); - setMethodSorter(this, desc); - } - - static void setMethodSorter(DefaultObjectWrapper ow, boolean desc) { - ow.setMethodSorter(new AlphabeticalMethodSorter(desc)); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java index 3d7a585..fc19bb7 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java @@ -38,7 +38,8 @@ public class EnumModelsTest { @Test public void modelCaching() throws Exception { - DefaultObjectWrapper ow = new DefaultObjectWrapper(Configuration.VERSION_3_0_0); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).usePrivateCaches(true) + .build(); TemplateHashModel enums = ow.getEnumModels(); TemplateHashModel e = (TemplateHashModel) enums.get(E.class.getName()); assertNotNull(e); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java index fc5a34a..4306a50 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/ErrorMessagesTest.java @@ -38,7 +38,7 @@ public class ErrorMessagesTest { @Test public void getterMessage() throws TemplateModelException { - DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); TemplateHashModel thm= (TemplateHashModel) ow.wrap(new TestBean()); try { @@ -56,7 +56,7 @@ public class ErrorMessagesTest { public void markupOutputParameter() throws Exception { TemplateHTMLOutputModel html = HTMLOutputFormat.INSTANCE.fromMarkup("<p>a"); - DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); TemplateHashModel thm = (TemplateHashModel) ow.wrap(new TestBean()); { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/FineTuneMethodAppearanceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/FineTuneMethodAppearanceTest.java b/src/test/java/org/apache/freemarker/core/model/impl/FineTuneMethodAppearanceTest.java index 2467f17..92f59fb 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/FineTuneMethodAppearanceTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/FineTuneMethodAppearanceTest.java @@ -36,9 +36,10 @@ public class FineTuneMethodAppearanceTest { @Test public void newWayOfConfiguring() throws TemplateModelException { - DefaultObjectWrapper ow = new DefaultObjectWrapper(Configuration.VERSION_3_0_0); - ow.setMethodAppearanceFineTuner(GetlessMethodsAsPropertyGettersRule.INSTANCE); - ow.setExposeFields(true); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0) + .methodAppearanceFineTuner(GetlessMethodsAsPropertyGettersRule.INSTANCE) + .exposeFields(true) + .build(); checkIfProperlyWrapped(ow.wrap(new C())); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/Java7MembersOnlyDefaultObjectWrapper.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/Java7MembersOnlyDefaultObjectWrapper.java b/src/test/java/org/apache/freemarker/core/model/impl/Java7MembersOnlyDefaultObjectWrapper.java index 98a3090..96c1adf 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/Java7MembersOnlyDefaultObjectWrapper.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/Java7MembersOnlyDefaultObjectWrapper.java @@ -43,7 +43,7 @@ public class Java7MembersOnlyDefaultObjectWrapper extends DefaultObjectWrapper { private static final Set<String> POST_JAVA_7_COLLECTION_METHODS = newHashSet("parallelStream", "removeIf", "stream"); private static final Set<String> POST_JAVA_7_LIST_METHODS = newHashSet("sort", "spliterator"); - MethodAppearanceFineTuner POST_JAVA_7_FILTER = new MethodAppearanceFineTuner() { + static final MethodAppearanceFineTuner POST_JAVA_7_FILTER = new MethodAppearanceFineTuner() { @Override public void process(DecisionInput in, Decision out) { @@ -83,8 +83,7 @@ public class Java7MembersOnlyDefaultObjectWrapper extends DefaultObjectWrapper { }; public Java7MembersOnlyDefaultObjectWrapper(Version version) { - super(version); - setMethodAppearanceFineTuner(POST_JAVA_7_FILTER); + super(new DefaultObjectWrapper.Builder(version).methodAppearanceFineTuner(POST_JAVA_7_FILTER), true); } private static <T> Set<T> newHashSet(T... items) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java index 57b8810..495f3f9 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperBridgeMethodsTest.java @@ -47,7 +47,7 @@ public class Java8DefaultObjectWrapperBridgeMethodsTest { } private void test(Class<?> pClass) throws TemplateModelException { - DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); TemplateHashModel wrapped; try { wrapped = (TemplateHashModel) ow.wrap(pClass.newInstance()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java b/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java index c4fe82f..905d536 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/Java8DefaultObjectWrapperTest.java @@ -36,7 +36,7 @@ public class Java8DefaultObjectWrapperTest { @Test public void testDefaultMethodRecognized() throws TemplateModelException { - DefaultObjectWrapperBuilder owb = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0); + DefaultObjectWrapper.Builder owb = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0); DefaultObjectWrapper ow = owb.build(); TemplateHashModel wrappedBean = (TemplateHashModel) ow.wrap(new Java8DefaultMethodsBean()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java b/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java index 50a3e2f..13cd79b 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; public class ModelAPINewInstanceTest extends TestCase { - private DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + private DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); public ModelAPINewInstanceTest(String name) { super(name); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java b/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java index 08dfe7c..2498859 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java @@ -33,7 +33,7 @@ public class ModelCacheTest { @Test public void modelCacheOff() throws Exception { - DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); assertFalse(ow.getUseModelCache()); // default is off String s = "foo"; @@ -46,8 +46,8 @@ public class ModelCacheTest { @Test @Ignore // ModelCache is current removed in FM3 public void modelCacheOn() throws Exception { - DefaultObjectWrapper ow = new DefaultObjectWrapper(Configuration.VERSION_3_0_0); - ow.setUseModelCache(true); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0) + .useModelCache(true).build(); assertTrue(ow.getUseModelCache()); TestBean obj = new TestBean(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java index 54cedf3..609d632 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java @@ -39,7 +39,8 @@ public class StaticModelsTest { @Test public void modelCaching() throws Exception { - DefaultObjectWrapper ow = new DefaultObjectWrapper(Configuration.VERSION_3_0_0); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).usePrivateCaches(true) + .build(); TemplateHashModel statics = ow.getStaticModels(); TemplateHashModel s = (TemplateHashModel) statics.get(S.class.getName()); assertNotNull(s); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/model/impl/TypeFlagsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/TypeFlagsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/TypeFlagsTest.java index 701ba34..fe11d1c 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/TypeFlagsTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/TypeFlagsTest.java @@ -44,7 +44,7 @@ public class TypeFlagsTest extends TestCase { super(name); } - private final DefaultObjectWrapper ow = new DefaultObjectWrapper(Configuration.VERSION_3_0_0); + private final DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); public void testSingleNumType() { checkTypeFlags(SingleNumTypeC.class, "mInt", http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java index 5cb3400..0b5861d 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java @@ -47,7 +47,7 @@ public class FileTemplateLoaderTest { File sub1Dir = new File(templateRootDir, "sub1"); File sub2Dir = new File(sub1Dir, "sub2"); if (!sub2Dir.mkdirs()) { - throw new IOException("Failed to create subdirectories"); + throw new IOException("Failed to invoke subdirectories"); } File tFile = new File(sub2Dir, "t.ftl"); FileUtils.write(tFile, "foo"); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java index 4f87e2c..34d00ec 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java @@ -42,7 +42,6 @@ import org.apache.freemarker.core.TemplateExceptionHandler; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.RestrictedObjectWrapper; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; @@ -411,7 +410,7 @@ public class RealServletContainertTest extends WebAppTestCase { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); cfg.setLogTemplateExceptions(true); - DefaultObjectWrapperBuilder bwb = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0); + DefaultObjectWrapper.Builder bwb = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0); bwb.setUseModelCache(true); cfg.setObjectWrapper(bwb.build()); cfg.setTemplateLoader(new WebAppTemplateLoader(getServletContext())); @@ -453,7 +452,7 @@ public class RealServletContainertTest extends WebAppTestCase { @Override protected ObjectWrapperAndUnwrapper createDefaultObjectWrapper() { - DefaultObjectWrapperBuilder bwb = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0); + DefaultObjectWrapper.Builder bwb = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0); bwb.setUseModelCache(true); assertEquals(Configuration.VERSION_3_0_0, bwb.getIncompatibleImprovements()); return bwb.build(); @@ -467,7 +466,7 @@ public class RealServletContainertTest extends WebAppTestCase { @Override protected Configuration createConfiguration() { Configuration cfg = new Configuration(Configuration.VERSION_3_0_0); - cfg.setObjectWrapper(new RestrictedObjectWrapper(Configuration.VERSION_3_0_0)); + cfg.setObjectWrapper(new RestrictedObjectWrapper.Builder(Configuration.VERSION_3_0_0).build()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java index a1af23e..c066070 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java @@ -36,7 +36,6 @@ import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.model.TemplateMethodModelEx; import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.SimpleScalar; import org.junit.Before; import org.junit.Test; @@ -52,7 +51,7 @@ public class TLDParsingTest { @Before public void before() throws Exception { - wrapper = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + wrapper = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); } @Test http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java index df37d11..e36d845 100644 --- a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java +++ b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java @@ -159,7 +159,7 @@ public final class ResourcesExtractor { File dstFile = new File(dstRootDir, contDstPath); if (contLine.endsWith("/")) { if (!dstFile.mkdirs()) { - throw new IOException("Failed to create directory: " + dstFile); + throw new IOException("Failed to invoke directory: " + dstFile); } } else { String srcEntryPath = contSrcPathRelative ? srcDirResourcePath + contSrcPath : contSrcPath; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java index df6fd4c..1580932 100644 --- a/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java +++ b/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java @@ -302,7 +302,7 @@ public class WebAppTestCase { FileUtils.deleteDirectory(d); } if (!d.mkdirs()) { - throw new IOException("Failed to create Jetty temp directory: " + d); + throw new IOException("Failed to invoke Jetty temp directory: " + d); } testTempDirectory = d; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java index 347ae06..eea08f2 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java @@ -56,7 +56,6 @@ import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.TemplateSequenceModel; import org.apache.freemarker.core.model.impl.DefaultNonListCollectionAdapter; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.ResourceBundleModel; import org.apache.freemarker.core.model.impl.SimpleCollection; import org.apache.freemarker.core.model.impl.SimpleDate; @@ -179,7 +178,7 @@ public class TemplateTestCase extends FileTestCase { conf.setTemplateLoader(new CopyrightCommentRemoverTemplateLoader( new FileTemplateLoader(new File(getTestClassDirectory(), "templates")))); - DefaultObjectWrapper dow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper dow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); dataModel.put(ASSERT_VAR_NAME, AssertDirective.INSTANCE); dataModel.put(ASSERT_EQUALS_VAR_NAME, AssertEqualsDirective.INSTANCE); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java index 09b9064..c2d7c90 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java @@ -38,7 +38,6 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.WrappingTemplateModel; import org.apache.freemarker.core.model.impl.DefaultMapAdapter; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.model.impl.SimpleCollection; import org.apache.freemarker.core.model.impl.SimpleHash; @@ -124,7 +123,7 @@ public class Listables { public List<? extends TemplateHashModelEx> getEmptyHashes() throws TemplateModelException { List<TemplateHashModelEx> emptyMaps = new ArrayList<>(); emptyMaps.addAll(getMapsWrappedAsEx2(Collections.emptyMap())); - emptyMaps.add((TemplateHashModelEx) new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build() + emptyMaps.add((TemplateHashModelEx) new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build() .wrap(Collections.emptyMap())); return emptyMaps; } @@ -135,7 +134,7 @@ public class Listables { private List<TemplateHashModelEx2> getMapsWrappedAsEx2(Map<?, ?> map) throws TemplateModelException { List<TemplateHashModelEx2> maps = new ArrayList<>(); - DefaultObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + DefaultObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); maps.add(new SimpleHash(map, ow)); maps.add((DefaultMapAdapter) ow.wrap(map)); @@ -144,7 +143,7 @@ public class Listables { public TemplateHashModelEx getHashNonEx2() { return new NonEx2MapAdapter(ImmutableMap.of("k1", 11, "k2", 22), - new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build()); + new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build()); } public static class NonEx2MapAdapter extends WrappingTemplateModel implements TemplateHashModelEx { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java index 3c1adfb..66a0ffe 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java @@ -26,7 +26,7 @@ import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.TemplateSequenceModel; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; +import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; import org.apache.freemarker.core.model.impl.SimpleHash; import org.apache.freemarker.core.model.impl.SimpleScalar; import org.apache.freemarker.core.model.impl.SimpleSequence; @@ -37,7 +37,7 @@ import org.apache.freemarker.core.model.impl.SimpleSequence; public class MultiModel1 implements TemplateHashModel, TemplateSequenceModel, TemplateScalarModel { - private ObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + private ObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); private TemplateModel m_cSubModel = new MultiModel2(); private TemplateModel m_cListHashModel1 = new MultiModel4(ow); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java index cfdbe12..4602b67 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java @@ -25,7 +25,7 @@ import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; -import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; +import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; import org.apache.freemarker.core.model.impl.SimpleHash; import org.apache.freemarker.core.util.HtmlEscape; import org.apache.freemarker.core.util.StandardCompress; @@ -36,7 +36,7 @@ import org.apache.freemarker.core.util.StandardCompress; public class TransformHashWrapper implements TemplateHashModel, TemplateScalarModel { - private ObjectWrapper ow = new DefaultObjectWrapperBuilder(Configuration.VERSION_3_0_0).build(); + private ObjectWrapper ow = new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).build(); private SimpleHash m_cHashModel = new SimpleHash(ow); /** Creates new TransformHashWrapper */ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/util/SimpleMapAndCollectionObjectWrapper.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/SimpleMapAndCollectionObjectWrapper.java b/src/test/java/org/apache/freemarker/test/util/SimpleMapAndCollectionObjectWrapper.java index 16d75db..c1da1c4 100644 --- a/src/test/java/org/apache/freemarker/test/util/SimpleMapAndCollectionObjectWrapper.java +++ b/src/test/java/org/apache/freemarker/test/util/SimpleMapAndCollectionObjectWrapper.java @@ -36,7 +36,7 @@ import org.apache.freemarker.core.model.impl.SimpleSequence; public class SimpleMapAndCollectionObjectWrapper extends DefaultObjectWrapper { public SimpleMapAndCollectionObjectWrapper(Version incompatibleImprovements) { - super(incompatibleImprovements); + super(new DefaultObjectWrapper.Builder(incompatibleImprovements), true); } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dceec32e/src/test/java/org/apache/freemarker/test/util/XMLLoader.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/XMLLoader.java b/src/test/java/org/apache/freemarker/test/util/XMLLoader.java index 914fd0d..90763a0 100644 --- a/src/test/java/org/apache/freemarker/test/util/XMLLoader.java +++ b/src/test/java/org/apache/freemarker/test/util/XMLLoader.java @@ -44,7 +44,7 @@ public final class XMLLoader { } /** - * Convenience method to create a {@link NodeModel} from a SAX {@link InputSource}. + * Convenience method to invoke a {@link NodeModel} from a SAX {@link InputSource}. */ static public NodeModel toModel(InputSource is, boolean simplify) throws SAXException, IOException, ParserConfigurationException {
