You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/09/12 21:11:10 UTC
[commons-configuration] branch master updated: Give lambdas more
flexibility in formatting where { and } can be on the same line as aggreed
on the dev ML.
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 88c71f5 Give lambdas more flexibility in formatting where { and } can be on the same line as aggreed on the dev ML.
88c71f5 is described below
commit 88c71f516ee5a3ee03e1eddd4e954d1356be6570
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 17:11:06 2019 -0400
Give lambdas more flexibility in formatting where { and } can be on the
same line as aggreed on the dev ML.
---
conf/checkstyle.xml | 1 +
.../apache/commons/configuration2/PropertiesConfiguration.java | 10 ++--------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/conf/checkstyle.xml b/conf/checkstyle.xml
index 825a36e..173cd87 100644
--- a/conf/checkstyle.xml
+++ b/conf/checkstyle.xml
@@ -133,6 +133,7 @@
<module name="EmptyBlock"/>
<module name="LeftCurly">
<property name="option" value="nl"/>
+ <property name="tokens" value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF, OBJBLOCK, STATIC_INIT"/>
</module>
<module name="NeedBraces"/>
<module name="RightCurly">
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index a7e984f..e602030 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -210,20 +210,14 @@ public class PropertiesConfiguration extends BaseConfiguration
*
* @since 2.6
*/
- public static final ConfigurationConsumer<ConfigurationException> DEFAULT_INCLUDE_LISTENER = e ->
- {
- throw e;
- };
+ public static final ConfigurationConsumer<ConfigurationException> DEFAULT_INCLUDE_LISTENER = e -> { throw e; };
/**
* Defines error handling as a noop for the special {@code "include"} key.
*
* @since 2.6
*/
- public static final ConfigurationConsumer<ConfigurationException> NOOP_INCLUDE_LISTENER = e ->
- {
- // noop
- };
+ public static final ConfigurationConsumer<ConfigurationException> NOOP_INCLUDE_LISTENER = e -> { /* noop */ };
/**
* The default encoding (ISO-8859-1 as specified by