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:54 UTC
[2/3] incubator-tamaya git commit: Fixed further issues from quality
gates.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
index dfb3816..5cd3f6c 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
@@ -36,7 +36,7 @@ public class DefaultConfigChangeObserver {
private static final Logger LOG = Logger.getLogger(DefaultConfigChangeObserver.class.getName());
- private Timer timer = new Timer("DefaultConfigChangeObserver", true);
+ private final Timer timer = new Timer("DefaultConfigChangeObserver", true);
private long checkPeriod = 2000L;
@@ -63,7 +63,7 @@ public class DefaultConfigChangeObserver {
public void checkConfigurationUpdate() {
LOG.finest("Checking configuration for changes...");
FrozenConfiguration newConfig = FrozenConfiguration.of(ConfigurationProvider.getConfiguration());
- ConfigurationChange changes = null;
+ ConfigurationChange changes;
if(lastConfig==null){
changes = ConfigurationChangeBuilder.of(newConfig).putAll(newConfig.getProperties())
.build();
@@ -92,7 +92,7 @@ public class DefaultConfigChangeObserver {
/**
* Sets the new check period, cancels the currently running timer and schedules a new task with the new checkperiod
* and a startup delay of 500ms.
- * @param checkPeriod
+ * @param checkPeriod the period in ms, for checking on changes.
*/
public void setCheckPeriod(long checkPeriod) {
LOG.finest("Resetting check period to " + checkPeriod + " ms, reregistering timer.");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java
----------------------------------------------------------------------
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 75f2c91..586df5c 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
@@ -38,11 +38,11 @@ public class DefaultConfigEventManagerSpi implements ConfigEventManagerSpi {
private static final Logger LOG = Logger.getLogger(DefaultConfigEventManagerSpi.class.getName());
- private Map<Class,List<ConfigEventListener>> listeners = new ConcurrentHashMap<>();
+ private final Map<Class,List<ConfigEventListener>> listeners = new ConcurrentHashMap<>();
- private ExecutorService publisher = Executors.newCachedThreadPool();
+ private final ExecutorService publisher = Executors.newCachedThreadPool();
- private DefaultConfigChangeObserver changeObserver = new DefaultConfigChangeObserver();
+ private final DefaultConfigChangeObserver changeObserver = new DefaultConfigChangeObserver();
/**
* Constructor. Also loads all registered listeners.
@@ -186,8 +186,8 @@ public class DefaultConfigEventManagerSpi implements ConfigEventManagerSpi {
*/
private static final class PublishConfigChangeTask implements Runnable{
- private ConfigEventListener l;
- private ConfigEvent<?> changes;
+ private final ConfigEventListener l;
+ private final ConfigEvent<?> changes;
public PublishConfigChangeTask(ConfigEventListener l, ConfigEvent<?> changes) {
this.l = Objects.requireNonNull(l);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/main/java/org/apache/tamaya/events/spi/BaseConfigEvent.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/spi/BaseConfigEvent.java b/modules/events/src/main/java/org/apache/tamaya/events/spi/BaseConfigEvent.java
index 15f3dfd..f6856d9 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/spi/BaseConfigEvent.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/spi/BaseConfigEvent.java
@@ -28,10 +28,10 @@ import java.util.UUID;
* @param <T> the vent type
*/
public abstract class BaseConfigEvent<T> implements ConfigEvent<T> {
- private long timestamp = System.currentTimeMillis();
+ protected long timestamp = System.currentTimeMillis();
protected String version = UUID.randomUUID().toString();
- protected T paylod;
- private Class<T> type;
+ protected final T paylod;
+ private final Class<T> type;
public BaseConfigEvent(T paylod, Class<T> type){
this.paylod = Objects.requireNonNull(paylod);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/test/java/org/apache/tamaya/events/ChangeableGlobalPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ChangeableGlobalPropertySource.java b/modules/events/src/test/java/org/apache/tamaya/events/ChangeableGlobalPropertySource.java
index c93b2ca..0384064 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ChangeableGlobalPropertySource.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ChangeableGlobalPropertySource.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class ChangeableGlobalPropertySource extends BasePropertySource{
- private static Map<String,String> STORED_ENTRIES = new ConcurrentHashMap<>();
+ private static final Map<String,String> STORED_ENTRIES = new ConcurrentHashMap<>();
@Override
public String getName() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java b/modules/events/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java
index 759d429..cc6c812 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java
@@ -30,7 +30,7 @@ import java.util.Map;
*/
public class ChangeableThreadLocalPropertySource extends BasePropertySource{
- private static ThreadLocal<Map<String,String>> STORED_ENTRIES = new ThreadLocal<Map<String,String>>(){
+ private static final ThreadLocal<Map<String,String>> STORED_ENTRIES = new ThreadLocal<Map<String,String>>(){
protected Map<String,String> initialValue(){
return new HashMap<>();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/events/src/test/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpiTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpiTest.java b/modules/events/src/test/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpiTest.java
index 55b49dc..d54a66e 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpiTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpiTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
*/
public class DefaultConfigEventManagerSpiTest {
- private DefaultConfigEventManagerSpi spi = new DefaultConfigEventManagerSpi();
+ private final DefaultConfigEventManagerSpi spi = new DefaultConfigEventManagerSpi();
private Object testAddListenerValue;
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
index f5a3457..a474ba8 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
@@ -48,11 +48,11 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
/**
* The config formats supported for the given location/resource paths.
*/
- private List<ConfigurationFormat> configFormats = new ArrayList<>();
+ private final List<ConfigurationFormat> configFormats = new ArrayList<>();
/**
* The paths to be evaluated.
*/
- private Collection<URL> paths = new ArrayList<>();
+ private final Collection<URL> paths = new ArrayList<>();
/**
* Creates a new instance.
@@ -81,7 +81,7 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
}
this.configFormats.addAll(Objects.requireNonNull(formats));
for(String path:paths) {
- Enumeration<URL> urls = null;
+ Enumeration<URL> urls;
try {
urls = cl.getResources(path);
} catch (IOException e) {
@@ -106,7 +106,7 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
ClassLoader classLoader, String... paths) {
this.configFormats.addAll(Objects.requireNonNull(formats));
for(String path:paths) {
- Enumeration<URL> urls = null;
+ Enumeration<URL> urls;
try {
urls = classLoader.getResources(path);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationData.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationData.java b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationData.java
index 4589972..b58d2ab 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationData.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationData.java
@@ -46,9 +46,9 @@ public final class ConfigurationData {
*/
private Map<String, Map<String, String>> namedSections;
/** The format instance used to read this instance. */
- private ConfigurationFormat format;
+ private final ConfigurationFormat format;
/** The resource read. */
- private String resource;
+ private final String resource;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
index 02de604..9c0e41c 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
@@ -27,9 +27,9 @@ import java.util.*;
public final class ConfigurationDataBuilder {
/** The format instance used to read this instance. */
- ConfigurationFormat format;
+ final ConfigurationFormat format;
/** The resource read. */
- String resource;
+ final String resource;
/**
* The properties of the default section (no name).
*/
@@ -104,7 +104,7 @@ public final class ConfigurationDataBuilder {
public ConfigurationDataBuilder addSectionProperty(String section, String key, String value) {
Map<String, String> map = getSections().get(section);
if (map == null) {
- map = new HashMap<String, String>();
+ map = new HashMap<>();
getSections().put(section, map);
}
map.put(key, value);
@@ -131,7 +131,7 @@ public final class ConfigurationDataBuilder {
public ConfigurationDataBuilder addSectionProperties(String section, Map<String, String> properties) {
Map<String, String> map = getSections().get(section);
if (map == null) {
- map = new HashMap<String, String>();
+ map = new HashMap<>();
getSections().put(section, map);
}
map.putAll(properties);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java b/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
index 1eaec9e..4680981 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
@@ -32,8 +32,8 @@ import java.util.logging.Logger;
*/
public class FlattenedDefaultPropertySource implements PropertySource {
private static final Logger LOG = Logger.getLogger(FlattenedDefaultPropertySource.class.getName());
- private Map<String, String> properties;
- private ConfigurationData data;
+ private final Map<String, String> properties;
+ private final ConfigurationData data;
private int defaultOrdinal = 0;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java b/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
index 2d72be8..c05da09 100644
--- a/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
+++ b/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
@@ -99,7 +99,7 @@ public class InputStreamFactoryTest {
@Test
public void callToMarkIsNotForwardedToWrapped() throws IOException {
- ArgumentCaptor<Integer> captor = ArgumentCaptor.forClass(Integer.class);
+// ArgumentCaptor<Integer> captor = ArgumentCaptor.forClass(Integer.class);
InputStream stream = new ByteArrayInputStream(new byte[]{1, 2, 3, 4});
InputStreamFactory closer = new InputStreamFactory(stream);
for (int i = 0; i < 100; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
index 9a63465..543bd1b 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
@@ -33,9 +33,9 @@ import java.util.Map;
*/
class CombinedConfiguration implements Configuration{
/** The name of the new configuration. */
- private String name;
+ private final String name;
/** The configuration's in evaluation order. Instances with higher indices override results with lower ones. */
- private Configuration[] configurations;
+ private final Configuration[] configurations;
/**
* Creates a combined configuration instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigWrappingPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigWrappingPropertySource.java b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigWrappingPropertySource.java
index 2c32c82..0c8f7a6 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigWrappingPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigWrappingPropertySource.java
@@ -29,11 +29,11 @@ import java.util.Objects;
*/
final class ConfigWrappingPropertySource implements PropertySource {
/** The property source name. */
- private String name;
+ private final String name;
/** The ordinal. */
- private int ordinal;
+ private final int ordinal;
/** The wrapped config. */
- private Configuration config;
+ private final Configuration config;
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
index b40d590..57815fe 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
@@ -409,7 +409,8 @@ public final class ConfigurationFunctions {
}
StringBuilder builder = new StringBuilder(400).append("{\n");
for (Map.Entry<String, String> en : props.entrySet()) {
- builder.append(" \"" + escape(en.getKey()) + "\": \"" + escape(en.getValue()) + "\",\n");
+ builder.append(" \"").append(escape(en.getKey())).append("\": \"" )
+ .append(escape(en.getValue())).append("\",\n");
}
if(builder.toString().endsWith(",\n")){
builder.setLength(builder.length()-2);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
----------------------------------------------------------------------
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 d5fb5e5..93eae3a 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
@@ -32,18 +32,18 @@ import java.util.Objects;
*/
class EnrichedConfiguration implements Configuration {
- private Configuration baseConfiguration;
+ private final Configuration baseConfiguration;
- private Map<String, Object> addedProperties = new HashMap<>();
+ private final Map<String, Object> addedProperties = new HashMap<>();
- private boolean overriding;
+ private final boolean overriding;
/**
* Constructor.
*
- * @param configuration
- * @param properties
- * @param overriding
+ * @param configuration the base config, not null.
+ * @param properties the properties to be added, not null.
+ * @param overriding true, if existing keys should be overriden, or config should be extended only.
*/
EnrichedConfiguration(Configuration configuration, Map<String, Object> properties, boolean overriding) {
this.baseConfiguration = Objects.requireNonNull(configuration);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
index 209b670..309424d 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
@@ -29,18 +29,18 @@ import java.util.Objects;
*/
class EnrichedPropertySource implements PropertySource {
- private PropertySource basePropertySource;
+ private final PropertySource basePropertySource;
- private Map<String, String> addedProperties;
+ private final Map<String, String> addedProperties;
- private boolean overriding;
+ private final boolean overriding;
/**
* Constructor.
*
- * @param propertySource
- * @param properties
- * @param overriding
+ * @param propertySource the base property source, not null.
+ * @param properties the properties to be added.
+ * @param overriding flag if existing properties are overridden.
*/
EnrichedPropertySource(PropertySource propertySource, Map<String, String> properties, boolean overriding) {
this.basePropertySource = Objects.requireNonNull(propertySource);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
index da58fa9..2d23450 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
@@ -34,7 +34,7 @@ class FilteredConfiguration implements Configuration {
private final Configuration baseConfiguration;
private final PropertyMatcher matcher;
- private String filterType;
+ private final String filterType;
FilteredConfiguration(Configuration baseConfiguration, PropertyMatcher matcher, String filterType) {
this.baseConfiguration = Objects.requireNonNull(baseConfiguration);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredPropertySource.java b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredPropertySource.java
index ed3a350..657656b 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredPropertySource.java
@@ -29,8 +29,8 @@ import java.util.Objects;
*/
class FilteredPropertySource implements PropertySource {
- private PropertySource baseSource;
- private Predicate<String> filter;
+ private final PropertySource baseSource;
+ private final Predicate<String> filter;
/**
* Creates a new instance
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/MappedPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/MappedPropertySource.java b/modules/functions/src/main/java/org/apache/tamaya/functions/MappedPropertySource.java
index 3668420..79b0844 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/MappedPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/MappedPropertySource.java
@@ -34,11 +34,11 @@ class MappedPropertySource implements PropertySource {
/**
* The mapping operator.
*/
- private KeyMapper keyMapper;
+ private final KeyMapper keyMapper;
/**
* The base configuration.
*/
- private PropertySource propertySource;
+ private final PropertySource propertySource;
/**
* Creates a new instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/ValueMappedPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/ValueMappedPropertySource.java b/modules/functions/src/main/java/org/apache/tamaya/functions/ValueMappedPropertySource.java
index 7f461b8..b0e9db8 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/ValueMappedPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/ValueMappedPropertySource.java
@@ -30,9 +30,9 @@ import java.util.Objects;
*/
class ValueMappedPropertySource implements PropertySource{
- private String name;
- private PropertyMapper valueFilter;
- private PropertySource source;
+ private final String name;
+ private final PropertyMapper valueFilter;
+ private final PropertySource source;
public ValueMappedPropertySource(String name, PropertyMapper valueFilter, PropertySource current) {
this.name = name!=null?name:"<valueFiltered> -> name="+current.getName()+", valueFilter="+valueFilter.toString();
@@ -56,7 +56,7 @@ class ValueMappedPropertySource implements PropertySource{
if(value!=null) {
return valueFilter.mapProperty(key, value);
}
- return value;
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/main/java/org/apache/tamaya/functions/package-info.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/package-info.java b/modules/functions/src/main/java/org/apache/tamaya/functions/package-info.java
index fa908e9..c602920 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/package-info.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/package-info.java
@@ -19,4 +19,4 @@
/**
* Contains additional useful operators and queries.
*/
-package org.apache.tamaya.resource.internal;
\ No newline at end of file
+package org.apache.tamaya.functions;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
index 66fd7bd..93a7da9 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/ConfigurationFunctionsTest.java
@@ -30,107 +30,107 @@ public class ConfigurationFunctionsTest {
@Test
public void testFilter() throws Exception {
-
+// TODO implement test
}
@Test
public void testMap() throws Exception {
-
+// TODO implement test
}
@Test
public void testSection() throws Exception {
-
+// TODO implement test
}
@Test
public void testSection1() throws Exception {
-
+// TODO implement test
}
@Test
public void testIsKeyInSection() throws Exception {
-
+// TODO implement test
}
@Test
public void testIsKeyInSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testTransitiveSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testSections1() throws Exception {
-
+// TODO implement test
}
@Test
public void testTransitiveSections1() throws Exception {
-
+// TODO implement test
}
@Test
public void testSectionsRecursive() throws Exception {
-
+// TODO implement test
}
@Test
public void testCombine() throws Exception {
-
+// TODO implement test
}
@Test
public void testPropertySourceFrom() throws Exception {
-
+// TODO implement test
}
@Test
public void testSectionRecursive() throws Exception {
-
+// TODO implement test
}
@Test
public void testJsonInfo() throws Exception {
-
+// TODO implement test
}
@Test
public void testJsonInfo1() throws Exception {
-
+// TODO implement test
}
@Test
public void testXmlInfo() throws Exception {
-
+// TODO implement test
}
@Test
public void testXmlInfo1() throws Exception {
-
+// TODO implement test
}
@Test
public void testTextInfo() throws Exception {
-
+// TODO implement test
}
@Test
public void testTextInfo1() throws Exception {
-
+// TODO implement test
}
@Test
public void testAddItems() throws Exception {
-
+// TODO implement test
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
index d9a0dab..2e90fbc 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/PropertySourceFunctionsTest.java
@@ -31,67 +31,67 @@ public class PropertySourceFunctionsTest {
@Test
public void testAddMetaData() throws Exception {
-
+// TODO implement test
}
@Test
public void testIsKeyInSection() throws Exception {
-
+// TODO implement test
}
@Test
public void testIsKeyInSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testTransitiveSections() throws Exception {
-
+// TODO implement test
}
@Test
public void testSections1() throws Exception {
-
+// TODO implement test
}
@Test
public void testTransitiveSections1() throws Exception {
-
+// TODO implement test
}
@Test
public void testSectionsRecursive() throws Exception {
-
+// TODO implement test
}
@Test
public void testSectionRecursive() throws Exception {
-
+// TODO implement test
}
@Test
public void testStripSectionKeys() throws Exception {
-
+// TODO implement test
}
@Test
public void testAddItems() throws Exception {
-
+// TODO implement test
}
@Test
public void testAddItems1() throws Exception {
-
+// TODO implement test
}
@Test
public void testReplaceItems() throws Exception {
-
+// TODO implement test
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection-api/src/main/java/org/apache/tamaya/inject/api/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/modules/injection-api/src/main/java/org/apache/tamaya/inject/api/InjectionUtils.java b/modules/injection-api/src/main/java/org/apache/tamaya/inject/api/InjectionUtils.java
index 43fe757..5250f32 100644
--- a/modules/injection-api/src/main/java/org/apache/tamaya/inject/api/InjectionUtils.java
+++ b/modules/injection-api/src/main/java/org/apache/tamaya/inject/api/InjectionUtils.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.ListIterator;
/**
- * Created by Anatole on 16.10.2015.
+ * Utility class with several commonly used functions.
*/
public final class InjectionUtils {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredMethod.java
----------------------------------------------------------------------
diff --git a/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredMethod.java b/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredMethod.java
index c451d8b..128946e 100644
--- a/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredMethod.java
+++ b/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredMethod.java
@@ -36,7 +36,7 @@ public interface ConfiguredMethod {
/**
* Get the methods input parameter types.
- * @return
+ * @return the method param types, not null.
*/
Class<?>[] getParameterTypes();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredType.java
----------------------------------------------------------------------
diff --git a/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredType.java b/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredType.java
index c0a2367..0f81dc7 100644
--- a/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredType.java
+++ b/modules/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredType.java
@@ -29,7 +29,7 @@ public interface ConfiguredType{
/**
* Get the type's class.
- * @return
+ * @return the base type.
*/
Class getType();
@@ -43,7 +43,7 @@ public interface ConfiguredType{
* Get the registered configured fields.
* @return the registered configured fields, never null.
*/
- public Collection<ConfiguredField> getConfiguredFields();
+ Collection<ConfiguredField> getConfiguredFields();
/**
* Get the registered configured methods.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index c884e38..0e05dd7 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -53,11 +53,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-events</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resolver</artifactId>
<version>${project.version}</version>
<optional>true</optional>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfigTemplateInvocationHandler.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfigTemplateInvocationHandler.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfigTemplateInvocationHandler.java
index 9b69da9..5d634e1 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfigTemplateInvocationHandler.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfigTemplateInvocationHandler.java
@@ -36,7 +36,7 @@ public final class ConfigTemplateInvocationHandler implements InvocationHandler
/**
* The configured type.
*/
- private ConfiguredType type;
+ private final ConfiguredType type;
/**
* Creates a new handler instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredFieldImpl.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredFieldImpl.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredFieldImpl.java
index 086265b..bc1c5ba 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredFieldImpl.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredFieldImpl.java
@@ -41,7 +41,7 @@ public class ConfiguredFieldImpl implements ConfiguredField{
/**
* The configured field instance.
*/
- protected Field annotatedField;
+ protected final Field annotatedField;
/**
* Models a configured field and provides mechanisms for injection.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredSetterMethod.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredSetterMethod.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredSetterMethod.java
index a731dec..b69df20 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredSetterMethod.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredSetterMethod.java
@@ -98,7 +98,7 @@ public class ConfiguredSetterMethod implements ConfiguredMethod {
/**
* Get the type to be set on the setter method.
- * @return
+ * @return the setter type.
*/
@Override
public Class<?>[] getParameterTypes() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredTypeImpl.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredTypeImpl.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredTypeImpl.java
index 1e82462..ecb464c 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredTypeImpl.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredTypeImpl.java
@@ -46,15 +46,15 @@ public class ConfiguredTypeImpl implements ConfiguredType{
/**
* A list with all annotated instance variables.
*/
- private List<ConfiguredField> configuredFields = new ArrayList<>();
+ private final List<ConfiguredField> configuredFields = new ArrayList<>();
/**
* A list with all annotated methods (templates).
*/
- private List<ConfiguredMethod> configuredSetterMethods = new ArrayList<>();
+ private final List<ConfiguredMethod> configuredSetterMethods = new ArrayList<>();
/**
* The basic type.
*/
- private Class type;
+ private final Class type;
/**
* Creates an instance of this class hereby evaluating the config annotations given for later effective
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
index 2630552..0795d66 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
@@ -43,7 +43,7 @@ import org.apache.tamaya.inject.spi.ConfiguredType;
@Priority(0)
public final class DefaultConfigurationInjector implements ConfigurationInjector {
- private Map<Class<?>, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
+ private final Map<Class<?>, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
private static final Logger LOG = Logger.getLogger(DefaultConfigurationInjector.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
index b877b5d..2f051b3 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
@@ -68,25 +68,25 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
/**
* The property name of the entry.
*/
- private String propertyName;
+ private final String propertyName;
/**
* The keys to be resolved.
*/
- private String[] keys;
+ private final String[] keys;
/**
* Back reference to the base configuration instance. This reference is used reevalaute the given property and
* compare the result with the previous value after a configuration change was triggered.
*/
- private Configuration configuration;
+ private final Configuration configuration;
/**
* The target type of the property used to lookup a matching {@link PropertyConverter}.
* If null, {@code propertyConverter} is set and used instead.
*/
- private TypeLiteral<T> targetType;
+ private final TypeLiteral<T> targetType;
/**
* The property converter to be applied, may be null. In the ladder case targetType is not null.
*/
- private PropertyConverter<T> propertyConverter;
+ private final PropertyConverter<T> propertyConverter;
/**
* Policy that defines how new values are applied, be default it is applied initially once, but never updated
* anymore.
@@ -160,7 +160,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
throw new ConfigException("Failed to evaluate target type for " + annotatedField.getDeclaringClass().getName()
+ '.' + annotatedField.getName());
}
- targetType = (Type) types[0];
+ targetType = types[0];
}
PropertyConverter<?> propertyConverter = null;
WithPropertyConverter annot = annotatedField.getAnnotation(WithPropertyConverter.class);
@@ -204,7 +204,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
throw new ConfigException("Failed to evaluate target type for " + method.getDeclaringClass()
.getName() + '.' + method.getName());
}
- targetType = (Class) types[0];
+ targetType = types[0];
}
PropertyConverter<Object> propertyConverter = null;
WithPropertyConverter annot = method.getAnnotation(WithPropertyConverter.class);
@@ -217,7 +217,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
+ '.' + method.getName(), e);
}
}
- return new DefaultDynamicValue<Object>(method.getName(),
+ return new DefaultDynamicValue<>(method.getName(),
configuration, TypeLiteral.of(targetType), propertyConverter, InjectionUtils.getKeys(method),
loadPolicy, updatePolicy);
}
@@ -304,7 +304,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
* @see DefaultDynamicValue#isPresent()
*/
public T get() {
- T newLocalValue = null;
+ T newLocalValue;
if(loadPolicy!=LoadPolicy.INITIAL) {
newLocalValue = evaluateValue();
if (this.value == null) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index 6fd8960..ed14119 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -213,7 +213,7 @@ final class InjectionHelper {
* Evaluates the given expression.
*
* @param expression the expression, not null.
- * @return
+ * @return the evaluated expression.
*/
public static String evaluateValue(String expression) {
if (!RESOLUTION_MODULE_LOADED) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/camel/src/main/java/org/apache/tamaya/integration/camel/TamayaPropertiesComponent.java
----------------------------------------------------------------------
diff --git a/modules/integration/camel/src/main/java/org/apache/tamaya/integration/camel/TamayaPropertiesComponent.java b/modules/integration/camel/src/main/java/org/apache/tamaya/integration/camel/TamayaPropertiesComponent.java
index d569a74..f7a0a10 100644
--- a/modules/integration/camel/src/main/java/org/apache/tamaya/integration/camel/TamayaPropertiesComponent.java
+++ b/modules/integration/camel/src/main/java/org/apache/tamaya/integration/camel/TamayaPropertiesComponent.java
@@ -59,15 +59,10 @@ public class TamayaPropertiesComponent extends PropertiesComponent{
setTamayaOverrides(true);
}
- @Override
- public Properties getOverrideProperties() {
- return super.getOverrideProperties();
- }
-
/**
* Apply the current Tamaya properties (configuration) as override properties evaluated first by camel before
* evaluating other uris.
- * @param enabled
+ * @param enabled flag to define if tamaya values override everything else.
*/
public void setTamayaOverrides(boolean enabled){
if(enabled){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/CDIAwareServiceContext.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/CDIAwareServiceContext.java b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/CDIAwareServiceContext.java
index 831c36a..94e6685 100644
--- a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/CDIAwareServiceContext.java
+++ b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/CDIAwareServiceContext.java
@@ -86,7 +86,7 @@ public class CDIAwareServiceContext implements ServiceContext {
*/
@Override
public <T> List<T> getServices(final Class<T> serviceType) {
- List<T> found = (List<T>) clAwareServiceContext.getServices(serviceType);
+ List<T> found = clAwareServiceContext.getServices(serviceType);
BeanManager beanManager = TamayaCDIIntegration.getBeanManager();
Instance<T> cdiInstances = null;
if(beanManager!=null){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContext.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContext.java b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContext.java
index c7bf107..8f8619b 100644
--- a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContext.java
+++ b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContext.java
@@ -46,6 +46,7 @@ import java.util.logging.Logger;
/**
* Default Implementation of a simple ConfigurationContext.
*/
+@SuppressWarnings("FieldCanBeLocal")
@Vetoed
public class DefaultConfigurationContext implements ConfigurationContext {
/** The logger used. */
@@ -53,7 +54,7 @@ public class DefaultConfigurationContext implements ConfigurationContext {
/**
* Cubcomponent handling {@link PropertyConverter} instances.
*/
- private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
+ private final PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
/**
* The current unmodifiable list of loaded {@link PropertySource} instances.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContextBuilder.java b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContextBuilder.java
index 407c881..f10038e 100644
--- a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContextBuilder.java
+++ b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/DefaultConfigurationContextBuilder.java
@@ -42,9 +42,9 @@ import java.util.Objects;
@Vetoed
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;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/EnumConverter.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/EnumConverter.java b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/EnumConverter.java
index 15a5698..90edbaf 100644
--- a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/EnumConverter.java
+++ b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/EnumConverter.java
@@ -36,7 +36,7 @@ import java.util.logging.Logger;
*/
@Vetoed
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/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/PropertyConverterManager.java b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/PropertyConverterManager.java
index 789d5ed..75e3004 100644
--- a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/internal/PropertyConverterManager.java
+++ b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/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>() {
@@ -344,7 +344,7 @@ public class PropertyConverterManager {
*/
protected <T> PropertyConverter<T> createDefaultPropertyConverter(final TypeLiteral<T> targetType) {
if (Enum.class.isAssignableFrom(targetType.getRawType())) {
- return new EnumConverter<T>(targetType.getRawType());
+ return new EnumConverter<>(targetType.getRawType());
}
PropertyConverter<T> converter = null;
final Method factoryMethod = getFactoryMethod(targetType.getRawType(), "of", "valueOf", "instanceOf", "getInstance", "from", "fromString", "parse");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredField.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredField.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredField.java
index c1392b1..fa826f5 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredField.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredField.java
@@ -31,7 +31,7 @@ import java.util.List;
*/
class CDIConfiguredField implements ConfiguredField{
- private Field field;
+ private final Field field;
private List<String> keys = new ArrayList<>();
CDIConfiguredField(InjectionPoint injectionPoint, List<String> keys){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredMethod.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredMethod.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredMethod.java
index 220fe9c..ed8019a 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredMethod.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredMethod.java
@@ -27,11 +27,11 @@ import java.util.Collections;
import java.util.List;
/**
- * Created by atsticks on 29.11.15.
+ * Implementation of a configured methods for CDI module.
*/
public class CDIConfiguredMethod implements ConfiguredMethod{
- private Method method;
+ private final Method method;
private List<String> keys = new ArrayList<>();
CDIConfiguredMethod(InjectionPoint injectionPoint, List<String> keys){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredType.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredType.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredType.java
index f400f69..c677065 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredType.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/CDIConfiguredType.java
@@ -36,9 +36,9 @@ import java.util.Objects;
*/
class CDIConfiguredType implements ConfiguredType{
- private Class<?> type;
- private List<CDIConfiguredMethod> methods = new ArrayList<>();
- private List<CDIConfiguredField> fields = new ArrayList<>();
+ private final Class<?> type;
+ private final List<CDIConfiguredMethod> methods = new ArrayList<>();
+ private final List<CDIConfiguredField> fields = new ArrayList<>();
public CDIConfiguredType(Class<?> type){
this.type = Objects.requireNonNull(type);
@@ -72,7 +72,7 @@ class CDIConfiguredType implements ConfiguredType{
/**
* Used to build up during injection point processing.
* @param injectionPoint the CDI injection ppint, not null.
- * @param keys
+ * @param keys the possible config keys, in order of precedence, not null.
*/
void addConfiguredMember(InjectionPoint injectionPoint, List<String> keys) {
Member member = injectionPoint.getMember();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
index 955e95f..b7408bb 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationExtension.java
@@ -59,7 +59,7 @@ public class ConfigurationExtension implements Extension {
static final Map<Class, ConfigOperator> CUSTOM_OPERATORS = new ConcurrentHashMap<>();
static final Map<Class, PropertyConverter> CUSTOM_CONVERTERS = new ConcurrentHashMap<>();
- private Set<Type> types = new HashSet<>();
+ private final Set<Type> types = new HashSet<>();
private Bean<?> convBean;
/**
@@ -92,12 +92,10 @@ public class ConfigurationExtension implements Extension {
// We don't want to wait until the injection really fails at runtime.
// If there is a non resolvable configuration, we want to know at startup.
Configuration config = ConfigurationProvider.getConfiguration();
- String keyFound = null;
String value = null;
for(String key:keys) {
value = config.get(key);
if(value!=null){
- keyFound = key;
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
index 6e51024..ae1a5cb 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
@@ -68,25 +68,25 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
/**
* The property name of the entry.
*/
- private String propertyName;
+ private final String propertyName;
/**
* The keys to be resolved.
*/
- private String[] keys;
+ private final String[] keys;
/**
* Back reference to the base configuration instance. This reference is used reevalaute the given property and
* compare the result with the previous value after a configuration change was triggered.
*/
- private Configuration configuration;
+ private final Configuration configuration;
/**
* The target type of the property used to lookup a matching {@link PropertyConverter}.
* If null, {@code propertyConverter} is set and used instead.
*/
- private TypeLiteral<T> targetType;
+ private final TypeLiteral<T> targetType;
/**
* The property converter to be applied, may be null. In the ladder case targetType is not null.
*/
- private PropertyConverter<T> propertyConverter;
+ private final PropertyConverter<T> propertyConverter;
/**
* Policy that defines how new values are applied, be default it is applied initially once, but never updated
* anymore.
@@ -160,7 +160,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
throw new ConfigException("Failed to evaluate target type for " + annotatedField.getDeclaringClass().getName()
+ '.' + annotatedField.getName());
}
- targetType = (Type) types[0];
+ targetType = types[0];
}
PropertyConverter<?> propertyConverter = null;
WithPropertyConverter annot = annotatedField.getAnnotation(WithPropertyConverter.class);
@@ -204,7 +204,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
throw new ConfigException("Failed to evaluate target type for " + method.getDeclaringClass()
.getName() + '.' + method.getName());
}
- targetType = (Class) types[0];
+ targetType = types[0];
}
PropertyConverter<Object> propertyConverter = null;
WithPropertyConverter annot = method.getAnnotation(WithPropertyConverter.class);
@@ -217,7 +217,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
+ '.' + method.getName(), e);
}
}
- return new DefaultDynamicValue<Object>(method.getName(),
+ return new DefaultDynamicValue<>(method.getName(),
configuration, TypeLiteral.of(targetType), propertyConverter, InjectionUtils.getKeys(method),
loadPolicy, updatePolicy);
}
@@ -304,7 +304,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
* @see DefaultDynamicValue#isPresent()
*/
public T get() {
- T newLocalValue = null;
+ T newLocalValue;
if(loadPolicy!=LoadPolicy.INITIAL) {
newLocalValue = evaluateValue();
if (this.value == null) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
index dac5c94..6923d9e 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
@@ -39,7 +39,6 @@ import javax.json.JsonReader;
import javax.json.JsonReaderFactory;
import java.io.IOException;
import java.io.StringReader;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -55,34 +54,33 @@ public class EtcdAccessor {
private static final Logger LOG = Logger.getLogger(EtcdAccessor.class.getName());
/** Timeout in seconds. */
- private static int timeout = 2;
+ private int timeout = 2;
/** Property that make Johnzon accept commentc. */
public static final String JOHNZON_SUPPORTS_COMMENTS_PROP = "org.apache.johnzon.supports-comments";
/** The JSON reader factory used. */
- private JsonReaderFactory readerFactory = initReaderFactory();
+ private final JsonReaderFactory readerFactory = initReaderFactory();
/** Initializes the factory to be used for creating readers. */
private JsonReaderFactory initReaderFactory() {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(JOHNZON_SUPPORTS_COMMENTS_PROP, true);
return Json.createReaderFactory(config);
}
/** The base server url. */
- private String serverURL;
+ private final String serverURL;
/** The http client. */
private CloseableHttpClient httpclient = HttpClients.createDefault();
/**
* Creates a new instance with the basic access url.
* @param server server url, e.g. {@code http://127.0.0.1:4001}, not null.
- * @throws MalformedURLException
*/
- public EtcdAccessor(String server)throws MalformedURLException{
+ public EtcdAccessor(String server){
this(server, 2);
}
- public EtcdAccessor(String server, int timeout) throws MalformedURLException {
+ public EtcdAccessor(String server, int timeout) {
this.timeout = timeout;
if(server.endsWith("/")){
serverURL = server.substring(0, server.length()-1);
@@ -105,7 +103,7 @@ public class EtcdAccessor {
httpGet.setConfig(RequestConfig.copy(RequestConfig.DEFAULT).setSocketTimeout(timeout)
.setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).build());
response = httpclient.execute(httpGet);
- HttpEntity entity = null;
+ HttpEntity entity;
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
entity = response.getEntity();
// and ensure it is fully consumed
@@ -340,8 +338,6 @@ public class EtcdAccessor {
HttpDelete delete = new HttpDelete(serverURL + "/v2/keys/"+key);
delete.setConfig(RequestConfig.copy(RequestConfig.DEFAULT).setSocketTimeout(timeout)
.setConnectionRequestTimeout(timeout).setConnectTimeout(timeout).build());
- List<NameValuePair> nvps = new ArrayList<>();
- // delete.setEntity(new UrlEncodedFormEntity(nvps));
response = httpclient.execute(delete);
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
HttpEntity entity = response.getEntity();
@@ -483,11 +479,11 @@ public class EtcdAccessor {
/**
* Recursively read out all key/values from this etcd JSON array.
- * @param result
- * @param node
+ * @param result map with key, values and metadata.
+ * @param node the node to parse.
*/
private void addNodes(Map<String, String> result, JsonObject node) {
- if(!node.containsKey("dir") || "false".equals(node.get("dir"))) {
+ if(!node.containsKey("dir") || "false".equals(node.get("dir").toString())) {
String key = node.getString("key").substring(1);
result.put(key, node.getString("value"));
if (node.containsKey("createdIndex")) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
index b44d32e..a07c504 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
@@ -96,7 +96,7 @@ public class EtcdPropertySource implements PropertySource{
} else{
key = key.substring(prefix.length());
}
- Map<String,String> props = null;
+ Map<String,String> props;
String reqKey = key;
if(key.startsWith("_")){
reqKey = key.substring(1);
@@ -114,10 +114,10 @@ public class EtcdPropertySource implements PropertySource{
}
for(EtcdAccessor accessor:etcdBackends){
try{
- props = accessor.get(key);
+ props = accessor.get(reqKey);
if(!props.containsKey("_ERROR")) {
// No repfix mapping necessary here, since we only access/return the value...
- return props.get(key);
+ return props.get(reqKey);
} else{
LOG.log(Level.FINE, "etcd error on " + accessor.getUrl() + ": " + props.get("_ERROR"));
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/etcd/src/test/java/org/apache/tamaya/etcd/EtcdPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/test/java/org/apache/tamaya/etcd/EtcdPropertySourceTest.java b/modules/integration/etcd/src/test/java/org/apache/tamaya/etcd/EtcdPropertySourceTest.java
index da4f6e6..137f832 100644
--- a/modules/integration/etcd/src/test/java/org/apache/tamaya/etcd/EtcdPropertySourceTest.java
+++ b/modules/integration/etcd/src/test/java/org/apache/tamaya/etcd/EtcdPropertySourceTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
*/
public class EtcdPropertySourceTest {
- private EtcdPropertySource propertySource = new EtcdPropertySource();
+ private final EtcdPropertySource propertySource = new EtcdPropertySource();
@BeforeClass
public static void setup(){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/Activator.java b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/Activator.java
index d5378ba..7425dfb 100644
--- a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/Activator.java
+++ b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/Activator.java
@@ -56,8 +56,6 @@ public class Activator implements BundleActivator {
private static final Logger LOG = Logger.getLogger(Activator.class.getName());
- private BundleContext context;
-
private ServiceRegistration<ConfigurationAdmin> registration;
private ServiceTracker<Object, Object> injectionTracker;
@@ -65,7 +63,7 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
String val = context.getProperty(SERVICE_OVERRIDE_PROP);
- if(val==null?true:Boolean.parseBoolean(val)){
+ if(val == null || Boolean.parseBoolean(val)){
Dictionary<String, Object> props = new Hashtable<>();
String ranking = context.getProperty(SERVICE_RANKING_PROP);
if (ranking == null) {
@@ -73,14 +71,13 @@ public class Activator implements BundleActivator {
} else {
props.put(Constants.SERVICE_RANKING, Integer.valueOf(ranking));
}
- this.context = context;
TamayaConfigAdminImpl cm = new TamayaConfigAdminImpl(context);
registration = context.registerService(ConfigurationAdmin.class, cm, props);
}
// register injection mechanisms, if not configured otherwise
val = context.getProperty(SERVICE_INJECT_PROP);
- if(val==null?true:Boolean.parseBoolean(val)){
+ if(val == null || Boolean.parseBoolean(val)){
injectionTracker = new ServiceTracker<Object, Object>(context, Object.class, null) {
@Override
public Object addingService(ServiceReference<Object> reference) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
index 8a6cd2a..c0ca5c5 100644
--- a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
+++ b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
@@ -84,7 +84,7 @@ public class OSGIEnhancedConfiguration extends DefaultConfiguration{
*/
private static final class OSGIPropertySource extends BasePropertySource{
- private org.osgi.service.cm.Configuration osgiConfiguration;
+ private final org.osgi.service.cm.Configuration osgiConfiguration;
public OSGIPropertySource(org.osgi.service.cm.Configuration osgiConfiguration){
this.osgiConfiguration = Objects.requireNonNull(osgiConfiguration);
@@ -102,7 +102,7 @@ public class OSGIEnhancedConfiguration extends DefaultConfiguration{
@Override
public String getName() {
return "OSGIConfig:pid="+
- osgiConfiguration.getPid()!=null?osgiConfiguration.getPid():osgiConfiguration.getFactoryPid();
+ (osgiConfiguration.getPid()!=null?osgiConfiguration.getPid():osgiConfiguration.getFactoryPid());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigAdminImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigAdminImpl.java b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigAdminImpl.java
index 6cb442e..d6ad07a 100644
--- a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigAdminImpl.java
+++ b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigAdminImpl.java
@@ -89,7 +89,7 @@ public class TamayaConfigAdminImpl implements ConfigurationAdmin {
* @param context the OSGI context
* @throws IOException if something fails.
*/
- public TamayaConfigAdminImpl(BundleContext context) throws IOException {
+ public TamayaConfigAdminImpl(BundleContext context) {
this.context = context;
this.configRootMapper = loadConfigRootMapper();
ServiceReference<ConfigurationAdmin> ref = context.getServiceReference(ConfigurationAdmin.class);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigurationImpl.java b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigurationImpl.java
index a995bab..57c1258 100644
--- a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigurationImpl.java
+++ b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/TamayaConfigurationImpl.java
@@ -38,7 +38,6 @@ public class TamayaConfigurationImpl implements Configuration {
private final String factoryPid;
private Map<String, String> properties = new HashMap<>();
private org.apache.tamaya.Configuration config;
- private OSGIConfigRootMapper configRootMapper;
/**
* Constructor.
@@ -51,7 +50,6 @@ public class TamayaConfigurationImpl implements Configuration {
ConfigurationAdmin parent) {
this.pid = confPid;
this.factoryPid = factoryPid;
- this.configRootMapper = Objects.requireNonNull(configRootMapper);
if(parent!=null){
try {
Dictionary<String, Object> conf = parent.getConfiguration(confPid, factoryPid).getProperties();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/TestConfigIntegration.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/TestConfigIntegration.java b/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/TestConfigIntegration.java
index b050980..79f0965 100644
--- a/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/TestConfigIntegration.java
+++ b/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/TestConfigIntegration.java
@@ -262,6 +262,7 @@ public class TestConfigIntegration{
public void testInjection() throws Exception {
Dictionary<String,Object> config = new Hashtable<>();
ServiceRegistration<HelloService> reg = context.registerService(HelloService.class, new HelloServiceImpl(), config);
+ assertNotNull(context.getServiceReference(HelloService.class));
ServiceReference<HelloService> ref = context.getServiceReference(HelloService.class);
assertNotNull("HelloService not loaded.", ref);
HelloService helloServ = context.getService(ref);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/integration/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java
----------------------------------------------------------------------
diff --git a/modules/integration/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java b/modules/integration/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java
index d59ae0d..6eab61d 100644
--- a/modules/integration/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java
+++ b/modules/integration/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java
@@ -40,7 +40,6 @@ public class SpringConfigTest2 {
ConfiguredSpringBean configuredBean = context.getBean(ConfiguredSpringBean.class);
assertNotNull(configuredBean.getJavaVersion());
assertEquals(System.getProperty("java.version"), configuredBean.getJavaVersion());
- org.springframework.core.env.Environment env;
assertNotNull(configuredBean.getMessage());
assertEquals("value2", configuredBean.getMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 78a88e6..3ffff57 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -112,7 +112,7 @@ under the License.
<executions>
<execution>
<id>copyMain</id>
- <phase>process-test-items</phase>
+ <phase>process-test-sources</phase>
<goals>
<goal>copy</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java b/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
index fe781f3..8bdd414 100644
--- a/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
+++ b/modules/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
@@ -46,13 +46,13 @@ public class JSONFormat implements ConfigurationFormat {
/** Property that make Johnzon accept commentc. */
public static final String JOHNZON_SUPPORTS_COMMENTS_PROP = "org.apache.johnzon.supports-comments";
/** The reader factory used. */
- private JsonReaderFactory readerFactory;
+ private final JsonReaderFactory readerFactory;
/**
* Constructor, itniaitlizing zhe JSON reader factory.
*/
public JSONFormat(){
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(JOHNZON_SUPPORTS_COMMENTS_PROP, true);
this.readerFactory = Json.createReaderFactory(config);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java b/modules/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
index 256f8e8..edeabbf 100644
--- a/modules/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
+++ b/modules/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
@@ -46,9 +46,9 @@ public class JSONPropertySource implements PropertySource {
public static final String JOHNZON_SUPPORTS_COMMENTS_PROP = "org.apache.johnzon.supports-comments";
/** The underlying resource. */
- private URL urlResource;
+ private final URL urlResource;
/** The values read. */
- private Map<String, String> values;
+ private final Map<String, String> values;
/** The evaluated ordinal. */
private int ordinal;
/** The JSON reader factory used. */
@@ -56,7 +56,7 @@ public class JSONPropertySource implements PropertySource {
/** Initializes the factory to be used for creating readers. */
private JsonReaderFactory initReaderFactory() {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(JOHNZON_SUPPORTS_COMMENTS_PROP, true);
return Json.createReaderFactory(config);
}
@@ -81,7 +81,7 @@ public class JSONPropertySource implements PropertySource {
if (this.values.containsKey(TAMAYA_ORDINAL)) {
this.ordinal = Integer.parseInt(this.values.get(TAMAYA_ORDINAL));
}
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(JOHNZON_SUPPORTS_COMMENTS_PROP, true);
this.readerFactory = Json.createReaderFactory(config);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
----------------------------------------------------------------------
diff --git a/modules/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java b/modules/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
index c27bc36..2135ec5 100644
--- a/modules/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
+++ b/modules/json/src/main/java/org/apache/tamaya/json/JSONVisitor.java
@@ -52,7 +52,7 @@ class JSONVisitor {
if (!(current.getValue() instanceof JsonStructure)) {
String key = stack.peek().getNSPrefix() + current.getKey();
- String value = null;
+ String value;
JsonValue jsonValue = current.getValue();
switch(jsonValue.getValueType()) {
case NULL: value = null; break;
@@ -89,7 +89,7 @@ class JSONVisitor {
* Context for a sub context visited.
*/
private static class VisitingContext {
- private String namespace;
+ private final String namespace;
private final JsonObject node;
private final Iterator<Map.Entry<String, JsonValue>> elements;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatTest.java
----------------------------------------------------------------------
diff --git a/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatTest.java b/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatTest.java
index 175e186..9218046 100644
--- a/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatTest.java
+++ b/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatTest.java
@@ -31,7 +31,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
public class JSONFormatTest extends CommonJSONTestCaseCollection {
- private JSONFormat format = new JSONFormat();
+ private final JSONFormat format = new JSONFormat();
@Test(expected = NullPointerException.class)
public void acceptsNeedsNonNullParameter() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/json/src/test/java/org/apache/tamaya/json/JSONPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/json/src/test/java/org/apache/tamaya/json/JSONPropertySourceTest.java b/modules/json/src/test/java/org/apache/tamaya/json/JSONPropertySourceTest.java
index 2353eaa..b3a96b3 100644
--- a/modules/json/src/test/java/org/apache/tamaya/json/JSONPropertySourceTest.java
+++ b/modules/json/src/test/java/org/apache/tamaya/json/JSONPropertySourceTest.java
@@ -51,7 +51,6 @@ public class JSONPropertySourceTest extends CommonJSONTestCaseCollection {
@Override
PropertySource getPropertiesFrom(URL source) throws Exception {
- JSONPropertySource propertySource = new JSONPropertySource(source);
- return propertySource;
+ return new JSONPropertySource(source);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java b/modules/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
index b3abf72..90ad0bf 100644
--- a/modules/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
+++ b/modules/management/src/test/java/org/apache/tamaya/management/internal/ManagedConfigTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
*/
public class ManagedConfigTest {
- private ManagedConfigMBean bean = new ManagedConfig();
+ private final ManagedConfigMBean bean = new ManagedConfig();
@org.junit.Test
public void testGetJsonConfigurationInfo() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e094b569/modules/model/src/main/java/org/apache/tamaya/model/ValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/ValidationResult.java b/modules/model/src/main/java/org/apache/tamaya/model/ValidationResult.java
index a7a55a6..203a73d 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/ValidationResult.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/ValidationResult.java
@@ -32,15 +32,15 @@ public final class ValidationResult {
/**
* the config section.
*/
- private ConfigModel configModel;
+ private final ConfigModel configModel;
/**
* The configModel result.
*/
- private ValidationState result;
+ private final ValidationState result;
/**
* The configModel message.
*/
- private String message;
+ private final String message;
/**
* Creates a new ValidationResult.