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/06/30 20:17:57 UTC
[isis] branch master updated: ISIS-1720: removes all the debug
stuff from prev. commit
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 b26cce3 ISIS-1720: removes all the debug stuff from prev. commit
b26cce3 is described below
commit b26cce3641a71f2eb050e055a7a2bf489b8a34f0
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Jun 30 22:17:46 2021 +0200
ISIS-1720: removes all the debug stuff from prev. commit
---
.../ignore/javalang/RemoveMethodsFacetFactory.java | 1 +
.../specloader/specimpl/FacetedMethodsBuilder.java | 25 ----------------------
.../specimpl/ObjectSpecificationAbstract.java | 10 ---------
3 files changed, 1 insertion(+), 35 deletions(-)
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 7edfe77..6cfb4e9 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
@@ -90,6 +90,7 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
for (Method method : methods) {
// remove synthetic methods (except when is a mixin)
+ // (it seems that javac marks methods synthetic in the context of non-static inner classes)
if (!isConcreteMixin
&& method.isSynthetic()) {
processClassContext.removeMethod(method);
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 6a788dd..799f119 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
@@ -66,24 +66,12 @@ import lombok.extern.log4j.Log4j2;
public class FacetedMethodsBuilder
implements HasMetaModelContext {
- private void debug(String format, Object...args) {
- if(introspectedClass.getName().contains("WrapperInteractionTest3$Task$")) {
- System.out.printf(format+"%n", args);
- }
- }
-
private static final String GET_PREFIX = "get";
private static final String IS_PREFIX = "is";
/* thread-safety ... make sure every methodsRemaining access is synchronized! */
private static final class ConcurrentMethodRemover implements MethodRemover {
- private void debug(String format, Method method) {
- if(method.getDeclaringClass().getName().contains("WrapperInteractionTest3$Task$")) {
- System.out.printf(format+"%n", method);
- }
- }
-
private final Set<Method> methodsRemaining;
private ConcurrentMethodRemover(final Class<?> introspectedClass, final Method[] methods) {
@@ -98,9 +86,7 @@ implements HasMetaModelContext {
val doRemove = removeIf.test(method);
if(doRemove) {
onRemoval.accept(method);
- //debug("accept method-2 %s", method);
}
- //debug("skipping method-2 %s", method);
return doRemove;
});
}
@@ -110,10 +96,6 @@ implements HasMetaModelContext {
if(method==null) {
return;
}
- if(method.toString().contains("Succeeded.act(")) {
- System.out.println("!!!gotcha " + method);
- }
- debug("remove method %s", method);
methodsRemaining.remove(method);
}
@@ -162,10 +144,6 @@ implements HasMetaModelContext {
this.explicitAnnotationsForActions =
getConfiguration().getApplib().getAnnotation().getAction().isExplicit();
- if(introspectedClass.getName().endsWith("WrapperInteractionTest3$Task$Succeeded")) {
- System.out.printf("introspectedClass[%s]: %s%n", introspectedClass, Can.ofArray(introspectedClass.getMethods()));
- }
-
val methodsRemaining = introspectedClass.getMethods();
this.methodRemover = new ConcurrentMethodRemover(introspectedClass, methodsRemaining);
@@ -389,7 +367,6 @@ implements HasMetaModelContext {
onActionFacetedMethod.accept(actionPeer);
return true;
}
- debug("skipping method %s", method);
return false;
});
@@ -398,8 +375,6 @@ implements HasMetaModelContext {
private FacetedMethod findActionFacetedMethod(
final Method actionMethod) {
- debug("represents action %s -> %b", actionMethod, representsAction(actionMethod));
-
if (!representsAction(actionMethod)) {
return null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 08585e6..e1e1a86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -272,10 +272,6 @@ implements ObjectSpecification {
log.debug("introspectingUpTo: {}, {}", getFullIdentifier(), upTo);
}
- if(this.getCorrespondingClass().getName().endsWith("WrapperInteractionTest3$Task$MixinAbstract")) {
- //System.out.printf("introspectUpTo[%s]: %s%n", this.getCorrespondingClass(), upTo);
- }
-
boolean revalidate = false;
switch (introspectionState) {
@@ -787,12 +783,6 @@ implements ObjectSpecification {
return;
}
for (val mixinType : mixinTypes) {
-
- if(mixinType.getName().contains("WrapperInteractionTest")
- && this.getCorrespondingClass().getName().endsWith("WrapperInteractionTest3$Task")) {
- System.out.printf("mixinType[%s]: %s%n", this.getCorrespondingClass(), mixinType);
- }
-
forEachMixedInAction(mixinType, onNewMixedInAction);
}
}