You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/03 09:05:31 UTC
[isis] branch master updated: ISIS-2774: just renaming methodCache
-> classCache
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 2e16c7d ISIS-2774: just renaming methodCache -> classCache
2e16c7d is described below
commit 2e16c7d994278fe634f5a9d7cfd2ea97deab5260
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 3 11:05:23 2021 +0200
ISIS-2774: just renaming methodCache -> classCache
---
.../org/apache/isis/applib/spec/AbstractSpecification.java | 4 ++--
.../apache/isis/applib/spec/AbstractSpecification2.java | 4 ++--
.../org/apache/isis/core/metamodel/facets/Evaluators.java | 4 ++--
.../isis/core/metamodel/facets/FacetFactoryAbstract.java | 4 ++--
.../domainobject/DomainObjectAnnotationFacetFactory.java | 2 +-
.../annotation/RemoveAnnotatedMethodsFacetFactory.java | 2 +-
.../RemoveDatanucleusPersistableTypesFacetFactory.java | 2 +-
.../datanucleus/RemoveDnPrefixedMethodsFacetFactory.java | 2 +-
.../object/ignore/javalang/RemoveMethodsFacetFactory.java | 6 +++---
.../ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java | 2 +-
.../ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java | 2 +-
...deAnnotationEnforcesMetamodelContributionValidator.java | 6 +++---
.../isis/core/metamodel/methods/MethodFinderUtils.java | 14 +++++++-------
.../classsubstitutor/ClassSubstitutorAbstract.java | 4 ++--
.../specloader/specimpl/FacetedMethodsBuilder.java | 6 +++---
15 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
index 57c4caa..9fc07df 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification.java
@@ -56,11 +56,11 @@ public abstract class AbstractSpecification<T> implements Specification {
private static Class<?> findExpectedType(final Class<?> fromClass) {
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
for (Class<?> c = fromClass; c != Object.class; c = c.getSuperclass()) {
- val methodFound = methodCache
+ val methodFound = classCache
.streamDeclaredMethods(c)
.filter(AbstractSpecification::isSatisfiesSafelyMethod)
.findFirst()
diff --git a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
index a1fd2a1..720358c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
@@ -58,11 +58,11 @@ public abstract class AbstractSpecification2<T> implements Specification2 {
private static Class<?> findExpectedType(final Class<?> fromClass) {
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
for (Class<?> c = fromClass; c != Object.class; c = c.getSuperclass()) {
- val methodFound = methodCache
+ val methodFound = classCache
.streamDeclaredMethods(c)
.filter(AbstractSpecification2::isSatisfiesTranslatableSafelyMethod)
.findFirst()
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
index 2571ed1..e859a06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
@@ -75,9 +75,9 @@ public final class Evaluators {
final Class<?> cls,
final Class<T> annotationType) {
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
- return methodCache
+ return classCache
.streamDeclaredMethods(cls)
.filter(MethodUtil::isNotStatic)
.filter(MethodUtil::isNoArg)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index f930307..596d726 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -42,14 +42,14 @@ implements FacetFactory, HasMetaModelContext {
@Getter(onMethod_ = {@Override}) private final ImmutableEnumSet<FeatureType> featureTypes;
- @Getter(AccessLevel.PROTECTED) private final _ClassCache methodCache;
+ @Getter(AccessLevel.PROTECTED) private final _ClassCache classCache;
public FacetFactoryAbstract(
final MetaModelContext metaModelContext,
final ImmutableEnumSet<FeatureType> featureTypes) {
this.metaModelContext = metaModelContext;
this.featureTypes = featureTypes;
- this.methodCache = _ClassCache.getInstance();
+ this.classCache = _ClassCache.getInstance();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index f881a5e..c085e33 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -254,7 +254,7 @@ implements
final Class<?> repositoryClass,
final String methodName) {
- val repoMethod = getMethodCache()
+ val repoMethod = getClassCache()
.streamPublicMethods(repositoryClass)
.filter(method->method.getName().equals(methodName))
.filter(method->{
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
index 68190f2..699e989 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/annotation/RemoveAnnotatedMethodsFacetFactory.java
@@ -77,7 +77,7 @@ extends FacetFactoryAbstract {
return;
}
- getMethodCache()
+ getClassCache()
.streamPublicMethods(cls)
.forEach(method->{
removeAnnotatedMethods(methodRemover, method, PreDestroy.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
index 4631b4e..b941c42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDatanucleusPersistableTypesFacetFactory.java
@@ -52,7 +52,7 @@ extends FacetFactoryAbstract {
}
private void addMethodsToBeIgnored(final Class<?> typeToIgnore) {
- getMethodCache()
+ getClassCache()
.streamPublicMethods(typeToIgnore)
.forEach(method->{
datanucleusPersistableMethodsToIgnore
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
index e924a92..394ed13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/datanucleus/RemoveDnPrefixedMethodsFacetFactory.java
@@ -38,7 +38,7 @@ extends FacetFactoryAbstract {
@Override
public void process(final ProcessClassContext context) {
- getMethodCache()
+ getClassCache()
.streamPublicMethods(context.getCls())
.filter(method->method.getName().startsWith("dn"))
.forEach(context::removeMethod);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index d9d336e..e03ec98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -63,7 +63,7 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
public RemoveMethodsFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.OBJECTS_ONLY);
- getMethodCache()
+ getClassCache()
.streamPublicMethods(Object.class)
.forEach(method->{
javaLangObjectMethodsToIgnore
@@ -85,7 +85,7 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
val isActionAnnotationRequired = processClassContext.getIntrospectionPolicy()
.getMemberAnnotationPolicy().isMemberAnnotationsRequired();
- getMethodCache()
+ getClassCache()
.streamPublicMethods(cls)
.forEach(method->{
// remove synthetic methods (except when is a mixin)
@@ -134,7 +134,7 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
return;
}
- getMethodCache()
+ getClassCache()
.streamPublicMethods(type)
.forEach(processClassContext::removeMethod);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
index 954c41d..b5e8095 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoEnhancementTypesFacetFactory.java
@@ -54,7 +54,7 @@ extends FacetFactoryAbstract {
private void addMethodsToBeIgnored(final Class<?> typeToIgnore) {
- getMethodCache()
+ getClassCache()
.streamPublicMethods(typeToIgnore)
.forEach(method->{
jdoEnhancementmethodsToIgnore
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
index a3bbe3b..31f267c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/jdo/RemoveJdoPrefixedMethodsFacetFactory.java
@@ -40,7 +40,7 @@ extends FacetFactoryAbstract {
@Override
public void process(final ProcessClassContext context) {
- getMethodCache()
+ getClassCache()
.streamPublicMethods(context.getCls())
.filter(method->method.getName().startsWith("jdo"))
.forEach(context::removeMethod);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
index 2a6d572..f625285 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/DomainIncludeAnnotationEnforcesMetamodelContributionValidator.java
@@ -54,12 +54,12 @@ import lombok.val;
public class DomainIncludeAnnotationEnforcesMetamodelContributionValidator
extends MetaModelVisitingValidatorAbstract {
- private final _ClassCache methodCache;
+ private final _ClassCache classCache;
@Inject
public DomainIncludeAnnotationEnforcesMetamodelContributionValidator(final MetaModelContext mmc) {
super(mmc);
- this.methodCache = _ClassCache.getInstance();
+ this.classCache = _ClassCache.getInstance();
}
@Override
@@ -107,7 +107,7 @@ extends MetaModelVisitingValidatorAbstract {
// methods intended to be included with the meta-model
val notRecognizedMethods = _Sets.<Method>newHashSet();
- methodCache
+ classCache
// methods intended to be included with the meta-model but missing
.streamDeclaredMethodsHaving(
type,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
index 126c7e9..47640c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodFinderUtils.java
@@ -66,11 +66,11 @@ public final class MethodFinderUtils {
final Class<?> expectedReturnType,
final Class<?>[] paramTypes) {
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
val method = options.getEncapsulationPolicy().isEncapsulatedMembersSupported()
- ? methodCache.lookupPublicOrDeclaredMethod(type, name, paramTypes)
- : methodCache.lookupPublicMethod(type, name, paramTypes);
+ ? classCache.lookupPublicOrDeclaredMethod(type, name, paramTypes)
+ : classCache.lookupPublicMethod(type, name, paramTypes);
if(method == null) {
return null;
}
@@ -361,11 +361,11 @@ public final class MethodFinderUtils {
public static Stream<Method> streamMethods(
final MethodFinderOptions options,
final Class<?> type) {
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
return options.getEncapsulationPolicy().isEncapsulatedMembersSupported()
- ? methodCache.streamPublicOrDeclaredMethods(type)
- : methodCache.streamPublicMethods(type)
- .filter(options.getMustSatisfy()::test);
+ ? classCache.streamPublicOrDeclaredMethods(type)
+ : classCache.streamPublicMethods(type)
+ .filter(options.getMustSatisfy()::test);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index 1da9cde..0c89c07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -33,7 +33,7 @@ import lombok.val;
public abstract class ClassSubstitutorAbstract implements ClassSubstitutor {
- private final _ClassCache methodCache = _ClassCache.getInstance();
+ private final _ClassCache classCache = _ClassCache.getInstance();
@Override
public final Substitution getSubstitution(@NonNull final Class<?> cls) {
@@ -80,7 +80,7 @@ public abstract class ClassSubstitutorAbstract implements ClassSubstitutor {
try {
// guard against cannot introspect
- methodCache.add(cls);
+ classCache.add(cls);
} catch (Throwable e) {
classesToIgnore.add(cls);
return null;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 1ac1895..f76dcab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -143,10 +143,10 @@ implements HasMetaModelContext {
this.isMemberAnnotationsRequired =
introspectionPolicy().getMemberAnnotationPolicy().isMemberAnnotationsRequired();
- val methodCache = _ClassCache.getInstance();
+ val classCache = _ClassCache.getInstance();
val methodsRemaining = introspectionPolicy().getEncapsulationPolicy().isEncapsulatedMembersSupported()
- ? methodCache.streamPublicOrDeclaredMethods(introspectedClass)
- : methodCache.streamPublicMethods(introspectedClass);
+ ? classCache.streamPublicOrDeclaredMethods(introspectedClass)
+ : classCache.streamPublicMethods(introspectedClass);
this.methodRemover = new ConcurrentMethodRemover(introspectedClass, methodsRemaining);
}