From scm-return-50383-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Aug 16 10:29:21 2017 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3FA531984B for ; Wed, 16 Aug 2017 10:29:21 +0000 (UTC) Received: (qmail 60369 invoked by uid 500); 16 Aug 2017 10:29:21 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60318 invoked by uid 500); 16 Aug 2017 10:29:21 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 60309 invoked by uid 99); 16 Aug 2017 10:29:19 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2017 10:29:19 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D2A203A021C for ; Wed, 16 Aug 2017 10:29:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1805168 - in /geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config: ConfigImpl.java configsource/SystemEnvConfigSource.java Date: Wed, 16 Aug 2017 10:29:14 -0000 To: scm@geronimo.apache.org From: johndament@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170816102917.D2A203A021C@svn01-us-west.apache.org> Author: johndament Date: Wed Aug 16 10:29:14 2017 New Revision: 1805168 URL: http://svn.apache.org/viewvc?rev=1805168&view=rev Log: Differentiate the results of empty strings and null values. Empty strings mean the property is set, but empty, null means the property is not set. Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java?rev=1805168&r1=1805167&r2=1805168&view=diff ============================================================================== --- geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java (original) +++ geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/ConfigImpl.java Wed Aug 16 10:29:14 2017 @@ -116,7 +116,7 @@ public class ConfigImpl implements Confi @Override public T getValue(String propertyName, Class propertyType) { String value = getValue(propertyName); - if (value == null || value.isEmpty()) { + if (value == null) { throw new NoSuchElementException("No configured value found for config key " + propertyName); } @@ -219,13 +219,9 @@ public class ConfigImpl implements Confi } - protected List sortDescending(List configSources) { - Collections.sort(configSources, new Comparator() { - @Override - public int compare(ConfigSource configSource1, ConfigSource configSource2) { - return (configSource1.getOrdinal() > configSource2.getOrdinal()) ? -1 : 1; - } - }); + private List sortDescending(List configSources) { + configSources.sort( + (configSource1, configSource2) -> (configSource1.getOrdinal() > configSource2.getOrdinal()) ? -1 : 1); return configSources; } Modified: geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java URL: http://svn.apache.org/viewvc/geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java?rev=1805168&r1=1805167&r2=1805168&view=diff ============================================================================== --- geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java (original) +++ geronimo/components/config/trunk/impl/src/main/java/org/apache/geronimo/config/configsource/SystemEnvConfigSource.java Wed Aug 16 10:29:14 2017 @@ -57,7 +57,7 @@ public class SystemEnvConfigSource exten @Override public String getValue(String key) { String val = configValues.get(key); - if (val == null || val.isEmpty()) { + if (val == null) { val = configValues.get(key.replace('.', '_')); }