You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/01/10 02:14:55 UTC
[3/3] incubator-tamaya git commit: Fixed further issues from quality
gates.
Fixed further issues from quality gates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/e094b569
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/e094b569
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/e094b569
Branch: refs/heads/master
Commit: e094b5693955c2c74a3474c5593a4ebea595e7c8
Parents: 6f1aa48
Author: anatole <an...@apache.org>
Authored: Sun Jan 10 02:14:41 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Sun Jan 10 02:14:41 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/TypeLiteral.java | 6 +-
.../apache/tamaya/spi/ConfigurationContext.java | 2 +-
.../apache/tamaya/spi/ConversionContext.java | 14 ++--
.../org/apache/tamaya/spi/PropertySource.java | 2 +-
.../spi/PropertyValueCombinationPolicy.java | 2 +-
.../org/apache/tamaya/ConfigurationTest.java | 10 +--
.../java/org/apache/tamaya/TypeLiteralTest.java | 4 +-
.../apache/tamaya/spi/ServiceContextTest.java | 2 +-
.../internal/DefaultConfigurationContext.java | 2 +-
.../DefaultConfigurationContextBuilder.java | 6 +-
.../internal/DefaultConfigurationProvider.java | 5 +-
.../core/internal/OSGIServiceContext.java | 2 +-
.../tamaya/core/internal/OSGIServiceLoader.java | 13 ++-
.../core/internal/PropertyConverterManager.java | 15 ++--
.../converters/BigDecimalConverter.java | 2 +-
.../converters/BigIntegerConverter.java | 2 +-
.../internal/converters/BooleanConverter.java | 2 +-
.../core/internal/converters/ByteConverter.java | 2 +-
.../internal/converters/ClassConverter.java | 2 +-
.../internal/converters/DoubleConverter.java | 2 +-
.../core/internal/converters/EnumConverter.java | 2 +-
.../internal/converters/FloatConverter.java | 2 +-
.../internal/converters/NumberConverter.java | 2 +-
.../core/internal/converters/URIConverter.java | 2 +-
.../core/internal/converters/URLConverter.java | 2 +-
.../java/org/apache/tamaya/core/internal/A.java | 2 +-
.../java/org/apache/tamaya/core/internal/C.java | 2 +-
.../internal/DefaultServiceContextTest.java | 8 +-
.../internal/PropertyConverterManagerTest.java | 6 +-
.../converters/BooleanConverterTest.java | 20 ++---
.../internal/converters/EnumConverterTest.java | 4 +-
.../converters/NumberConverterTest.java | 2 +-
.../EnvironmentPropertySourceTest.java | 2 +-
.../PropertiesFilePropertySourceTest.java | 4 +-
.../SystemPropertySourceTest.java | 2 +-
code/pom.xml | 1 -
.../tamaya/examples/resolver/ExampleMain.java | 2 +-
.../fileobserver/ObservedConfigExampleTest.java | 3 -
.../remote/client/PrintConfigServlet.java | 4 +-
.../remote/client/RemotePropertySource.java | 2 +-
examples/8-remote-example/pom.xml | 10 ---
examples/8-remote-example/server/pom.xml | 11 +--
.../tamaya/builder/ConfigurationBuilder.java | 5 +-
.../ProgrammaticConfigurationContext.java | 8 +-
.../tamaya/builder/PropertySourceBuilder.java | 4 +-
.../tamaya/builder/SimplePropertySource.java | 4 +-
.../AbstractClassloaderAwareItemLoader.java | 4 +-
.../clsupport/CLAwareConfigurationContext.java | 2 +-
.../tamaya/clsupport/ServiceContainer.java | 15 ++--
.../org/apache/tamaya/events/ChangeType.java | 5 +-
.../tamaya/events/ConfigEventManager.java | 2 +-
.../tamaya/events/ConfigurationChange.java | 4 +-
.../events/ConfigurationChangeBuilder.java | 6 +-
.../events/ConfigurationContextChange.java | 4 +-
.../ConfigurationContextChangeBuilder.java | 2 +-
.../tamaya/events/FrozenPropertySource.java | 4 +-
.../tamaya/events/PropertySourceChange.java | 6 +-
.../events/PropertySourceChangeBuilder.java | 6 +-
.../folderobserver/FileChangeListener.java | 6 +-
.../ObservingPropertySourceProvider.java | 4 +-
.../internal/DefaultConfigChangeObserver.java | 6 +-
.../internal/DefaultConfigEventManagerSpi.java | 10 +--
.../tamaya/events/spi/BaseConfigEvent.java | 6 +-
.../events/ChangeableGlobalPropertySource.java | 2 +-
.../ChangeableThreadLocalPropertySource.java | 2 +-
.../DefaultConfigEventManagerSpiTest.java | 2 +-
.../BaseFormatPropertySourceProvider.java | 8 +-
.../apache/tamaya/format/ConfigurationData.java | 4 +-
.../tamaya/format/ConfigurationDataBuilder.java | 8 +-
.../format/FlattenedDefaultPropertySource.java | 4 +-
.../tamaya/format/InputStreamFactoryTest.java | 2 +-
.../tamaya/functions/CombinedConfiguration.java | 4 +-
.../functions/ConfigWrappingPropertySource.java | 6 +-
.../functions/ConfigurationFunctions.java | 3 +-
.../tamaya/functions/EnrichedConfiguration.java | 12 +--
.../functions/EnrichedPropertySource.java | 12 +--
.../tamaya/functions/FilteredConfiguration.java | 2 +-
.../functions/FilteredPropertySource.java | 4 +-
.../tamaya/functions/MappedPropertySource.java | 4 +-
.../functions/ValueMappedPropertySource.java | 8 +-
.../apache/tamaya/functions/package-info.java | 2 +-
.../functions/ConfigurationFunctionsTest.java | 42 +++++-----
.../functions/PropertySourceFunctionsTest.java | 26 +++---
.../tamaya/inject/api/InjectionUtils.java | 2 +-
.../tamaya/inject/spi/ConfiguredMethod.java | 2 +-
.../tamaya/inject/spi/ConfiguredType.java | 4 +-
modules/injection/pom.xml | 5 --
.../ConfigTemplateInvocationHandler.java | 2 +-
.../inject/internal/ConfiguredFieldImpl.java | 2 +-
.../inject/internal/ConfiguredSetterMethod.java | 2 +-
.../inject/internal/ConfiguredTypeImpl.java | 6 +-
.../internal/DefaultConfigurationInjector.java | 2 +-
.../inject/internal/DefaultDynamicValue.java | 18 ++---
.../tamaya/inject/internal/InjectionHelper.java | 2 +-
.../camel/TamayaPropertiesComponent.java | 7 +-
.../cdi/internal/CDIAwareServiceContext.java | 2 +-
.../internal/DefaultConfigurationContext.java | 3 +-
.../DefaultConfigurationContextBuilder.java | 6 +-
.../integration/cdi/internal/EnumConverter.java | 2 +-
.../cdi/internal/PropertyConverterManager.java | 8 +-
.../integration/cdi/CDIConfiguredField.java | 2 +-
.../integration/cdi/CDIConfiguredMethod.java | 4 +-
.../integration/cdi/CDIConfiguredType.java | 8 +-
.../integration/cdi/ConfigurationExtension.java | 4 +-
.../integration/cdi/DefaultDynamicValue.java | 18 ++---
.../org/apache/tamaya/etcd/EtcdAccessor.java | 24 +++---
.../apache/tamaya/etcd/EtcdPropertySource.java | 6 +-
.../tamaya/etcd/EtcdPropertySourceTest.java | 2 +-
.../tamaya/integration/osgi/Activator.java | 7 +-
.../osgi/OSGIEnhancedConfiguration.java | 4 +-
.../integration/osgi/TamayaConfigAdminImpl.java | 2 +-
.../osgi/TamayaConfigurationImpl.java | 2 -
.../integration/osgi/TestConfigIntegration.java | 1 +
.../integration/spring/SpringConfigTest2.java | 1 -
modules/json/pom.xml | 2 +-
.../java/org/apache/tamaya/json/JSONFormat.java | 4 +-
.../apache/tamaya/json/JSONPropertySource.java | 8 +-
.../org/apache/tamaya/json/JSONVisitor.java | 4 +-
.../org/apache/tamaya/json/JSONFormatTest.java | 2 +-
.../tamaya/json/JSONPropertySourceTest.java | 3 +-
.../management/internal/ManagedConfigTest.java | 2 +-
.../apache/tamaya/model/ValidationResult.java | 6 +-
.../ConfiguredInlineModelProviderSpi.java | 2 +-
.../ConfiguredPropertiesModelProviderSpi.java | 2 +-
.../ConfiguredResourcesModelProviderSpi.java | 12 +--
.../ConfiguredTypeEventsModelPopulator.java | 2 +-
.../apache/tamaya/model/spi/AbstractModel.java | 6 +-
.../tamaya/model/spi/AreaConfigModel.java | 8 +-
.../model/spi/ConfigDocumentationMBean.java | 10 +--
.../tamaya/model/spi/ConfigModelGroup.java | 10 +--
.../apache/tamaya/model/spi/ParameterModel.java | 10 +--
.../internal/ConfigDocumentationBeanTest.java | 2 +-
.../tamaya/optional/OptionalConfiguration.java | 2 +-
.../internal/DefaultExpressionEvaluator.java | 2 +-
.../internal/ExpressionResolutionFilter.java | 2 +-
.../tamaya/resolver/internal/FileResolver.java | 4 +-
.../resolver/internal/ResourceResolver.java | 4 +-
.../tamaya/resolver/spi/ExpressionResolver.java | 2 +-
.../tamaya/resolver/MyTestPropertySource.java | 5 +-
.../AbstractPathPropertySourceProvider.java | 4 +-
.../resource/internal/ClasspathCollector.java | 2 +-
.../tamaya/resource/internal/FileCollector.java | 22 +++--
.../tamaya/resource/internal/Locator.java | 2 +-
.../AbstractPathPropertySourceProviderTest.java | 2 +-
.../internal/DefaultResourceResolverTest.java | 2 +-
.../resource/internal/FileCollectorTest.java | 3 +
.../PathBasedPropertySourceProvider.java | 4 +-
.../server/internal/RestConfigAdminService.java | 2 +-
.../server/internal/RestConfigService.java | 2 +-
.../spisupport/DefaultConfigurationContext.java | 2 +-
.../apache/tamaya/spisupport/EnumConverter.java | 2 +-
.../tamaya/spisupport/MapPropertySource.java | 2 +-
.../PropertiesResourcePropertySource.java | 4 +-
.../spisupport/PropertyConverterManager.java | 14 ++--
readme/ReleaseNotes-0.1-incubating.html | 1 +
.../META-INF/javaconfiguration.properties | 27 ++++---
.../internal/FileProprtyStoreProviderSpi.java | 85 ++++++++++++++++++++
157 files changed, 486 insertions(+), 434 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index 2b387e9..597c27c 100644
--- a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -42,7 +42,7 @@ public class TypeLiteral<T> implements Serializable {
private static final long serialVersionUID = 1L;
private static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
/** The current defined type. */
- private Type definedType;
+ private final Type definedType;
/**
* Constructor.
@@ -113,7 +113,7 @@ public class TypeLiteral<T> implements Serializable {
* @return the actual type represented by this object
*/
public final Class<T> getRawType() {
- Class<T> rawType = null;
+ Class<T> rawType;
if (this.definedType instanceof Class) {
rawType = (Class<T>) this.definedType;
@@ -132,7 +132,7 @@ public class TypeLiteral<T> implements Serializable {
protected Type getDefinedType(Class<?> clazz) {
- Type type = null;
+ Type type;
if (clazz == null) {
throw new RuntimeException("Class parameter clazz can not be null");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index ac4f9cd..f0354af 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -68,7 +68,7 @@ public interface ConfigurationContext {
* This method returns the Map of registered PropertyConverters
* per type.
* The List for each type is ordered via their {@link javax.annotation.Priority} and
- * cladd name. Refer also to {@link #getPropertyConverters()}.
+ * cladd name.
* </p>
*
* <p>A simplified scenario could be like:</p>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
index 037f7aa..73727dd 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
@@ -35,11 +35,11 @@ import java.util.Set;
*/
public class ConversionContext {
- private Configuration configuration;
- private String key;
- private TypeLiteral<?> targetType;
- private AnnotatedElement annotatedElement;
- private List<String> supportedFormats = new ArrayList<>();
+ private final Configuration configuration;
+ private final String key;
+ private final TypeLiteral<?> targetType;
+ private final AnnotatedElement annotatedElement;
+ private final List<String> supportedFormats = new ArrayList<>();
/**
* Private constructor used from builder.
@@ -133,11 +133,11 @@ public class ConversionContext {
/** The accessed key, or null. */
private String key;
/** The target type. */
- private TypeLiteral<?> targetType;
+ private final TypeLiteral<?> targetType;
/** The injection target (only set with injection used). */
private AnnotatedElement annotatedElement;
/** The ordered list of formats tried. */
- private Set<String> supportedFormats = new HashSet<>();
+ private final Set<String> supportedFormats = new HashSet<>();
/**
* Creates a new Builder instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
index f09f41c..2ec280b 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
@@ -47,7 +47,7 @@ public interface PropertySource {
/**
* property name to override default tamaya ordinals
*/
- static final String TAMAYA_ORDINAL = "tamaya.ordinal";
+ String TAMAYA_ORDINAL = "tamaya.ordinal";
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/main/java/org/apache/tamaya/spi/PropertyValueCombinationPolicy.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValueCombinationPolicy.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValueCombinationPolicy.java
index dbda457..45292fc 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValueCombinationPolicy.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValueCombinationPolicy.java
@@ -31,7 +31,7 @@ public interface PropertyValueCombinationPolicy {
* Default overriding collector, where each existing entry ({@code current} is overridden by a subsequent non-null
* entry evaluated by {@code propertySource.get(key)}.
*/
- public static final PropertyValueCombinationPolicy DEFAULT_OVERRIDING_COLLECTOR = new PropertyValueCombinationPolicy(){
+ PropertyValueCombinationPolicy DEFAULT_OVERRIDING_COLLECTOR = new PropertyValueCombinationPolicy(){
@Override
public String collect(String currentValue, String key, PropertySource propertySource) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
index 11a16b9..0c33cd9 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
@@ -32,10 +32,10 @@ public class ConfigurationTest {
assertEquals(Boolean.TRUE, ConfigurationProvider.getConfiguration().get("booleanTrue", Boolean.class));
assertEquals(Boolean.FALSE, ConfigurationProvider.getConfiguration().get("booleanFalse", Boolean.class));
assertEquals((int)Byte.MAX_VALUE, (int)ConfigurationProvider.getConfiguration().get("byte", Byte.class));
- assertEquals((int)Integer.MAX_VALUE, (int)ConfigurationProvider.getConfiguration().get("int", Integer.class));
- assertEquals((long)Long.MAX_VALUE, (long)ConfigurationProvider.getConfiguration().get("long", Long.class));
- assertEquals((double)Float.MAX_VALUE, (double)ConfigurationProvider.getConfiguration().get("float", Float.class), 0.0d);
- assertEquals((double)Double.MAX_VALUE, (double)ConfigurationProvider.getConfiguration().get("double", Double.class), 0.0d);
+ assertEquals(Integer.MAX_VALUE, (int)ConfigurationProvider.getConfiguration().get("int", Integer.class));
+ assertEquals(Long.MAX_VALUE, (long)ConfigurationProvider.getConfiguration().get("long", Long.class));
+ assertEquals(Float.MAX_VALUE, (double)ConfigurationProvider.getConfiguration().get("float", Float.class), 0.0d);
+ assertEquals(Double.MAX_VALUE, ConfigurationProvider.getConfiguration().get("double", Double.class), 0.0d);
}
@Test
@@ -57,7 +57,7 @@ public class ConfigurationTest {
@Test
public void testGetDouble() throws Exception {
- assertEquals(Double.MAX_VALUE,(double) ConfigurationProvider.getConfiguration().get("double", Double.class), 0.0d);
+ assertEquals(Double.MAX_VALUE,ConfigurationProvider.getConfiguration().get("double", Double.class), 0.0d);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java b/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
index 51edae9..ce130c9 100644
--- a/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
@@ -39,7 +39,7 @@ public class TypeLiteralTest {
@Test
public void test_of(){
- class MyListClass extends ArrayList<String>{};
+ class MyListClass extends ArrayList<String>{}
TypeLiteral<MyListClass> listTypeLiteral = TypeLiteral.of(MyListClass.class);
assertEquals(MyListClass.class, listTypeLiteral.getRawType());
assertEquals(MyListClass.class, listTypeLiteral.getType());
@@ -54,7 +54,7 @@ public class TypeLiteralTest {
@Test
public void test_getGenericInterfaceTypeParameter(){
- class MyListClass extends ArrayList<String> implements List<String>{};
+ class MyListClass extends ArrayList<String> implements List<String>{}
assertEquals(String.class, TypeLiteral.getGenericInterfaceTypeParameters(MyListClass.class, List.class)[0]);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java b/code/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
index e8c7f90..dc544ed 100644
--- a/code/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
public class ServiceContextTest {
- private ServiceContext serviceContext = new ServiceContext(){
+ private final ServiceContext serviceContext = new ServiceContext(){
@Override
public int ordinal() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index ac68a73..b0533b0 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -51,7 +51,7 @@ public class DefaultConfigurationContext implements ConfigurationContext {
/**
* Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
*/
- private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
+ private final PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
/**
* The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertySource} instances.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
index 2c44689..944a1e0 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
@@ -40,9 +40,9 @@ import java.util.Objects;
*/
public class DefaultConfigurationContextBuilder implements ConfigurationContextBuilder {
- Map<String, PropertySource> propertySources = new HashMap<>();
- List<PropertyFilter> propertyFilters = new ArrayList<>();
- Map<TypeLiteral<?>, List<PropertyConverter<?>>> propertyConverters = new HashMap<>();
+ final Map<String, PropertySource> propertySources = new HashMap<>();
+ final List<PropertyFilter> propertyFilters = new ArrayList<>();
+ final Map<TypeLiteral<?>, List<PropertyConverter<?>>> propertyConverters = new HashMap<>();
PropertyValueCombinationPolicy combinationPolicy;
public DefaultConfigurationContextBuilder(){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
index 2dc15bd..4330b7e 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
@@ -46,10 +46,7 @@ public class DefaultConfigurationProvider implements ConfigurationProviderSpi {
@Override
public ConfigurationContextBuilder getConfigurationContextBuilder() {
- ConfigurationContextBuilder contextBuilder =
- ServiceContextManager.getServiceContext().getService(ConfigurationContextBuilder.class);
-
- return contextBuilder;
+ return ServiceContextManager.getServiceContext().getService(ConfigurationContextBuilder.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceContext.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceContext.java b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceContext.java
index 083cd54..4cc6749 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceContext.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceContext.java
@@ -36,7 +36,7 @@ public class OSGIServiceContext implements ServiceContext{
private static final OSGIServiceComparator REF_COMPARATOR = new OSGIServiceComparator();
- private BundleContext bundleContext;
+ private final BundleContext bundleContext;
public OSGIServiceContext(BundleContext bundleContext){
this.bundleContext = Objects.requireNonNull(bundleContext);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
index dcc702f..7cd98d2 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/OSGIServiceLoader.java
@@ -90,16 +90,16 @@ public class OSGIServiceLoader implements BundleListener {
if (implClassName.length() > 0) {
try {
// Load the service class
- Class<?> implClass = (Class<?>) bundle.loadClass(implClassName);
- if (serviceClass.isAssignableFrom(implClass) == false) {
+ Class<?> implClass = bundle.loadClass(implClassName);
+ if (!serviceClass.isAssignableFrom(implClass)) {
log.warning("Configured service: " + implClassName + " is not assignble to " +
serviceClass.getName());
continue;
}
// Provide service properties
- Hashtable<String, String> props = new Hashtable<String, String>();
+ Hashtable<String, String> props = new Hashtable<>();
props.put(Constants.VERSION_ATTRIBUTE, bundle.getVersion().toString());
- String vendor = (String) bundle.getHeaders().get(Constants.BUNDLE_VENDOR);
+ String vendor = bundle.getHeaders().get(Constants.BUNDLE_VENDOR);
props.put(Constants.SERVICE_VENDOR, (vendor != null ? vendor : "anonymous"));
// Translate annotated @Priority into a service ranking
props.put(Constants.SERVICE_RANKING,
@@ -133,7 +133,7 @@ public class OSGIServiceLoader implements BundleListener {
*/
static class JDKUtilServiceFactory implements ServiceFactory
{
- private Class<?> serviceClass;
+ private final Class<?> serviceClass;
public JDKUtilServiceFactory(Class<?> serviceClass) {
this.serviceClass = serviceClass;
@@ -142,8 +142,7 @@ public class OSGIServiceLoader implements BundleListener {
@Override
public Object getService(Bundle bundle, ServiceRegistration registration) {
try {
- Object serviceInstance = serviceClass.newInstance();
- return serviceInstance;
+ return serviceClass.newInstance();
}
catch (Exception ex) {
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index 038bccc..eb18cfb 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -57,15 +57,15 @@ public class PropertyConverterManager {
/**
* The registered converters.
*/
- private Map<TypeLiteral<?>, List<PropertyConverter<?>>> converters = new ConcurrentHashMap<>();
+ private final Map<TypeLiteral<?>, List<PropertyConverter<?>>> converters = new ConcurrentHashMap<>();
/**
* The transitive converters.
*/
- private Map<TypeLiteral<?>, List<PropertyConverter<?>>> transitiveConverters = new ConcurrentHashMap<>();
+ private final Map<TypeLiteral<?>, List<PropertyConverter<?>>> transitiveConverters = new ConcurrentHashMap<>();
/**
* The lock used.
*/
- private ReadWriteLock lock = new ReentrantReadWriteLock();
+ private final ReadWriteLock lock = new ReentrantReadWriteLock();
private static final Comparator<Object> PRIORITY_COMPARATOR = new Comparator<Object>() {
@@ -171,10 +171,7 @@ public class PropertyConverterManager {
* @return true, if a converter for the given type is registered, or a default one can be created.
*/
public boolean isTargetTypeSupported(TypeLiteral<?> targetType) {
- if (converters.containsKey(targetType) || transitiveConverters.containsKey(targetType)) {
- return true;
- }
- return createDefaultPropertyConverter(targetType) != null;
+ return converters.containsKey(targetType) || transitiveConverters.containsKey(targetType) || createDefaultPropertyConverter(targetType) != null;
}
/**
@@ -413,8 +410,8 @@ public class PropertyConverterManager {
private static class DefaultPropertyConverter<T> implements PropertyConverter<T> {
- private Method factoryMethod;
- private Class<T> targetType;
+ private final Method factoryMethod;
+ private final Class<T> targetType;
DefaultPropertyConverter(Method factoryMethod, Class<T> targetType){
this.factoryMethod = Objects.requireNonNull(factoryMethod);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
index 7057e73..2c17214 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
@@ -41,7 +41,7 @@ public class BigDecimalConverter implements PropertyConverter<BigDecimal>{
/** The logger. */
private static final Logger LOG = Logger.getLogger(BigDecimalConverter.class.getName());
/** Converter to be used if the format is not directly supported by BigDecimal, e.g. for integral hex values. */
- private BigIntegerConverter integerConverter = new BigIntegerConverter();
+ private final BigIntegerConverter integerConverter = new BigIntegerConverter();
@Override
public BigDecimal convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
index 57ff2fb..a5a32b3 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
@@ -42,7 +42,7 @@ public class BigIntegerConverter implements PropertyConverter<BigInteger>{
/** The logger. */
private static final Logger LOG = Logger.getLogger(BigIntegerConverter.class.getName());
/** Converter used to decode hex, octal values. */
- private ByteConverter byteConverter = new ByteConverter();
+ private final ByteConverter byteConverter = new ByteConverter();
@Override
public BigInteger convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
index d0f596d..93b1da3 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
*/
public class BooleanConverter implements PropertyConverter<Boolean> {
- private Logger LOG = Logger.getLogger(getClass().getName());
+ private final Logger LOG = Logger.getLogger(getClass().getName());
@Override
public Boolean convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
index ed193d8..fc2bf9d 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
@@ -45,7 +45,7 @@ import java.util.logging.Logger;
*/
public class ByteConverter implements PropertyConverter<Byte>{
- private Logger LOG = Logger.getLogger(getClass().getName());
+ private final Logger LOG = Logger.getLogger(getClass().getName());
@Override
public Byte convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
index 8fd3cb8..15e78d2 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
@@ -34,7 +34,7 @@ import java.util.logging.Logger;
*/
public class ClassConverter implements PropertyConverter<Class<?>>{
- private Logger LOG = Logger.getLogger(getClass().getName());
+ private final Logger LOG = Logger.getLogger(getClass().getName());
@Override
public Class<?> convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
index b843d91..791632d 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
@@ -43,7 +43,7 @@ public class DoubleConverter implements PropertyConverter<Double> {
/**
* The converter used, when floating point parse failed.
*/
- private LongConverter integerConverter = new LongConverter();
+ private final LongConverter integerConverter = new LongConverter();
@Override
public Double convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
index 1cf68fe..01c15eb 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
* Converter, converting from String to tge given enum type.
*/
public class EnumConverter<T> implements PropertyConverter<T> {
- private Logger LOG = Logger.getLogger(EnumConverter.class.getName());
+ private final Logger LOG = Logger.getLogger(EnumConverter.class.getName());
private Class<T> enumType;
private Method factory;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
index 1cbb273..d66f1f9 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
@@ -43,7 +43,7 @@ public class FloatConverter implements PropertyConverter<Float> {
/**
* The converter used, when floating point parse failed.
*/
- private IntegerConverter integerConverter = new IntegerConverter();
+ private final IntegerConverter integerConverter = new IntegerConverter();
@Override
public Float convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
index c222090..d267580 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
@@ -40,7 +40,7 @@ public class NumberConverter implements PropertyConverter<Number>{
/** the logger. */
private static final Logger LOGGER = Logger.getLogger(NumberConverter.class.getName());
/** Converter used for trying to parse as an integral value. */
- private LongConverter longConverter = new LongConverter();
+ private final LongConverter longConverter = new LongConverter();
@Override
public Number convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java
index 74b1337..ac30bfc 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URIConverter.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
*/
public class URIConverter implements PropertyConverter<URI> {
- private Logger LOG = Logger.getLogger(getClass().getName());
+ private final Logger LOG = Logger.getLogger(getClass().getName());
@Override
public URI convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
index 4125c8a..9a85a16 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
*/
public class URLConverter implements PropertyConverter<URL> {
- private Logger LOG = Logger.getLogger(getClass().getName());
+ private final Logger LOG = Logger.getLogger(getClass().getName());
@Override
public URL convert(String value, ConversionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/A.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/A.java b/code/core/src/test/java/org/apache/tamaya/core/internal/A.java
index aa77a5d..aaab601 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/A.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/A.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.core.internal;
/**
* Test class for testing transitively evaluated property converters.
*/
-public class A implements AutoCloseable{
+class A implements AutoCloseable{
@Override
public void close() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/C.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/C.java b/code/core/src/test/java/org/apache/tamaya/core/internal/C.java
index aad1ef9..fdd3476 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/C.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/C.java
@@ -26,7 +26,7 @@ import java.nio.CharBuffer;
*/
public class C extends B implements Readable{
- private String inValue;
+ private final String inValue;
public C(String inValue){
this.inValue = inValue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java
index 1d24884..9999a8e 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/DefaultServiceContextTest.java
@@ -32,7 +32,7 @@ public class DefaultServiceContextTest {
/**
* context to test
*/
- private DefaultServiceContext context = new DefaultServiceContext();
+ private final DefaultServiceContext context = new DefaultServiceContext();
@Test
@@ -109,7 +109,7 @@ public class DefaultServiceContextTest {
// some test interfaces and classes
- public static interface InvalidPriorityInterface {
+ public interface InvalidPriorityInterface {
}
@Priority(value = 50)
@@ -121,7 +121,7 @@ public class DefaultServiceContextTest {
}
- public static interface MultiImplsInterface {
+ public interface MultiImplsInterface {
}
public static class MultiImpl1 implements MultiImplsInterface {
@@ -135,6 +135,6 @@ public class DefaultServiceContextTest {
public static class MultiImpl3 implements MultiImplsInterface {
}
- private static interface NoImplInterface {
+ private interface NoImplInterface {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
index 82d834a..ec420f8 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
@@ -34,7 +34,7 @@ import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
public class PropertyConverterManagerTest {
- private ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder(
+ private final ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder(
"someKey", TypeLiteral.of(Object.class)).build();
@Test
@@ -74,7 +74,7 @@ public class PropertyConverterManagerTest {
assertThat(result, notNullValue());
assertThat(result, instanceOf(C.class));
- assertThat(((C)result).getInValue(), equalTo("testDirectConverterMapping"));
+ assertThat((result).getInValue(), equalTo("testDirectConverterMapping"));
}
@Test
@@ -160,7 +160,7 @@ public class PropertyConverterManagerTest {
}
public static class MyType {
- private String typeValue;
+ private final String typeValue;
private MyType(String value) {
typeValue = value;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
index c3b3f96..ac75c34 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
@@ -74,34 +74,34 @@ public class BooleanConverterTest {
// falses
valueRead = config.get("tests.converter.boolean.n1", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.n2", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.no1", Boolean.class);
assertFalse(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.no2", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.no3", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.false1", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.false2", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.false3", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.f1", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.f2", Boolean.class);
assertNotNull(valueRead);
- assertFalse(valueRead.booleanValue());
+ assertFalse(valueRead);
valueRead = config.get("tests.converter.boolean.foo", Boolean.class);
assertNull(valueRead);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java
index 208baa0..915ead9 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/EnumConverterTest.java
@@ -33,9 +33,9 @@ import static org.junit.Assert.assertNull;
*/
public class EnumConverterTest {
- private EnumConverter testConverter = new EnumConverter(RoundingMode.class);
+ private final EnumConverter testConverter = new EnumConverter(RoundingMode.class);
- private ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder("someKey", TypeLiteral.of(Enum.class)).build();
+ private final ConversionContext DUMMY_CONTEXT = new ConversionContext.Builder("someKey", TypeLiteral.of(Enum.class)).build();
@Test
public void testConvert() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java
index 25e6fd9..3fa2e58 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/NumberConverterTest.java
@@ -41,7 +41,7 @@ public class NumberConverterTest {
Configuration config = ConfigurationProvider.getConfiguration();
Number valueRead = config.get("tests.converter.bd.decimal", Number.class);
assertTrue(valueRead!=null);
- assertEquals(valueRead, Long.valueOf(101));
+ assertEquals(valueRead, 101L);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/propertysource/EnvironmentPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/propertysource/EnvironmentPropertySourceTest.java b/code/core/src/test/java/org/apache/tamaya/core/propertysource/EnvironmentPropertySourceTest.java
index 280351e..f9feb4b 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/propertysource/EnvironmentPropertySourceTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/propertysource/EnvironmentPropertySourceTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue;
*/
public class EnvironmentPropertySourceTest {
- private EnvironmentPropertySource envPropertySource = new EnvironmentPropertySource();
+ private final EnvironmentPropertySource envPropertySource = new EnvironmentPropertySource();
@Test
public void testGetOrdinal() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/propertysource/PropertiesFilePropertySourceTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/propertysource/PropertiesFilePropertySourceTest.java b/code/core/src/test/java/org/apache/tamaya/core/propertysource/PropertiesFilePropertySourceTest.java
index 36b0f5d..2028ceb 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/propertysource/PropertiesFilePropertySourceTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/propertysource/PropertiesFilePropertySourceTest.java
@@ -25,9 +25,9 @@ import org.junit.Test;
public class PropertiesFilePropertySourceTest {
- private SimplePropertySource testfilePropertySource = new SimplePropertySource(Thread.currentThread()
+ private final SimplePropertySource testfilePropertySource = new SimplePropertySource(Thread.currentThread()
.getContextClassLoader().getResource("testfile.properties"));
- private SimplePropertySource overrideOrdinalPropertySource = new SimplePropertySource(
+ private final SimplePropertySource overrideOrdinalPropertySource = new SimplePropertySource(
Thread.currentThread().getContextClassLoader().getResource("overrideOrdinal.properties"));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/core/src/test/java/org/apache/tamaya/core/propertysource/SystemPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/code/core/src/test/java/org/apache/tamaya/core/propertysource/SystemPropertySourceTest.java b/code/core/src/test/java/org/apache/tamaya/core/propertysource/SystemPropertySourceTest.java
index c627972..f0eaf68 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/propertysource/SystemPropertySourceTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/propertysource/SystemPropertySourceTest.java
@@ -28,7 +28,7 @@ import java.util.Properties;
public class SystemPropertySourceTest {
- private SystemPropertySource testPropertySource = new SystemPropertySource();
+ private final SystemPropertySource testPropertySource = new SystemPropertySource();
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/code/pom.xml
----------------------------------------------------------------------
diff --git a/code/pom.xml b/code/pom.xml
index fe14514..28dfac5 100644
--- a/code/pom.xml
+++ b/code/pom.xml
@@ -28,7 +28,6 @@ under the License.
<version>0.2-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.tamaya</groupId>
<artifactId>code</artifactId>
<packaging>pom</packaging>
<name>Apache Tamaya Codebase</name>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/1-minimal-example/src/main/java/org/apache/tamaya/examples/resolver/ExampleMain.java
----------------------------------------------------------------------
diff --git a/examples/1-minimal-example/src/main/java/org/apache/tamaya/examples/resolver/ExampleMain.java b/examples/1-minimal-example/src/main/java/org/apache/tamaya/examples/resolver/ExampleMain.java
index 2950c10..f98c897 100644
--- a/examples/1-minimal-example/src/main/java/org/apache/tamaya/examples/resolver/ExampleMain.java
+++ b/examples/1-minimal-example/src/main/java/org/apache/tamaya/examples/resolver/ExampleMain.java
@@ -51,7 +51,7 @@ public class ExampleMain {
private static String dump(Map<String, String> properties) {
StringBuilder b = new StringBuilder();
for(Map.Entry<String,String> en: new TreeMap<>(properties).entrySet()) {
- b.append(" " + en.getKey() + " = " + en.getValue() + '\n');
+ b.append(" ").append(en.getKey() ).append(" = ").append(en.getValue()).append('\n');
}
return b.toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
index 4d62760..1e6ed9f 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
@@ -48,9 +48,6 @@ public class ObservedConfigExampleTest {
public void setup() throws IOException {
// create some temporary config
Path tempDir = Files.createTempDirectory("observedFolder");
-
- Path propertyLocation = tempDir;
-
FileUtils.copyInputStreamToFile(
getClass().getResourceAsStream("/test.properties"),
new File(tempDir.toFile(), "test.properties"));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/PrintConfigServlet.java
----------------------------------------------------------------------
diff --git a/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/PrintConfigServlet.java b/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/PrintConfigServlet.java
index 7a69638..d0ff9d1 100644
--- a/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/PrintConfigServlet.java
+++ b/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/PrintConfigServlet.java
@@ -41,12 +41,12 @@ public class PrintConfigServlet extends HttpServlet {
/**
* The client id used.
*/
- private String clientId = Client.getClientId();
+ private final String clientId = Client.getClientId();
/**
* The current info map, containing the clientId. This is passed to be added to the configuration's info section
* when shows.
*/
- private Map<String,String> info = new HashMap<>();
+ private final Map<String,String> info = new HashMap<>();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/RemotePropertySource.java
----------------------------------------------------------------------
diff --git a/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/RemotePropertySource.java b/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/RemotePropertySource.java
index 1d66caa..9990874 100644
--- a/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/RemotePropertySource.java
+++ b/examples/8-remote-example/client/src/main/java/org/apache/tamaya/examples/remote/client/RemotePropertySource.java
@@ -52,7 +52,7 @@ public class RemotePropertySource extends BaseRemotePropertySource{
configServerUrl = "http://localhost:8888/config?scope=CLIENT&scopeId={clientId}&format=application/json";
}
System.out.println("Reading config from " + configServerUrl.replace("{clientId}", Client.getClientId()));
- return Arrays.asList(new URL[]{new URL(configServerUrl.replace("{clientId}", Client.getClientId()))});
+ return Arrays.asList(new URL(configServerUrl.replace("{clientId}", Client.getClientId())));
} catch (MalformedURLException e) {
Logger.getLogger(getClass().getName()).log(Level.WARNING, "Failed to configure remote config location,", e);
return Collections.emptySet();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/8-remote-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/8-remote-example/pom.xml b/examples/8-remote-example/pom.xml
index e80683e..27e44fb 100644
--- a/examples/8-remote-example/pom.xml
+++ b/examples/8-remote-example/pom.xml
@@ -52,16 +52,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-formats</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/examples/8-remote-example/server/pom.xml
----------------------------------------------------------------------
diff --git a/examples/8-remote-example/server/pom.xml b/examples/8-remote-example/server/pom.xml
index c89e79a..1965bd3 100644
--- a/examples/8-remote-example/server/pom.xml
+++ b/examples/8-remote-example/server/pom.xml
@@ -47,16 +47,7 @@ under the License.
<artifactId>tamaya-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-formats</artifactId>
- <version>${project.version}</version>
- </dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
index 5126cea..cd457a1 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
@@ -80,7 +80,7 @@ import static java.lang.String.format;
*/
public class ConfigurationBuilder {
/** Builder used to create new ConfigurationContext instances. */
- private ProgrammaticConfigurationContext.Builder contextBuilder = new ProgrammaticConfigurationContext.Builder();
+ private final ProgrammaticConfigurationContext.Builder contextBuilder = new ProgrammaticConfigurationContext.Builder();
/**
* Flag if the config has already been built.
@@ -113,6 +113,7 @@ public class ConfigurationBuilder {
* Allows to set configuration context during unit tests.
*/
ConfigurationBuilder setConfigurationContext(ConfigurationContext configurationContext) {
+ //noinspection deprecation
contextBuilder.setConfigurationContext(configurationContext);
return this;
}
@@ -487,8 +488,6 @@ public class ConfigurationBuilder {
* Disables the automatic loading of all {@link org.apache.tamaya.spi.PropertyFilter}
* service providers.
*
- * @return the builder instance currently used
- *
* @see org.apache.tamaya.spi.PropertyFilter
* @see #enabledProvidedPropertyFilters()
* @see #addPropertyFilters(org.apache.tamaya.spi.PropertyFilter...)
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
index b3a1c3f..68e770d 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
@@ -76,7 +76,7 @@ class ProgrammaticConfigurationContext implements ConfigurationContext {
/**
* Lock for internal synchronization.
*/
- private ReadWriteLock propertySourceLock = new ReentrantReadWriteLock();
+ private final ReadWriteLock propertySourceLock = new ReentrantReadWriteLock();
/**
@@ -256,14 +256,14 @@ class ProgrammaticConfigurationContext implements ConfigurationContext {
/**
* The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertySource} instances.
*/
- private List<PropertySource> propertySources = new ArrayList<>();
+ private final List<PropertySource> propertySources = new ArrayList<>();
/**
* The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertyFilter} instances.
*/
- private List<PropertyFilter> propertyFilters = new ArrayList<>();
+ private final List<PropertyFilter> propertyFilters = new ArrayList<>();
- private Map<TypeLiteral<?>, List<PropertyConverter<?>>> propertyConverters = new HashMap<>();
+ private final Map<TypeLiteral<?>, List<PropertyConverter<?>>> propertyConverters = new HashMap<>();
/**
* The overriding policy used when combining PropertySources registered to evalute the final configuration
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
index e298939..481a80c 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
@@ -31,9 +31,9 @@ public final class PropertySourceBuilder {
/** The ordinal to be used. */
private int ordinal;
/** The name to be used. */
- private String name;
+ private final String name;
/** The properties. */
- private Map<String,String> properties = new HashMap<>();
+ private final Map<String,String> properties = new HashMap<>();
/** private constructor. */
private PropertySourceBuilder(String name){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java b/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
index f39a0cc..0d5561e 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
@@ -31,9 +31,9 @@ import java.util.logging.Logger;
*/
public class SimplePropertySource implements PropertySource {
/** The properties. */
- private Map<String, String> properties;
+ private final Map<String, String> properties;
/** The source's name. */
- private String name;
+ private final String name;
public SimplePropertySource(String name, Map<String, String> properties){
this.properties = new HashMap<>(properties);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/AbstractClassloaderAwareItemLoader.java
----------------------------------------------------------------------
diff --git a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/AbstractClassloaderAwareItemLoader.java b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/AbstractClassloaderAwareItemLoader.java
index 775d778..0145d1f 100644
--- a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/AbstractClassloaderAwareItemLoader.java
+++ b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/AbstractClassloaderAwareItemLoader.java
@@ -49,7 +49,7 @@ public abstract class AbstractClassloaderAwareItemLoader<T> {
/**
* The items managed, related to their classloader.
*/
- private Map<String, T> items = new ConcurrentHashMap<>();
+ private final Map<String, T> items = new ConcurrentHashMap<>();
/**
* Creates a new instance, using the current Thread context classloader, or - if null - the classloader that
@@ -115,7 +115,7 @@ public abstract class AbstractClassloaderAwareItemLoader<T> {
* Creates a new item for being stored linked with the given lassloader.
*
* @param classLoader the classloader, not null.
- * @return
+ * @return the new item loaded.
*/
protected abstract T createItem(ClassLoader classLoader);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/CLAwareConfigurationContext.java
----------------------------------------------------------------------
diff --git a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/CLAwareConfigurationContext.java b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/CLAwareConfigurationContext.java
index 47b78b2..94e5fb5 100644
--- a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/CLAwareConfigurationContext.java
+++ b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/CLAwareConfigurationContext.java
@@ -41,7 +41,7 @@ public class CLAwareConfigurationContext implements ConfigurationContext {
/** The logger used. */
private final static Logger LOG = Logger.getLogger(CLAwareConfigurationContext.class.getName());
- private ContextManager contextManager = new ContextManager();
+ private final ContextManager contextManager = new ContextManager();
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/ServiceContainer.java
----------------------------------------------------------------------
diff --git a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/ServiceContainer.java b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/ServiceContainer.java
index 1eea749..23e73c0 100644
--- a/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/ServiceContainer.java
+++ b/modules/classloader-support/src/main/java/org/apache/tamaya/clsupport/ServiceContainer.java
@@ -39,7 +39,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Created by Anatole on 08.09.2015.
+ * Classloader managed ServiceContainer.
*/
class ServiceContainer {
@@ -50,7 +50,7 @@ class ServiceContainer {
// The access control context taken when the ServiceLoader is created
private final AccessControlContext acc;
- private WeakReference<ClassLoader> classLoaderRef;
+ private final WeakReference<ClassLoader> classLoaderRef;
/**
* List current services loaded using this classloader, per class.
@@ -82,7 +82,7 @@ class ServiceContainer {
public <T> void loadServices(Class<?> type,
Collection<ServiceContainer> preceedingContainers) {
- Map<String, Object> services = (Map<String, Object>) this.servicesLoaded.get(type);
+ Map<String, Object> services = this.servicesLoaded.get(type);
if (services == null) {
services = new LinkedHashMap<>();
this.servicesLoaded.put(type, services);
@@ -100,7 +100,6 @@ class ServiceContainer {
for (ServiceContainer cont : preceedingContainers) {
if (cont.containsService(type, s)) {
LOG.finest("Ignoring duplicate service: " + s);
- continue;
}
}
LOG.info("Loading component: " + s);
@@ -133,10 +132,7 @@ class ServiceContainer {
private boolean containsService(Class<?> type, String serviceClassName) {
Map<String, Object> services = servicesLoaded.get(type);
- if (services == null) {
- return false;
- }
- return services.containsKey(serviceClassName);
+ return services != null && services.containsKey(serviceClassName);
}
@@ -154,8 +150,7 @@ class ServiceContainer {
"Provider " + className + " not a subtype");
}
try {
- S p = serviceType.cast(c.newInstance());
- return p;
+ return serviceType.cast(c.newInstance());
} catch (Throwable x) {
fail(serviceType,
"Provider " + className + " could not be instantiated",
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ChangeType.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ChangeType.java b/modules/events/src/main/java/org/apache/tamaya/events/ChangeType.java
index 4363579..2059017 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ChangeType.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ChangeType.java
@@ -19,10 +19,13 @@
package org.apache.tamaya.events;
/**
- * Created by Anatole on 20.02.2015.
+ * Enum describing the type of configuration change.
*/
public enum ChangeType {
+ /** Configuration hase been added. */
NEW,
+ /** Configuration hase been removed. */
DELETED,
+ /** Configuration hase been changed. */
UPDATED,
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
----------------------------------------------------------------------
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 f0bd0fa..6b206c8 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
@@ -166,7 +166,7 @@ public final class ConfigEventManager {
/**
* Sets the current monitoring period and restarts the monitor. You still have to enable the monitor if
* it is currently not enabled.
- * @param millis
+ * @param millis the monitoring period in ms.
* @see #enableChangeMonitoring(boolean)
* @see #isChangeMonitoring()
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChange.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChange.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChange.java
index 0366556..c31cda2 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChange.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChange.java
@@ -39,13 +39,13 @@ public final class ConfigurationChange implements ConfigEvent<Configuration>, Se
private static final long serialVersionUID = 1L;
/** The base property provider/configuration. */
- private FrozenConfiguration configuration;
+ private final FrozenConfiguration configuration;
/** The base version, usable for optimistic locking. */
private String version = UUID.randomUUID().toString();
/** The timestamp of the change set in millis from the epoch. */
private long timestamp = System.currentTimeMillis();
/** The recorded changes. */
- private Map<String,PropertyChangeEvent> changes = new HashMap<>();
+ private final Map<String,PropertyChangeEvent> changes = new HashMap<>();
/**
* Get an empty change set for the given provider.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
index 78f60a9..1fd228a 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
@@ -50,7 +50,7 @@ public final class ConfigurationChangeBuilder {
/**
* The underlying configuration/provider.
*/
- Configuration source;
+ final Configuration source;
/**
* The version configured, or null, for generating a default.
*/
@@ -213,7 +213,9 @@ public final class ConfigurationChangeBuilder {
* @return the builder for chaining.
*/
public ConfigurationChangeBuilder putAll(Map<String, String> changes) {
- changes.putAll(changes);
+ for (Map.Entry<String, String> en : changes.entrySet()) {
+ this.delta.put(en.getKey(), new PropertyChangeEvent(this.source, en.getKey(), null, en.getValue()));
+ }
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java
index eda5ab1..8c9ceef 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java
@@ -39,13 +39,13 @@ public final class ConfigurationContextChange implements ConfigEvent<Configurati
private static final long serialVersionUID = 1L;
/** The base property provider/configuration. */
- private List<PropertySourceChange> changedPropertySources = new ArrayList<>();
+ private final List<PropertySourceChange> changedPropertySources = new ArrayList<>();
/** The base version, usable for optimistic locking. */
private String version = UUID.randomUUID().toString();
/** The timestamp of the change set in millis from the epoch. */
private long timestamp = System.currentTimeMillis();
/** The configuration context. */
- private ConfigurationContext configurationContext;
+ private final ConfigurationContext configurationContext;
/**
* Get an empty change set for the given provider.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChangeBuilder.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChangeBuilder.java
index 2341f92..a48107a 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationContextChangeBuilder.java
@@ -52,7 +52,7 @@ public final class ConfigurationContextChangeBuilder {
*/
Long timestamp;
- ConfigurationContext configurationContext;
+ final ConfigurationContext configurationContext;
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java
index 12778be..a8167f2 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java
@@ -34,7 +34,7 @@ public final class FrozenPropertySource implements PropertySource, Serializable
/**
* The ordinal.
*/
- private int ordinal;
+ private final int ordinal;
/**
* The properties read.
*/
@@ -42,7 +42,7 @@ public final class FrozenPropertySource implements PropertySource, Serializable
/**
* The PropertySource's name.
*/
- private String name;
+ private final String name;
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChange.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChange.java b/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChange.java
index a34e949..063612c 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChange.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChange.java
@@ -39,15 +39,15 @@ public final class PropertySourceChange implements ConfigEvent<PropertySource>,
private static final long serialVersionUID = 1L;
/** The base property provider/configuration. */
- private FrozenPropertySource propertySource;
+ private final FrozenPropertySource propertySource;
/** The base version, usable for optimistic locking. */
private String version = UUID.randomUUID().toString();
/** The timestamp of the change set in millis from the epoch. */
private long timestamp = System.currentTimeMillis();
/** The recorded changes. */
- private Map<String,PropertyChangeEvent> changes = new HashMap<>();
+ private final Map<String,PropertyChangeEvent> changes = new HashMap<>();
/** The overall type of change. */
- private ChangeType changeType;
+ private final ChangeType changeType;
/**
* Constructor used by {@link PropertySourceChangeBuilder}.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java
index 25f3620..009cb11 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java
@@ -49,7 +49,7 @@ public final class PropertySourceChangeBuilder {
/**
* The underlying configuration/provider.
*/
- PropertySource source;
+ final PropertySource source;
/**
* The version configured, or null, for generating a default.
*/
@@ -196,7 +196,9 @@ public final class PropertySourceChangeBuilder {
* @return the builder for chaining.
*/
public PropertySourceChangeBuilder putAll(Map<String, String> changes) {
- changes.putAll(changes);
+ for (Map.Entry<String, String> en : this.source.getProperties().entrySet()) {
+ this.delta.put(en.getKey(), new PropertyChangeEvent(this.source, en.getKey(), null, en.getValue()));
+ }
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
index 3427ce8..283719e 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
@@ -45,11 +45,11 @@ class FileChangeListener implements Runnable {
private static final Logger LOGGER = Logger.getLogger(FileChangeListener.class.getName());
- private WatchService watchService;
+ private final WatchService watchService;
- private FileChangeObserver observer;
+ private final FileChangeObserver observer;
- private Path directory;
+ private final Path directory;
private volatile boolean running = true;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
index d8c869f..6082dd0 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
@@ -59,7 +59,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider,
/**
* The thread pool used.
*/
- private ExecutorService executor = Executors.newSingleThreadExecutor();
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
/**
* Constructorm using an explicit directory, ignoring all kind of configuration, if set.
@@ -103,7 +103,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider,
protected Collection<PropertySource> getPropertySources(final Path file) {
return Arrays.asList(new PropertySource[]{new BasePropertySource() {
- private Map<String,String> props = readProperties(file);
+ private final Map<String,String> props = readProperties(file);
@Override
public Map<String, String> getProperties() {
return props;