You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by ot...@apache.org on 2014/12/20 10:55:47 UTC
incubator-tamaya git commit: remove unused imports and unused methods
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 28aba6dc6 -> 31161dfdb
remove unused imports and unused methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/31161dfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/31161dfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/31161dfd
Branch: refs/heads/master
Commit: 31161dfdb5a5bfee3b465c98ea0ec7fe979087ec
Parents: 28aba6d
Author: otaviojava <ot...@people.apache.org>
Authored: Sat Dec 20 07:55:32 2014 -0200
Committer: otaviojava <ot...@people.apache.org>
Committed: Sat Dec 20 07:55:32 2014 -0200
----------------------------------------------------------------------
.../java/org/apache/tamaya/Configuration.java | 2 +-
.../org/apache/tamaya/EnvironmentManager.java | 6 +--
.../java/org/apache/tamaya/PropertyAdapter.java | 2 -
.../tamaya/annotation/WithPropertyAdapter.java | 3 +-
.../spi/DefaultServiceContextProvider.java | 6 +--
.../spi/EnvironmentManagerSingletonSpi.java | 2 -
.../tamaya/TestConfigServiceSingletonSpi.java | 12 +++---
.../tamaya/TestEnvironmentManagerSingleton.java | 6 ---
.../TestPropertyAdaptersSingletonSpi.java | 6 ++-
.../core/config/AbstractConfiguration.java | 15 ++++---
.../core/config/ConfigurationBuilder.java | 19 ++++-----
.../tamaya/core/config/MappedConfiguration.java | 17 +++++---
.../tamaya/core/env/BuildableEnvironment.java | 1 -
.../core/env/ConfiguredSystemProperties.java | 31 +++++++++-----
.../org/apache/tamaya/core/internal/Utils.java | 3 +-
.../config/ConfigTemplateInvocationHandler.java | 4 +-
...DefaultConfigurationManagerSingletonSpi.java | 44 +++++++++-----------
.../config/WeakConfigListenerManager.java | 20 ---------
.../internal/el/SystemPropertyResolver.java | 5 +--
...DependentApplicationEnvironmentProvider.java | 27 ++++++------
...ssLoaderDependentEarEnvironmentProvider.java | 4 +-
.../env/InitialEnvironmentProvider.java | 13 +++---
.../internal/env/SingleEnvironmentManager.java | 1 -
.../core/internal/format/PropertiesFormat.java | 1 +
.../internal/format/PropertiesXmlFormat.java | 3 +-
.../internal/inject/ConfigurationInjector.java | 3 +-
.../core/internal/inject/ConfiguredField.java | 6 +--
.../inject/ConfiguredInstancesManager.java | 1 -
.../core/internal/inject/ConfiguredMethod.java | 4 +-
.../core/internal/inject/ConfiguredType.java | 6 ++-
.../core/internal/logging/Log4j2Logger.java | 2 +-
.../DefaultPropertyAdaptersSingletonSpi.java | 7 +++-
.../core/internal/resources/io/ClassUtils.java | 12 +++---
.../resources/io/InputStreamResource.java | 1 -
.../core/internal/resources/io/StringUtils.java | 8 ----
.../core/properties/AbstractPropertySource.java | 15 ++++---
.../properties/DelegatingPropertySource.java | 1 -
.../core/properties/FreezedPropertySource.java | 14 ++++---
.../properties/IntersectingPropertySource.java | 7 +---
.../properties/PathBasedPropertySource.java | 3 +-
.../core/properties/PropertySourceBuilder.java | 22 +++++-----
.../core/properties/PropertySourceFactory.java | 19 +++++----
.../properties/ReplacingPropertySource.java | 1 -
.../core/properties/URLBasedPropertySource.java | 3 +-
.../apache/tamaya/core/resource/Resource.java | 2 -
.../tamaya/core/spi/AdapterProviderSpi.java | 1 -
.../tamaya/core/spi/EnvironmentProvider.java | 5 +--
.../tamaya/core/spi/PropertyAdapterService.java | 2 +
...tionManagerSingletonSpiSingletonSpiTest.java | 5 +--
.../java/org/apache/tamaya/JavaOneDemo.java | 12 +++---
.../tamaya/core/config/MutableConfigTest.java | 11 +++--
.../env/ConfiguredSystemPropertiesTest.java | 7 ++--
.../internal/MutableTestConfigProvider.java | 16 +++----
.../samples/annotations/ConfiguredTest.java | 2 +-
.../simple/SimplePropertiesAndCLISample.java | 13 +++---
.../apache/tamaya/ucs/UC1ReadProperties.java | 28 +++++++------
.../apache/tamaya/ucs/UC2CombineProperties.java | 7 ++--
.../integration/cdi/ConfigurationExtension.java | 2 +-
58 files changed, 243 insertions(+), 258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/Configuration.java b/api/src/main/java/org/apache/tamaya/Configuration.java
index ac988ac..1cabed8 100644
--- a/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -102,7 +102,7 @@ public interface Configuration extends PropertySource {
Optional<Double> val = get(key, Double.class);
if(val.isPresent()){
- return OptionalDouble.empty().of(val.get());
+ return OptionalDouble.of(val.get());
}
return OptionalDouble.empty();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/EnvironmentManager.java b/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
index d71abdb..1c60d95 100644
--- a/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
+++ b/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
@@ -18,12 +18,8 @@
*/
package org.apache.tamaya;
-import org.apache.tamaya.spi.ServiceContext;
import org.apache.tamaya.spi.EnvironmentManagerSingletonSpi;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import org.apache.tamaya.spi.ServiceContext;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/PropertyAdapter.java b/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
index 5ee0eb7..3a388c7 100644
--- a/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
+++ b/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
@@ -20,8 +20,6 @@ package org.apache.tamaya;
import org.apache.tamaya.annotation.WithPropertyAdapter;
-import org.apache.tamaya.spi.PropertyAdaptersSingletonSpi;
-import org.apache.tamaya.spi.ServiceContext;
/**
* Interface for an adapter that converts a configured String into something else.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/annotation/WithPropertyAdapter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annotation/WithPropertyAdapter.java b/api/src/main/java/org/apache/tamaya/annotation/WithPropertyAdapter.java
index 4001742..1b121a1 100644
--- a/api/src/main/java/org/apache/tamaya/annotation/WithPropertyAdapter.java
+++ b/api/src/main/java/org/apache/tamaya/annotation/WithPropertyAdapter.java
@@ -39,6 +39,7 @@ public @interface WithPropertyAdapter {
* general org.apache.tamaya.core.internal registered. If no adapter is defined (default) and no corresponding adapter is
* registered, it is handled as a deployment error.
*/
- Class<? extends PropertyAdapter> value();
+ @SuppressWarnings("rawtypes")
+ Class<? extends PropertyAdapter> value();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/spi/DefaultServiceContextProvider.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/DefaultServiceContextProvider.java b/api/src/main/java/org/apache/tamaya/spi/DefaultServiceContextProvider.java
index 8ac1cd6..295bab7 100644
--- a/api/src/main/java/org/apache/tamaya/spi/DefaultServiceContextProvider.java
+++ b/api/src/main/java/org/apache/tamaya/spi/DefaultServiceContextProvider.java
@@ -27,9 +27,10 @@ import java.util.logging.Logger;
* This class implements the (default) {@link ServiceContext} interface and hereby uses the JDK
* {@link java.util.ServiceLoader} to load the services required.
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
class DefaultServiceContextProvider implements ServiceContext {
/** List current services loaded, per class. */
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
/** Singletons. */
private final ConcurrentHashMap<Class, Optional<?>> singletons = new ConcurrentHashMap<>();
/** Comparator for ordering of multiple services found. */
@@ -41,7 +42,7 @@ class DefaultServiceContextProvider implements ServiceContext {
@Override
public <T> Optional<T> getService(Class<T> serviceType) {
- Optional<T> cached = (Optional<T>)singletons.get(serviceType);
+ Optional<T> cached = (Optional<T>)singletons.get(serviceType);
if(cached==null) {
List<? extends T> services = getServices(serviceType, Collections.emptyList());
if (services.isEmpty()) {
@@ -68,7 +69,6 @@ class DefaultServiceContextProvider implements ServiceContext {
*/
@Override
public <T> List<? extends T> getServices(final Class<T> serviceType, final List<? extends T> defaultList) {
- @SuppressWarnings("unchecked")
List<T> found = (List<T>) servicesLoaded.get(serviceType);
if (found != null) {
return found;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java b/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
index 9be5653..84ac864 100644
--- a/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
+++ b/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
@@ -21,8 +21,6 @@ package org.apache.tamaya.spi;
import org.apache.tamaya.Environment;
-import java.util.*;
-
/**
* Service for accessing {@link org.apache.tamaya.Environment}. Environments are used to
* access/determine configurations.<br/>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java b/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java
index d044982..b3e457a 100644
--- a/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java
+++ b/api/src/test/java/org/apache/tamaya/TestConfigServiceSingletonSpi.java
@@ -18,14 +18,15 @@
*/
package org.apache.tamaya;
-import org.apache.tamaya.spi.ConfigurationManagerSingletonSpi;
-
-import java.beans.PropertyChangeListener;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.Predicate;
+import org.apache.tamaya.spi.ConfigurationManagerSingletonSpi;
+
/**
* Created by Anatole on 09.09.2014.
*/
@@ -57,7 +58,8 @@ public class TestConfigServiceSingletonSpi implements ConfigurationManagerSingle
return configs.containsKey(name);
}
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
public <T> T getConfiguration(String name, Class<T> type){
if(type.equals(Configuration.class)) {
Configuration config = configs.get(name);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/test/java/org/apache/tamaya/TestEnvironmentManagerSingleton.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/tamaya/TestEnvironmentManagerSingleton.java b/api/src/test/java/org/apache/tamaya/TestEnvironmentManagerSingleton.java
index 98a7114..30423a6 100644
--- a/api/src/test/java/org/apache/tamaya/TestEnvironmentManagerSingleton.java
+++ b/api/src/test/java/org/apache/tamaya/TestEnvironmentManagerSingleton.java
@@ -20,12 +20,6 @@ package org.apache.tamaya;
import org.apache.tamaya.spi.EnvironmentManagerSingletonSpi;
-import javax.swing.text.html.Option;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
/**
* Created by Anatole on 12.09.2014.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/api/src/test/java/org/apache/tamaya/TestPropertyAdaptersSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/tamaya/TestPropertyAdaptersSingletonSpi.java b/api/src/test/java/org/apache/tamaya/TestPropertyAdaptersSingletonSpi.java
index 2d3cfbc..d80859a 100644
--- a/api/src/test/java/org/apache/tamaya/TestPropertyAdaptersSingletonSpi.java
+++ b/api/src/test/java/org/apache/tamaya/TestPropertyAdaptersSingletonSpi.java
@@ -20,6 +20,7 @@ package org.apache.tamaya;
import org.apache.tamaya.annotation.WithPropertyAdapter;
import org.apache.tamaya.spi.PropertyAdaptersSingletonSpi;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
@@ -35,9 +36,10 @@ import java.util.concurrent.ConcurrentHashMap;
* Test implementation current {@link PropertyAdaptersSingletonSpi}, which provides adapters
* for some basic types.
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public final class TestPropertyAdaptersSingletonSpi implements PropertyAdaptersSingletonSpi{
- private Map<Class, PropertyAdapter<?>> adapters = new ConcurrentHashMap<>();
+ private Map<Class, PropertyAdapter<?>> adapters = new ConcurrentHashMap<>();
private TestPropertyAdaptersSingletonSpi(){
register(char.class, (s) -> s.charAt(0));
@@ -67,7 +69,7 @@ public final class TestPropertyAdaptersSingletonSpi implements PropertyAdaptersS
}
- @Override
+ @Override
public <T> PropertyAdapter<T> register(Class<T> targetType, PropertyAdapter<T> adapter){
Objects.requireNonNull(targetType);
Objects.requireNonNull(adapter);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
index cfd0da3..40feff8 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
@@ -18,22 +18,25 @@
*/
package org.apache.tamaya.core.config;
-import org.apache.tamaya.*;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.apache.tamaya.ConfigChangeSet;
+import org.apache.tamaya.ConfigChangeSetBuilder;
+import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.PropertyAdapter;
import org.apache.tamaya.core.properties.AbstractPropertySource;
import org.apache.tamaya.core.spi.AdapterProviderSpi;
import org.apache.tamaya.spi.ServiceContext;
-import java.util.*;
-import java.util.logging.Logger;
-
/**
* Abstract implementation class for {@link org.apache.tamaya.Configuration}, which supports optimistic
* locking and mutability.
*/
public abstract class AbstractConfiguration extends AbstractPropertySource implements Configuration{
- private static final Logger LOG = Logger.getLogger(AbstractConfiguration.class.getName());
-
private static final long serialVersionUID = 503764580971917964L;
private final Object LOCK = new Object();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
index 3355e6b..5f66644 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
@@ -18,14 +18,18 @@
*/
package org.apache.tamaya.core.config;
-import org.apache.tamaya.*;
-import org.apache.tamaya.core.properties.PropertySourceBuilder;
-
import java.net.URL;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import java.util.logging.Logger;
+
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.core.properties.PropertySourceBuilder;
/**
* Builder for assembling non trivial {@link org.apache.tamaya.Configuration} instances.
@@ -33,11 +37,6 @@ import java.util.logging.Logger;
public final class ConfigurationBuilder {
/**
- * THe logger used.
- */
- private static final Logger LOG = Logger.getLogger(ConfigurationBuilder.class.getName());
-
- /**
* The final meta info to be used, or null, if a default should be generated.
*/
private PropertySourceBuilder builderDelegate;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
index 24c715e..5833e2c 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/MappedConfiguration.java
@@ -1,17 +1,22 @@
package org.apache.tamaya.core.config;
-import org.apache.tamaya.*;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.UnaryOperator;
+import org.apache.tamaya.ConfigChangeSet;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.MetaInfoBuilder;
+
/**
* Configuration implementation that maps certain parts (defined by an {@code UnaryOperator<String>}) to alternate areas.
*/
class MappedConfiguration extends AbstractConfiguration implements Configuration {
- /** The mapping operator. */
+
+ private static final long serialVersionUID = 8690637705511432083L;
+
+ /** The mapping operator. */
private UnaryOperator<String> keyMapper;
/** The base configuration. */
private Configuration config;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/env/BuildableEnvironment.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/env/BuildableEnvironment.java b/core/src/main/java/org/apache/tamaya/core/env/BuildableEnvironment.java
index 547d56d..f44592c 100644
--- a/core/src/main/java/org/apache/tamaya/core/env/BuildableEnvironment.java
+++ b/core/src/main/java/org/apache/tamaya/core/env/BuildableEnvironment.java
@@ -27,7 +27,6 @@ import java.util.*;
*/
class BuildableEnvironment implements Environment {
- private static final long serialVersionUID = 707575538680740130L;
/** The environment data. */
private Map<String,String> context = new TreeMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java b/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
index 555699d..51367e8 100644
--- a/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
+++ b/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
@@ -18,11 +18,18 @@
*/
package org.apache.tamaya.core.env;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.Environment;
-
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
@@ -30,21 +37,24 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.logging.Logger;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.Environment;
+
/**
* Properties implementation class that can be applied as current System properties by calling
* {@link org.apache.tamaya.core.env.ConfiguredSystemProperties#install()}. The system properties will
* then behave contextually depending on the current runtime configuration active.
*/
public class ConfiguredSystemProperties extends Properties {
- private static final Logger LOG = Logger.getLogger(ConfiguredSystemProperties.class.getName());
+
+ private static final long serialVersionUID = 2152870929299226804L;
+
+ private static final Logger LOG = Logger.getLogger(ConfiguredSystemProperties.class.getName());
private Properties initialProperties;
private static volatile Map<String, Properties> contextualProperties = new ConcurrentHashMap<>();
private static volatile Supplier<String> contextProvider = () ->
Environment.current().get("context.id").orElse("<system>");
- private static Supplier<String> loadContextProvider() {
- return null;
- }
private final Object LOCK = new Object();
@@ -197,7 +207,8 @@ public class ConfiguredSystemProperties extends Properties {
getContextualProperties().load(inStream);
}
- @Override
+ @SuppressWarnings("deprecation")
+ @Override
public void save(OutputStream out, String comments) {
super.save(out, comments);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/Utils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/Utils.java b/core/src/main/java/org/apache/tamaya/core/internal/Utils.java
index 6990de2..2a5f4af 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/Utils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/Utils.java
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
* Utility class simplifying some implementation aspects.
* Created by Anatole on 11.11.2014.
*/
+@SuppressWarnings("unchecked")
public final class Utils {
private static final Logger LOG = Logger.getLogger(Utils.class.getName());
@@ -48,7 +49,7 @@ public final class Utils {
* @param <R> the repeatable container annotation type
* @return a list with the annotations found (could be empty, but never null).
*/
- public static <T extends Annotation, R extends Annotation> Collection<T>
+ public static <T extends Annotation, R extends Annotation> Collection<T>
getAnnotations(AnnotatedElement annotated,
Class<T> repeatableAnnotation,
Class<R> annotationContainer){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/config/ConfigTemplateInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/ConfigTemplateInvocationHandler.java b/core/src/main/java/org/apache/tamaya/core/internal/config/ConfigTemplateInvocationHandler.java
index 18e9d03..a514029 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/ConfigTemplateInvocationHandler.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/ConfigTemplateInvocationHandler.java
@@ -30,12 +30,12 @@ import java.util.Objects;
*/
class ConfigTemplateInvocationHandler implements InvocationHandler {
/** The underlying configuration. */
- private Configuration config;
+// private Configuration config;
/** The configured type. */
private ConfiguredType type;
public ConfigTemplateInvocationHandler(Class<?> type, Configuration config) {
- this.config = Objects.requireNonNull(config);
+// this.config = Objects.requireNonNull(config);
this.type = new ConfiguredType(Objects.requireNonNull(type));
if(!type.isInterface()){
throw new IllegalArgumentException("Can only proxy interfaces as configuration templates.");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/config/DefaultConfigurationManagerSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/DefaultConfigurationManagerSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/internal/config/DefaultConfigurationManagerSingletonSpi.java
index 1a04cef..d3551e7 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/DefaultConfigurationManagerSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/DefaultConfigurationManagerSingletonSpi.java
@@ -18,27 +18,34 @@
*/
package org.apache.tamaya.core.internal.config;
-import org.apache.tamaya.*;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.ConfigChangeSet;
+import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.PropertySource;
import org.apache.tamaya.core.internal.el.DefaultExpressionEvaluator;
import org.apache.tamaya.core.internal.inject.ConfigurationInjector;
import org.apache.tamaya.core.properties.PropertySourceBuilder;
import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
import org.apache.tamaya.core.spi.ExpressionEvaluator;
-
-import org.apache.tamaya.spi.ServiceContext;
import org.apache.tamaya.spi.ConfigurationManagerSingletonSpi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Proxy;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import org.apache.tamaya.spi.ServiceContext;
/**
* Default SPI that implements the behaviour of {@link org.apache.tamaya.spi.ConfigurationManagerSingletonSpi}.
*/
+@SuppressWarnings("unchecked")
public class DefaultConfigurationManagerSingletonSpi implements ConfigurationManagerSingletonSpi {
private static final String DEFAULT_CONFIG_NAME = "default";
@@ -63,7 +70,8 @@ public class DefaultConfigurationManagerSingletonSpi implements ConfigurationMan
}
}
- @Override
+
+ @Override
public <T> T getConfiguration(String name, Class<T> type) {
ConfigurationProviderSpi provider = configProviders.get(name);
if (provider == null) {
@@ -103,20 +111,6 @@ public class DefaultConfigurationManagerSingletonSpi implements ConfigurationMan
ConfigurationInjector.configure(instance);
}
- private String getConfigId(Annotation... qualifiers) {
- if (qualifiers == null || qualifiers.length == 0) {
- return "";
- }
- StringBuilder b = new StringBuilder();
- for (Annotation annot : qualifiers) {
- b.append('[');
- b.append(annot.annotationType().getName());
- b.append(':');
- b.append(annot.toString());
- b.append(']');
- }
- return b.toString();
- }
@Override
public String evaluateValue(Configuration config, String expression) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/config/WeakConfigListenerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/WeakConfigListenerManager.java b/core/src/main/java/org/apache/tamaya/core/internal/config/WeakConfigListenerManager.java
index 4c950fc..7cc6a15 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/WeakConfigListenerManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/WeakConfigListenerManager.java
@@ -35,26 +35,6 @@ public class WeakConfigListenerManager{
private Map<String,Store<PropertyChangeListener>> changeListeners = new ConcurrentHashMap<>();
- private void addPropertyChangeListener(PropertyChangeListener l, String... configIds){
- for(String configId : configIds){
- Store<PropertyChangeListener> items = changeListeners.get(configId);
- if(items != null){
- synchronized(items){
- items.add(l);
- }
- }
- }
- }
-
- private void removePropertyChangeListener(PropertyChangeListener l, String... configIds){
- for(String configId : configIds){
- Store<PropertyChangeListener> items = changeListeners.get(configId);
- if(items != null){
- items.remove(l);
- }
- }
- }
-
private void publishPropertyChangeEventToGlobalListeners(PropertyChangeEvent evt){
Store<PropertyChangeListener> items = changeListeners.get("_globalConfigChangeListeners");
if(items != null){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
index 450504e..cf60a52 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
@@ -18,12 +18,11 @@
*/
package org.apache.tamaya.core.internal.el;
+import java.util.Optional;
+
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.Configuration;
import org.apache.tamaya.core.spi.ExpressionResolver;
-import java.util.*;
-
/**
* Created by Anatole on 28.09.2014.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentApplicationEnvironmentProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentApplicationEnvironmentProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentApplicationEnvironmentProvider.java
index dc404b5..1632fcd 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentApplicationEnvironmentProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentApplicationEnvironmentProvider.java
@@ -18,20 +18,22 @@
*/
package org.apache.tamaya.core.internal.env;
-import org.apache.tamaya.Environment;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.tamaya.core.config.ConfigurationFormats;
-import org.apache.tamaya.core.env.EnvironmentBuilder;
import org.apache.tamaya.core.resource.Resource;
-import org.apache.tamaya.spi.ServiceContext;
+import org.apache.tamaya.core.resource.ResourceLoader;
import org.apache.tamaya.core.spi.ConfigurationFormat;
import org.apache.tamaya.core.spi.EnvironmentProvider;
-import org.apache.tamaya.core.resource.ResourceLoader;
-
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.tamaya.spi.ServiceContext;
/**
* Application environment provider that is dependent on the current context classloader and tries to
@@ -44,8 +46,6 @@ public class ClassLoaderDependentApplicationEnvironmentProvider implements Envir
private static final Logger LOG = Logger.getLogger(ClassLoaderDependentApplicationEnvironmentProvider.class.getName());
- private static final String WARID_PROP = "environment.applicationId";
-
private Map<ClassLoader, Map<String,String>> environments = new ConcurrentHashMap<>();
private Map<ClassLoader, Boolean> environmentAvailable = new ConcurrentHashMap<>();
@@ -78,7 +78,7 @@ public class ClassLoaderDependentApplicationEnvironmentProvider implements Envir
}
List<Resource> propertyUris = ServiceContext.getInstance().getSingleton(ResourceLoader.class).getResources(cl,
"classpath:META-INF/env/application.properties", "classpath:META-INF/env/application.xml", "classpath:META-INF/env/application.ini");
- data = new HashMap();
+ data = new HashMap<>();
for(Resource resource:propertyUris){
try{
@@ -89,7 +89,6 @@ public class ClassLoaderDependentApplicationEnvironmentProvider implements Envir
LOG.log(Level.SEVERE, e, () -> "Error reading application environment data fromMap " + resource);
}
}
- String applicationId = data.getOrDefault(WARID_PROP, cl.toString());
data.put("classloader.type", cl.getClass().getName());
data.put("classloader.info", cl.toString());
Set<Resource> uris = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentEarEnvironmentProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentEarEnvironmentProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentEarEnvironmentProvider.java
index 69ad04a..990d13d 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentEarEnvironmentProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/env/ClassLoaderDependentEarEnvironmentProvider.java
@@ -45,7 +45,7 @@ public class ClassLoaderDependentEarEnvironmentProvider implements EnvironmentPr
private static final Logger LOG = Logger.getLogger(ClassLoaderDependentEarEnvironmentProvider.class.getName());
- private static final String EARID_PROP = "environment.earId";
+// private static final String EARID_PROP = "environment.earId";
private Map<ClassLoader, Map<String,String>> environments = new ConcurrentHashMap<>();
private Map<ClassLoader, Boolean> environmentAvailable = new ConcurrentHashMap<>();
@@ -90,7 +90,7 @@ public class ClassLoaderDependentEarEnvironmentProvider implements EnvironmentPr
LOG.log(Level.SEVERE, e, () -> "Error reading ear environment data fromMap " + resource);
}
}
- String earId = data.getOrDefault(EARID_PROP, cl.toString());
+// String earId = data.getOrDefault(EARID_PROP, cl.toString());
String stageValue = data.get(EnvironmentBuilder.STAGE_PROP);
if (stageValue != null) {
data.put(EnvironmentBuilder.STAGE_PROP,stageValue);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/env/InitialEnvironmentProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/env/InitialEnvironmentProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/env/InitialEnvironmentProvider.java
index 76dac95..c2e4704 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/env/InitialEnvironmentProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/env/InitialEnvironmentProvider.java
@@ -18,16 +18,19 @@
*/
package org.apache.tamaya.core.internal.env;
-import org.apache.tamaya.core.env.ConfiguredSystemProperties;
-import org.apache.tamaya.core.env.EnvironmentBuilder;
-
import java.net.InetAddress;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.TimeZone;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.tamaya.Environment;
+import org.apache.tamaya.core.env.ConfiguredSystemProperties;
+import org.apache.tamaya.core.env.EnvironmentBuilder;
import org.apache.tamaya.core.spi.EnvironmentProvider;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/env/SingleEnvironmentManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/env/SingleEnvironmentManager.java b/core/src/main/java/org/apache/tamaya/core/internal/env/SingleEnvironmentManager.java
index 76ea0c8..4a75fbb 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/env/SingleEnvironmentManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/env/SingleEnvironmentManager.java
@@ -51,7 +51,6 @@ public class SingleEnvironmentManager implements EnvironmentManagerSingletonSpi{
@Override
public Environment getCurrentEnvironment(){
- Environment env = null;
EnvironmentBuilder b = EnvironmentBuilder.of();
for(EnvironmentProvider prov: environmentProviders){
if(prov.isActive()){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesFormat.java b/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesFormat.java
index d64fa11..6646120 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesFormat.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesFormat.java
@@ -43,6 +43,7 @@ public class PropertiesFormat implements ConfigurationFormat{
return path != null && path.endsWith(".properties");
}
+ @SuppressWarnings("unchecked")
@Override
public Map<String,String> readConfiguration(Resource resource) {
if (isAccepted(resource) && resource.exists()) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesXmlFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesXmlFormat.java b/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesXmlFormat.java
index 3322407..b34e78e 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesXmlFormat.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/format/PropertiesXmlFormat.java
@@ -44,7 +44,8 @@ public class PropertiesXmlFormat implements ConfigurationFormat{
return path != null && path.endsWith(".xml");
}
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
public Map<String,String> readConfiguration(Resource resource) {
if (isAccepted(resource) && resource.exists()) {
try (InputStream is = resource.getInputStream()) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfigurationInjector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfigurationInjector.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfigurationInjector.java
index 10d2374..ccc8251 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfigurationInjector.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfigurationInjector.java
@@ -25,11 +25,12 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Simple injector singleton that also registers instances configured using weak references.
*/
+@SuppressWarnings("rawtypes")
public final class ConfigurationInjector {
private static final ConfigurationInjector INSTANCE = new ConfigurationInjector();
- private Map<Class, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
+ private Map<Class, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
public static ConfiguredType registerType(Class<?> type){
if (!ConfiguredType.isConfigured(type)) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
index ee5aeda..5058e70 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
* it (referenced by a weak reference). It also implements all aspects current value filtering, converting any applying the
* final value by reflection.
*/
-@SuppressWarnings("UnusedDeclaration")
+@SuppressWarnings({"rawtypes", "unchecked"})
public class ConfiguredField {
private Logger LOG = Logger.getLogger(ConfiguredField.class.getName());
@@ -119,12 +119,12 @@ public class ConfiguredField {
}
// Check for adapter/filter
WithPropertyAdapter adapterAnnot = this.annotatedField.getAnnotation(WithPropertyAdapter.class);
- Class<? extends PropertyAdapter> propertyAdapterType;
+ Class<? extends PropertyAdapter> propertyAdapterType;
if (adapterAnnot != null) {
propertyAdapterType = adapterAnnot.value();
if (!propertyAdapterType.equals(PropertyAdapter.class)) {
// TODO cache here...
- PropertyAdapter<String> filter = propertyAdapterType.newInstance();
+ PropertyAdapter<String> filter = propertyAdapterType.newInstance();
configValue = filter.adapt(configValue);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
index 2153777..2bb11d5 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
@@ -37,7 +37,6 @@ public final class ConfiguredInstancesManager implements PropertyChangeListener{
private static final ConfiguredInstancesManager INSTANCE = new ConfiguredInstancesManager();
private Map<ConfiguredType,List<WeakReference<Object>>> configuredInstances = new ConcurrentHashMap<>();
- private final Object LOCK = new Object();
private ConfiguredInstancesManager(){
// Configuration.addConfigChangeListener(this);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
index 3bc4472..75efe49 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
@@ -35,7 +35,6 @@ import java.util.stream.Collectors;
* final value by reflection.
* Created by Anatole on 01.10.2014.
*/
-@SuppressWarnings("UnusedDeclaration")
public class ConfiguredMethod {
private static final Logger LOG = Logger.getLogger(ConfiguredMethod.class.getName());
@@ -155,7 +154,8 @@ public class ConfiguredMethod {
*
* @throws org.apache.tamaya.ConfigException if the configuration required could not be resolved or converted.
*/
- public Object getValue(Object[] args) throws ConfigException {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public Object getValue(Object[] args) throws ConfigException {
// TODO do something with additional args?
String configValue = getConfigValue();
try {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredType.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredType.java
index 643873f..7560648 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredType.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredType.java
@@ -31,12 +31,14 @@ import java.util.*;
* Structure that contains and manages configuration related things for a configured type registered.
* Created by Anatole on 03.10.2014.
*/
+@SuppressWarnings({ "rawtypes", "unchecked" })
public class ConfiguredType {
private List<ConfiguredField> configuredFields = new ArrayList<>();
private Map<Method, ConfiguredMethod> configuredMethods = new HashMap<>();
private List<ConfigChangeCallbackMethod> callbackMethods = new ArrayList<>();
- private Class type;
+
+ private Class type;
public ConfiguredType(Class type) {
this.type = Objects.requireNonNull(type);
@@ -142,7 +144,7 @@ public class ConfiguredType {
return true;
}
- public static boolean isConfigured(Class type) {
+ public static boolean isConfigured(Class type) {
if(type.getAnnotation(DefaultAreas.class)!=null){
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
index 8b3349a..35ae4ab 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
@@ -31,7 +31,7 @@ public class Log4j2Logger extends AbstractDelegatingLogger {
static {
//older versions current log4j don't have TRACE, use debug
- org.apache.logging.log4j.Level t = org.apache.logging.log4j.Level.DEBUG;
+// org.apache.logging.log4j.Level t = org.apache.logging.log4j.Level.DEBUG;
TO_LOG4J.put(Level.ALL, org.apache.logging.log4j.Level.ALL);
TO_LOG4J.put(Level.SEVERE, org.apache.logging.log4j.Level.ERROR);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/properties/DefaultPropertyAdaptersSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/properties/DefaultPropertyAdaptersSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/internal/properties/DefaultPropertyAdaptersSingletonSpi.java
index a8791a8..b41a153 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/properties/DefaultPropertyAdaptersSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/properties/DefaultPropertyAdaptersSingletonSpi.java
@@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.PropertyAdapter;
import org.apache.tamaya.annotation.WithPropertyAdapter;
import org.apache.tamaya.spi.PropertyAdaptersSingletonSpi;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
@@ -35,9 +36,11 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Created by Anatole on 30.09.2014.
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public class DefaultPropertyAdaptersSingletonSpi implements PropertyAdaptersSingletonSpi{
- private Map<Class,PropertyAdapter> adapters = new ConcurrentHashMap<>();
+
+ private Map<Class,PropertyAdapter> adapters = new ConcurrentHashMap<>();
public DefaultPropertyAdaptersSingletonSpi(){
// Add default adapters
@@ -67,7 +70,7 @@ public class DefaultPropertyAdaptersSingletonSpi implements PropertyAdaptersSing
register(ZoneId.class, ZoneId::of);
}
- @Override
+ @Override
public <T> PropertyAdapter<T> register(Class<T> targetType, PropertyAdapter<T> adapter){
return adapters.put(targetType, adapter);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
index 82b9d6e..4207cab 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
@@ -16,13 +16,13 @@
package org.apache.tamaya.core.internal.resources.io;
-import java.beans.Introspector;
import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
/**
* Miscellaneous class utility methods.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
index 4fe958e..97a4ad9 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
@@ -19,7 +19,6 @@ package org.apache.tamaya.core.internal.resources.io;
import java.io.IOException;
import java.io.InputStream;
import java.util.Objects;
-import java.util.function.Supplier;
/**
* {@link org.apache.tamaya.core.resource.Resource} implementation for a given InputStream. Should only
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
index 5d37917..48a2b59 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
@@ -16,19 +16,11 @@
package org.apache.tamaya.core.internal.resources.io;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.TreeSet;
/**
* Miscellaneous {@link String} utility methods.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertySource.java
index 1e9acd3..126f84e 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertySource.java
@@ -18,17 +18,23 @@
*/
package org.apache.tamaya.core.properties;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
import org.apache.tamaya.MetaInfo;
import org.apache.tamaya.MetaInfoBuilder;
import org.apache.tamaya.PropertySource;
-import java.io.Serializable;
-import java.util.*;
-
/**
* Abstract base class for implementing a {@link org.apache.tamaya.PropertySource}.
*/
-@SuppressWarnings("NullableProblems")
public abstract class AbstractPropertySource implements PropertySource, Serializable{
/**
* serialVersionUID.
@@ -83,7 +89,6 @@ public abstract class AbstractPropertySource implements PropertySource, Serializ
return Optional.ofNullable(toMap().get(key));
}
- @SuppressWarnings("NullableProblems")
@Override
public Set<String> keySet(){
return toMap().keySet();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/DelegatingPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/DelegatingPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/DelegatingPropertySource.java
index 0e1914b..611ed0d 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/DelegatingPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/DelegatingPropertySource.java
@@ -38,7 +38,6 @@ import java.util.*;
*/
class DelegatingPropertySource implements PropertySource {
- private static final long serialVersionUID = -1419376385695224799L;
private PropertySource mainMap;
private Map<String,String> parentMap;
private MetaInfo metaInfo;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/FreezedPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/FreezedPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/FreezedPropertySource.java
index 81ea88c..204c1c9 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/FreezedPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/FreezedPropertySource.java
@@ -18,15 +18,19 @@
*/
package org.apache.tamaya.core.properties;
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
import org.apache.tamaya.ConfigChangeSet;
import org.apache.tamaya.MetaInfo;
import org.apache.tamaya.MetaInfoBuilder;
import org.apache.tamaya.PropertySource;
-import java.io.Serializable;
-import java.time.Instant;
-import java.util.*;
-
/**
* This class models a freezed instance current an {@link org.apache.tamaya.PropertySource}.
* Created by Anatole on 28.03.14.
@@ -34,7 +38,7 @@ import java.util.*;
final class FreezedPropertySource implements PropertySource, Serializable{
private static final long serialVersionUID = 3365413090311267088L;
- private Map<String,Map<String,String>> fieldMMetaInfo = new HashMap<>();
+// private Map<String,Map<String,String>> fieldMMetaInfo = new HashMap<>();
private MetaInfo metaInfo;
private Map<String,String> properties = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/IntersectingPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/IntersectingPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/IntersectingPropertySource.java
index b0fb90c..bc22822 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/IntersectingPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/IntersectingPropertySource.java
@@ -30,7 +30,8 @@ import java.util.stream.Collectors;
*/
class IntersectingPropertySource extends AbstractPropertySource {
- private List<PropertySource> providers;
+ private static final long serialVersionUID = -1492990130201110889L;
+ private List<PropertySource> providers;
private PropertySource aggregatedDelegate;
public IntersectingPropertySource(MetaInfo metaInfo, AggregationPolicy policy, List<PropertySource> providers) {
@@ -47,10 +48,6 @@ class IntersectingPropertySource extends AbstractPropertySource {
return Optional.empty();
}
- private boolean filter(Map.Entry<String, String> entry) {
- return containsKey(entry.getKey());
- }
-
@Override
public boolean containsKey(String key) {
for (PropertySource prov : this.providers) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/PathBasedPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/PathBasedPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/PathBasedPropertySource.java
index 0c23394..4ea663a 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/PathBasedPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/PathBasedPropertySource.java
@@ -32,7 +32,8 @@ import java.util.*;
*/
final class PathBasedPropertySource extends AbstractPropertySource {
- private List<String> paths = new ArrayList<>();
+ private static final long serialVersionUID = 5147019699905042582L;
+ private List<String> paths = new ArrayList<>();
private Map<String, String> properties = new HashMap<>();
private AggregationPolicy aggregationPolicy;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceBuilder.java b/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceBuilder.java
index 392b298..de81c92 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceBuilder.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceBuilder.java
@@ -18,25 +18,27 @@
*/
package org.apache.tamaya.core.properties;
-import org.apache.tamaya.*;
-
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import java.util.logging.Logger;
+
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.MetaInfoBuilder;
+import org.apache.tamaya.PropertySource;
/**
* Builder for assembling non trivial property providers.
*/
public final class PropertySourceBuilder {
- private static final Supplier<IllegalStateException> noPropertyProviderAvailable =
- () -> new IllegalStateException("No PropertyProvidersSingletonSpi available.");
+// private static final Supplier<IllegalStateException> noPropertyProviderAvailable =
+// () -> new IllegalStateException("No PropertyProvidersSingletonSpi available.");
- /**
- * THe logger used.
- */
- private static final Logger LOG = Logger.getLogger(PropertySourceBuilder.class.getName());
/**
* The final meta info to be used, or null, if a default should be generated.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFactory.java b/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFactory.java
index 6c47936..b007ea8 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFactory.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFactory.java
@@ -18,17 +18,21 @@
*/
package org.apache.tamaya.core.properties;
-import org.apache.tamaya.AggregationPolicy;
-import org.apache.tamaya.MetaInfo;
-import org.apache.tamaya.MetaInfoBuilder;
-import org.apache.tamaya.PropertySource;
-
import java.net.URL;
import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import java.util.logging.Logger;
+
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.MetaInfoBuilder;
+import org.apache.tamaya.PropertySource;
/**
* Default implementation current the singleton backing bean for the {@link org.apache.tamaya.core.properties.PropertySourceBuilder}.
@@ -38,7 +42,6 @@ public final class PropertySourceFactory {
private static final PropertySource EMPTY_PROPERTYSOURCE = fromMap(MetaInfo.of("<empty>"), Collections.emptyMap());
private static final PropertySource ENV_PROPERTYSOURCE = new EnvironmentPropertySource();
- private static final Logger LOG = Logger.getLogger(PropertySourceFactory.class.getName());
/**
* Singleton constructor.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/ReplacingPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/ReplacingPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/ReplacingPropertySource.java
index cee7891..4ea3c09 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/ReplacingPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/ReplacingPropertySource.java
@@ -32,7 +32,6 @@ import java.util.*;
*/
class ReplacingPropertySource implements PropertySource {
- private static final long serialVersionUID = -1419376385695224799L;
private PropertySource mainMap;
private Map<String,String> replacingMap;
private MetaInfo metaInfo;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/properties/URLBasedPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/URLBasedPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/URLBasedPropertySource.java
index e509cf1..a3ae395 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/URLBasedPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/URLBasedPropertySource.java
@@ -36,7 +36,8 @@ import java.util.*;
*/
final class URLBasedPropertySource extends AbstractPropertySource {
- private List<URL> resources = new ArrayList<>();
+ private static final long serialVersionUID = 648272283683183532L;
+ private List<URL> resources = new ArrayList<>();
private Map<String,String> properties = new HashMap<>();
private AggregationPolicy aggregationPolicy;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/resource/Resource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/resource/Resource.java b/core/src/main/java/org/apache/tamaya/core/resource/Resource.java
index 511be7e..c64c656 100644
--- a/core/src/main/java/org/apache/tamaya/core/resource/Resource.java
+++ b/core/src/main/java/org/apache/tamaya/core/resource/Resource.java
@@ -17,10 +17,8 @@ package org.apache.tamaya.core.resource;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
import java.net.URL;
-import java.util.function.Supplier;
/**
* Interface for a resource descriptor that abstracts from the actual
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/spi/AdapterProviderSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/AdapterProviderSpi.java b/core/src/main/java/org/apache/tamaya/core/spi/AdapterProviderSpi.java
index 1638eec..9b15c79 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/AdapterProviderSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/AdapterProviderSpi.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.core.spi;
import org.apache.tamaya.PropertyAdapter;
-import java.util.function.Function;
/**
* This service provides different {@link org.apache.tamaya.PropertyAdapter} instances for types.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java b/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
index 15b9f5b..3696db9 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
@@ -18,10 +18,9 @@
*/
package org.apache.tamaya.core.spi;
-import org.apache.tamaya.Environment;
-
import java.util.Map;
-import java.util.Set;
+
+import org.apache.tamaya.Environment;
/**
* SPI for components that define a concrete type current {@link org.apache.tamaya.Environment}.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java b/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
index fef8c9c..e849b1a 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/PropertyAdapterService.java
@@ -27,8 +27,10 @@ import java.util.Set;
import org.apache.tamaya.PropertyAdapter;
+@SuppressWarnings("unchecked")
public interface PropertyAdapterService{
+
public default PropertyAdapter<URL> getURLAdapter(){
return PropertyAdapter.class.cast(getClassAdapter(URL.class));
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java b/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
index 7596a1f..1c1559a 100644
--- a/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
+++ b/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
@@ -28,14 +28,11 @@ import org.apache.tamaya.annotation.DefaultValue;
import org.apache.tamaya.core.internal.config.DefaultConfigurationManagerSingletonSpi;
import org.junit.Test;
-import java.beans.PropertyChangeListener;
-
/**
* Test class for {@link org.apache.tamaya.core.internal.config.DefaultConfigurationManagerSingletonSpi}.
*/
public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
- private static final PropertyChangeListener LISTENER = System.out::println;
@Test
public void testSEConfigurationService() {
@@ -77,7 +74,7 @@ public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
@Test
public void testGetRootEnvironment() {
- DefaultConfigurationManagerSingletonSpi s = new DefaultConfigurationManagerSingletonSpi();
+// DefaultConfigurationManagerSingletonSpi s = new DefaultConfigurationManagerSingletonSpi();
Environment env = Environment.root();
assertNotNull(env);
assertEquals(System.getProperty("java.version"),
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/JavaOneDemo.java b/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
index fb66970..4287e68 100644
--- a/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
+++ b/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
@@ -18,16 +18,14 @@
*/
package org.apache.tamaya;
-import org.apache.tamaya.core.config.ConfigurationFormats;
-import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.apache.tamaya.core.spi.ConfigurationFormat;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.apache.tamaya.core.properties.PropertySourceBuilder;
+import org.junit.Test;
/**
* Created by Anatole on 30.09.2014.
@@ -50,7 +48,7 @@ public class JavaOneDemo {
@Test
public void testProgrammaticConfig() {
- ConfigurationFormat format = ConfigurationFormats.getPropertiesFormat();
+// ConfigurationFormat format = ConfigurationFormats.getPropertiesFormat();
Map<String, String> cfgMap = new HashMap<>();
cfgMap.put("param1", "value1");
cfgMap.put("a", "Adrian"); // overrides Anatole
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java b/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
index adcca93..e6627b0 100644
--- a/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
@@ -18,17 +18,16 @@
*/
package org.apache.tamaya.core.config;
-import org.apache.tamaya.ConfigChangeSet;
-import org.apache.tamaya.ConfigChangeSetBuilder;
-import org.apache.tamaya.Configuration;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertFalse;
+import org.apache.tamaya.ConfigChangeSet;
+import org.apache.tamaya.ConfigChangeSetBuilder;
+import org.apache.tamaya.Configuration;
+import org.junit.Test;
/**
* Simple test for a mutable Configuration instance.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java b/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
index ed3bf15..8869ce4 100644
--- a/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.tamaya.core.env;
-import org.apache.tamaya.Configuration;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
/**
* Created by Anatole on 02.10.2014.
@@ -32,7 +31,7 @@ public class ConfiguredSystemPropertiesTest {
@Test
public void testInstall(){
- Configuration config = Configuration.current();
+// Configuration config = Configuration.current();
Properties props = System.getProperties();
assertTrue(props.getClass().getName().equals(Properties.class.getName()));
System.out.println("Props("+props.getClass().getName()+"): " + props);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java b/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
index 226faf9..9046abe 100644
--- a/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
+++ b/core/src/test/java/org/apache/tamaya/internal/MutableTestConfigProvider.java
@@ -18,17 +18,18 @@
*/
package org.apache.tamaya.internal;
-import org.apache.tamaya.*;
-import org.apache.tamaya.core.config.AbstractConfiguration;
-import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
-
import java.beans.PropertyChangeEvent;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.tamaya.ConfigChangeSet;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.core.config.AbstractConfiguration;
+import org.apache.tamaya.core.spi.ConfigurationProviderSpi;
+
/**
* Simple test provider that creates a mutable instance of a configuration, just using a simple map instance.
*/
@@ -48,7 +49,7 @@ public class MutableTestConfigProvider implements ConfigurationProviderSpi{
dataMap.put("sons.1", "Robin");
dataMap.put("sons.2", "Luke");
dataMap.put("sons.3", "Benjamin");
- PropertySource provider = PropertySourceBuilder.of(CONFIG_NAME).addMap(dataMap).build();
+// PropertySource provider = PropertySourceBuilder.of(CONFIG_NAME).addMap(dataMap).build();
testConfig = new MutableConfiguration(dataMap, MetaInfo.of(CONFIG_NAME));
}
@@ -72,7 +73,8 @@ public class MutableTestConfigProvider implements ConfigurationProviderSpi{
*/
private final class MutableConfiguration extends AbstractConfiguration{
- private final Map<String,String> data = new ConcurrentHashMap<>();
+ private static final long serialVersionUID = 8811989470609598218L;
+ private final Map<String,String> data = new ConcurrentHashMap<>();
MutableConfiguration(Map<String,String> data, MetaInfo metaInfo){
super(metaInfo);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java b/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
index a71a58d..db17a48 100644
--- a/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
+++ b/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.samples.annotations;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assume.assumeTrue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java b/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
index 80a6fb1..b55f731 100644
--- a/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
+++ b/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java
@@ -18,16 +18,13 @@
*/
package org.apache.tamaya.simple;
-import org.apache.tamaya.core.config.ConfigurationFormats;
-import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.apache.tamaya.core.spi.ConfigurationFormat;
-import org.junit.Test;
-
-import org.apache.tamaya.Configuration;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.core.properties.PropertySourceBuilder;
+import org.junit.Test;
+
/**
* Created by Anatole on 24.02.14.
*/
@@ -45,7 +42,7 @@ public class SimplePropertiesAndCLISample {
@Test
public void testProgrammaticConfig() {
- ConfigurationFormat format = ConfigurationFormats.getPropertiesFormat();
+// ConfigurationFormat format = ConfigurationFormats.getPropertiesFormat();
Map<String, String> cfgMap = new HashMap<>();
cfgMap.put("param1", "value1");
cfgMap.put("a", "Adrian"); // overrides Anatole
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
index c487bdb..61785ac 100644
--- a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
+++ b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
@@ -18,20 +18,22 @@
*/
package org.apache.tamaya.ucs;
-import org.apache.tamaya.*;
-import org.apache.tamaya.core.config.ConfigFunctions;
-import org.apache.tamaya.core.properties.PropertySourceBuilder;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.core.config.ConfigFunctions;
+import org.apache.tamaya.core.properties.PropertySourceBuilder;
+import org.junit.Test;
+
/**
* Configuration is organized as key/value pairs. This basically can be modeled as {@code Map<String,String>}
* Configuration should be as simple as possible. A {@code Map<String,String>} instance has methods that may not
@@ -62,10 +64,10 @@ public class UC1ReadProperties {
public void example() {
Configuration config = PropertySourceBuilder.of("test")
.addPaths("classpath:ucs/UC1ReadProperties/UC1ReadPropertiesTest.properties").build().toConfiguration();
- String name = config.get("name").orElse("Anatole");
- BigDecimal bigNum = config.get("num.BD", BigDecimal.class).orElseThrow(() -> new IllegalStateException("Sorry"));
- double anotherNum = config.getDouble("num.Double").getAsDouble();
- long longNum = config.getLong("num.Long").orElse(288900L);
+// String name = config.get("name").orElse("Anatole");
+// BigDecimal bigNum = config.get("num.BD", BigDecimal.class).orElseThrow(() -> new IllegalStateException("Sorry"));
+// double anotherNum = config.getDouble("num.Double").getAsDouble();
+// long longNum = config.getLong("num.Long").orElse(288900L);
// or more simpler use area function
Configuration areaConfig2 = config.with(ConfigFunctions.selectArea("num"));
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java b/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
index 993048b..73f475f 100644
--- a/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
+++ b/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
@@ -18,12 +18,13 @@
*/
package org.apache.tamaya.ucs;
-import org.apache.tamaya.*;
+import org.apache.tamaya.AggregationPolicy;
+import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.MetaInfo;
+import org.apache.tamaya.PropertySource;
import org.apache.tamaya.core.properties.PropertySourceBuilder;
import org.junit.Test;
-import static junit.framework.TestCase.assertTrue;
-
/**
* Configuration is organized as key/value pairs. This basically can be modeled as {@code Map<String,String>}
* Configuration should be as simple as possible. Advanced use cases can often easily implemented by combining
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/31161dfd/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 45450ca..4f66e51 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
@@ -39,7 +39,7 @@ public final class ConfigurationExtension implements Extension {
if (!ConfiguredType.isConfigured(at.getJavaClass())) {
return;
}
- final ConfiguredType configuredType = ConfigurationInjector.registerType(at.getJavaClass());
+// final ConfiguredType configuredType = ConfigurationInjector.registerType(at.getJavaClass());
final InjectionTarget<T> it = pit.getInjectionTarget();
InjectionTarget<T> wrapped = new InjectionTarget<T>() {