Repository: incubator-freemarker Updated Branches: refs/heads/3 d4de527bc -> 78428211c
TemplateModel implementations that contain an ObjectWrapper (which itself is not Serializable) were marked as Serializable mistakenly. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/78428211 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/78428211 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/78428211 Branch: refs/heads/3 Commit: 78428211cda3f959b3f704c610390421869b9a1b Parents: d4de527 Author: ddekany <ddek...@apache.org> Authored: Tue Aug 8 23:47:05 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Tue Aug 8 23:47:05 2017 +0200 ---------------------------------------------------------------------- .../apache/freemarker/core/model/impl/DefaultArrayAdapter.java | 3 +-- .../freemarker/core/model/impl/DefaultEnumerationAdapter.java | 3 +-- .../freemarker/core/model/impl/DefaultIterableAdapter.java | 3 +-- .../freemarker/core/model/impl/DefaultIteratorAdapter.java | 3 +-- .../apache/freemarker/core/model/impl/DefaultListAdapter.java | 3 +-- .../org/apache/freemarker/core/model/impl/DefaultMapAdapter.java | 4 +--- .../core/model/impl/DefaultNonListCollectionAdapter.java | 3 +-- .../java/org/apache/freemarker/core/model/impl/SimpleHash.java | 3 +-- .../org/apache/freemarker/core/model/impl/SimpleSequence.java | 3 +-- 9 files changed, 9 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java index fc310c3..b661fcc 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.lang.reflect.Array; import org.apache.freemarker.core.model.AdapterTemplateModel; @@ -51,7 +50,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see TemplateSequenceModel */ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implements TemplateSequenceModel, - AdapterTemplateModel, WrapperTemplateModel, Serializable { + AdapterTemplateModel, WrapperTemplateModel { /** * Factory method for creating new adapter instances. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultEnumerationAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultEnumerationAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultEnumerationAdapter.java index d5b6989..2149f8c 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultEnumerationAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultEnumerationAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.Enumeration; import java.util.Iterator; @@ -43,7 +42,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; */ @SuppressWarnings("serial") public class DefaultEnumerationAdapter extends WrappingTemplateModel implements TemplateCollectionModel, - AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { + AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { @SuppressFBWarnings(value="SE_BAD_FIELD", justification="We hope it's Seralizable") private final Enumeration<?> enumeration; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java index b778573..1033a5f 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -47,7 +46,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; */ @SuppressWarnings("serial") public class DefaultIterableAdapter extends WrappingTemplateModel implements TemplateCollectionModel, - AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { + AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { private final Iterable<?> iterable; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java index 0524475..8159f14 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.Iterator; import org.apache.freemarker.core.model.AdapterTemplateModel; @@ -51,7 +50,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; * {@code true}, which is the default when its {@code incompatibleImprovements} property is 2.3.22 or higher. */ public class DefaultIteratorAdapter extends WrappingTemplateModel implements TemplateCollectionModel, - AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { + AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { @SuppressFBWarnings(value="SE_BAD_FIELD", justification="We hope it's Seralizable") private final Iterator iterator; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java index 3c99a73..b90a343 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.AbstractSequentialList; import java.util.List; @@ -55,7 +54,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see TemplateSequenceModel */ public class DefaultListAdapter extends WrappingTemplateModel implements TemplateSequenceModel, - AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { + AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { protected final List list; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java index e17b0b7..65f7cb4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.Map; import java.util.SortedMap; @@ -52,8 +51,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * {@code true}, which is the default when its {@code incompatibleImprovements} property is 2.3.22 or higher. */ public class DefaultMapAdapter extends WrappingTemplateModel - implements TemplateHashModelEx2, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, - Serializable { + implements TemplateHashModelEx2, AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { private final Map map; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java index 4e7bbde..60b41f1 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -46,7 +45,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * these collections (though of course, Java methods called from the template can violate this rule). */ public class DefaultNonListCollectionAdapter extends WrappingTemplateModel implements TemplateCollectionModelEx, - AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport, Serializable { + AdapterTemplateModel, WrapperTemplateModel, TemplateModelWithAPISupport { private final Collection collection; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java index 3c56b51..ba61df4 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleHash.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Iterator; @@ -76,7 +75,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see DefaultMapAdapter * @see TemplateHashModelEx */ -public class SimpleHash extends WrappingTemplateModel implements TemplateHashModelEx2, Serializable { +public class SimpleHash extends WrappingTemplateModel implements TemplateHashModelEx2 { private final Map map; private boolean putFailed; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/78428211/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java index ab60ed9..be48318 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/SimpleSequence.java @@ -19,7 +19,6 @@ package org.apache.freemarker.core.model.impl; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -68,7 +67,7 @@ import org.apache.freemarker.core.model.WrappingTemplateModel; * @see DefaultArrayAdapter * @see TemplateSequenceModel */ -public class SimpleSequence extends WrappingTemplateModel implements TemplateSequenceModel, Serializable { +public class SimpleSequence extends WrappingTemplateModel implements TemplateSequenceModel { /** * The {@link List} that stored the elements of this sequence. It might contains both {@link TemplateModel} elements
