This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/3 by this push:
new b829ada Forward ported from 2.3-gae:
BeansWrapper.clearClassIntrospecitonCache was renamed to
clearClassIntrospectionCache (note the typo)
b829ada is described below
commit b829ada73df5cd815482420fa23cb5c4b624cea6
Author: ddekany <[email protected]>
AuthorDate: Sat Apr 6 12:58:13 2019 +0200
Forward ported from 2.3-gae: BeansWrapper.clearClassIntrospecitonCache was
renamed to clearClassIntrospectionCache (note the typo)
---
FM3-CHANGE-LOG.txt | 1 +
.../freemarker/core/model/impl/AbstractParallelIntrospectionTest.java | 2 +-
.../java/org/apache/freemarker/core/model/impl/EnumModelsTest.java | 2 +-
.../java/org/apache/freemarker/core/model/impl/ModelCacheTest.java | 2 +-
.../java/org/apache/freemarker/core/model/impl/StaticModelsTest.java | 2 +-
.../java/org/apache/freemarker/core/model/impl/ClassIntrospector.java | 2 +-
.../org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java | 4 ++--
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 21f2d08..54bb96d 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -507,6 +507,7 @@ Core / Template loading and caching
.templateConfigurations (for example based on the directory it is in), or
with the #ftl directive inside the
template. Thus, a given template always has the same charset, no mater how
it's accessed.
- Require customLookupCondition-s to be Serializable.
+- BeansWrapper.clearClassIntrospecitonCache was renamed to
clearClassIntrospectionCache (note the typo)
DOM (XML)
.........
diff --git
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AbstractParallelIntrospectionTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AbstractParallelIntrospectionTest.java
index f62587b..446309f 100644
---
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AbstractParallelIntrospectionTest.java
+++
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/AbstractParallelIntrospectionTest.java
@@ -87,7 +87,7 @@ public abstract class AbstractParallelIntrospectionTest
extends TestCase {
try {
for (int i = 0; i < iterations; i++) {
if (Math.random() < CACHE_CLEARING_CHANCE) {
- ow.clearClassIntrospecitonCache();
+ ow.clearClassIntrospectionCache();
}
int objIdx = (int) (Math.random() * NUM_ENTITYES);
TemplateHashModel h = getWrappedEntity(objIdx);
diff --git
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java
index cd405e9..965aab6 100644
---
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java
+++
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/EnumModelsTest.java
@@ -64,7 +64,7 @@ public class EnumModelsTest {
assertSame(e, enums.get(E.class.getName()));
- ow.clearClassIntrospecitonCache();
+ ow.clearClassIntrospectionCache();
TemplateHashModel eAfterClean = (TemplateHashModel)
enums.get(E.class.getName());
assertNotSame(e, eAfterClean);
assertSame(eAfterClean, enums.get(E.class.getName()));
diff --git
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java
index 2498859..0d28779 100644
---
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java
+++
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelCacheTest.java
@@ -57,7 +57,7 @@ public class ModelCacheTest {
TemplateModel wrappedC = ow.wrap(c);
assertSame(wrappedC, ow.wrap(c));
- ow.clearClassIntrospecitonCache();
+ ow.clearClassIntrospectionCache();
assertNotSame(wrappedC, ow.wrap(c));
assertSame(ow.wrap(c), ow.wrap(c));
}
diff --git
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java
index a5ead62..d8f013e 100644
---
a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java
+++
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/StaticModelsTest.java
@@ -71,7 +71,7 @@ public class StaticModelsTest {
assertSame(s, statics.get(S.class.getName()));
- ow.clearClassIntrospecitonCache();
+ ow.clearClassIntrospectionCache();
TemplateHashModel sAfterClean = (TemplateHashModel)
statics.get(S.class.getName());
assertNotSame(s, sAfterClean);
assertSame(sAfterClean, statics.get(S.class.getName()));
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java
index 5cad757..621f876 100644
---
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java
+++
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/ClassIntrospector.java
@@ -826,7 +826,7 @@ class ClassIntrospector {
// Cache management:
/**
- * Corresponds to {@link
DefaultObjectWrapper#clearClassIntrospecitonCache()}.
+ * Corresponds to {@link
DefaultObjectWrapper#clearClassIntrospectionCache()}.
*/
void clearCache() {
if (getHasSharedInstanceRestrictons()) {
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java
index 45d00c2..0540af8 100644
---
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java
+++
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapper.java
@@ -313,7 +313,7 @@ public class DefaultObjectWrapper implements
RichObjectWrapper {
/**
* Tells if this instance acts like if its class introspection cache is
sharable with other {@link DefaultObjectWrapper}-s.
- * A restricted cache denies certain too "antisocial" operations, like
{@link #clearClassIntrospecitonCache()}.
+ * A restricted cache denies certain too "antisocial" operations, like
{@link #clearClassIntrospectionCache()}.
* The value depends on how the instance
* was created; with a public constructor (then this is {@code false}), or
with {@link Builder}
* (then it's {@code true}). Note that in the last case it's possible that
the introspection cache
@@ -1119,7 +1119,7 @@ public class DefaultObjectWrapper implements
RichObjectWrapper {
*
* @throws IllegalStateException if {@link
#isClassIntrospectionCacheRestricted()} is {@code true}.
*/
- public void clearClassIntrospecitonCache() {
+ public void clearClassIntrospectionCache() {
classIntrospector.clearCache();
}
