upgrade to a maven-checkstyle-plugin for Java8 Sadly all the new versions behave slightly different. That's of course not good but the additional failures are reasonable at least. I went through all the complaints and fixed them.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/91e3a170 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/91e3a170 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/91e3a170 Branch: refs/heads/master Commit: 91e3a170edbbf190606147ab4894d2cd59ebfc49 Parents: 00f2ba3 Author: Mark Struberg <strub...@apache.org> Authored: Tue Mar 6 14:51:28 2018 +0100 Committer: Mark Struberg <strub...@apache.org> Committed: Tue Mar 6 14:51:28 2018 +0100 ---------------------------------------------------------------------- .../deltaspike/cdise/tck/ContainerCtrlTckTest.java | 4 ++-- .../core/impl/config/ConfigResolverContext.java | 14 +++++++------- .../core/impl/config/DeltaSpikeConfigInfo.java | 8 ++++---- .../impl/config/EnvironmentPropertyConfigSource.java | 2 +- .../core/impl/config/LocalJndiConfigSource.java | 2 +- .../core/impl/config/TypedResolverImpl.java | 2 +- .../apache/deltaspike/core/impl/jmx/Operation.java | 6 +++--- .../core/impl/message/DefaultMessageContext.java | 4 ++-- .../InjectableGroupedConversationManager.java | 2 +- .../apache/deltaspike/example/viewconfig/Pages.java | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java index 536508b..f33a199 100644 --- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java +++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java @@ -225,11 +225,11 @@ public class ContainerCtrlTckTest cdiContainer.shutdown(); } - @Test @LockedCDIImplementation(versions = { @LockedVersionRange(implementation = CdiImplementation.WELD11, versionRange = "[1.1.14,1.2)"), @LockedVersionRange(implementation = CdiImplementation.WELD20, versionRange = "[2.0.1.Final,2.1)") - }) + }) + @Test public void testShutdownWithInactiveContexts() { CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer(); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java index 4f3997c..bf08982 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigResolverContext.java @@ -34,39 +34,39 @@ class ConfigResolverContext private boolean evaluateVariables; private boolean propertyAware; - public ConfigResolverContext() + ConfigResolverContext() { } - public ConfigResolverContext setEvaluateVariables(final boolean evaluateVariables) + ConfigResolverContext setEvaluateVariables(final boolean evaluateVariables) { this.evaluateVariables = evaluateVariables; return this; } - public boolean isEvaluateVariables() + boolean isEvaluateVariables() { return evaluateVariables; } - public ConfigResolverContext setProjectStageAware(final boolean projectStageAware) + ConfigResolverContext setProjectStageAware(final boolean projectStageAware) { this.projectStageAware = projectStageAware; return this; } - public boolean isProjectStageAware() + boolean isProjectStageAware() { return projectStageAware; } - public ConfigResolverContext setPropertyAware(final boolean propertyAware) + ConfigResolverContext setPropertyAware(final boolean propertyAware) { this.propertyAware = propertyAware; return this; } - public boolean isPropertyAware() + boolean isPropertyAware() { return propertyAware; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java index 286806b..6efb1e7 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DeltaSpikeConfigInfo.java @@ -226,24 +226,24 @@ public class DeltaSpikeConfigInfo implements DeltaSpikeConfigInfoMBean private final String value; private final String fromConfigSource; - public ConfigEntry(String key, String value, String fromConfigSource) + ConfigEntry(String key, String value, String fromConfigSource) { this.key = key; this.value = value; this.fromConfigSource = fromConfigSource; } - public String getKey() + String getKey() { return key; } - public String getValue() + String getValue() { return value; } - public String getFromConfigSource() + String getFromConfigSource() { return fromConfigSource; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java index 5c5ea5d..b1ff8d1 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/EnvironmentPropertyConfigSource.java @@ -30,7 +30,7 @@ package org.apache.deltaspike.core.impl.config; class EnvironmentPropertyConfigSource extends MapConfigSource { - public EnvironmentPropertyConfigSource() + EnvironmentPropertyConfigSource() { super(System.getenv()); initOrdinal(300); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java index bcc4b20..df7aea2 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java @@ -34,7 +34,7 @@ class LocalJndiConfigSource extends BaseConfigSource { private static final String BASE_NAME = "java:comp/env/deltaspike/"; - public LocalJndiConfigSource() + LocalJndiConfigSource() { initOrdinal(200); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java index df36054..c7d3f85 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/TypedResolverImpl.java @@ -70,7 +70,7 @@ public class TypedResolverImpl<T> implements ConfigResolver.UntypedResolver<T> private T lastValue = null; - public TypedResolverImpl(ConfigImpl config, String propertyName) + TypedResolverImpl(ConfigImpl config, String propertyName) { this.config = config; this.keyOriginal = propertyName; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java index 40920bc..6a9ccab 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/Operation.java @@ -28,18 +28,18 @@ class Operation private final Method operation; private final boolean presentAsTabularIfPossible; - public Operation(final Method operation, final boolean presentAsTabularIfPossible) + Operation(final Method operation, final boolean presentAsTabularIfPossible) { this.operation = operation; this.presentAsTabularIfPossible = presentAsTabularIfPossible; } - public boolean isPresentAsTabularIfPossible() + boolean isPresentAsTabularIfPossible() { return presentAsTabularIfPossible; } - public Method getOperation() + Method getOperation() { return operation; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java index b776471..44fb945 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java @@ -50,11 +50,11 @@ class DefaultMessageContext implements MessageContext private List<String> messageSources = new ArrayList<String>(); - public DefaultMessageContext() + DefaultMessageContext() { } - public DefaultMessageContext(MessageContext otherMessageContext) + DefaultMessageContext(MessageContext otherMessageContext) { messageInterpolator(otherMessageContext.getMessageInterpolator()); localeResolver(otherMessageContext.getLocaleResolver()); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java index f88d491..56fcdf7 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java @@ -32,7 +32,7 @@ class InjectableGroupedConversationManager implements GroupedConversationManager { private transient volatile GroupedConversationManager conversationManager; - public InjectableGroupedConversationManager(GroupedConversationManager conversationManager) + InjectableGroupedConversationManager(GroupedConversationManager conversationManager) { this.conversationManager = conversationManager; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91e3a170/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java ---------------------------------------------------------------------- diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java index 9029958..cac53ed 100644 --- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java +++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/Pages.java @@ -53,7 +53,7 @@ public interface Pages extends ViewConfig @NavigationParameter.List({ @NavigationParameter(key = "param1", value = "Hey, I come from a navigation parameter"), @NavigationParameter(key = "param2", value = "Hey, It's an interpolated value: #{myBean.aValue}") - }) + }) class NavigationParameterPage implements RedirectedPages { }
