(Some code cleanup forward ported from 2.3-gae)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/80300dd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/80300dd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/80300dd4 Branch: refs/heads/3 Commit: 80300dd4f285144f249389c5036c4de8ab385bba Parents: 651633c Author: ddekany <[email protected]> Authored: Tue Mar 7 15:28:25 2017 +0100 Committer: ddekany <[email protected]> Committed: Tue Mar 7 15:28:25 2017 +0100 ---------------------------------------------------------------------- .../core/model/impl/ClassIntrospector.java | 2 +- .../core/model/impl/DefaultObjectWrapper.java | 32 ++++++++++---------- .../impl/DefaultObjectWrapperConfiguration.java | 28 ++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/80300dd4/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java b/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java index 0d62ab9..c98fe33 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java @@ -190,7 +190,7 @@ class ClassIntrospector { * Returns a {@link ClassIntrospectorBuilder}-s that could be used to create an identical {@link #ClassIntrospector} * . The returned {@link ClassIntrospectorBuilder} can be modified without interfering with anything. */ - ClassIntrospectorBuilder getPropertyAssignments() { + ClassIntrospectorBuilder createBuilder() { return new ClassIntrospectorBuilder(this); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/80300dd4/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java index f13caf5..f5c9a2c 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java @@ -262,11 +262,11 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable // but we need to use the same sharedInrospectionLock forever, because that's what the model factories // synchronize on, even during the classIntrospector is being replaced. sharedIntrospectionLock = new Object(); - classIntrospector = new ClassIntrospector(bwConf.classIntrospectorFactory, sharedIntrospectionLock); + classIntrospector = new ClassIntrospector(bwConf.classIntrospectorBuilder, sharedIntrospectionLock); } else { // As this is a read-only DefaultObjectWrapper, the classIntrospector is never replaced, and since it's shared by // other DefaultObjectWrapper instances, we use the lock belonging to the shared ClassIntrospector. - classIntrospector = bwConf.classIntrospectorFactory.build(); + classIntrospector = bwConf.classIntrospectorBuilder.build(); sharedIntrospectionLock = classIntrospector.getSharedLock(); } @@ -425,9 +425,9 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable checkModifiable(); if (classIntrospector.getExposureLevel() != exposureLevel) { - ClassIntrospectorBuilder pa = classIntrospector.getPropertyAssignments(); - pa.setExposureLevel(exposureLevel); - replaceClassIntrospector(pa); + ClassIntrospectorBuilder builder = classIntrospector.createBuilder(); + builder.setExposureLevel(exposureLevel); + replaceClassIntrospector(builder); } } @@ -452,9 +452,9 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable checkModifiable(); if (classIntrospector.getExposeFields() != exposeFields) { - ClassIntrospectorBuilder pa = classIntrospector.getPropertyAssignments(); - pa.setExposeFields(exposeFields); - replaceClassIntrospector(pa); + ClassIntrospectorBuilder builder = classIntrospector.createBuilder(); + builder.setExposeFields(exposeFields); + replaceClassIntrospector(builder); } } @@ -479,9 +479,9 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable checkModifiable(); if (classIntrospector.getMethodAppearanceFineTuner() != methodAppearanceFineTuner) { - ClassIntrospectorBuilder pa = classIntrospector.getPropertyAssignments(); - pa.setMethodAppearanceFineTuner(methodAppearanceFineTuner); - replaceClassIntrospector(pa); + ClassIntrospectorBuilder builder = classIntrospector.createBuilder(); + builder.setMethodAppearanceFineTuner(methodAppearanceFineTuner); + replaceClassIntrospector(builder); } } @@ -493,9 +493,9 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable checkModifiable(); if (classIntrospector.getMethodSorter() != methodSorter) { - ClassIntrospectorBuilder pa = classIntrospector.getPropertyAssignments(); - pa.setMethodSorter(methodSorter); - replaceClassIntrospector(pa); + ClassIntrospectorBuilder builder = classIntrospector.createBuilder(); + builder.setMethodSorter(methodSorter); + replaceClassIntrospector(builder); } } @@ -517,10 +517,10 @@ public class DefaultObjectWrapper implements RichObjectWrapper, WriteProtectable * Replaces the value of {@link #classIntrospector}, but first it unregisters * the model factories in the old {@link #classIntrospector}. */ - private void replaceClassIntrospector(ClassIntrospectorBuilder pa) { + private void replaceClassIntrospector(ClassIntrospectorBuilder builder) { checkModifiable(); - final ClassIntrospector newCI = new ClassIntrospector(pa, sharedIntrospectionLock); + final ClassIntrospector newCI = new ClassIntrospector(builder, sharedIntrospectionLock); final ClassIntrospector oldCI; // In principle this need not be synchronized, but as apps might publish the configuration improperly, or http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/80300dd4/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java index 958c6b3..8ca16de 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperConfiguration.java @@ -35,7 +35,7 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { private final Version incompatibleImprovements; - protected ClassIntrospectorBuilder classIntrospectorFactory; + protected ClassIntrospectorBuilder classIntrospectorBuilder; // Properties and their *defaults*: private boolean simpleMapWrapper = false; @@ -74,7 +74,7 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { : DefaultObjectWrapper.normalizeIncompatibleImprovementsVersion(incompatibleImprovements); this.incompatibleImprovements = incompatibleImprovements; - classIntrospectorFactory = new ClassIntrospectorBuilder(incompatibleImprovements); + classIntrospectorBuilder = new ClassIntrospectorBuilder(incompatibleImprovements); } /** @@ -94,7 +94,7 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { result = prime * result + (outerIdentity != null ? outerIdentity.hashCode() : 0); result = prime * result + (strict ? 1231 : 1237); result = prime * result + (useModelCache ? 1231 : 1237); - result = prime * result + classIntrospectorFactory.hashCode(); + result = prime * result + classIntrospectorBuilder.hashCode(); return result; } @@ -115,15 +115,15 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { if (outerIdentity != other.outerIdentity) return false; if (strict != other.strict) return false; if (useModelCache != other.useModelCache) return false; - return classIntrospectorFactory.equals(other.classIntrospectorFactory); + return classIntrospectorBuilder.equals(other.classIntrospectorBuilder); } protected Object clone(boolean deepCloneKey) { try { DefaultObjectWrapperConfiguration clone = (DefaultObjectWrapperConfiguration) super.clone(); if (deepCloneKey) { - clone.classIntrospectorFactory - = (ClassIntrospectorBuilder) classIntrospectorFactory.clone(); + clone.classIntrospectorBuilder + = (ClassIntrospectorBuilder) classIntrospectorBuilder.clone(); } return clone; } catch (CloneNotSupportedException e) { @@ -175,25 +175,25 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { } public int getExposureLevel() { - return classIntrospectorFactory.getExposureLevel(); + return classIntrospectorBuilder.getExposureLevel(); } /** See {@link DefaultObjectWrapper#setExposureLevel(int)}. */ public void setExposureLevel(int exposureLevel) { - classIntrospectorFactory.setExposureLevel(exposureLevel); + classIntrospectorBuilder.setExposureLevel(exposureLevel); } public boolean getExposeFields() { - return classIntrospectorFactory.getExposeFields(); + return classIntrospectorBuilder.getExposeFields(); } /** See {@link DefaultObjectWrapper#setExposeFields(boolean)}. */ public void setExposeFields(boolean exposeFields) { - classIntrospectorFactory.setExposeFields(exposeFields); + classIntrospectorBuilder.setExposeFields(exposeFields); } public MethodAppearanceFineTuner getMethodAppearanceFineTuner() { - return classIntrospectorFactory.getMethodAppearanceFineTuner(); + return classIntrospectorBuilder.getMethodAppearanceFineTuner(); } /** @@ -202,15 +202,15 @@ public abstract class DefaultObjectWrapperConfiguration implements Cloneable { * the value implements {@link SingletonCustomizer}. */ public void setMethodAppearanceFineTuner(MethodAppearanceFineTuner methodAppearanceFineTuner) { - classIntrospectorFactory.setMethodAppearanceFineTuner(methodAppearanceFineTuner); + classIntrospectorBuilder.setMethodAppearanceFineTuner(methodAppearanceFineTuner); } MethodSorter getMethodSorter() { - return classIntrospectorFactory.getMethodSorter(); + return classIntrospectorBuilder.getMethodSorter(); } void setMethodSorter(MethodSorter methodSorter) { - classIntrospectorFactory.setMethodSorter(methodSorter); + classIntrospectorBuilder.setMethodSorter(methodSorter); } }
