You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/10/23 05:38:07 UTC
incubator-tamaya-extensions git commit: TAMAYA-291: Fix warnings
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master c6989780e -> 537883c78
TAMAYA-291: Fix warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/537883c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/537883c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/537883c7
Branch: refs/heads/master
Commit: 537883c7867f0d953bced2ddd9d95925aec11247
Parents: c698978
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Oct 23 07:37:57 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Oct 23 07:37:57 2017 +0200
----------------------------------------------------------------------
.../tamaya/events/ConfigEventManager.java | 7 +-
.../events/ConfigurationChangeBuilder.java | 9 +-
.../tamaya/events/FrozenConfiguration.java | 10 +-
.../internal/DefaultConfigEventManagerSpi.java | 5 +-
.../events/spi/ConfigEventManagerSpi.java | 10 +-
.../tamaya/events/ConfigEventManagerTest.java | 2 -
.../events/ConfigurationChangeBuilderTest.java | 142 +++++++++----------
.../tamaya/events/FrozenConfigurationTest.java | 2 -
.../tamaya/events/MethodNotMockedAnswer.java | 1 +
.../tamaya/events/ObservedConfigTest.java | 9 --
.../tamaya/events/RandomPropertySource.java | 3 +-
.../apache/tamaya/events/TestConfigView.java | 6 +-
.../folderobserver/FileChangeListener.java | 9 +-
.../ObservingPropertySourceProvider.java | 3 +-
14 files changed, 96 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
index b5cb0ae..96dc9a5 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java
@@ -28,6 +28,7 @@ import java.util.Collection;
* Singleton accessor for accessing the event support component that distributes change events of
* {@link org.apache.tamaya.spi.PropertySource} and {@link org.apache.tamaya.Configuration}.
*/
+@SuppressWarnings("rawtypes")
public final class ConfigEventManager {
/**
* The backing SPI.
@@ -62,7 +63,7 @@ public final class ConfigEventManager {
* @param l the listener not null.
* @param eventType the event type to which this listener listens to.
*/
- public static <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T> eventType) {
+ public static <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T> eventType) {
spi().addListener(l);
}
@@ -82,7 +83,7 @@ public final class ConfigEventManager {
* @param l the listener, not null.
* @param eventType the event type to which this listener listens to.
*/
- public static <T extends ConfigEvent> void removeListener(ConfigEventListener l, Class<T> eventType) {
+ public static <T extends ConfigEvent> void removeListener(ConfigEventListener l, Class<T> eventType) {
spi().removeListener(l);
}
@@ -92,7 +93,7 @@ public final class ConfigEventManager {
* @param <T> type param
* @return a list with the listeners found, never null.
*/
- public static <T extends ConfigEvent>
+ public static <T extends ConfigEvent>
Collection<? extends ConfigEventListener> getListeners(Class<T> type) {
return spi().getListeners(type);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
index 7379e72..8becb11 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
@@ -22,9 +22,7 @@ import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import java.beans.PropertyChangeEvent;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
@@ -167,7 +165,7 @@ public final class ConfigurationChangeBuilder {
*
* @param key the changed key
* @param value the new value.
- * @return this instance for chining.
+ * @return this instance for chaining.
*/
public ConfigurationChangeBuilder addChange(String key, String value) {
this.delta.put(key, new PropertyChangeEvent(this.source, key, this.source.get(key), value));
@@ -271,15 +269,10 @@ public final class ConfigurationChangeBuilder {
return new ConfigurationChange(this);
}
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return "ConfigurationChangeSetBuilder [config=" + source + ", " +
", delta=" + delta + "]";
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
index 61e8abe..21ef873 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
@@ -22,7 +22,6 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.ConfigOperator;
import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.functions.ConfigurationFunctions;
import org.apache.tamaya.spi.ConfigurationContext;
@@ -95,7 +94,8 @@ public final class FrozenConfiguration implements Configuration, Serializable {
return val;
}
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
public <T> T get(String key, Class<T> type) {
return (T) get(key, TypeLiteral.of(type));
}
@@ -115,10 +115,10 @@ public final class FrozenConfiguration implements Configuration, Serializable {
public <T> T get(String key, TypeLiteral<T> type) {
String value = get(key);
if (value != null) {
- List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
+ List<PropertyConverter<T>> converters = getContext()
.getPropertyConverters(type);
ConversionContext context = new ConversionContext.Builder(this,
- ConfigurationProvider.getConfigurationContext(), key,type).build();
+ getContext(), key,type).build();
for (PropertyConverter<T> converter : converters) {
try {
T t = converter.convert(value, context);
@@ -210,7 +210,7 @@ public final class FrozenConfiguration implements Configuration, Serializable {
* <p>The time is taken from {@linkplain System#currentTimeMillis()}</p>
*
* @see System#currentTimeMillis()
- * @return the moment in time when this configruration has been created
+ * @return the moment in time when this configuration has been created
*/
public long getFrozenAt() {
return frozenAt;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/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 cc26d47..bc5fdcf 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
@@ -35,12 +35,13 @@ import java.util.logging.Logger;
* Default implementation of {@link DefaultConfigEventManagerSpi} just forwarding all
* events synchronously to the listeners.
*/
+@SuppressWarnings("rawtypes")
@Component
public class DefaultConfigEventManagerSpi implements ConfigEventManagerSpi {
private static final Logger LOG = Logger.getLogger(DefaultConfigEventManagerSpi.class.getName());
- private final Map<Class,List<ConfigEventListener>> listeners = new ConcurrentHashMap<>();
+ private final Map<Class,List<ConfigEventListener>> listeners = new ConcurrentHashMap<>();
private final ExecutorService publisher = Executors.newCachedThreadPool();
@@ -68,7 +69,7 @@ public class DefaultConfigEventManagerSpi implements ConfigEventManagerSpi {
addListener(l, ConfigEvent.class);
}
- @Override
+ @Override
public <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T> eventType){
List<ConfigEventListener> ls = listeners.get(eventType);
if(ls==null){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
index 66a8f73..4c90224 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java
@@ -29,6 +29,7 @@ import java.util.Collection;
* by default this equals to registering it with {@link java.util.ServiceLoader}. Add {@link javax.annotation.Priority}
* annotations for overriding (higher values override lower values).
*/
+@SuppressWarnings("rawtypes")
public interface ConfigEventManagerSpi {
/**
* Adds a listener for observing events. References of this
@@ -47,7 +48,7 @@ public interface ConfigEventManagerSpi {
* @param eventType the type of concrete configuration event this listeners should be informed about. All other
* event types will never be delivered to this listener instance.
*/
- <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T> eventType);
+ <T extends ConfigEvent> void addListener(ConfigEventListener l, Class<T> eventType);
/**
* Removes a listener for observing events.
@@ -82,7 +83,7 @@ public interface ConfigEventManagerSpi {
Collection<? extends ConfigEventListener> getListeners(Class<? extends ConfigEvent> eventType);
/**
- * Publishes an event to all interested listeners, hereby executing all registered listeners sequentually and
+ * Publishes an event to all interested listeners, hereby executing all registered listeners sequentially and
* synchronously.,
*
* @param event the event, not null.
@@ -90,7 +91,7 @@ public interface ConfigEventManagerSpi {
void fireEvent(ConfigEvent<?> event);
/**
- * Publishes an event to all interested listeners, hereby publishing the change events asynchrously and in
+ * Publishes an event to all interested listeners, hereby publishing the change events asynchronously and in
* parallel (multithreaded).
*
* @param event the event, not null.
@@ -117,12 +118,11 @@ public interface ConfigEventManagerSpi {
* Start/stop the change monitoring service, which will observe/reevaluate the current configuration regularly
* and trigger ConfigurationChange events if something is changed. This is quite handy for publishing
* configuration changes to whatever systems are interested in. Hereby the origin of a configuration change
- * can be on this machine, or also remotedly. For handling corresponding {@link ConfigEventListener} have
+ * can be on this machine, or also remotely. For handling corresponding {@link ConfigEventListener} have
* to be registered, e.g. listening on {@link org.apache.tamaya.events.ConfigurationChange} events.
*
* @param enable whether to enable or disable the change monitoring.
*/
void enableChangeMonitor(boolean enable);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java
index b56407c..1e658af 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java
@@ -20,8 +20,6 @@ package org.apache.tamaya.events;
import org.junit.Test;
-import java.util.UUID;
-
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeBuilderTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeBuilderTest.java
index f249433..d0ee77a 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeBuilderTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeBuilderTest.java
@@ -30,110 +30,102 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
-
public class ConfigurationChangeBuilderTest {
- @Test
- public void compareReturnAnEmptyListOfChangesForTwoEmptyConfigurations() {
- Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
-
- doReturn(emptyMap()).when(oc).getProperties();
- doReturn(emptyMap()).when(nc).getProperties();
-
- Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
-
- assertThat(diff).isNotNull().isEmpty();
- }
+ @Test
+ public void compareReturnAnEmptyListOfChangesForTwoEmptyConfigurations() {
+ Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- @Test
- public void compareReturnsAChangeEventIfThereIsANewKeyInTheNewVersionOfTheConfiguration() {
- Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ doReturn(emptyMap()).when(oc).getProperties();
+ doReturn(emptyMap()).when(nc).getProperties();
- doReturn(emptyMap()).when(oc).getProperties();
- doReturn(null).when(oc).get(eq("a"));
+ Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
- Map<String, String> valuesNC = new HashMap<String, String>() {{
- put("a", "19");
- }};
+ assertThat(diff).isNotNull().isEmpty();
+ }
- doReturn(valuesNC).when(nc).getProperties();
- doReturn("19").when(nc).get(eq("a"));
+ @Test
+ public void compareReturnsAChangeEventIfThereIsANewKeyInTheNewVersionOfTheConfiguration() {
+ Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
+ doReturn(emptyMap()).when(oc).getProperties();
+ doReturn(null).when(oc).get(eq("a"));
- assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
+ Map<String, String> valuesNC = new HashMap<String, String>();
+ valuesNC.put("a", "19");
- PropertyChangeEvent change = diff.iterator().next();
+ doReturn(valuesNC).when(nc).getProperties();
+ doReturn("19").when(nc).get(eq("a"));
- assertThat(change).isNotNull();
- assertThat(change.getNewValue()).isEqualTo("19");
- assertThat(change.getOldValue()).isNull();
- assertThat(change.getPropertyName()).isEqualTo("a");
- }
+ Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
- @Test
- public void compareReturnsAChangeEventIfAKeyHasBeenRemovedInTheNewVersionOfTheConfiguration() {
- Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
- Map<String, String> valuesOC = new HashMap<String, String>() {{
- put("a", "19");
- }};
+ PropertyChangeEvent change = diff.iterator().next();
- doReturn(valuesOC).when(oc).getProperties();
- doReturn("19").when(oc).get(eq("a"));
+ assertThat(change).isNotNull();
+ assertThat(change.getNewValue()).isEqualTo("19");
+ assertThat(change.getOldValue()).isNull();
+ assertThat(change.getPropertyName()).isEqualTo("a");
+ }
+ @Test
+ public void compareReturnsAChangeEventIfAKeyHasBeenRemovedInTheNewVersionOfTheConfiguration() {
+ Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- doReturn(emptyMap()).when(nc).getProperties();
- doReturn(null).when(nc).get(eq("a"));
+ Map<String, String> valuesOC = new HashMap<String, String>();
+ valuesOC.put("a", "19");
- Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
+ doReturn(valuesOC).when(oc).getProperties();
+ doReturn("19").when(oc).get(eq("a"));
- assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
+ doReturn(emptyMap()).when(nc).getProperties();
+ doReturn(null).when(nc).get(eq("a"));
- PropertyChangeEvent change = diff.iterator().next();
+ Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
- assertThat(change).isNotNull();
- assertThat(change.getNewValue()).isNull();
- assertThat(change.getOldValue()).isEqualTo("19");
- assertThat(change.getPropertyName()).isEqualTo("a");
- }
+ assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
- @Test
- public void compareReturnsAChangeEventIfValueOfExistingKeyHasChanged() {
- Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ PropertyChangeEvent change = diff.iterator().next();
- Map<String, String> valuesOC = new HashMap<String, String>() {{
- put("a", "91");
- }};
+ assertThat(change).isNotNull();
+ assertThat(change.getNewValue()).isNull();
+ assertThat(change.getOldValue()).isEqualTo("19");
+ assertThat(change.getPropertyName()).isEqualTo("a");
+ }
- doReturn(valuesOC).when(oc).getProperties();
- doReturn("91").when(oc).get(eq("a"));
- doReturn("old configuration").when(oc).toString();
+ @Test
+ public void compareReturnsAChangeEventIfValueOfExistingKeyHasChanged() {
+ Configuration oc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
+ Configuration nc = Mockito.mock(Configuration.class, new MethodNotMockedAnswer());
- Map<String, String> valuesNC = new HashMap<String, String>() {{
- put("a", "19");
- }};
+ Map<String, String> valuesOC = new HashMap<String, String>();
+ valuesOC.put("a", "91");
+ doReturn(valuesOC).when(oc).getProperties();
+ doReturn("91").when(oc).get(eq("a"));
+ doReturn("old configuration").when(oc).toString();
- doReturn(valuesNC).when(nc).getProperties();
- doReturn("19").when(nc).get(eq("a"));
- doReturn("new configuration").when(nc).toString();
+ Map<String, String> valuesNC = new HashMap<String, String>();
+ valuesNC.put("a", "19");
- Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
+ doReturn(valuesNC).when(nc).getProperties();
+ doReturn("19").when(nc).get(eq("a"));
+ doReturn("new configuration").when(nc).toString();
- assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
+ Collection<PropertyChangeEvent> diff = ConfigurationChangeBuilder.compare(oc, nc);
- PropertyChangeEvent change = diff.iterator().next();
+ assertThat(diff).isNotNull().isNotEmpty().hasSize(1);
- assertThat(change).isNotNull();
- assertThat(change.getNewValue()).isEqualTo("19");
- assertThat(change.getOldValue()).isEqualTo("91");
- assertThat(change.getPropertyName()).isEqualTo("a");
- }
+ PropertyChangeEvent change = diff.iterator().next();
+ assertThat(change).isNotNull();
+ assertThat(change.getNewValue()).isEqualTo("19");
+ assertThat(change.getOldValue()).isEqualTo("91");
+ assertThat(change.getPropertyName()).isEqualTo("a");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/FrozenConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/FrozenConfigurationTest.java b/modules/events/src/test/java/org/apache/tamaya/events/FrozenConfigurationTest.java
index dbb2ead..264d99a 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/FrozenConfigurationTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/FrozenConfigurationTest.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.events;
import org.apache.tamaya.Configuration;
-import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -58,7 +57,6 @@ public class FrozenConfigurationTest {
/*
* All tests for equals() and hashCode() go here...
*/
-
@Test
public void twoFrozenAreDifferentIfTheyHaveADifferentIdAndFrozenAtTimestamp() {
Map<String, String> properties = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/MethodNotMockedAnswer.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/MethodNotMockedAnswer.java b/modules/events/src/test/java/org/apache/tamaya/events/MethodNotMockedAnswer.java
index 0fbcaa5..90e0f70 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/MethodNotMockedAnswer.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/MethodNotMockedAnswer.java
@@ -23,6 +23,7 @@ import org.mockito.stubbing.Answer;
import java.lang.reflect.Method;
+@SuppressWarnings("rawtypes")
public class MethodNotMockedAnswer implements Answer
{
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
index 22e9044..da749c3 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
@@ -18,18 +18,9 @@
*/
package org.apache.tamaya.events;
-import org.apache.commons.io.FileUtils;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.events.folderobserver.TestObservingProvider;
import org.junit.Test;
-import java.io.File;
import java.io.IOException;
-import java.util.Map;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java b/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
index 746c5f3..4faa1b5 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
@@ -20,13 +20,12 @@ package org.apache.tamaya.events;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spi.PropertyValueBuilder;
import java.util.HashMap;
import java.util.Map;
/**
- * PropertySource that provides a randome entry, different on each access!
+ * PropertySource that provides a random entry, different on each access!
*/
public class RandomPropertySource implements PropertySource{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
index 0713298..b15d966 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
@@ -22,7 +22,6 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.ConfigOperator;
import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
@@ -101,7 +100,8 @@ public class TestConfigView implements ConfigOperator{
return val;
}
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
public <T> T get(String key, Class<T> type) {
return (T) get(key, TypeLiteral.of(type));
}
@@ -121,7 +121,7 @@ public class TestConfigView implements ConfigOperator{
public <T> T get(String key, TypeLiteral<T> type) {
String value = get(key);
if (value != null) {
- List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
+ List<PropertyConverter<T>> converters = getContext()
.getPropertyConverters(type);
ConversionContext context = new ConversionContext.Builder(
key,type).build();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
index 5f7f5d7..9b6b93a 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java
@@ -28,6 +28,7 @@ import java.nio.file.StandardWatchEventKinds;
import java.nio.file.WatchEvent;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -65,7 +66,7 @@ class FileChangeListener implements Runnable {
StandardWatchEventKinds.ENTRY_MODIFY,
StandardWatchEventKinds.ENTRY_CREATE);
} catch (IOException e) {
- throw new FileChangeListenerException("An error happened when does try to registry to watch the folder", e);
+ throw new FileChangeListenerException("An error happened when you tried to register to watch the folder", e);
}
}
}
@@ -103,9 +104,9 @@ class FileChangeListener implements Runnable {
}
}
watckKey.reset();
- Thread.sleep(1_000L);
+ TimeUnit.SECONDS.sleep(1);
} catch (Exception e) {
- throw new FileChangeListenerException("An error happened when does try to watch the folder", e);
+ throw new FileChangeListenerException("An error happened when you tried to register to watch the folder", e);
}
}
@@ -118,7 +119,7 @@ class FileChangeListener implements Runnable {
FileSystem fileSystem = Paths.get(".").getFileSystem();
return fileSystem.newWatchService();
} catch (IOException e) {
- LOGGER.log(Level.WARNING, "The file System does not supports WatchService", e);
+ LOGGER.log(Level.WARNING, "The filesystem does not support WatchService", e);
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/537883c7/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
index 6142b5a..7a60ea8 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java
@@ -68,7 +68,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider,
private final ExecutorService executor = Executors.newSingleThreadExecutor();
/**
- * Constructorm using an explicit directory, ignoring all kind of configuration, if set.
+ * Constructor using an explicit directory, ignoring all kind of configuration, if set.
*
* @param directory the target directory. If null, the default configuration and system property are used.
*/
@@ -176,7 +176,6 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider,
@Override
public void directoryChanged(Path directory) {
synchronized (this.propertySources) {
- final List<PropertySource> existingPropertySources = new ArrayList<>(propertySources);
propertySources.clear();
final Collection<PropertySource> sourcesRead = readConfiguration(directory);
this.propertySources.addAll(sourcesRead);