You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/04/04 23:14:37 UTC
git commit: DELTASPIKE-288 folder-only tests and improvements
Updated Branches:
refs/heads/master 2f2fada8a -> 2025778cb
DELTASPIKE-288 folder-only tests and improvements
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/2025778c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/2025778c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/2025778c
Branch: refs/heads/master
Commit: 2025778cb2e9680ff2d1fe4a6f5f83627c0a096d
Parents: 2f2fada
Author: gpetracek <gp...@apache.org>
Authored: Thu Apr 4 22:43:03 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Thu Apr 4 23:03:49 2013 +0200
----------------------------------------------------------------------
.../jsf/impl/config/view/ViewConfigExtension.java | 23 +++-
.../deltaspike/jsf/impl/util/ViewConfigUtils.java | 9 ++-
.../jsf/impl/config/view/folder/uc001/Pages.java | 36 ++++++
.../config/view/folder/uc001/ViewConfigTest.java | 85 +++++++++++++++
4 files changed, 147 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2025778c/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
index baae73e..69921de 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
@@ -77,14 +77,14 @@ public class ViewConfigExtension implements Extension, Deactivatable
Class beanClass = pat.getAnnotatedType().getJavaClass();
if (ViewConfig.class.isAssignableFrom(beanClass))
{
- addPageDefinition(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
+ addConfigClass(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
pat.veto();
}
else
{
- if (beanClass.isAnnotationPresent(Folder.class))
+ if (ViewConfigUtils.isFolderConfig(beanClass) && beanClass.isAnnotationPresent(Folder.class))
{
- addPageDefinition(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
+ addConfigClass(pat.getAnnotatedType().getJavaClass(), pat.getAnnotatedType().getAnnotations());
pat.veto();
}
else
@@ -151,10 +151,23 @@ public class ViewConfigExtension implements Extension, Deactivatable
public void addPageDefinition(Class<? extends ViewConfig> viewConfigClass)
{
- addPageDefinition(viewConfigClass, new HashSet<Annotation>(Arrays.asList(viewConfigClass.getAnnotations())));
+ addConfigClass(viewConfigClass, new HashSet<Annotation>(Arrays.asList(viewConfigClass.getAnnotations())));
}
- protected void addPageDefinition(Class<? extends ViewConfig> viewConfigClass, Set<Annotation> viewConfigAnnotations)
+ public void addFolderDefinition(Class configClass)
+ {
+ if (ViewConfigUtils.isFolderConfig(configClass))
+ {
+ addConfigClass(configClass, new HashSet<Annotation>(Arrays.asList(configClass.getAnnotations())));
+ }
+ else
+ {
+ throw new IllegalArgumentException(configClass != null ? configClass.getName() : "null" +
+ " is an invalid config for folders");
+ }
+ }
+
+ protected void addConfigClass(Class viewConfigClass, Set<Annotation> viewConfigAnnotations)
{
for (Annotation annotation : viewConfigAnnotations)
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2025778c/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ViewConfigUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ViewConfigUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ViewConfigUtils.java
index 8175c33..560f3e1 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ViewConfigUtils.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ViewConfigUtils.java
@@ -18,7 +18,9 @@
*/
package org.apache.deltaspike.jsf.impl.util;
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
import org.apache.deltaspike.core.util.ClassUtils;
+import org.apache.deltaspike.jsf.api.config.view.Folder;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -34,7 +36,12 @@ public abstract class ViewConfigUtils
public static boolean isFolderConfig(Class configClass)
{
- return Modifier.isAbstract(configClass.getModifiers()) || Modifier.isInterface(configClass.getModifiers());
+ return configClass != null && (
+ (ViewConfig.class.isAssignableFrom(configClass) &&
+ Modifier.isAbstract(configClass.getModifiers()) ||
+ Modifier.isInterface(configClass.getModifiers())
+ ) ||
+ configClass.isAnnotationPresent(Folder.class));
}
//TODO
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2025778c/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/Pages.java
new file mode 100644
index 0000000..48285da
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/Pages.java
@@ -0,0 +1,36 @@
+/*
+ * 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.deltaspike.test.jsf.impl.config.view.folder.uc001;
+
+import org.apache.deltaspike.core.api.config.view.ViewConfig;
+import org.apache.deltaspike.jsf.api.config.view.Folder;
+
+interface Pages
+{
+ //folder (-only) meta-data would be here or at an interface
+ interface AdminArea extends ViewConfig
+ {
+ //empty intentionally
+ }
+
+ @Folder
+ interface VipArea
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/2025778c/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/ViewConfigTest.java
new file mode 100644
index 0000000..d414b00
--- /dev/null
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/folder/uc001/ViewConfigTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.deltaspike.test.jsf.impl.config.view.folder.uc001;
+
+import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
+import org.apache.deltaspike.jsf.api.config.view.Folder;
+import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ViewConfigTest
+{
+ private ViewConfigExtension viewConfigExtension;
+
+ @Before
+ public void before()
+ {
+ this.viewConfigExtension = new ViewConfigExtension();
+ }
+
+ @After
+ public void after()
+ {
+ this.viewConfigExtension.freeViewConfigCache(null);
+ }
+
+ @Test
+ public void testFolderOnlyMetaData()
+ {
+ this.viewConfigExtension.addPageDefinition(Pages.AdminArea.class);
+ this.viewConfigExtension.addFolderDefinition(Pages.VipArea.class);
+
+ ViewConfigNode node = this.viewConfigExtension.findNode(Pages.AdminArea.class);
+
+ Assert.assertNotNull(node);
+ Assert.assertNotNull(node.getParent());
+ Assert.assertNotNull(node.getParent().getParent());
+ Assert.assertNull(node.getParent().getParent().getParent());
+
+ Assert.assertNotNull(node.getChildren());
+ Assert.assertEquals(0, node.getChildren().size());
+
+ Assert.assertNotNull(node.getMetaData());
+ Assert.assertEquals(0, node.getMetaData().size());
+
+ Assert.assertNotNull(node.getInheritedMetaData());
+ Assert.assertEquals(0, node.getInheritedMetaData().size());
+
+
+ node = this.viewConfigExtension.findNode(Pages.VipArea.class);
+
+ Assert.assertNotNull(node);
+ Assert.assertNotNull(node.getParent());
+ Assert.assertNotNull(node.getParent().getParent());
+ Assert.assertNull(node.getParent().getParent().getParent());
+
+ Assert.assertNotNull(node.getChildren());
+ Assert.assertEquals(0, node.getChildren().size());
+
+ Assert.assertNotNull(node.getMetaData());
+ Assert.assertEquals(1, node.getMetaData().size());
+ Assert.assertEquals(Folder.class, node.getMetaData().iterator().next().annotationType());
+
+ Assert.assertNotNull(node.getInheritedMetaData());
+ Assert.assertEquals(0, node.getInheritedMetaData().size());
+ }
+}