You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/06/28 19:04:57 UTC
[3/3] git commit: ISIS-451: fixing filtering of synthetic/abstract
methods from metamodel
ISIS-451: fixing filtering of synthetic/abstract methods from metamodel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e1fa54a2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e1fa54a2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e1fa54a2
Branch: refs/heads/master
Commit: e1fa54a20eb6506c6a8b5cb3837fa5af004bca4a
Parents: d068fbe
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jun 28 18:04:38 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jun 28 18:04:38 2013 +0100
----------------------------------------------------------------------
...veJavaLangComparableMethodsFacetFactory.java | 5 +-
...eSyntheticOrAbstractMethodsFacetFactory.java | 52 ++++++++++++++++
.../SyntheticMethodFilteringFacetFactory.java | 62 --------------------
.../accessor/PropertyAccessorFacetFactory.java | 1 +
.../dflt/ProgrammingModelFacetsJava5.java | 4 +-
5 files changed, 58 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e1fa54a2/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
index 1dcb1b0..dda320c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveJavaLangComparableMethodsFacetFactory.java
@@ -37,11 +37,12 @@ public class RemoveJavaLangComparableMethodsFacetFactory extends FacetFactoryAbs
public void process(final ProcessClassContext processClassContext) {
super.process(processClassContext);
Class<?> cls = processClassContext.getCls();
- Method[] declaredMethods = cls.getMethods(); // not getDeclaredMethods !!!
- for (Method method : declaredMethods) {
+ Method[] methods = cls.getMethods(); // not getDeclaredMethods !!!
+ for (Method method : methods) {
if(method.getName().equals("compareTo")) {
processClassContext.removeMethod(method);
}
+
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e1fa54a2/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveSyntheticOrAbstractMethodsFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveSyntheticOrAbstractMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveSyntheticOrAbstractMethodsFacetFactory.java
new file mode 100644
index 0000000..5e0427d
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/RemoveSyntheticOrAbstractMethodsFacetFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.progmodel.facets.object.ignore.javalang;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+
+/**
+ * Designed to simply filter out any synthetic methods.
+ *
+ * <p>
+ * Does not add any {@link Facet}s.
+ */
+public class RemoveSyntheticOrAbstractMethodsFacetFactory extends FacetFactoryAbstract {
+
+ public RemoveSyntheticOrAbstractMethodsFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
+ super.process(processClassContext);
+ Class<?> cls = processClassContext.getCls();
+ Method[] methods = cls.getMethods();
+ for (Method method : methods) {
+ if (method.isSynthetic() || Modifier.isAbstract(method.getModifiers())) {
+ processClassContext.removeMethod(method);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/e1fa54a2/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/SyntheticMethodFilteringFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/SyntheticMethodFilteringFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/SyntheticMethodFilteringFacetFactory.java
deleted file mode 100644
index 5396624..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/javalang/SyntheticMethodFilteringFacetFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.progmodel.facets.object.ignore.javalang;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodFilteringFacetFactory;
-
-/**
- * Designed to simply filter out any synthetic methods.
- *
- * <p>
- * Does not add any {@link Facet}s.
- */
-public class SyntheticMethodFilteringFacetFactory extends FacetFactoryAbstract implements MethodFilteringFacetFactory {
-
- public SyntheticMethodFilteringFacetFactory() {
- super(new ArrayList<FeatureType>());
- }
-
- @Override
- public boolean recognizes(final Method method) {
- return isSynthetic(method);
- }
-
- private boolean isSynthetic(final Method method) {
- try {
- final Class<?> type = method.getClass();
- try {
- return ((Boolean) type.getMethod("isSynthetic", (Class[]) null).invoke(method, (Object[]) null)).booleanValue();
- } catch (final NoSuchMethodException nsm) {
- // pre java 5
- return false;
- }
- } catch (final Exception e) {
- throw new IsisException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e1fa54a2/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyAccessorFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyAccessorFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyAccessorFacetFactory.java
index 6fd00dd..efbf81c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyAccessorFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/accessor/PropertyAccessorFacetFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.progmodel.facets.properties.accessor;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.List;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
http://git-wip-us.apache.org/repos/asf/isis/blob/e1fa54a2/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 7d56f17..29bb10b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -94,7 +94,7 @@ import org.apache.isis.core.progmodel.facets.object.ignore.javalang.RemoveInject
import org.apache.isis.core.progmodel.facets.object.ignore.javalang.RemoveJavaLangComparableMethodsFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ignore.javalang.RemoveJavaLangObjectMethodsFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ignore.javalang.RemoveSuperclassMethodsFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.ignore.javalang.SyntheticMethodFilteringFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ignore.javalang.RemoveSyntheticOrAbstractMethodsFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory;
import org.apache.isis.core.progmodel.facets.object.immutable.annotation.ImmutableAnnotationFacetFactory;
@@ -216,7 +216,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(ObjectTypeDerivedFromClassNameFacetFactory.class);
addFactory(IteratorFilteringFacetFactory.class);
- addFactory(SyntheticMethodFilteringFacetFactory.class);
+ addFactory(RemoveSyntheticOrAbstractMethodsFacetFactory.class);
addFactory(RemoveSuperclassMethodsFacetFactory.class);
addFactory(RemoveJavaLangObjectMethodsFacetFactory.class);
addFactory(RemoveJavaLangComparableMethodsFacetFactory.class);