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/11/29 20:57:30 UTC
incubator-tamaya-sandbox git commit: TAMAYA-218: Fix warnings while
trying to verify tests
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master bb340e091 -> 3fa5309e2
TAMAYA-218: Fix warnings while trying to verify tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/3fa5309e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/3fa5309e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/3fa5309e
Branch: refs/heads/master
Commit: 3fa5309e2933a950e2b0dd593a67d1c1abeb3a09
Parents: bb340e0
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 29 21:57:09 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 29 21:57:09 2017 +0100
----------------------------------------------------------------------
.../tamaya/metamodel/spi/ItemFactory.java | 8 ++++----
.../metamodel/spi/ItemFactoryManager.java | 20 ++++++++++++--------
.../metamodel/spi/MetaConfigurationReader.java | 1 -
.../tamaya/metamodel/spi/SimpleResolver.java | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3fa5309e/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactory.java
index 1cfb8b9..af2bbaf 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactory.java
@@ -28,21 +28,21 @@ import java.util.Map;
public interface ItemFactory<T> {
/**
- * Get the factory name.
+ * Gets the factory name.
* @return the factory name, not null.
*/
String getName();
/**
- * Create a new instance.
- * @param parameters the parameters for configuring the instance.
+ * Creates a new instance.
+ * @param parameters the parameters to configure the instance.
* @return the new instance, not null.
*/
T create(Map<String,String> parameters);
/**
* Get the target type created by this factory. This can be used to
- * assign the factory to an acording item base type, e.g. a PropertySource,
+ * assign the factory to an according item base type, e.g. a PropertySource,
* PropertySourceProvider, PropertyFilter etc.
* @return the target type, not null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3fa5309e/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
index 4578640..0963b44 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
@@ -18,23 +18,27 @@
*/
package org.apache.tamaya.metamodel.spi;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.ServiceContextManager;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.tamaya.spi.ServiceContextManager;
+
/**
* Created by atsticks on 04.12.16.
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public final class ItemFactoryManager {
private static final Logger LOG = Logger.getLogger(ItemFactoryManager.class.getName());
- private Map<Class, List<ItemFactory<?>>> factoryRegistry = new ConcurrentHashMap<>();
+ private Map<Class, List<ItemFactory<?>>> factoryRegistry = new ConcurrentHashMap<>();
private static ItemFactoryManager INSTANCE = new ItemFactoryManager();
@@ -45,7 +49,7 @@ public final class ItemFactoryManager {
return INSTANCE;
}
- public <T> List<ItemFactory<T>> getFactories(Class<T> type){
+ public <T> List<ItemFactory<T>> getFactories(Class<T> type){
List<ItemFactory<?>> factories = factoryRegistry.get(type);
if(factories==null){
Collection<ItemFactory> allFactories =
@@ -71,7 +75,7 @@ public final class ItemFactoryManager {
// try creating a new factory with the given id as fully qualified class name...
try{
Class<? extends ItemFactory> instanceType = (Class<? extends ItemFactory>) Class.forName(id);
- ItemFactory<T> factory = new SimpleItemFactory(type, instanceType);
+ ItemFactory<T> factory = new SimpleItemFactory<T>(type, instanceType);
registerItemFactory(factory);
return factory;
}catch(Exception e){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3fa5309e/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
index 8ebfe25..f8cf9c8 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.metamodel.spi;
import org.apache.tamaya.spi.ConfigurationBuilder;
-import org.apache.tamaya.spi.ConfigurationContextBuilder;
import org.w3c.dom.Document;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3fa5309e/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/SimpleResolver.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/SimpleResolver.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/SimpleResolver.java
index 9cb3065..4cab006 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/SimpleResolver.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/SimpleResolver.java
@@ -25,7 +25,7 @@ package org.apache.tamaya.metamodel.spi;
public interface SimpleResolver {
/**
- * Get the expression id, which is the first part of an placeholder expression
+ * Get the expression id, which is the first part of a placeholder expression
* ({@code ${expressionId:expression}}).
* @return the expression id, never null.
*/