This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new a0e00f9 TAMAYA-379: Enforce checkstyle rules
new b977103 Merge pull request #27 from acoburn/TAMAYA-379
a0e00f9 is described below
commit a0e00f9f229bc0eedc26cde55649c632ee60da97
Author: Aaron Coburn <[email protected]>
AuthorDate: Mon Jan 21 23:37:51 2019 -0500
TAMAYA-379: Enforce checkstyle rules
---
buildtools/src/main/resources/checkstyle/style.xml | 2 +-
.../src/main/java/org/apache/tamaya/events/ConfigEventManager.java | 6 +++---
.../main/java/org/apache/tamaya/events/FrozenConfiguration.java | 7 +++----
.../tamaya/events/internal/DefaultConfigEventManagerSpi.java | 4 ++--
.../java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java | 2 +-
.../java/org/apache/tamaya/functions/EnrichedConfiguration.java | 4 +++-
.../java/org/apache/tamaya/functions/PropertySourceFunctions.java | 2 +-
.../src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java | 7 ++++++-
.../java/org/apache/tamaya/cdi/TamayaSEInjectionExtension.java | 6 +++++-
.../main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java | 1 +
.../java/org/apache/tamaya/microprofile/MicroprofileAdapter.java | 4 ++--
.../org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java | 3 +--
.../apache/tamaya/microprofile/converter/ProviderConverter.java | 1 -
.../common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java | 1 +
.../src/main/java/org/apache/tamaya/osgi/TamayaConfigPlugin.java | 2 ++
.../src/main/java/org/apache/tamaya/gogo/shell/BackupCommands.java | 2 +-
.../src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java | 2 +-
.../main/java/org/apache/tamaya/gogo/shell/HistoryCommands.java | 2 +-
.../main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java | 2 +-
.../org/apache/tamaya/karaf/shell/ApplyTamayaConfigCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/BackupCreateCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/BackupDeleteCommand.java | 2 +-
.../main/java/org/apache/tamaya/karaf/shell/BackupListCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/BackupRestoreCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java | 5 ++++-
.../main/java/org/apache/tamaya/karaf/shell/GetPolicyCommand.java | 2 +-
.../org/apache/tamaya/karaf/shell/HistoryDeleteAllCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/HistoryDeleteCommand.java | 2 +-
.../main/java/org/apache/tamaya/karaf/shell/HistoryGetCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/HistoryMaxsizeCommand.java | 2 +-
.../org/apache/tamaya/karaf/shell/HistoryMaxsizeSetCommand.java | 2 +-
.../src/main/java/org/apache/tamaya/karaf/shell/InfoCommand.java | 2 +-
.../main/java/org/apache/tamaya/karaf/shell/OSGIConfigCommand.java | 2 +-
.../main/java/org/apache/tamaya/karaf/shell/PolicyGetCommand.java | 2 +-
.../main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java | 2 +-
.../org/apache/tamaya/karaf/shell/PropagateUpdatesCommand.java | 2 +-
.../org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/PropertyGetCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java | 2 +-
.../java/org/apache/tamaya/karaf/shell/TamayaConfigCommand.java | 2 +-
.../tamaya/resolver/internal/ExpressionResolutionFilter.java | 6 +++++-
.../java/org/apache/tamaya/resolver/internal/FileResolver.java | 4 ++--
.../main/java/org/apache/tamaya/resolver/internal/URLResolver.java | 3 +--
.../apache/tamaya/resource/AbstractPathPropertySourceProvider.java | 5 ++---
pom.xml | 1 -
47 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/buildtools/src/main/resources/checkstyle/style.xml
b/buildtools/src/main/resources/checkstyle/style.xml
index 5a43f94..473daab 100644
--- a/buildtools/src/main/resources/checkstyle/style.xml
+++ b/buildtools/src/main/resources/checkstyle/style.xml
@@ -70,7 +70,7 @@ under the License.
<module name="LocalVariableName"/>
<module name="MethodName">
<property name="format"
- value="^_?[a-z][a-zA-Z0-9]*$"/>
+ value="^_?([a-z][a-zA-Z0-9]*|tm(_[a-z]+)+)$"/>
</module>
<module name="PackageName"/>
<module name="LocalFinalVariableName"/>
diff --git
a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
index 46e47bd..a5b0a7b 100644
---
a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
+++
b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
@@ -86,7 +86,7 @@ public final class ConfigEventManager {
* @param l the listener not null.
* @param eventType the event type to which this listener listens to.
*/
- public <T extends ConfigEvent> void addListener(ConfigEventListener l,
Class<T> eventType) {
+ public <T extends ConfigEvent> void addListener(ConfigEventListener l,
Class<T> eventType) {
spi(classLoader).addListener(l);
}
@@ -106,7 +106,7 @@ public final class ConfigEventManager {
* @param l the listener, not null.
* @param eventType the event type to which this listener listens to.
*/
- public <T extends ConfigEvent> void removeListener(ConfigEventListener
l, Class<T> eventType) {
+ public <T extends ConfigEvent> void removeListener(ConfigEventListener l,
Class<T> eventType) {
spi(classLoader).removeListener(l);
}
@@ -116,7 +116,7 @@ public final class ConfigEventManager {
* @param <T> type param
* @return a createList with the listeners found, never null.
*/
- public <T extends ConfigEvent>
+ public <T extends ConfigEvent>
Collection<? extends ConfigEventListener> getListeners(Class<T> type) {
return spi(classLoader).getListeners(type);
}
diff --git
a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
index 9da6912..6301170 100644
---
a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
+++
b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
@@ -21,8 +21,7 @@ package org.apache.tamaya.events;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationSnapshot;
import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.spi.*;
-import org.apache.tamaya.spisupport.*;
+import org.apache.tamaya.spi.ConfigurationContext;
import java.io.Serializable;
import java.util.*;
@@ -31,7 +30,7 @@ import java.util.*;
* /**
* Configuration implementation that stores all current values of a given
(possibly dynamic, contextual and non server
* capable instance) and is fully serializable. Note that hereby only the
scannable key/createValue pairs are considered.
- * @deprecated Use {@link DefaultConfigurationSnapshot}
+ * @deprecated Use {@link
org.apache.tamaya.spisupport.DefaultConfigurationSnapshot}
*/
@Deprecated
public final class FrozenConfiguration implements Configuration, Serializable {
@@ -111,7 +110,7 @@ public final class FrozenConfiguration implements
Configuration, Serializable {
}
@SuppressWarnings("unchecked")
- @Override
+ @Override
public <T> T get(String key, Class<T> type) {
return snapshot.get(key, type);
}
diff --git
a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java
b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java
index 5cf945a..e3e93c9 100644
---
a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java
+++
b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java
@@ -42,7 +42,7 @@ public class DefaultConfigEventManagerSpi implements
ConfigEventManagerSpi, Clas
private static final Logger LOG =
Logger.getLogger(DefaultConfigEventManagerSpi.class.getName());
- private final Map<Class,List<ConfigEventListener>> listeners = new
ConcurrentHashMap<>();
+ private final Map<Class,List<ConfigEventListener>> listeners = new
ConcurrentHashMap<>();
private final ExecutorService publisher = Executors.newCachedThreadPool();
@@ -74,7 +74,7 @@ public class DefaultConfigEventManagerSpi implements
ConfigEventManagerSpi, Clas
addListener(l, ConfigEvent.class);
}
- @Override
+ @Override
public <T extends ConfigEvent> void addListener(ConfigEventListener l,
Class<T> eventType){
final List<ConfigEventListener> ls =
listeners.computeIfAbsent(eventType, k -> Collections.synchronizedList(new
ArrayList<>()));
synchronized (ls){
diff --git
a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
index 4c90224..8b1cc31 100644
---
a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
+++
b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
@@ -48,7 +48,7 @@ public interface ConfigEventManagerSpi {
* @param eventType the type of concrete configuration event this
listeners should be informed about. All other
* event types will never be delivered to this listener
instance.
*/
- <T extends ConfigEvent> void addListener(ConfigEventListener l,
Class<T> eventType);
+ <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T>
eventType);
/**
* Removes a listener for observing events.
diff --git
a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
index ace5dec..b5a93be 100644
---
a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
+++
b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
@@ -18,7 +18,9 @@
*/
package org.apache.tamaya.functions;
-import org.apache.tamaya.*;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationSnapshot;
+import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spisupport.DefaultConfigurationSnapshot;
diff --git
a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertySourceFunctions.java
b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertySourceFunctions.java
index 2e5deea..7b5e3e3 100644
---
a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertySourceFunctions.java
+++
b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertySourceFunctions.java
@@ -198,7 +198,7 @@ public final class PropertySourceFunctions {
int index = section.lastIndexOf('.');
if (index < 0 && section.isEmpty()) {
transitiveAreas.add("<root>");
- } if (index < 0) {
+ } else if (index < 0) {
transitiveAreas.add(section);
} else {
while (index > 0) {
diff --git
a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
index 986b7a4..30be989 100644
---
a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
+++
b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
@@ -34,7 +34,12 @@ import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Provider;
-import java.lang.reflect.*;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.util.List;
import java.util.Optional;
import java.util.function.UnaryOperator;
diff --git
a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaSEInjectionExtension.java
b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaSEInjectionExtension.java
index 5f82c2b..a87cb5c 100644
---
a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaSEInjectionExtension.java
+++
b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaSEInjectionExtension.java
@@ -26,7 +26,11 @@ import org.apache.tamaya.inject.api.ConfigSection;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.*;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.inject.spi.ProcessInjectionTarget;
import javax.inject.Inject;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git
a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
index 3f10293..e29528d 100644
---
a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
+++
b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
@@ -238,6 +238,7 @@ public abstract class BaseDynamicValue<T> implements
DynamicValue<T> {
LOG.info("New config value for keys " + keys + " detected,
but not yet applied.");
break;
case NEVER:
+ default:
LOG.finest("New config value for keys " + keys + "
detected, but ignored.");
break;
}
diff --git
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java
index 0adaaf1..4fb211b 100644
---
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java
+++
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java
@@ -127,7 +127,7 @@ public final class MicroprofileAdapter{
* @return the corresponding Tamaya {@link PropertyConverter} instance,
never null.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public static <T> PropertyConverter<T> toPropertyConverter(Converter<T>
converter) {
+ public static <T> PropertyConverter<T> toPropertyConverter(Converter<T>
converter) {
if(converter instanceof MicroprofileConverter){
return ((MicroprofileConverter)converter).getPropertyConverter();
}
@@ -141,7 +141,7 @@ public final class MicroprofileAdapter{
* @return the corresponding Microprofile.io {@link Converter} instance,
never null.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public static <T> Converter<T> toConverter(PropertyConverter<T>
converter) {
+ public static <T> Converter<T> toConverter(PropertyConverter<T> converter)
{
if(converter instanceof TamayaPropertyConverter){
return ((TamayaPropertyConverter)converter).getConverter();
}
diff --git
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
index 419829b..16df3c6 100644
---
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
+++
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
@@ -62,7 +62,6 @@ final class MicroprofileConfigBuilder implements
ConfigBuilder {
*/
@Override
public ConfigBuilder addDefaultSources() {
-
configurationBuilder.addPropertySources(
new SystemPropertySource(400), //
new EnvironmentPropertySource(300), //
@@ -129,7 +128,7 @@ final class MicroprofileConfigBuilder implements
ConfigBuilder {
return this;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public ConfigBuilder withConverters(Converter<?>... converters) {
for (Converter<?> converter : converters) {
diff --git
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
index 6907503..b6d1c05 100644
---
a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
+++
b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
@@ -73,7 +73,6 @@ public class ProviderConverter implements
PropertyConverter<Provider> {
* @param <T> the type.
*/
private static final class ConvertQuery<T> implements
Function<Configuration, T> {
-
private String rawValue;
private TypeLiteral<T> type;
diff --git
a/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
b/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
index 0bbc526..8480e63 100644
---
a/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
+++
b/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
@@ -162,6 +162,7 @@ final class ConfigChanger {
LOG.info(() -> "Setting key " + dictEntry.getKey() + "
to " + configuredValue);
ConfigHistory.propertySet(pid,dictEntry.getKey(),
configuredValue, dictEntry.getValue());
dictionary.put(dictEntry.getKey(), configuredValue);
+ break;
case EXTEND:
default:
break;
diff --git
a/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/TamayaConfigPlugin.java
b/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/TamayaConfigPlugin.java
index b35166e..05a6ced 100644
---
a/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/TamayaConfigPlugin.java
+++
b/modules/osgi/common/src/main/java/org/apache/tamaya/osgi/TamayaConfigPlugin.java
@@ -139,6 +139,8 @@ public class TamayaConfigPlugin implements
TamayaConfigService, BundleListener,
case Bundle.ACTIVE:
configureBundle(bundle);
break;
+ default:
+ break;
}
}
}
diff --git
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/BackupCommands.java
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/BackupCommands.java
index 9b87077..0c8c0f9 100644
---
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/BackupCommands.java
+++
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/BackupCommands.java
@@ -78,4 +78,4 @@ public class BackupCommands {
Objects.requireNonNull(pid)));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java
index de47ae6..d7d8c9f 100644
---
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java
+++
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java
@@ -89,4 +89,4 @@ public class ConfigCommands {
public void tm_propertysources() throws IOException {
System.out.println(org.apache.tamaya.osgi.commands.ConfigCommands.getPropertySourceOverview());
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/HistoryCommands.java
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/HistoryCommands.java
index 8463ac3..3379e4c 100644
---
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/HistoryCommands.java
+++
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/HistoryCommands.java
@@ -89,4 +89,4 @@ public class HistoryCommands {
maxSize));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java
index cf38662..447bed2 100644
---
a/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java
+++
b/modules/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java
@@ -83,4 +83,4 @@ public class SettingsCommands {
public void tm_propagate_updates_set(boolean enabled) throws IOException {
System.out.println(ConfigCommands.setAutoUpdateEnabled(getService(TamayaConfigService.class),
enabled));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/ApplyTamayaConfigCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/ApplyTamayaConfigCommand.java
index c43e92a..e9338ba 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/ApplyTamayaConfigCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/ApplyTamayaConfigCommand.java
@@ -55,4 +55,4 @@ public class ApplyTamayaConfigCommand implements Action{
return(ConfigCommands.applyTamayaConfiguration(configPlugin, pid,
opMode, dryRun));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupCreateCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupCreateCommand.java
index 20ed420..eef4bee 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupCreateCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupCreateCommand.java
@@ -56,4 +56,4 @@ public class BackupCreateCommand implements Action{
return(BackupCommands.createBackup(configPlugin, cm, pid, replace));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupDeleteCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupDeleteCommand.java
index 55d0d97..d07e7d5 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupDeleteCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupDeleteCommand.java
@@ -47,4 +47,4 @@ public class BackupDeleteCommand implements Action{
return(BackupCommands.deleteBackup(configPlugin, pid));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupListCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupListCommand.java
index 68a8355..56fb7c3 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupListCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupListCommand.java
@@ -47,4 +47,4 @@ public class BackupListCommand implements Action{
return(BackupCommands.listBackup(configPlugin, pid));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupRestoreCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupRestoreCommand.java
index 9e600a2..49afa83 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupRestoreCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/BackupRestoreCommand.java
@@ -46,4 +46,4 @@ public class BackupRestoreCommand implements Action{
return(BackupCommands.restoreBackup(configPlugin, pid));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
index 45ce97e..4463081 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
@@ -70,4 +70,4 @@ public class DefaultEnableCommand implements Action{
}
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
index f5ce13c..661394b 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
@@ -49,6 +49,9 @@ public class DefaultEnabledCommand implements Action{
return(ConfigCommands.getDefaultEnabled(configPlugin));
}
+ /**
+ * A class for completing operations in the Karaf shell.
+ */
@Service
public static final class OperationModeCompleter implements Completer {
@@ -62,4 +65,4 @@ public class DefaultEnabledCommand implements Action{
}
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/GetPolicyCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/GetPolicyCommand.java
index c393418..9586e1a 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/GetPolicyCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/GetPolicyCommand.java
@@ -42,4 +42,4 @@ public class GetPolicyCommand implements Action{
return ConfigCommands.getDefaultOpPolicy(configPlugin);
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteAllCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteAllCommand.java
index e1dc4be..fd3d090 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteAllCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteAllCommand.java
@@ -42,4 +42,4 @@ public class HistoryDeleteAllCommand implements Action{
return HistoryCommands.clearHistory(configPlugin, null);
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteCommand.java
index c7fa3a0..ced1ca0 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryDeleteCommand.java
@@ -47,4 +47,4 @@ public class HistoryDeleteCommand implements Action{
return HistoryCommands.clearHistory(configPlugin, pid);
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryGetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryGetCommand.java
index 1a2e324..91b8722 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryGetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryGetCommand.java
@@ -76,4 +76,4 @@ public class HistoryGetCommand implements Action{
}
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeCommand.java
index 2555a59..367011c 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeCommand.java
@@ -42,4 +42,4 @@ public class HistoryMaxsizeCommand implements Action{
return(HistoryCommands.getMaxHistorySize(configPlugin));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeSetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeSetCommand.java
index 960bfd7..5747faf 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeSetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/HistoryMaxsizeSetCommand.java
@@ -47,4 +47,4 @@ public class HistoryMaxsizeSetCommand implements Action{
return(HistoryCommands.setMaxHistorySize(configPlugin, maxSize));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/InfoCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/InfoCommand.java
index 94d7278..3f776ae 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/InfoCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/InfoCommand.java
@@ -41,4 +41,4 @@ public class InfoCommand implements Action {
return(ConfigCommands.getInfo(configPlugin));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/OSGIConfigCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/OSGIConfigCommand.java
index 334c31f..ce77961 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/OSGIConfigCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/OSGIConfigCommand.java
@@ -51,4 +51,4 @@ public class OSGIConfigCommand implements Action{
return(ConfigCommands.readOSGIConfiguration(configPlugin, pid,
section));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicyGetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicyGetCommand.java
index 107f30b..074e594 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicyGetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicyGetCommand.java
@@ -42,4 +42,4 @@ public class PolicyGetCommand implements Action{
return(ConfigCommands.getDefaultOpPolicy(configPlugin));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
index cb67a3d..52ca7b2 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
@@ -71,4 +71,4 @@ public class PolicySetCommand implements Action{
}
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesCommand.java
index 5a2dcc5..ee120e9 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesCommand.java
@@ -44,4 +44,4 @@ public class PropagateUpdatesCommand implements Action{
return(configPlugin.isAutoUpdateEnabled());
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
index c018204..0fbd91b 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
@@ -49,4 +49,4 @@ public class PropagateUpdatesSetCommand implements Action{
return(ConfigCommands.setAutoUpdateEnabled(configPlugin, enabled));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertyGetCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertyGetCommand.java
index d141d8e..9284344 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertyGetCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertyGetCommand.java
@@ -49,4 +49,4 @@ public class PropertyGetCommand implements Action{
return(ConfigCommands.getProperty(propertysource, key, extended));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
index 4dea80b..b24bca8 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourceCommand.java
@@ -41,4 +41,4 @@ public class PropertySourceCommand implements Action{
return(ConfigCommands.getPropertySource(propertysource));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
index b2167f4..e8c90dd 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropertySourcesCommand.java
@@ -36,4 +36,4 @@ public class PropertySourcesCommand implements Action{
return(ConfigCommands.getPropertySourceOverview());
}
-}
\ No newline at end of file
+}
diff --git
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/TamayaConfigCommand.java
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/TamayaConfigCommand.java
index 8b673b7..bf7e0de 100644
---
a/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/TamayaConfigCommand.java
+++
b/modules/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/TamayaConfigCommand.java
@@ -53,4 +53,4 @@ public class TamayaConfigCommand implements Action{
return(ConfigCommands.readTamayaConfig(section, null));
}
-}
\ No newline at end of file
+}
diff --git
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
index cad5499..1f43f61 100644
---
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
+++
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
@@ -20,7 +20,11 @@ package org.apache.tamaya.resolver.internal;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
-import org.apache.tamaya.spi.*;
+import org.apache.tamaya.spi.ClassloaderAware;
+import org.apache.tamaya.spi.FilterContext;
+import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spi.ServiceContextManager;
import javax.annotation.Priority;
import java.util.Objects;
diff --git
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java
index 9837c81..e5612b7 100644
---
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java
+++
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java
@@ -44,7 +44,7 @@ import org.apache.tamaya.spi.ServiceContextManager;
@Priority(400)
public final class FileResolver implements ExpressionResolver {
- /**
+ /**
* The looger used.
*/
private final Logger LOG = Logger.getLogger(FileResolver.class.getName());
@@ -81,7 +81,7 @@ public final class FileResolver implements ExpressionResolver
{
}
try {
- byte[] encoded = Files.readAllBytes(Paths.get(url.toURI()));
+ byte[] encoded = Files.readAllBytes(Paths.get(url.toURI()));
return new String(encoded, UTF_8);
} catch (Exception e) {
LOG.log(Level.FINEST, "Could not resolve URL: " + expression, e);
diff --git
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/URLResolver.java
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/URLResolver.java
index 32195f8..0dd8c6a 100644
---
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/URLResolver.java
+++
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/URLResolver.java
@@ -48,8 +48,7 @@ public final class URLResolver implements ExpressionResolver {
try {
URL url = new URL(expression);
try (InputStreamReader inputStreamReader = new
InputStreamReader(url.openStream(), UTF_8);
- BufferedReader bufferedReader = new
BufferedReader(inputStreamReader))
- {
+ BufferedReader bufferedReader = new
BufferedReader(inputStreamReader)) {
StringBuilder builder = new StringBuilder();
String inputLine;
while ((inputLine = bufferedReader.readLine()) != null) {
diff --git
a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
index 096dce7..17ab352 100644
---
a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
+++
b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
@@ -120,11 +120,10 @@ public abstract class AbstractPathPropertySourceProvider
implements PropertySour
*/
public static PropertySource createPropertiesPropertySource(URL url) {
Properties props = new Properties();
- try (InputStream is = url.openStream()){
+ try (InputStream is = url.openStream()) {
props.load(is);
return new PropertiesBasedPropertySource(url.toString(), props);
- }
- catch (Exception e){
+ } catch (Exception e) {
LOG.log(Level.WARNING, "Failed to read properties from " + url, e);
return null;
}
diff --git a/pom.xml b/pom.xml
index 1e8e2b7..c67740b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,6 @@ under the License.
</executions>
<configuration>
<logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>false</failOnViolation>
<configLocation>buildtools/src/main/resources/checkstyle/style.xml</configLocation>
</configuration>
