You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/03/15 10:42:18 UTC
[1/2] incubator-tamaya git commit: Fixed deprecated calls,
some javadoc issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 5e4d9ef4a -> 5a5d637cb
Fixed deprecated calls, some javadoc issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/8f37dd7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/8f37dd7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/8f37dd7d
Branch: refs/heads/master
Commit: 8f37dd7deded80e9ac4fc69a7eab984eb0b7992b
Parents: 5e4d9ef
Author: anatole <an...@apache.org>
Authored: Tue Mar 15 08:39:07 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 15 08:39:07 2016 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/builder/ConfigurationBuilderTest.java | 5 ++---
.../tamaya/format/BaseFormatPropertySourceProvider.java | 8 ++++----
.../java/org/apache/tamaya/functions/PropertyMatcher.java | 1 -
.../org/apache/tamaya/inject/internal/InjectionHelper.java | 7 ++++---
.../apache/tamaya/integration/cdi/ConfigurationProducer.java | 4 ++--
.../apache/tamaya/integration/cdi/DefaultDynamicValue.java | 2 +-
.../tamaya/integration/osgi/OSGIEnhancedConfiguration.java | 2 +-
.../apache/tamaya/spisupport/PropertyConverterManager.java | 1 +
8 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java b/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
index 43196f7..07a72c5 100644
--- a/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
+++ b/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
@@ -370,8 +370,7 @@ public class ConfigurationBuilderTest {
@Test(expected = NullPointerException.class)
public void canNotAddNullAsPropertyFilter() {
ConfigurationBuilder builder = new ConfigurationBuilder();
-
- builder.addPropertyFilters(null);
+ builder.addPropertyFilters((PropertyFilter[])null);
}
@Test
@@ -505,7 +504,7 @@ public class ConfigurationBuilderTest {
@Test(expected = NullPointerException.class)
public void cannotAddNullAsPropertyProvider() {
- new ConfigurationBuilder().addPropertySourceProviders(null);
+ new ConfigurationBuilder().addPropertySourceProviders((PropertySourceProvider[])null);
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
index a474ba8..84d6cfa 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
@@ -35,10 +35,10 @@ import java.util.logging.Logger;
/**
* Implementation of a {@link PropertySourceProvider} that reads configuration from some given resource paths
- * and using the given formats. The resource path are resolved using the current
- * {@link org.apache.tamaya.resource.ResourceResolver} active. For each resource found the configuration formats
- * passed get a chance to read the resource, if they succeed the result is taken as the providers PropertySources
- * to be exposed.
+ * and using the given formats. The resource path are resolved as classpath resources. This can be changed by
+ * overriding {@link #getPropertySources()}.
+ * For each resource found the configuration formats passed get a chance to read the resource, if they succeed the
+ * result is taken as the providers PropertySources to be exposed.
*/
public abstract class BaseFormatPropertySourceProvider implements PropertySourceProvider {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
index 0df3cb0..e0f5212 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
@@ -31,7 +31,6 @@ public interface PropertyMatcher {
* @param key the key, not null
* @param value, the value, not null
* @return {@code true} if the entry should match the predicate,
- * otherwise {@code false}
*/
boolean test(String key, String value);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index 2b7271f..418d51b 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -38,6 +38,7 @@ import org.apache.tamaya.inject.api.InjectionUtils;
import org.apache.tamaya.inject.api.WithPropertyConverter;
import org.apache.tamaya.inject.spi.ConfiguredType;
import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
+import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.ServiceContextManager;
@@ -188,11 +189,11 @@ final class InjectionHelper {
if(configValue==null) {
return null;
}
- List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
+ ConfigurationContext configContext = ConfigurationProvider.getConfiguration().getContext();
+ List<PropertyConverter<T>> converters = configContext
.getPropertyConverters(targetType);
ConversionContext ctx = new ConversionContext.Builder(ConfigurationProvider.getConfiguration(),
- ConfigurationProvider.getConfigurationContext(), key, targetType)
- .setAnnotatedElement(element).build();
+ configContext, key, targetType).setAnnotatedElement(element).build();
for (PropertyConverter<T> converter : converters) {
adaptedValue = converter.convert(configValue, ctx);
if (adaptedValue != null) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java
index bf7c6eb..8d5f346 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java
@@ -99,7 +99,7 @@ public class ConfigurationProducer {
}
}
ConversionContext.Builder builder = new ConversionContext.Builder(config,
- ConfigurationProvider.getConfigurationContext(), keyFound, TypeLiteral.of(toType));
+ ConfigurationProvider.getConfiguration().getContext(), keyFound, TypeLiteral.of(toType));
if (injectionPoint.getMember() instanceof AnnotatedElement) {
builder.setAnnotatedElement((AnnotatedElement) injectionPoint.getMember());
}
@@ -117,7 +117,7 @@ public class ConfigurationProducer {
value = customCnverter.convert(defaultTextValue, conversionContext);
}
if (value == null) {
- List<PropertyConverter<Object>> converters = ConfigurationProvider.getConfigurationContext()
+ List<PropertyConverter<Object>> converters = ConfigurationProvider.getConfiguration().getContext()
.getPropertyConverters(TypeLiteral.of(toType));
for (PropertyConverter<Object> converter : converters) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
index dbae46a..3b436a5 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
@@ -384,7 +384,7 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
} else {
String source = configuration.get(key);
ConversionContext ctx = new ConversionContext.Builder(configuration,
- ConfigurationProvider.getConfigurationContext(), key, targetType).build();
+ configuration.getContext(), key, targetType).build();
value = propertyConverter.convert(source, ctx);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
index c0ca5c5..c94f1f7 100644
--- a/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
+++ b/modules/integration/osgi/src/main/java/org/apache/tamaya/integration/osgi/OSGIEnhancedConfiguration.java
@@ -60,7 +60,7 @@ public class OSGIEnhancedConfiguration extends DefaultConfiguration{
* Configuration wrapped into a Tamaya PropertySource.
*/
private static final class OSGIConfigurationContext extends DefaultConfigurationContext{
- private ConfigurationContext tamayaContext = ConfigurationProvider.getConfigurationContext();
+ private ConfigurationContext tamayaContext = ConfigurationProvider.getConfiguration().getContext();
private OSGIPropertySource osgiPropertySource;
public OSGIConfigurationContext(org.osgi.service.cm.Configuration osgiConfiguration){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8f37dd7d/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyConverterManager.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyConverterManager.java
index 5fd219b..ff64210 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyConverterManager.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertyConverterManager.java
@@ -302,6 +302,7 @@ public class PropertyConverterManager {
* @param <T> the type
* @return the boxed type, or null.
*/
+ @SuppressWarnings("all")
private <T> TypeLiteral<T> mapBoxedType(TypeLiteral<T> targetType) {
Type parameterType = targetType.getType();
if (parameterType == int.class) {
[2/2] incubator-tamaya git commit: Fixed several build warnings.
Posted by an...@apache.org.
Fixed several build warnings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/5a5d637c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/5a5d637c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/5a5d637c
Branch: refs/heads/master
Commit: 5a5d637cbd3d3286c5dcc0e5dac624d6c1177219
Parents: 8f37dd7
Author: anatole <an...@apache.org>
Authored: Tue Mar 15 10:42:00 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 15 10:42:00 2016 +0100
----------------------------------------------------------------------
modules/integration/cdi-se/pom.xml | 3 +--
.../org/apache/tamaya/integration/cdi/DefaultDynamicValue.java | 1 -
modules/integration/osgi/pom.xml | 5 +----
.../main/java/org/apache/tamaya/model/spi/ParameterModel.java | 2 +-
.../java/org/apache/tamaya/optional/OptionalConfiguration.java | 4 +---
modules/server/pom.xml | 3 ---
.../java/org/apache/tamaya/server/ConfigurationResource.java | 3 ---
.../main/java/org/apache/tamaya/server/VersionProperties.java | 2 +-
8 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi-se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/pom.xml b/modules/integration/cdi-se/pom.xml
index c3bda9a..a0dfc3f 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -60,8 +60,7 @@ under the License.
<configuration>
<instructions>
<Export-Package>
- org.apache.tamaya.integration.cdi,
- org.apache.tamaya.integration.cdi.config,
+ org.apache.tamaya.integration.cdi.config
</Export-Package>
<Private-Package>
org.apache.tamaya.integration.cdi.internal
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
index 3b436a5..98ee05a 100644
--- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
+++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.integration.cdi;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.inject.api.BaseDynamicValue;
import org.apache.tamaya.inject.api.DynamicValue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/pom.xml b/modules/integration/osgi/pom.xml
index f668edc..3d25028 100644
--- a/modules/integration/osgi/pom.xml
+++ b/modules/integration/osgi/pom.xml
@@ -48,11 +48,8 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.tamaya.integration.osgi.genereal.Activator
+ org.apache.tamaya.integration.osgi.Activator
</Bundle-Activator>
- <Private-Package>
- org.tamaya.integration.osgi.general
- </Private-Package>
<Export-Service>
org.osgi.service.cm.ConfigurationAdmin
</Export-Service>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
index 7e28682..43d7174 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
@@ -169,7 +169,7 @@ public class ParameterModel extends AbstractModel {
try {
this.type = Class.forName("java.lang."+type);
} catch (ClassNotFoundException e2) {
- Logger.getLogger(getClass().getName()).log(Level.WARNING, "Failed to load parameter type: " + type, e2);
+ Logger.getLogger(getClass().getName()).log(Level.INFO, "Failed to load parameter type: " + type, e2);
}
}
return this;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
index fe5c15d..4868bc1 100644
--- a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
+++ b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
@@ -105,8 +105,6 @@ public final class OptionalConfiguration {
/**
* Returns an instance of OptionalConfiguration, which uses the given provider and policy for evaluating the values.
- * @param policy the policy how a value should be evaluated depending if Tamaya is available or not.
- * @param provider the non Tamaya-based provider to be used to evaluate values.
*
* @param policy the policy how a value should be evaluated depending if Tamaya is available or not.
* @param provider the non Tamaya-based provider to be used to evaluate values.
@@ -119,7 +117,7 @@ public final class OptionalConfiguration {
/**
* Returns a default instance, which uses a default provider returning values from system properties and environment
* only.
- * @param policy the policy how a value should be evaluated depending if Tamaya is available or not.
+ *
* @param policy the policy how a value should be evaluated depending if Tamaya is available or not.
* @return a default OptionalConfiguration instance, never null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 31db1cc..7e34018 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -177,9 +177,6 @@ under the License.
org.apache.tamaya.server,
org.apache.tamaya.server.spi
</Export-Package>
- <Private-Package>
- org.apache.tamaya.server.internal
- </Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 0dc99f2..ebc6eca 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -188,13 +188,10 @@ public class ConfigurationResource {
* }
* </pre>
*
- * @param key name of the key to show
* @param key name of the key to show
* @param value configuration value for the given key
* @param ttl time to live
* @return written configuration value.
- * @param ttl time to live
- * @return written configuration value.
*/
@PUT
@Path("/keys/{key}")
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
index e6136fb..e271694 100644
--- a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
+++ b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
@@ -27,7 +27,7 @@ import java.util.Properties;
* at runtime.</p>
*
* <p>All information offered by this is loaded from a properties file at
- * {@value #VERSION_PROPERTY_FILE}.</p>
+ * {@link VersionProperties#VERSION_PROPERTY_FILE}.</p>
*/
public class VersionProperties {
private static final String VERSION_PROPERTY_FILE = "/META-INF/tamaya-server-version.properties";