[prev in list] [next in list] [prev in thread] [next in thread]
List: jakarta-commons-dev
Subject: [commons-configuration] branch master updated: Fix broken XML. Remove trailing white spaces on all l
From: ggregory () apache ! org
Date: 2019-02-28 16:18:31
Message-ID: 155137071162.26540.10398895671630617102 () gitbox ! apache ! org
[Download RAW message or body]
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 330f883 Fix broken XML. Remove trailing white spaces on all lines.
330f883 is described below
commit 330f88323c909014f50f471d40107b649969026e
Author: Gary Gregory <ggregory@rocketsoftware.com>
AuthorDate: Thu Feb 28 11:18:28 2019 -0500
Fix broken XML. Remove trailing white spaces on all lines.
---
src/changes/changes.xml | 2 +-
.../builder/INIBuilderProperties.java | 2 +-
.../configuration2/interpol/DefaultLookups.java | 32 ++++-----
.../interpol/StringLookupAdapter.java | 84 +++++++++++-----------
.../configuration2/InterpolationTestHelper.java | 6 +-
.../apache/commons/configuration2/test/HsqlDB.java | 2 +-
6 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9e8bd1c..ff787c6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -32,7 +32,7 @@
</action>
<action dev="ggregory" type="update" issue="CONFIGURATION-738" due-to="Gary \
Gregory"> Update Jackson from 2.9.7 to 2.9.8.
- </action>.
+ </action>
<action dev="ggregory" type="update" issue="CONFIGURATION-739" due-to="Gary \
Gregory"> Update Apache Commons Codec from 1.11 to 1.12.
</action>
diff --git a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java \
b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java \
index 0f301fd..0571b8a 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java
@@ -34,7 +34,7 @@ package org.apache.commons.configuration2.builder;
* @param <T> the type of the result of all set methods for method chaining
*/
public interface INIBuilderProperties<T> {
-
+
/**
* Allows setting the leading comment separator which is used in reading an INI
* file.
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java \
b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java index \
d8520ca..eda4532 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java
@@ -32,7 +32,7 @@ import org.apache.commons.text.lookup.StringLookupFactory;
* All the default {@code Lookup} classes are state-less, thus their instances can \
be shared between multiple
* configuration objects. Therefore, it makes sense to keep shared instances in this \
enumeration class.
* </p>
- *
+ *
* Provides access to lookups defined in Apache Commons Text:
* <ul>
* <li>"base64Decoder" for the {@code Base64DecoderStringLookup} since Apache \
Commons Text 1.6.</li> @@ -53,7 +53,7 @@ import \
org.apache.commons.text.lookup.StringLookupFactory;
* <li>"urlEncoder" for the {@code UrlEncoderStringLookup} since Apache Commons Text \
1.6.</li>
* <li>"xml" for the {@code XmlStringLookup} since Apache Commons Text 1.5.</li>
* </ul>
- *
+ *
* @version $Id$
* @since 2.0
*/
@@ -61,7 +61,7 @@ public enum DefaultLookups {
/**
* The lookup for Base64 decoding.
- *
+ *
* @since 2.4
*/
BASE64_DECODER(StringLookupFactory.KEY_BASE64_DECODER,
@@ -69,7 +69,7 @@ public enum DefaultLookups {
/**
* The lookup for Base64 decoding.
- *
+ *
* @since 2.4
*/
BASE64_ENCODER(StringLookupFactory.KEY_BASE64_ENCODER,
@@ -77,14 +77,14 @@ public enum DefaultLookups {
/**
* The lookup for constants.
- *
+ *
* @since 2.4
*/
CONST(StringLookupFactory.KEY_CONST, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.constantStringLookup())),
/**
* The lookup for dates.
- *
+ *
* @since 2.4
*/
DATE(StringLookupFactory.KEY_DATE, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.dateStringLookup())), @@ -97,14 \
+97,14 @@ public enum DefaultLookups {
/**
* The lookup for files.
- *
+ *
* @since 2.4
*/
FILE(StringLookupFactory.KEY_FILE, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.fileStringLookup())),
/**
* The lookup for Java platform information.
- *
+ *
* @since 2.4
*/
JAVA(StringLookupFactory.KEY_JAVA,
@@ -112,7 +112,7 @@ public enum DefaultLookups {
/**
* The lookup for localhost information.
- *
+ *
* @since 2.4
*/
LOCAL_HOST(StringLookupFactory.KEY_LOCALHOST,
@@ -120,7 +120,7 @@ public enum DefaultLookups {
/**
* The lookup for properties.
- *
+ *
* @since 2.4
*/
PROPERTIES(StringLookupFactory.KEY_PROPERTIES,
@@ -128,7 +128,7 @@ public enum DefaultLookups {
/**
* The lookup for resource bundles.
- *
+ *
* @since 2.4
*/
RESOURCE_BUNDLE(StringLookupFactory.KEY_RESOURCE_BUNDLE,
@@ -136,7 +136,7 @@ public enum DefaultLookups {
/**
* The lookup for scripts.
- *
+ *
* @since 2.4
*/
SCRIPT(StringLookupFactory.KEY_SCRIPT, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.scriptStringLookup())), @@ -149,14 \
+149,14 @@ public enum DefaultLookups {
/**
* The lookup for URLs.
- *
+ *
* @since 2.4
*/
URL(StringLookupFactory.KEY_URL, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.urlStringLookup())),
/**
* The lookup for URL decoding.
- *
+ *
* @since 2.4
*/
URL_DECODER(StringLookupFactory.KEY_URL_DECODER,
@@ -164,7 +164,7 @@ public enum DefaultLookups {
/**
* The lookup for URL decoding.
- *
+ *
* @since 2.4
*/
URL_ENCODER(StringLookupFactory.KEY_URL_ENCODER,
@@ -172,7 +172,7 @@ public enum DefaultLookups {
/**
* The lookup for URL decoding.
- *
+ *
* @since 2.4
*/
XML(StringLookupFactory.KEY_XML, new \
StringLookupAdapter(StringLookupFactory.INSTANCE.xmlStringLookup()));
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java \
b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java \
index 8e52b15..b9bea49 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java
@@ -1,42 +1,42 @@
-/*
- * 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 of 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.
- */
-package org.apache.commons.configuration2.interpol;
-
-import java.util.Objects;
-
-import org.apache.commons.text.lookup.StringLookup;
-
-/**
- * Wraps an Apache Commons Text {@link StringLookup} as an Apache Commons \
Configuration {@link Lookup}.
- *
- * @since 2.4
- */
-class StringLookupAdapter implements Lookup {
-
- private final StringLookup stringLookup;
-
- StringLookupAdapter(StringLookup stringLookup) {
- super();
- this.stringLookup = Objects.requireNonNull(stringLookup, "stringLookup");
- }
-
- @Override
- public Object lookup(String key) {
- return stringLookup.lookup(key);
- }
-
-}
+/*
+ * 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 of 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.
+ */
+package org.apache.commons.configuration2.interpol;
+
+import java.util.Objects;
+
+import org.apache.commons.text.lookup.StringLookup;
+
+/**
+ * Wraps an Apache Commons Text {@link StringLookup} as an Apache Commons \
Configuration {@link Lookup}. + *
+ * @since 2.4
+ */
+class StringLookupAdapter implements Lookup {
+
+ private final StringLookup stringLookup;
+
+ StringLookupAdapter(StringLookup stringLookup) {
+ super();
+ this.stringLookup = Objects.requireNonNull(stringLookup, "stringLookup");
+ }
+
+ @Override
+ public Object lookup(String key) {
+ return stringLookup.lookup(key);
+ }
+
+}
diff --git a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java \
b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java index \
1990027..a8e542c 100644
--- a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java
+++ b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java
@@ -195,9 +195,9 @@ public class InterpolationTestHelper
{ "name", "canonical-name", "address" };
String[] localhostValues = null;
try {
- localhostValues = new String[] {
- InetAddress.getLocalHost().getHostName(),
- InetAddress.getLocalHost().getCanonicalHostName(),
+ localhostValues = new String[] {
+ InetAddress.getLocalHost().getHostName(),
+ InetAddress.getLocalHost().getCanonicalHostName(),
InetAddress.getLocalHost().getHostAddress() };
} catch (UnknownHostException e) {
Assert.fail(e);
diff --git a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java \
b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java index \
ad2580c..1b279c1 100644
--- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
+++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
@@ -107,7 +107,7 @@ public class HsqlDB
sb.append(fileBuf, 0, res);
}
return sb.toString();
- }
+ }
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic