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/03/31 21:53:22 UTC
git commit: DELTASPIKE-288 improved api
Updated Branches:
refs/heads/master 24d95d3ef -> 232063dba
DELTASPIKE-288 improved api
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/232063db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/232063db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/232063db
Branch: refs/heads/master
Commit: 232063dba093f27c6d4a8649f6b3345bb7c4f8f5
Parents: 24d95d3
Author: gpetracek <gp...@apache.org>
Authored: Sun Mar 31 21:44:21 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sun Mar 31 21:46:16 2013 +0200
----------------------------------------------------------------------
.../api/config/view/metadata/ConfigDescriptor.java | 5 +--
.../config/view/metadata/ViewConfigDescriptor.java | 9 +----
.../config/view/metadata/ViewConfigResolver.java | 6 ++--
.../config/view/AbstractPathConfigDescriptor.java | 8 ++--
.../config/view/DefaultFolderConfigDescriptor.java | 2 +-
.../config/view/DefaultViewConfigResolver.java | 26 +++++++-------
.../view/DefaultViewPathConfigDescriptor.java | 12 ++-----
.../ViewConfigAwareNavigationHandler.java | 7 ++--
.../impl/security/SecurityAwareViewHandler.java | 2 +-
.../deltaspike/jsf/impl/util/SecurityUtils.java | 4 +-
.../destination/uc004/ViewConfigTest.java | 4 +-
.../navigation/syntax/uc001/ViewConfigTest.java | 2 +-
.../navigation/syntax/uc002/ViewConfigTest.java | 2 +-
.../navigation/syntax/uc003/ViewConfigTest.java | 6 ++--
.../navigation/syntax/uc004/ViewConfigTest.java | 12 +++---
.../navigation/syntax/uc005/ViewConfigTest.java | 12 +++---
.../navigation/syntax/uc006/ViewConfigTest.java | 12 +++---
17 files changed, 59 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java
index ad69b92..6de9a62 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java
@@ -25,10 +25,9 @@ import java.util.List;
* Base descriptor for all type-safe view-configs which represents the
* config-class and meta-data, callbacks,... provided by/bound to this class.
*/
-public interface ConfigDescriptor
+public interface ConfigDescriptor<CT /*config type*/>
{
- //needed e.g. for folder nodes which aren't view-configs
- Class getConfigClass();
+ Class<? extends CT> getConfigClass();
/**
* Meta-data which is configured for the entry. It allows to provide and resolve meta-data annotated
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigDescriptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigDescriptor.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigDescriptor.java
index e12d2d5..d542c08 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigDescriptor.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigDescriptor.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.config.view.ViewConfig;
/**
* Descriptor which represents a concrete view (/page).
*/
-public interface ViewConfigDescriptor extends ConfigDescriptor
+public interface ViewConfigDescriptor extends ConfigDescriptor<ViewConfig>
{
/**
* View-ID of the current descriptor
@@ -31,11 +31,4 @@ public interface ViewConfigDescriptor extends ConfigDescriptor
* @return current view-id
*/
String getViewId();
-
- /**
- * Class which was used for creating the current descriptor
- *
- * @return view-config class
- */
- Class<? extends ViewConfig> getViewConfig();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java
index 6b03384..1071cf7 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java
@@ -34,7 +34,7 @@ import java.util.List;
//TODO re-visit name since we also need ConfigDescriptor
public interface ViewConfigResolver
{
- ConfigDescriptor getConfigDescriptor(String path);
+ ConfigDescriptor<?> getConfigDescriptor(String path);
/**
* Resolves the {@link ConfigDescriptor} for the given config-class
@@ -42,7 +42,7 @@ public interface ViewConfigResolver
* @param configClass config-class (which usually represents a folder node)
* @return config-descriptor which represents the given config-class
*/
- ConfigDescriptor getConfigDescriptor(Class configClass);
+ ConfigDescriptor<?> getConfigDescriptor(Class configClass);
//TODO re-visit name (depends on other discussions)
/**
@@ -50,7 +50,7 @@ public interface ViewConfigResolver
*
* @return all descriptors for the known view-configs
*/
- List<ConfigDescriptor> getConfigDescriptors();
+ List<ConfigDescriptor<?>> getConfigDescriptors();
/**
* Resolves the {@link ViewConfigDescriptor} for the given view-id
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java
index 3993e45..3e509d3 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java
@@ -29,13 +29,13 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-abstract class AbstractPathConfigDescriptor implements ConfigDescriptor
+abstract class AbstractPathConfigDescriptor<CT> implements ConfigDescriptor<CT>
{
- private final Class source;
+ private final Class<? extends CT> source;
private List<Annotation> metaData;
private Map<Class<? extends Annotation>, List<CallbackDescriptor>> callbackDescriptors;
- AbstractPathConfigDescriptor(Class configClass,
+ AbstractPathConfigDescriptor(Class<? extends CT> configClass,
List<Annotation> mergedMetaData,
Map<Class<? extends Annotation>, List<CallbackDescriptor>> callbackDescriptors)
{
@@ -45,7 +45,7 @@ abstract class AbstractPathConfigDescriptor implements ConfigDescriptor
}
@Override
- public Class getConfigClass()
+ public Class<? extends CT> getConfigClass()
{
return this.source;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultFolderConfigDescriptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultFolderConfigDescriptor.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultFolderConfigDescriptor.java
index 8119a0b..2c52c92 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultFolderConfigDescriptor.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultFolderConfigDescriptor.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Annotation;
import java.util.List;
import java.util.Map;
-class DefaultFolderConfigDescriptor extends AbstractPathConfigDescriptor
+class DefaultFolderConfigDescriptor extends AbstractPathConfigDescriptor<Object>
{
private final String path;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java
index 535f6e6..255e123 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java
@@ -91,26 +91,26 @@ public class DefaultViewConfigResolver implements ViewConfigResolver
else
{
foundViewIds.put(
- currentViewConfigDescriptor.getViewId(), currentViewConfigDescriptor.getViewConfig());
+ currentViewConfigDescriptor.getViewId(), currentViewConfigDescriptor.getConfigClass());
}
if (this.defaultErrorView == null)
{
- if (DefaultErrorView.class.isAssignableFrom(currentViewConfigDescriptor.getViewConfig()))
+ if (DefaultErrorView.class.isAssignableFrom(currentViewConfigDescriptor.getConfigClass()))
{
this.defaultErrorView = currentViewConfigDescriptor;
}
}
- else if (DefaultErrorView.class.isAssignableFrom(currentViewConfigDescriptor.getViewConfig()))
+ else if (DefaultErrorView.class.isAssignableFrom(currentViewConfigDescriptor.getConfigClass()))
{
throw new IllegalStateException("It isn't allowed to configure multiple default-error-views. " +
- "Found default-error-views: " + this.defaultErrorView.getViewConfig() + " and " +
- currentViewConfigDescriptor.getViewConfig().getName());
+ "Found default-error-views: " + this.defaultErrorView.getConfigClass() + " and " +
+ currentViewConfigDescriptor.getConfigClass().getName());
}
- if (!viewConfigs.containsKey(currentViewConfigDescriptor.getViewConfig()))
+ if (!viewConfigs.containsKey(currentViewConfigDescriptor.getConfigClass()))
{
- viewConfigs.put(currentViewConfigDescriptor.getViewConfig(), currentViewConfigDescriptor);
+ viewConfigs.put(currentViewConfigDescriptor.getConfigClass(), currentViewConfigDescriptor);
}
}
else
@@ -158,7 +158,7 @@ public class DefaultViewConfigResolver implements ViewConfigResolver
}
@Override
- public ConfigDescriptor getConfigDescriptor(String path)
+ public ConfigDescriptor<?> getConfigDescriptor(String path)
{
if (path == null)
{
@@ -187,7 +187,7 @@ public class DefaultViewConfigResolver implements ViewConfigResolver
}
@Override
- public ConfigDescriptor getConfigDescriptor(Class configClass)
+ public ConfigDescriptor<?> getConfigDescriptor(Class configClass)
{
ConfigDescriptor result = null;
if (ViewConfig.class.isAssignableFrom(configClass))
@@ -204,12 +204,12 @@ public class DefaultViewConfigResolver implements ViewConfigResolver
}
@Override
- public List<ConfigDescriptor> getConfigDescriptors()
+ public List<ConfigDescriptor<?>> getConfigDescriptors()
{
- ConfigDescriptor[] result = this.folderDefinitionToViewDefinitionEntryMapping.values()
- .toArray(new ConfigDescriptor[this.folderDefinitionToViewDefinitionEntryMapping.size()]);
+ ConfigDescriptor<?>[] result = this.folderDefinitionToViewDefinitionEntryMapping.values()
+ .toArray(new ConfigDescriptor<?>[this.folderDefinitionToViewDefinitionEntryMapping.size()]);
- return new ArrayList<ConfigDescriptor>(Arrays.asList(result));
+ return new ArrayList<ConfigDescriptor<?>>(Arrays.asList(result));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewPathConfigDescriptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewPathConfigDescriptor.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewPathConfigDescriptor.java
index 56a8bd1..7aff752 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewPathConfigDescriptor.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewPathConfigDescriptor.java
@@ -26,10 +26,11 @@ import java.lang.annotation.Annotation;
import java.util.List;
import java.util.Map;
-class DefaultViewPathConfigDescriptor extends AbstractPathConfigDescriptor implements ViewConfigDescriptor
+class DefaultViewPathConfigDescriptor
+ extends AbstractPathConfigDescriptor<ViewConfig>
+ implements ViewConfigDescriptor
{
private final String viewId;
- private final Class<? extends ViewConfig> viewConfig;
DefaultViewPathConfigDescriptor(String viewId,
Class<? extends ViewConfig> configClass,
@@ -38,7 +39,6 @@ class DefaultViewPathConfigDescriptor extends AbstractPathConfigDescriptor imple
{
super(configClass, mergedMetaData, callbackDescriptors);
this.viewId = viewId;
- this.viewConfig = configClass;
}
@Override
@@ -48,12 +48,6 @@ class DefaultViewPathConfigDescriptor extends AbstractPathConfigDescriptor imple
}
@Override
- public Class<? extends ViewConfig> getViewConfig()
- {
- return this.viewConfig;
- }
-
- @Override
public String toString()
{
return this.viewId;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
index f33d587..0ff2851 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/ViewConfigAwareNavigationHandler.java
@@ -114,10 +114,11 @@ public class ViewConfigAwareNavigationHandler extends NavigationHandler
if (entry != null)
{
+ //in case of false it has been added already
if (allowCaching)
{
this.viewConfigs.put(outcome, entry);
- addConfiguredViewParameters(entry.getViewConfig()); //in case of false it has been added already
+ addConfiguredViewParameters(entry.getConfigClass());
}
String oldViewId = null;
@@ -217,7 +218,7 @@ public class ViewConfigAwareNavigationHandler extends NavigationHandler
return null;
}
- if (navigateEvent.getToView().equals(viewConfigDescriptor.getViewConfig()))
+ if (navigateEvent.getToView().equals(viewConfigDescriptor.getConfigClass()))
{
return viewConfigDescriptor;
}
@@ -235,7 +236,7 @@ public class ViewConfigAwareNavigationHandler extends NavigationHandler
if (oldViewConfigDescriptor != null)
{
PreViewConfigNavigateEvent navigateEvent = new PreViewConfigNavigateEvent(
- oldViewConfigDescriptor.getViewConfig(), newViewConfigDescriptor.getViewConfig());
+ oldViewConfigDescriptor.getConfigClass(), newViewConfigDescriptor.getConfigClass());
this.beanManager.fireEvent(navigateEvent);
return navigateEvent;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
index ee01415..1e9bbac 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/SecurityAwareViewHandler.java
@@ -104,7 +104,7 @@ public class SecurityAwareViewHandler extends ViewHandlerWrapper implements Deac
errorViewDescriptor.getMetaData(View.class).iterator().next().navigation() /*always available*/)
{
SecurityUtils.tryToHandleSecurityViolation(accessDeniedException);
- errorView = errorViewDescriptor.getViewConfig();
+ errorView = errorViewDescriptor.getConfigClass();
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
index 308a7c5..99f9c85 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java
@@ -45,7 +45,7 @@ import java.util.Set;
public abstract class SecurityUtils
{
public static void invokeVoters(EditableAccessDecisionVoterContext accessDecisionVoterContext,
- ConfigDescriptor viewConfigDescriptor)
+ ConfigDescriptor<?> viewConfigDescriptor)
{
if (viewConfigDescriptor == null)
{
@@ -156,7 +156,7 @@ public abstract class SecurityUtils
if (errorPageDescriptor != null)
{
- errorView = errorPageDescriptor.getViewConfig();
+ errorView = errorPageDescriptor.getConfigClass();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTest.java
index 790a46b..6c6c449 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/destination/uc004/ViewConfigTest.java
@@ -104,7 +104,7 @@ public class ViewConfigTest
ViewConfigResolver viewConfigResolver = this.viewConfigResolverProducer.createViewConfigResolver();
Assert.assertNotNull(viewConfigResolver.getDefaultErrorViewConfigDescriptor());
- Assert.assertEquals(Pages.Index.class, viewConfigResolver.getDefaultErrorViewConfigDescriptor().getViewConfig());
- Assert.assertEquals(Pages.Index.class, viewConfigResolver.getViewConfigDescriptor(DefaultErrorView.class).getViewConfig());
+ Assert.assertEquals(Pages.Index.class, viewConfigResolver.getDefaultErrorViewConfigDescriptor().getConfigClass());
+ Assert.assertEquals(Pages.Index.class, viewConfigResolver.getViewConfigDescriptor(DefaultErrorView.class).getConfigClass());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc001/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc001/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc001/ViewConfigTest.java
index c690492..083003b 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc001/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc001/ViewConfigTest.java
@@ -79,7 +79,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/simplePageConfig001.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(SimplePageConfig001.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(SimplePageConfig001.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
//@View gets added autom. if it isn't provided in-/directly
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc002/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc002/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc002/ViewConfigTest.java
index 53ba9c3..75d4fc2 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc002/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc002/ViewConfigTest.java
@@ -79,7 +79,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/simplePageConfig002.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(SimplePageConfig002.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(SimplePageConfig002.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc003/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc003/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc003/ViewConfigTest.java
index da15dd9..e8aa818 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc003/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc003/ViewConfigTest.java
@@ -180,7 +180,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -196,7 +196,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/home.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -211,7 +211,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc004/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc004/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc004/ViewConfigTest.java
index 5e9e352..e67ac4e 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc004/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc004/ViewConfigTest.java
@@ -229,7 +229,7 @@ public class ViewConfigTest
this.viewConfigExtension.addPageDefinition(Pages.Admin.Statistics.Home.class);
ViewConfigResolver viewConfigResolver = this.viewConfigResolverProducer.createViewConfigResolver();
- ConfigDescriptor configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
+ ConfigDescriptor<?> configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
Assert.assertNotNull(configDescriptor);
Assert.assertNotNull(configDescriptor.getConfigClass());
@@ -276,7 +276,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/home.jsp", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -291,7 +291,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -306,7 +306,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/home.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -321,7 +321,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -336,7 +336,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/home.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
index c5b5388..6681faa 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
@@ -236,7 +236,7 @@ public class ViewConfigTest
this.viewConfigExtension.addPageDefinition(Pages.Admin.Statistics.Home.class);
ViewConfigResolver viewConfigResolver = this.viewConfigResolverProducer.createViewConfigResolver();
- ConfigDescriptor configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
+ ConfigDescriptor<?> configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
Assert.assertNotNull(configDescriptor);
Assert.assertNotNull(configDescriptor.getConfigClass());
@@ -294,7 +294,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -309,7 +309,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -323,7 +323,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/home.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -337,7 +337,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -351,7 +351,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/home.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/232063db/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
index 5cc02f0..4fe7945 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
@@ -236,7 +236,7 @@ public class ViewConfigTest
this.viewConfigExtension.addPageDefinition(Pages.Admin.Statistics.Home.class);
ViewConfigResolver viewConfigResolver = this.viewConfigResolverProducer.createViewConfigResolver();
- ConfigDescriptor configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
+ ConfigDescriptor<?> configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.class);
Assert.assertNotNull(configDescriptor);
Assert.assertNotNull(configDescriptor.getConfigClass());
@@ -295,7 +295,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/index.jsf", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -310,7 +310,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/index.faces", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -324,7 +324,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/statistics/home.jsf", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Statistics.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -338,7 +338,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/index.xhtml", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Index.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
@@ -352,7 +352,7 @@ public class ViewConfigTest
Assert.assertNotNull(viewConfigDescriptor);
Assert.assertEquals("/pages/admin/home.jsf", viewConfigDescriptor.getViewId());
- Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getViewConfig());
+ Assert.assertEquals(Pages.Admin.Home.class, viewConfigDescriptor.getConfigClass());
Assert.assertNotNull(viewConfigDescriptor.getMetaData());
Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());