Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/configjsr 639e69f08 -> 7dbbbe550
- Adapted OSGI deps. - Defined clear resolvability of packages, removing redundancies. - Refactored parts of TypeLiteral into util class. Signed-off-by: Anatole Tresch <[email protected]> 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/7dbbbe55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/7dbbbe55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/7dbbbe55 Branch: refs/heads/configjsr Commit: 7dbbbe5507b8c9730eb660d5ca3fe66429ae62cf Parents: 639e69f Author: Anatole Tresch <[email protected]> Authored: Mon Feb 5 19:48:24 2018 +0100 Committer: Anatole Tresch <[email protected]> Committed: Mon Feb 5 19:48:24 2018 +0100 ---------------------------------------------------------------------- .../collections/AdaptiveCombinationPolicy.java | 31 +++++++++----------- .../tamaya/collections/ItemTokenizer.java | 6 ++-- .../tamaya/collections/LinkedListConverter.java | 1 - .../tamaya/collections/TreeSetConverter.java | 5 ---- .../tamaya/consul/ConsulBackendConfig.java | 7 ++--- .../apache/tamaya/etcd/EtcdBackendConfig.java | 7 ++--- .../apache/tamaya/etcd/EtcdConfigSource.java | 10 +++---- .../tamaya/hazelcast/HazelcastConfigSource.java | 5 +--- .../tamaya/jodatime/DateTimeZoneConverter.java | 3 +- .../tamaya/jodatime/InstantConverter.java | 1 - .../org/apache/tamaya/meta/MetaProperties.java | 6 ++-- meta/src/main/resources/META-INF/beans.xml | 24 +++++++++++++++ .../META-INF/javaconfiguration.properties | 20 +++++++++++++ ...apache.tamaya.management.MetaPropertyMapping | 20 +++++++++++++ meta/src/test/resources/META-INF/beans.xml | 24 +++++++++++++++ .../apache/tamaya/metamodel/MetaContext.java | 16 +++------- .../apache/tamaya/metamodel/Refreshable.java | 2 -- .../internal/ComponentConfigurator.java | 2 +- .../internal/resolver/PropertiesResolver.java | 2 -- .../metamodel/spi/ItemFactoryManager.java | 6 +--- .../apache/tamaya/usagetracker/UsageStat.java | 6 +--- .../internal/DefaultConfigUsage.java | 18 ++---------- .../tamaya/validation/ValidationManager.java | 14 ++------- .../internal/ConfigValidationBean.java | 21 ++++++------- .../validation/spi/ConfigValidationReader.java | 6 ++-- .../org/apache/tamaya/vertx/ConfigVerticle.java | 29 ++++++------------ 26 files changed, 152 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java ---------------------------------------------------------------------- diff --git a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java index 0354f9e..a88437e 100644 --- a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java +++ b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java @@ -43,24 +43,21 @@ public class AdaptiveCombinationPolicy implements ConfigValueCombinationPolicy { * Collecting combination policy using (optional) {@code item-separator} parameter for determining the separator * to combine multiple config entries found. */ - private static final ConfigValueCombinationPolicy COLLECTING_POLICY = new ConfigValueCombinationPolicy(){ - @Override - public String collect(String currentValue, String key, ConfigSource propertySource) { - // check for default collection combination policies for lists, sets, maps etc. - String newValue = propertySource.getValue(key); - if(newValue!=null){ - if(currentValue==null){ - return newValue; - } - final String separator = MetaProperties.getOptionalMetaEntry(ConfigProvider.getConfig(), - key, "item-separator").orElse(","); - return currentValue + separator + newValue; - }else{ - if(currentValue!=null){ - return currentValue; - } - return null; + private static final ConfigValueCombinationPolicy COLLECTING_POLICY = (currentValue, key, propertySource) -> { + // check for default collection combination policies for lists, sets, maps etc. + String newValue = propertySource.getValue(key); + if(newValue!=null){ + if(currentValue==null){ + return newValue; + } + final String separator = MetaProperties.getOptionalMetaEntry(ConfigProvider.getConfig(), + key, "item-separator").orElse(","); + return currentValue + separator + newValue; + }else{ + if(currentValue!=null){ + return currentValue; } + return null; } }; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java ---------------------------------------------------------------------- diff --git a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java index e0281ef..93836d5 100644 --- a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java +++ b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java @@ -180,7 +180,7 @@ final class ItemTokenizer { return null; } - static final Type targetType() { + static Type targetType() { ConversionContext ctx = ConversionContext.getContext(); if(ctx!=null){ return ctx.getTargetType(); @@ -188,7 +188,7 @@ final class ItemTokenizer { return null; } - static final Config config() { + static Config config() { ConversionContext ctx = ConversionContext.getContext(); if(ctx!=null){ return ctx.getConfiguration(); @@ -196,7 +196,7 @@ final class ItemTokenizer { return ConfigProvider.getConfig(); } - static final String key() { + static String key() { ConversionContext ctx = ConversionContext.getContext(); if(ctx!=null){ return ctx.getKey(); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/collections/src/main/java/org/apache/tamaya/collections/LinkedListConverter.java ---------------------------------------------------------------------- diff --git a/collections/src/main/java/org/apache/tamaya/collections/LinkedListConverter.java b/collections/src/main/java/org/apache/tamaya/collections/LinkedListConverter.java index e06c12d..a5b630b 100644 --- a/collections/src/main/java/org/apache/tamaya/collections/LinkedListConverter.java +++ b/collections/src/main/java/org/apache/tamaya/collections/LinkedListConverter.java @@ -50,7 +50,6 @@ public class LinkedListConverter implements Converter<LinkedList> { Object convValue = ItemTokenizer.convertValue(items[1]); if(convValue!=null){ result.add(convValue); - continue; }else{ LOG.log(Level.SEVERE, "Failed to convert collection value type for '"+raw+"'."); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/collections/src/main/java/org/apache/tamaya/collections/TreeSetConverter.java ---------------------------------------------------------------------- diff --git a/collections/src/main/java/org/apache/tamaya/collections/TreeSetConverter.java b/collections/src/main/java/org/apache/tamaya/collections/TreeSetConverter.java index 0e9dbed..2df3cc0 100644 --- a/collections/src/main/java/org/apache/tamaya/collections/TreeSetConverter.java +++ b/collections/src/main/java/org/apache/tamaya/collections/TreeSetConverter.java @@ -18,10 +18,6 @@ */ package org.apache.tamaya.collections; -import org.apache.tamaya.base.convert.ConversionContext; - -import javax.config.Config; -import javax.config.ConfigProvider; import javax.config.spi.Converter; import java.util.List; import java.util.TreeSet; @@ -55,7 +51,6 @@ public class TreeSetConverter implements Converter<TreeSet> { Object convValue = ItemTokenizer.convertValue(items[1]); if(convValue!=null){ result.add(convValue); - continue; }else{ LOG.log(Level.SEVERE, "Failed to convert collection value type for '"+raw+"'."); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/consul/src/main/java/org/apache/tamaya/consul/ConsulBackendConfig.java ---------------------------------------------------------------------- diff --git a/consul/src/main/java/org/apache/tamaya/consul/ConsulBackendConfig.java b/consul/src/main/java/org/apache/tamaya/consul/ConsulBackendConfig.java index 61be0ba..1513ad8 100644 --- a/consul/src/main/java/org/apache/tamaya/consul/ConsulBackendConfig.java +++ b/consul/src/main/java/org/apache/tamaya/consul/ConsulBackendConfig.java @@ -58,13 +58,10 @@ public final class ConsulBackendConfig { private static boolean isConsulDisabled() { String value = System.getProperty(TAMAYA_CONSUL_DISABLE); - if(value==null){ + if (value == null) { value = System.getenv(TAMAYA_CONSUL_DISABLE); } - if(value==null){ - return false; - } - return value.isEmpty() || Boolean.parseBoolean(value); + return value != null && (value.isEmpty() || Boolean.parseBoolean(value)); } public static List<HostAndPort> getConsulBackends(){ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/etcd/src/main/java/org/apache/tamaya/etcd/EtcdBackendConfig.java ---------------------------------------------------------------------- diff --git a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdBackendConfig.java b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdBackendConfig.java index 123313a..118771b 100644 --- a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdBackendConfig.java +++ b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdBackendConfig.java @@ -65,13 +65,10 @@ public final class EtcdBackendConfig { private static boolean isEtcdDisabled() { String value = System.getProperty(TAMAYA_ETCD_DISABLE); - if(value==null){ + if (value == null) { value = System.getenv(TAMAYA_ETCD_DISABLE); } - if(value==null){ - return false; - } - return value.isEmpty() || Boolean.parseBoolean(value); + return value != null && (value.isEmpty() || Boolean.parseBoolean(value)); } public static List<EtcdAccessor> getEtcdBackends(){ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/etcd/src/main/java/org/apache/tamaya/etcd/EtcdConfigSource.java ---------------------------------------------------------------------- diff --git a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdConfigSource.java b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdConfigSource.java index 05c3a53..6d8d984 100644 --- a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdConfigSource.java +++ b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdConfigSource.java @@ -232,14 +232,14 @@ public class EtcdConfigSource extends BaseConfigSource } private String getBackendConfigString() { - String backendProp = ""; + StringBuilder backendProp = new StringBuilder(); for(EtcdAccessor acc:getEtcdBackends()){ - if(backendProp.isEmpty()){ - backendProp += acc.getUrl(); + if(backendProp.length() == 0){ + backendProp.append(acc.getUrl()); }else{ - backendProp += ", " + acc.getUrl(); + backendProp.append(", ").append(acc.getUrl()); } } - return backendProp; + return backendProp.toString(); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastConfigSource.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastConfigSource.java b/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastConfigSource.java index 5808ac9..10ade97 100644 --- a/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastConfigSource.java +++ b/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastConfigSource.java @@ -26,8 +26,6 @@ import com.hazelcast.core.IMap; import org.apache.tamaya.base.configsource.BaseConfigSource; import org.apache.tamaya.mutableconfig.ConfigChangeRequest; import org.apache.tamaya.mutableconfig.spi.MutableConfigSource; -import org.apache.tamaya.spi.PropertyValue; -import org.apache.tamaya.spisupport.propertysource.BasePropertySource; import java.util.Collections; import java.util.HashMap; @@ -185,8 +183,7 @@ implements MutableConfigSource { */ public void refresh() { IMap<String,String> config = hazelcastInstance.getMap(mapReference); - Map<String, String> configMap = new HashMap<>(config); - this.configMap = configMap; + this.configMap = new HashMap<>(config); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java ---------------------------------------------------------------------- diff --git a/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java b/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java index 4b959f7..e78bb9f 100644 --- a/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java +++ b/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java @@ -72,8 +72,7 @@ public class DateTimeZoneConverter implements Converter<DateTimeZone> { } private boolean isSingleIntegerValue(String value) { - boolean match = IS_INTEGER_VALUE.matcher(value).matches(); - return match; + return IS_INTEGER_VALUE.matcher(value).matches(); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/jodatime/src/main/java/org/apache/tamaya/jodatime/InstantConverter.java ---------------------------------------------------------------------- diff --git a/jodatime/src/main/java/org/apache/tamaya/jodatime/InstantConverter.java b/jodatime/src/main/java/org/apache/tamaya/jodatime/InstantConverter.java index 2f29592..fbe3dad 100644 --- a/jodatime/src/main/java/org/apache/tamaya/jodatime/InstantConverter.java +++ b/jodatime/src/main/java/org/apache/tamaya/jodatime/InstantConverter.java @@ -19,7 +19,6 @@ package org.apache.tamaya.jodatime; import org.apache.tamaya.base.convert.ConversionContext; -import org.joda.time.DateTime; import org.joda.time.Instant; import org.joda.time.format.*; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java ---------------------------------------------------------------------- diff --git a/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java b/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java index 27212a7..8fa181f 100644 --- a/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java +++ b/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java @@ -84,9 +84,9 @@ public final class MetaProperties { Predicate<String> filter = mapping.getMetaEntryFilter(null); for(ConfigSource cs:config.getConfigSources()){ if(cs.getName().equals(configSource)){ - cs.getProperties().entrySet().forEach(k -> { - if(filter.test(k.getKey())){ - result.put(k.getKey(), k.getValue()); + cs.getProperties().forEach((key, value) -> { + if (filter.test(key)) { + result.put(key, value); } }); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/meta/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/meta/src/main/resources/META-INF/beans.xml b/meta/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..adee378 --- /dev/null +++ b/meta/src/main/resources/META-INF/beans.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy current the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd";> + +</beans> + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/meta/src/main/resources/META-INF/javaconfiguration.properties ---------------------------------------------------------------------- diff --git a/meta/src/main/resources/META-INF/javaconfiguration.properties b/meta/src/main/resources/META-INF/javaconfiguration.properties new file mode 100644 index 0000000..6661aaf --- /dev/null +++ b/meta/src/main/resources/META-INF/javaconfiguration.properties @@ -0,0 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy current the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z=alphabet + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/meta/src/main/resources/META-INF/services/org.apache.tamaya.management.MetaPropertyMapping ---------------------------------------------------------------------- diff --git a/meta/src/main/resources/META-INF/services/org.apache.tamaya.management.MetaPropertyMapping b/meta/src/main/resources/META-INF/services/org.apache.tamaya.management.MetaPropertyMapping new file mode 100644 index 0000000..3ec5c5b --- /dev/null +++ b/meta/src/main/resources/META-INF/services/org.apache.tamaya.management.MetaPropertyMapping @@ -0,0 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy current the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.apache.tamaya.meta.internal.DefaultMetaPropertyMapping +org.apache.tamaya.meta.internal.EtcdMetaPropertyMapping \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/meta/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/meta/src/test/resources/META-INF/beans.xml b/meta/src/test/resources/META-INF/beans.xml new file mode 100644 index 0000000..adee378 --- /dev/null +++ b/meta/src/test/resources/META-INF/beans.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy current the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd";> + +</beans> + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaContext.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaContext.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaContext.java index c890148..fb18323 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaContext.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaContext.java @@ -37,12 +37,7 @@ import java.util.concurrent.TimeUnit; */ public final class MetaContext { - private static final ThreadLocal<MetaContext> THREAD_CONTEXT = new ThreadLocal<MetaContext>(){ - @Override - protected MetaContext initialValue() { - return new MetaContext(); - } - }; + private static final ThreadLocal<MetaContext> THREAD_CONTEXT = ThreadLocal.withInitial(() -> new MetaContext()); private final Map<String,Value> properties = new ConcurrentHashMap<>(); @@ -180,10 +175,7 @@ public final class MetaContext { * @param unit the target time unit. */ public void setPropertyIfAbsent(String key, String value, long ttl, TimeUnit unit){ - Value prev = this.properties.get(key); - if(prev==null){ - this.properties.put(key, new Value(key, value, unit.toMillis(ttl))); - } + this.properties.computeIfAbsent(key, k -> new Value(k, value, unit.toMillis(ttl))); } /** @@ -203,8 +195,8 @@ public final class MetaContext { public void setProperties(Map<String,String> properties, long ttl, TimeUnit unit){ for(Map.Entry<String, String> en:properties.entrySet()) { this.properties.put( - en.getKey().toString(), - new Value(en.getKey().toString(), en.getValue().toString(), unit.toMillis(ttl))); + en.getKey(), + new Value(en.getKey(), en.getValue(), unit.toMillis(ttl))); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java index dc51554..60ece93 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/Refreshable.java @@ -18,8 +18,6 @@ */ package org.apache.tamaya.metamodel; -import org.apache.tamaya.spi.ConfigurationContext; - /** * Common interface for refreshable items. */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java index 30463d4..3acfcc1 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java @@ -158,7 +158,7 @@ public final class ComponentConfigurator<T> { if (value.isEmpty()) { return null; } - return Character.valueOf(value.charAt(0)); + return value.charAt(0); case "short": case "Short": return Short.valueOf(value); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java index 083daae..009783a 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java @@ -22,8 +22,6 @@ import org.apache.tamaya.metamodel.MetaContext; import org.apache.tamaya.metamodel.spi.SimpleResolver; import org.osgi.service.component.annotations.Component; -import java.net.URI; - /** * Simple resolver for {@link org.apache.tamaya.metamodel.MetaContext} entries that * reads data from system and environment properties. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/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 6450317..93a195e 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 @@ -80,11 +80,7 @@ public final class ItemFactoryManager { } public <T> void registerItemFactory(ItemFactory<T> factory) { - List<ItemFactory<?>> factories = factoryRegistry.get(factory.getType()); - if(factories==null){ - factories = new ArrayList<>(); - factoryRegistry.put(factory.getType(), factories); - } + List<ItemFactory<?>> factories = factoryRegistry.computeIfAbsent(factory.getType(), k -> new ArrayList<>()); factories.add(factory); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java ---------------------------------------------------------------------- diff --git a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java index b8f0541..20d5682 100644 --- a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java +++ b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java @@ -217,11 +217,7 @@ public final class UsageStat { } private AccessStats getAccessDetails(String accessPoint, String[] trace) { - AccessStats details = accessDetails.get(accessPoint); - if(details==null){ - details = new AccessStats(key, accessPoint, trace); - accessDetails.put(accessPoint, details); - } + AccessStats details = accessDetails.computeIfAbsent(accessPoint, p -> new AccessStats(key, p, trace)); return details; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/DefaultConfigUsage.java ---------------------------------------------------------------------- diff --git a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/DefaultConfigUsage.java b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/DefaultConfigUsage.java index caaa0ec..15ebc37 100644 --- a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/DefaultConfigUsage.java +++ b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/DefaultConfigUsage.java @@ -52,10 +52,7 @@ public class DefaultConfigUsage implements ConfigUsageSpi { */ private boolean initEnabled() { String val = System.getProperty("tamaya.usage-report"); - if(Boolean.parseBoolean(val)){ - return true; - } - return false; + return Boolean.parseBoolean(val); } public DefaultConfigUsage(){ @@ -121,11 +118,7 @@ public class DefaultConfigUsage implements ConfigUsageSpi { if(!isTrackingEnabled()){ return; } - UsageStat usage = this.stats.get(key); - if(usage==null){ - usage = new UsageStat(key); - this.stats.put(key, usage); - } + UsageStat usage = this.stats.computeIfAbsent(key, UsageStat::new); usage.trackUsage(key, value); } @@ -140,12 +133,7 @@ public class DefaultConfigUsage implements ConfigUsageSpi { b.append("=========================================\n"); b.append("DATE: ").append(new Date()).append("\n\n"); List<UsageStat> usages = new ArrayList<>(getUsageStats()); - Collections.sort(usages, new Comparator<UsageStat>() { - @Override - public int compare(UsageStat k1, UsageStat k2) { - return k2.getUsageCount() - k1.getUsageCount(); - } - }); + usages.sort((k1, k2) -> k2.getUsageCount() - k1.getUsageCount()); for(UsageStat usage:usages){ String usageCount = String.valueOf(usage.getUsageCount()); b.append(usageCount); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java ---------------------------------------------------------------------- diff --git a/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java b/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java index 64ec6a0..aca56e2 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java +++ b/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java @@ -65,12 +65,7 @@ public final class ValidationManager { for (ValidationModelProviderSpi model : ServiceContextManager.getServiceContext().getServices(ValidationModelProviderSpi.class)) { models.addAll(model.getConfigModels()); } - Collections.sort(models, new Comparator<ValidationModel>() { - @Override - public int compare(ValidationModel k1, ValidationModel k2) { - return k2.getName().compareTo(k2.getName()); - } - }); + models.sort((k1, k2) -> k2.getName().compareTo(k2.getName())); } /** @@ -209,12 +204,7 @@ public final class ValidationManager { Set<String> areas = extractTransitiveAreas(keys); for (ValidationModel defConf : getModels()) { if(ValidationTarget.Section.equals(defConf.getType())){ - for (Iterator<String> iter = areas.iterator();iter.hasNext();){ - String area = iter.next(); - if(area.matches(defConf.getName())){ - iter.remove(); - } - } + areas.removeIf(area -> area.matches(defConf.getName())); } if(ValidationTarget.Parameter.equals(defConf.getType())){ keys.remove(defConf.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationBean.java ---------------------------------------------------------------------- diff --git a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationBean.java b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationBean.java index fc75a26..4f41d3e 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationBean.java +++ b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationBean.java @@ -62,15 +62,12 @@ public class ConfigValidationBean implements ConfigValidationMBean { return compare; } }; - private static final Comparator<ValidationModel> VAL_COMPARATOR = new Comparator<ValidationModel>() { - @Override - public int compare(ValidationModel v1, ValidationModel v2) { - int compare = v1.getType().compareTo(v2.getType()); - if(compare==0){ - compare = v1.getName().compareTo(v2.getName()); - } - return compare; + private static final Comparator<ValidationModel> VAL_COMPARATOR = (v1, v2) -> { + int compare = v1.getType().compareTo(v2.getType()); + if(compare==0){ + compare = v1.getName().compareTo(v2.getName()); } + return compare; }; private Config config; @@ -106,7 +103,7 @@ public class ConfigValidationBean implements ConfigValidationMBean { @Override public String validate(boolean showUndefined) { List<Validation> validations = new ArrayList<>(ValidationManager.getInstance().validate(getConfig(), showUndefined)); - Collections.sort(validations, COMPARATOR); + validations.sort(COMPARATOR); JsonArrayBuilder builder = Json.createArrayBuilder(); for(Validation val:validations){ builder.add(toJsonObject(val)); @@ -119,7 +116,7 @@ public class ConfigValidationBean implements ConfigValidationMBean { @Override public String getConfigurationModel() { List<ValidationModel> configModels = new ArrayList<>(ValidationManager.getInstance().getModels()); - Collections.sort(configModels, VAL_COMPARATOR); + configModels.sort(VAL_COMPARATOR); JsonArrayBuilder result = Json.createArrayBuilder(); for(ValidationModel val: configModels){ result.add(toJsonObject(val)); @@ -135,7 +132,7 @@ public class ConfigValidationBean implements ConfigValidationMBean { @Override public String findConfigurationModels(String namePattern) { List<ValidationModel> configModels = new ArrayList<>(ValidationManager.getInstance().findModels(namePattern)); - Collections.sort(configModels, VAL_COMPARATOR); + configModels.sort(VAL_COMPARATOR); JsonArrayBuilder result = Json.createArrayBuilder(); for(ValidationModel val: configModels){ result.add(toJsonObject(val)); @@ -146,7 +143,7 @@ public class ConfigValidationBean implements ConfigValidationMBean { @Override public String findValidationModels(String namePattern, ValidationTarget... type) { List<ValidationModel> configModels = new ArrayList<>(ValidationManager.getInstance().findModels(namePattern, type)); - Collections.sort(configModels, VAL_COMPARATOR); + configModels.sort(VAL_COMPARATOR); JsonArrayBuilder result = Json.createArrayBuilder(); for(ValidationModel val: configModels){ result.add(toJsonObject(val)); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/validation/src/main/java/org/apache/tamaya/validation/spi/ConfigValidationReader.java ---------------------------------------------------------------------- diff --git a/validation/src/main/java/org/apache/tamaya/validation/spi/ConfigValidationReader.java b/validation/src/main/java/org/apache/tamaya/validation/spi/ConfigValidationReader.java index 0240304..2938a3e 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/spi/ConfigValidationReader.java +++ b/validation/src/main/java/org/apache/tamaya/validation/spi/ConfigValidationReader.java @@ -48,9 +48,9 @@ public final class ConfigValidationReader { List<ValidationModel> result = new ArrayList<>(); Set<String> itemKeys = new HashSet<>(); for (String key : props.keySet()) { - if (key.toString().startsWith("_") && - key.toString().endsWith(DEFAULT_META_INFO_SELECTOR + ".target")) { - itemKeys.add(key.toString().substring(0, key.toString().length() - ".model.target".length())); + if (key.startsWith("_") && + key.endsWith(DEFAULT_META_INFO_SELECTOR + ".target")) { + itemKeys.add(key.substring(0, key.length() - ".model.target".length())); } } for (String baseKey : itemKeys) { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/7dbbbe55/vertx/src/main/java/org/apache/tamaya/vertx/ConfigVerticle.java ---------------------------------------------------------------------- diff --git a/vertx/src/main/java/org/apache/tamaya/vertx/ConfigVerticle.java b/vertx/src/main/java/org/apache/tamaya/vertx/ConfigVerticle.java index 37cbcd3..eebf09c 100644 --- a/vertx/src/main/java/org/apache/tamaya/vertx/ConfigVerticle.java +++ b/vertx/src/main/java/org/apache/tamaya/vertx/ConfigVerticle.java @@ -46,28 +46,17 @@ public class ConfigVerticle extends AbstractConfiguredVerticle{ @Override public void start()throws Exception{ mapBusListener = vertx.eventBus().consumer(mapBusTarget); - mapBusListener.handler(new Handler<Message<String>>(){ - @Override - public void handle(final Message<String> message) { - Config config = ConfigProvider.getConfig(); - Config cfg = ConfigurationFunctions.filter( - new PropertyMatcher() { - @Override - public boolean test(String key, String value) { - return key.matches(message.body()); - } - } - ).apply(config); - message.reply(Json.encodePrettily(ConfigurationFunctions.toMap(cfg))); - } + mapBusListener.handler(message -> { + Config config = ConfigProvider.getConfig(); + Config cfg = ConfigurationFunctions.filter( + (key, value) -> key.matches(message.body()) + ).apply(config); + message.reply(Json.encodePrettily(ConfigurationFunctions.toMap(cfg))); }); valBusListener = vertx.eventBus().consumer(valBusTarget); - valBusListener.handler(new Handler<Message<String>>(){ - @Override - public void handle(final Message<String> message) { - Config config = ConfigProvider.getConfig(); - message.reply(config.getValue(message.body(), String.class)); - } + valBusListener.handler(message -> { + Config config = ConfigProvider.getConfig(); + message.reply(config.getValue(message.body(), String.class)); }); }
