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 2024/08/18 12:38:21 UTC
(commons-beanutils) branch master updated (ccfa4303 -> 783355be)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
from ccfa4303 Bump github/codeql-action from 3.26.0 to 3.26.2 (#273)
new 89c99d47 Use final
new 1d39faf4 Use final
new 917ffbeb Remove redundant keyword
new 6e6d2317 Remove redundant parentheses
new 972b353f Use compact array notation
new 1736fb65 Use method reference
new 410acff1 Remove redundant call to super()
new 39929537 Remove redundant parentheses
new debc0b2d Remove redundant parentheses
new 38c26ab4 Remove redundant parentheses
new 4f8ab90b Remove redundant call to super()
new 1e1fb71d Remove redundant parentheses
new b05bc7bf Remove redundant parentheses
new a38901bf Use final
new bd658024 Remove redundant call to super()
new 88ced6c3 Use final
new d37101d1 Remove redundant parentheses
new 135b783c Use final
new ec25ea6a Use diamonds
new 22a16fde Remove redundant keyword
new 91ef81ab Use diamonds
new 4aae1ca3 Remove redundant call to super()
new 2ff6aae1 Remove redundant parentheses
new 30305706 Remove redundant parentheses
new dab715aa Remove redundant parentheses
new 56835b18 Remove redundant call to super()
new 04d05e47 Remove redundant parentheses
new f9a73898 Remove redundant call to super()
new c7974859 Remove redundant parentheses
new edab0597 Remove redundant parentheses
new 532c3b24 Remove redundant parentheses
new c6dcc82a Remove redundant parentheses
new c301062c Sort members
new 783355be Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-beanutils.git
The 34 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../beanutils2/BaseDynaBeanMapDecorator.java | 2 +-
.../org/apache/commons/beanutils2/BeanMap.java | 2 +-
.../apache/commons/beanutils2/DynaProperty.java | 6 +-
.../beanutils2/FluentPropertyBeanIntrospector.java | 2 +-
.../apache/commons/beanutils2/LazyDynaBean.java | 2 +-
.../apache/commons/beanutils2/LazyDynaList.java | 11 +-
.../org/apache/commons/beanutils2/LazyDynaMap.java | 2 +-
.../beanutils2/converters/ColorConverter.java | 85 ++++++++-------
.../beanutils2/converters/DateTimeConverter.java | 10 +-
.../beanutils2/converters/DimensionConverter.java | 33 +++---
.../beanutils2/converters/DurationConverter.java | 2 +-
.../converters/InetAddressConverter.java | 25 +++--
.../beanutils2/converters/LocalTimeConverter.java | 2 +-
.../beanutils2/converters/LocaleConverter.java | 23 ++---
.../beanutils2/converters/MonthDayConverter.java | 2 +-
.../beanutils2/converters/OffsetTimeConverter.java | 2 +-
.../beanutils2/converters/PatternConverter.java | 23 ++---
.../beanutils2/converters/PeriodConverter.java | 2 +-
.../beanutils2/converters/PointConverter.java | 23 ++---
.../beanutils2/converters/YearConverter.java | 2 +-
.../beanutils2/converters/YearMonthConverter.java | 2 +-
.../beanutils2/converters/ZoneIdConverter.java | 2 +-
.../beanutils2/converters/ZoneOffsetConverter.java | 2 +-
.../beanutils2/expression/DefaultResolver.java | 2 +-
.../locale/converters/DateLocaleConverter.java | 2 +-
.../apache/commons/beanutils2/BeanMapTestCase.java | 114 ++++++++++-----------
.../commons/beanutils2/BeanPredicateTestCase.java | 2 +-
.../commons/beanutils2/BeanUtilsBeanTestCase.java | 36 +++----
.../commons/beanutils2/BeanificationTestCase.java | 4 +-
.../DefaultIntrospectionContextTestCase.java | 2 +-
.../commons/beanutils2/LazyDynaListTestCase.java | 6 +-
.../commons/beanutils2/LazyDynaMapTestCase.java | 2 +-
.../commons/beanutils2/bugs/Jira541TestCase.java | 92 ++++++++---------
.../converters/ColorConverterTestCase.java | 96 ++++++++---------
.../converters/InetAddressConverterTestCase.java | 8 +-
.../converters/LocaleConverterTestCase.java | 12 +--
.../converters/PointConverterTestCase.java | 8 +-
37 files changed, 324 insertions(+), 329 deletions(-)
(commons-beanutils) 32/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit c6dcc82a69c67e1a06d2194dca4416965ab78a57
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:29:01 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/ZoneOffsetConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverter.java
index daab97f5..b1f1fee1 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverter.java
@@ -63,7 +63,7 @@ public final class ZoneOffsetConverter extends AbstractConverter<ZoneOffset> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (ZoneOffset.class.equals(type)) {
- return type.cast(ZoneOffset.of((String.valueOf(value))));
+ return type.cast(ZoneOffset.of(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 07/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit 410acff1caa8c3a59fcc03ef47a15633826dfbff
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:22:16 2024 -0400
Remove redundant call to super()
Use final
---
.../java/org/apache/commons/beanutils2/converters/ColorConverter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
index ed85c9a3..543a9f4b 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
@@ -47,7 +47,6 @@ public class ColorConverter extends AbstractConverter<Color> {
* Construct a <b>{@link Color}</b> <em>Converter</em> that throws a {@code ConversionException} if an error occurs.
*/
public ColorConverter() {
- super();
}
/**
@@ -178,7 +177,7 @@ public class ColorConverter extends AbstractConverter<Color> {
private Color parseToStringColor(final String value) {
Objects.requireNonNull(value);
- Matcher matcher = JAVA_COLOR_PATTERN.matcher(value);
+ final Matcher matcher = JAVA_COLOR_PATTERN.matcher(value);
if (!matcher.matches()) {
throw new IllegalArgumentException("Invalid Color String provided. Could not parse.");
(commons-beanutils) 05/34: Use compact array notation
Posted by gg...@apache.org.
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-beanutils.git
commit 972b353f9fbdf69fff4383b84950e34e485316bf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 07:36:48 2024 -0400
Use compact array notation
---
src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
index 5afe0e2f..a0bcc642 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
@@ -184,7 +184,7 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
// all beans (and all objects for that matter.
@Override
public String[] getSampleKeys() {
- final String[] keys = new String[] {
+ final String[] keys = {
"someIntValue",
"someLongValue",
"someDoubleValue",
@@ -211,7 +211,7 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
@Override
public Object[] getNewSampleValues() {
- final Object[] values = new Object[] {
+ final Object[] values = {
Integer.valueOf(223),
Long.valueOf(23341928234L),
Double.valueOf(23423.34),
(commons-beanutils) 30/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit edab0597cff665c198ab7640cdbe78a34128db91
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:46 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/YearMonthConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/YearMonthConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/YearMonthConverter.java
index abab00a2..fcf977a0 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/YearMonthConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/YearMonthConverter.java
@@ -63,7 +63,7 @@ public final class YearMonthConverter extends AbstractConverter<YearMonth> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (YearMonth.class.equals(type)) {
- return type.cast(YearMonth.parse((String.valueOf(value))));
+ return type.cast(YearMonth.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 33/34: Sort members
Posted by gg...@apache.org.
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-beanutils.git
commit c301062c198d42f981fd565a2b07f61d3afb067e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:36:57 2024 -0400
Sort members
---
.../beanutils2/converters/ColorConverter.java | 84 ++++++++--------
.../beanutils2/converters/DimensionConverter.java | 22 ++--
.../converters/InetAddressConverter.java | 22 ++--
.../beanutils2/converters/LocaleConverter.java | 22 ++--
.../beanutils2/converters/PatternConverter.java | 22 ++--
.../beanutils2/converters/PointConverter.java | 22 ++--
.../apache/commons/beanutils2/BeanMapTestCase.java | 112 ++++++++++-----------
.../commons/beanutils2/BeanUtilsBeanTestCase.java | 36 +++----
.../commons/beanutils2/bugs/Jira541TestCase.java | 86 ++++++++--------
.../converters/ColorConverterTestCase.java | 96 +++++++++---------
.../converters/InetAddressConverterTestCase.java | 8 +-
.../converters/LocaleConverterTestCase.java | 12 +--
.../converters/PointConverterTestCase.java | 8 +-
13 files changed, 276 insertions(+), 276 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
index 543a9f4b..10b5d4ec 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ColorConverter.java
@@ -60,17 +60,6 @@ public class ColorConverter extends AbstractConverter<Color> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<Color> getDefaultType() {
- return Color.class;
- }
-
/**
* Converts a {@link Color} into a {@link String}.
*
@@ -159,39 +148,14 @@ public class ColorConverter extends AbstractConverter<Color> {
}
/**
- * Parses the Color based on the result of the {@link Color#toString()} method.
- *
- * Accepts the following values:
- * <ul>
- * <li>{@code java.awt.Color[r=255,g=255,b=255]}</li>
- * <li>{@code [r=255,g=255,b=255]}</li>
- * <li>{@code r=255,g=255,b=255}</li>
- * <li>{@code 255,255,255}</li>
- * </ul>
+ * Gets the default type this {@code Converter} handles.
*
- * @param value A color as represented by {@link Color#toString()}.
- * @return The Java friendly {@link Color} this color represents.
- * @throws IllegalArgumentException If the input can't be matches by the {@link #JAVA_COLOR_PATTERN}
- * or a {@link Color} component specified is over 255.
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
*/
- private Color parseToStringColor(final String value) {
- Objects.requireNonNull(value);
-
- final Matcher matcher = JAVA_COLOR_PATTERN.matcher(value);
-
- if (!matcher.matches()) {
- throw new IllegalArgumentException("Invalid Color String provided. Could not parse.");
- }
-
- final int red = Integer.parseInt(matcher.group(1));
- final int green = Integer.parseInt(matcher.group(2));
- final int blue = Integer.parseInt(matcher.group(3));
-
- if (red > 255 || green > 255 || blue > 255) {
- throw new IllegalArgumentException("Color component integers must be between 0 and 255.");
- }
-
- return new Color(red, green, blue);
+ @Override
+ protected Class<Color> getDefaultType() {
+ return Color.class;
}
/**
@@ -236,4 +200,40 @@ public class ColorConverter extends AbstractConverter<Color> {
"is required, prefix with 0x instead of #, otherwise expecting 3, 4, 6, or 8 characters only.");
}
}
+
+ /**
+ * Parses the Color based on the result of the {@link Color#toString()} method.
+ *
+ * Accepts the following values:
+ * <ul>
+ * <li>{@code java.awt.Color[r=255,g=255,b=255]}</li>
+ * <li>{@code [r=255,g=255,b=255]}</li>
+ * <li>{@code r=255,g=255,b=255}</li>
+ * <li>{@code 255,255,255}</li>
+ * </ul>
+ *
+ * @param value A color as represented by {@link Color#toString()}.
+ * @return The Java friendly {@link Color} this color represents.
+ * @throws IllegalArgumentException If the input can't be matches by the {@link #JAVA_COLOR_PATTERN}
+ * or a {@link Color} component specified is over 255.
+ */
+ private Color parseToStringColor(final String value) {
+ Objects.requireNonNull(value);
+
+ final Matcher matcher = JAVA_COLOR_PATTERN.matcher(value);
+
+ if (!matcher.matches()) {
+ throw new IllegalArgumentException("Invalid Color String provided. Could not parse.");
+ }
+
+ final int red = Integer.parseInt(matcher.group(1));
+ final int green = Integer.parseInt(matcher.group(2));
+ final int blue = Integer.parseInt(matcher.group(3));
+
+ if (red > 255 || green > 255 || blue > 255) {
+ throw new IllegalArgumentException("Color component integers must be between 0 and 255.");
+ }
+
+ return new Color(red, green, blue);
+ }
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
index 58d27942..664455ce 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
@@ -56,17 +56,6 @@ public class DimensionConverter extends AbstractConverter<Dimension> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<Dimension> getDefaultType() {
- return Dimension.class;
- }
-
/**
* Converts the input object into an output object of the specified type.
*
@@ -103,4 +92,15 @@ public class DimensionConverter extends AbstractConverter<Dimension> {
throw conversionException(type, value);
}
+
+ /**
+ * Gets the default type this {@code Converter} handles.
+ *
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
+ */
+ @Override
+ protected Class<Dimension> getDefaultType() {
+ return Dimension.class;
+ }
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
index 4f98bdc3..a1d35915 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
@@ -47,17 +47,6 @@ public class InetAddressConverter extends AbstractConverter<InetAddress> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<InetAddress> getDefaultType() {
- return InetAddress.class;
- }
-
/**
* Converts the specified input object into an output object of the specified type.
*
@@ -81,4 +70,15 @@ public class InetAddressConverter extends AbstractConverter<InetAddress> {
throw conversionException(type, value);
}
+
+ /**
+ * Gets the default type this {@code Converter} handles.
+ *
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
+ */
+ @Override
+ protected Class<InetAddress> getDefaultType() {
+ return InetAddress.class;
+ }
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
index d0ee5e13..e12dfc7c 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
@@ -44,17 +44,6 @@ public class LocaleConverter extends AbstractConverter<Locale> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<Locale> getDefaultType() {
- return Locale.class;
- }
-
/**
* Converts the specified input object into an output object of the specified type.
*
@@ -72,4 +61,15 @@ public class LocaleConverter extends AbstractConverter<Locale> {
throw conversionException(type, value);
}
+
+ /**
+ * Gets the default type this {@code Converter} handles.
+ *
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
+ */
+ @Override
+ protected Class<Locale> getDefaultType() {
+ return Locale.class;
+ }
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
index c338e52d..25449cd8 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
@@ -44,17 +44,6 @@ public class PatternConverter extends AbstractConverter<Pattern> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<Pattern> getDefaultType() {
- return Pattern.class;
- }
-
/**
* Converts the specified input object into an output object of the specified type.
*
@@ -73,4 +62,15 @@ public class PatternConverter extends AbstractConverter<Pattern> {
throw conversionException(type, value);
}
+
+ /**
+ * Gets the default type this {@code Converter} handles.
+ *
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
+ */
+ @Override
+ protected Class<Pattern> getDefaultType() {
+ return Pattern.class;
+ }
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
index 6991eaab..e2f993e9 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
@@ -49,17 +49,6 @@ public class PointConverter extends AbstractConverter<Point> {
super(defaultValue);
}
- /**
- * Gets the default type this {@code Converter} handles.
- *
- * @return The default type this {@code Converter} handles.
- * @since 2.0.0
- */
- @Override
- protected Class<Point> getDefaultType() {
- return Point.class;
- }
-
/**
* Converts the specified input object into an output object of the specified type.
*
@@ -100,4 +89,15 @@ public class PointConverter extends AbstractConverter<Point> {
throw conversionException(type, value);
}
+
+ /**
+ * Gets the default type this {@code Converter} handles.
+ *
+ * @return The default type this {@code Converter} handles.
+ * @since 2.0.0
+ */
+ @Override
+ protected Class<Point> getDefaultType() {
+ return Point.class;
+ }
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
index a0bcc642..dc4704cf 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
@@ -172,6 +172,24 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
super(testName);
}
+ @Override
+ public Object[] getNewSampleValues() {
+ final Object[] values = {
+ Integer.valueOf(223),
+ Long.valueOf(23341928234L),
+ Double.valueOf(23423.34),
+ Float.valueOf(213332.12f),
+ Short.valueOf((short)234),
+ Byte.valueOf((byte)20),
+ Character.valueOf('b'),
+ Integer.valueOf(232),
+ "SomeNewStringValue",
+ new Object(),
+ null,
+ };
+ return values;
+ }
+
// note to self. The Sample keys were generated by copying the field
// declarations and using the following regular expression search and replace:
//
@@ -210,21 +228,20 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
}
@Override
- public Object[] getNewSampleValues() {
- final Object[] values = {
- Integer.valueOf(223),
- Long.valueOf(23341928234L),
- Double.valueOf(23423.34),
- Float.valueOf(213332.12f),
- Short.valueOf((short)234),
- Byte.valueOf((byte)20),
- Character.valueOf('b'),
- Integer.valueOf(232),
- "SomeNewStringValue",
- new Object(),
- null,
+ public String[] ignoredTests() {
+ // Ignore the serialization tests on collection views.
+ return new String[] {
+ "TestBeanMap.bulkTestMapEntrySet.testCanonicalEmptyCollectionExists",
+ "TestBeanMap.bulkTestMapEntrySet.testCanonicalFullCollectionExists",
+ "TestBeanMap.bulkTestMapKeySet.testCanonicalEmptyCollectionExists",
+ "TestBeanMap.bulkTestMapKeySet.testCanonicalFullCollectionExists",
+ "TestBeanMap.bulkTestMapValues.testCanonicalEmptyCollectionExists",
+ "TestBeanMap.bulkTestMapValues.testCanonicalFullCollectionExists",
+ "TestBeanMap.bulkTestMapEntrySet.testSimpleSerialization",
+ "TestBeanMap.bulkTestMapKeySet.testSimpleSerialization",
+ "TestBeanMap.bulkTestMapEntrySet.testSerializeDeserializeThenCompare",
+ "TestBeanMap.bulkTestMapKeySet.testSerializeDeserializeThenCompare"
};
- return values;
}
/**
@@ -264,43 +281,8 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
}
@Override
- public String[] ignoredTests() {
- // Ignore the serialization tests on collection views.
- return new String[] {
- "TestBeanMap.bulkTestMapEntrySet.testCanonicalEmptyCollectionExists",
- "TestBeanMap.bulkTestMapEntrySet.testCanonicalFullCollectionExists",
- "TestBeanMap.bulkTestMapKeySet.testCanonicalEmptyCollectionExists",
- "TestBeanMap.bulkTestMapKeySet.testCanonicalFullCollectionExists",
- "TestBeanMap.bulkTestMapValues.testCanonicalEmptyCollectionExists",
- "TestBeanMap.bulkTestMapValues.testCanonicalFullCollectionExists",
- "TestBeanMap.bulkTestMapEntrySet.testSimpleSerialization",
- "TestBeanMap.bulkTestMapKeySet.testSimpleSerialization",
- "TestBeanMap.bulkTestMapEntrySet.testSerializeDeserializeThenCompare",
- "TestBeanMap.bulkTestMapKeySet.testSerializeDeserializeThenCompare"
- };
- }
-
- /**
- * Need to override this method because the "clear()" method on the bean
- * map just returns the bean properties to their default states. It does
- * not actually remove the mappings as per the map contract. The default
- * testClear() methods checks that the clear method throws an
- * UnsupportedOperationException since this class is not add/remove
- * modifiable. In our case though, we do not always throw that exception.
- */
- @Override
- public void testMapClear() {
- //TODO: make sure a call to BeanMap.clear returns the bean to its
- //default initialization values.
- }
-
- /**
- * Need to override this method because the "put()" method on the bean
- * doesn't work for this type of Map.
- */
- @Override
- public void testMapPut() {
- // see testBeanMapPutAllWriteable
+ public Map<String, Object> makeObject() {
+ return new BeanMap();
}
public void testBeanMapClone() {
@@ -425,6 +407,29 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
assertEquals("Double.TYPE", Double.valueOf("6"), beanMap.getTypeTransformer(Double.TYPE).apply("6"));
}
+ /**
+ * Need to override this method because the "clear()" method on the bean
+ * map just returns the bean properties to their default states. It does
+ * not actually remove the mappings as per the map contract. The default
+ * testClear() methods checks that the clear method throws an
+ * UnsupportedOperationException since this class is not add/remove
+ * modifiable. In our case though, we do not always throw that exception.
+ */
+ @Override
+ public void testMapClear() {
+ //TODO: make sure a call to BeanMap.clear returns the bean to its
+ //default initialization values.
+ }
+
+ /**
+ * Need to override this method because the "put()" method on the bean
+ * doesn't work for this type of Map.
+ */
+ @Override
+ public void testMapPut() {
+ // see testBeanMapPutAllWriteable
+ }
+
public void testMethodAccessor() throws Exception {
final BeanMap map = (BeanMap) makeFullMap();
final Method method = BeanWithProperties.class.getDeclaredMethod("getSomeIntegerValue");
@@ -445,9 +450,4 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> {
values = map.values();
super.verifyValues();
}
-
- @Override
- public Map<String, Object> makeObject() {
- return new BeanMap();
- }
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
index 4461dfe6..4374fc35 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
@@ -754,18 +754,6 @@ public class BeanUtilsBeanTestCase extends TestCase {
}
}
- public void testGetMappedProperty2Args() throws Exception {
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, null));
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, ""));
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty("", null));
- }
-
- public void testGetMappedProperty3Args() throws Exception {
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, null));
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, "", null));
- assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty("", null, null));
- }
-
/**
* tests getting an indexed property
*/
@@ -825,6 +813,18 @@ public class BeanUtilsBeanTestCase extends TestCase {
assertEquals("java.util.Date[0] --> String", testUtilDate.toString(), value);
}
+ public void testGetMappedProperty2Args() throws Exception {
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, null));
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, ""));
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty("", null));
+ }
+
+ public void testGetMappedProperty3Args() throws Exception {
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, null));
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty(null, "", null));
+ assertThrows(NullPointerException.class, () -> BeanUtils.getMappedProperty("", null, null));
+ }
+
/**
* tests getting a nested property
*/
@@ -903,6 +903,12 @@ public class BeanUtilsBeanTestCase extends TestCase {
assertEquals("Mapped property set correctly", "some.dotty.value", bean.getMapproperty("this.that.the-other"));
}
+ public void testPopulate() throws Exception {
+ BeanUtilsBean.getInstance().populate(null, null);
+ BeanUtilsBean.getInstance().populate("", null);
+ BeanUtilsBean.getInstance().populate(null, new HashMap<>());
+ }
+
/**
* Test populate() method on individual array elements.
*/
@@ -943,12 +949,6 @@ public class BeanUtilsBeanTestCase extends TestCase {
}
- public void testPopulate() throws Exception {
- BeanUtilsBean.getInstance().populate(null, null);
- BeanUtilsBean.getInstance().populate("", null);
- BeanUtilsBean.getInstance().populate(null, new HashMap<>());
- }
-
/**
* Test populate() method on array properties as a whole.
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
index 6f073b00..b2676cb7 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
@@ -35,33 +35,36 @@ import org.junit.jupiter.api.Test;
*/
public class Jira541TestCase {
- private static final String FIELD_NAME = "field";
- private static final String FIELD_VALUE = "name";
+ public static class BaseType {
- @Test
- public void testFluentBeanIntrospectorOnOverriddenSetter() throws Exception {
- testImpl();
+ private String field;
+
+ public String getField() {
+ return field;
+ }
+
+ public BaseType setField(final String objectName) {
+ this.field = objectName;
+ return this;
+ }
}
+ public static class SubTypeA extends BaseType {
- @Test
- public void testFluentBeanIntrospectorOnOverriddenSetterConcurrent() throws Exception {
- final ExecutorService executionService = Executors.newFixedThreadPool(256);
- try {
- final List<Future<?>> futures = new ArrayList<>();
- for (int i = 0; i < 10000; i++) {
- futures.add(executionService.submit(() -> {
- testImpl();
- return null;
- }));
- }
- for (final Future<?> future : futures) {
- future.get();
- }
- } finally {
- executionService.shutdown();
+ @Override
+ public SubTypeA setField(final String field) {
+ super.setField(field);
+ return this;
}
}
+ public static class SubTypeB extends BaseType {
+
+ }
+
+ private static final String FIELD_NAME = "field";
+
+ private static final String FIELD_VALUE = "name";
+
private static void testImpl() throws ReflectiveOperationException {
final PropertyUtilsBean propertyUtilsBean = new PropertyUtilsBean();
propertyUtilsBean.addBeanIntrospector(new FluentPropertyBeanIntrospector());
@@ -78,30 +81,27 @@ public class Jira541TestCase {
assertEquals(FIELD_VALUE, subTypeB.getField());
}
- public static class BaseType {
-
- private String field;
-
- public BaseType setField(final String objectName) {
- this.field = objectName;
- return this;
- }
-
- public String getField() {
- return field;
- }
+ @Test
+ public void testFluentBeanIntrospectorOnOverriddenSetter() throws Exception {
+ testImpl();
}
- public static class SubTypeA extends BaseType {
-
- @Override
- public SubTypeA setField(final String field) {
- super.setField(field);
- return this;
+ @Test
+ public void testFluentBeanIntrospectorOnOverriddenSetterConcurrent() throws Exception {
+ final ExecutorService executionService = Executors.newFixedThreadPool(256);
+ try {
+ final List<Future<?>> futures = new ArrayList<>();
+ for (int i = 0; i < 10000; i++) {
+ futures.add(executionService.submit(() -> {
+ testImpl();
+ return null;
+ }));
+ }
+ for (final Future<?> future : futures) {
+ future.get();
+ }
+ } finally {
+ executionService.shutdown();
}
}
-
- public static class SubTypeB extends BaseType {
-
- }
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ColorConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ColorConverterTestCase.java
index 93ca7b5d..a3773586 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ColorConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ColorConverterTestCase.java
@@ -39,66 +39,60 @@ public class ColorConverterTestCase {
converter = new ColorConverter();
}
- @Test
- public void testConvertingPattern() {
- final Color expected = Color.BLACK;
- final Color actual = converter.convert(Color.class, "#000000");
-
- Assert.assertEquals(expected, actual);
+ @Test(expected = ConversionException.class)
+ public void testColorBlank() {
+ converter.convert(Color.class, "#");
}
- @Test
- public void testConvertingPatternWithAlpha() {
- final Color expected = Color.LIGHT_GRAY;
- final Color actual = converter.convert(Color.class, "#C0C0C0FF");
-
- Assert.assertEquals(expected, actual);
+ @Test(expected = ConversionException.class)
+ public void testColorInvalidLength() {
+ converter.convert(Color.class, "#F");
}
@Test
- public void testConvertingPattern3Digit() {
+ public void testConvertingColorName() {
final Color expected = Color.WHITE;
- final Color actual = converter.convert(Color.class, "#FFF");
+ final Color actual = converter.convert(Color.class, "white");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingPattern4Digit() {
- final Color expected = Color.YELLOW;
- final Color actual = converter.convert(Color.class, "#FF0F");
+ public void testConvertingColorNameCaps() {
+ final Color expected = Color.LIGHT_GRAY;
+ final Color actual = converter.convert(Color.class, "LIGHTGRAY");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingLiteralHex() {
- final Color expected = Color.BLUE;
- final Color actual = converter.convert(Color.class, "0x0000FF");
+ public void testConvertingJavaColorStringFull() {
+ final Color expected = Color.WHITE;
+ final Color actual = converter.convert(Color.class, "java.awt.Color[r=255,g=255,b=255]");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingColorName() {
- final Color expected = Color.WHITE;
- final Color actual = converter.convert(Color.class, "white");
+ public void testConvertingJavaColorStringWithoutBrackets() {
+ final Color expected = Color.DARK_GRAY;
+ final Color actual = converter.convert(Color.class, "r=64,g=64,b=64");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingColorNameCaps() {
- final Color expected = Color.LIGHT_GRAY;
- final Color actual = converter.convert(Color.class, "LIGHTGRAY");
+ public void testConvertingJavaColorStringWithoutColorPrefixes() {
+ final Color expected = Color.PINK;
+ final Color actual = converter.convert(Color.class, "255,175,175");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingJavaColorStringFull() {
- final Color expected = Color.WHITE;
- final Color actual = converter.convert(Color.class, "java.awt.Color[r=255,g=255,b=255]");
+ public void testConvertingJavaColorStringWithoutPackage() {
+ final Color expected = Color.GREEN;
+ final Color actual = converter.convert(Color.class, "[r=0,g=255,b=0]");
Assert.assertEquals(expected, actual);
}
@@ -116,46 +110,52 @@ public class ColorConverterTestCase {
}
@Test
- public void testConvertingJavaColorStringWithoutPackage() {
- final Color expected = Color.GREEN;
- final Color actual = converter.convert(Color.class, "[r=0,g=255,b=0]");
+ public void testConvertingLiteralHex() {
+ final Color expected = Color.BLUE;
+ final Color actual = converter.convert(Color.class, "0x0000FF");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingJavaColorStringWithoutBrackets() {
- final Color expected = Color.DARK_GRAY;
- final Color actual = converter.convert(Color.class, "r=64,g=64,b=64");
+ public void testConvertingPattern() {
+ final Color expected = Color.BLACK;
+ final Color actual = converter.convert(Color.class, "#000000");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingJavaColorStringWithoutColorPrefixes() {
- final Color expected = Color.PINK;
- final Color actual = converter.convert(Color.class, "255,175,175");
+ public void testConvertingPattern3Digit() {
+ final Color expected = Color.WHITE;
+ final Color actual = converter.convert(Color.class, "#FFF");
Assert.assertEquals(expected, actual);
}
- @Test(expected = ConversionException.class)
- public void testInvalidNumber3() {
- converter.convert(Color.class, "#FFZ");
+ @Test
+ public void testConvertingPattern4Digit() {
+ final Color expected = Color.YELLOW;
+ final Color actual = converter.convert(Color.class, "#FF0F");
+
+ Assert.assertEquals(expected, actual);
}
- @Test(expected = ConversionException.class)
- public void testInvalidNumber4() {
- converter.convert(Color.class, "#FFFY");
+ @Test
+ public void testConvertingPatternWithAlpha() {
+ final Color expected = Color.LIGHT_GRAY;
+ final Color actual = converter.convert(Color.class, "#C0C0C0FF");
+
+ Assert.assertEquals(expected, actual);
}
@Test(expected = ConversionException.class)
- public void testColorBlank() {
- converter.convert(Color.class, "#");
+ public void testInvalidNumber3() {
+ converter.convert(Color.class, "#FFZ");
}
@Test(expected = ConversionException.class)
- public void testColorInvalidLength() {
- converter.convert(Color.class, "#F");
+ public void testInvalidNumber4() {
+ converter.convert(Color.class, "#FFFY");
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/InetAddressConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/InetAddressConverterTestCase.java
index 5d9b5a87..4f1905c2 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/InetAddressConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/InetAddressConverterTestCase.java
@@ -65,12 +65,12 @@ public class InetAddressConverterTestCase {
}
@Test(expected = ConversionException.class)
- public void testText() {
- converter.convert(InetAddress.class, "Hello, world!");
+ public void testInvalidIp() {
+ converter.convert(InetAddress.class, "512.512.512.512");
}
@Test(expected = ConversionException.class)
- public void testInvalidIp() {
- converter.convert(InetAddress.class, "512.512.512.512");
+ public void testText() {
+ converter.convert(InetAddress.class, "Hello, world!");
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/LocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LocaleConverterTestCase.java
index 91859c90..bc423421 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/LocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LocaleConverterTestCase.java
@@ -39,17 +39,17 @@ public class LocaleConverterTestCase {
}
@Test
- public void testConvertStandardLocale() {
- final Locale expected = Locale.ENGLISH;
- final Locale actual = converter.convert(Locale.class, "en");
+ public void testConvertCustomLocale() {
+ final Locale expected = Locale.forLanguageTag("en-owo");
+ final Locale actual = converter.convert(Locale.class, "en-owo");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertCustomLocale() {
- final Locale expected = Locale.forLanguageTag("en-owo");
- final Locale actual = converter.convert(Locale.class, "en-owo");
+ public void testConvertStandardLocale() {
+ final Locale expected = Locale.ENGLISH;
+ final Locale actual = converter.convert(Locale.class, "en");
Assert.assertEquals(expected, actual);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/PointConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/PointConverterTestCase.java
index 42eb6368..33d883fd 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/PointConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/PointConverterTestCase.java
@@ -39,17 +39,17 @@ public class PointConverterTestCase {
}
@Test
- public void testConvertingPoint() {
+ public void testConvertingNoSpace() {
final Point expected = new Point(100, 200);
- final Point actual = converter.convert(Point.class, "(100, 200)");
+ final Point actual = converter.convert(Point.class, "(100,200)");
Assert.assertEquals(expected, actual);
}
@Test
- public void testConvertingNoSpace() {
+ public void testConvertingPoint() {
final Point expected = new Point(100, 200);
- final Point actual = converter.convert(Point.class, "(100,200)");
+ final Point actual = converter.convert(Point.class, "(100, 200)");
Assert.assertEquals(expected, actual);
}
(commons-beanutils) 02/34: Use final
Posted by gg...@apache.org.
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-beanutils.git
commit 1d39faf4300c5b999422956e77b357a8c2c4ce34
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 07:35:28 2024 -0400
Use final
---
.../java/org/apache/commons/beanutils2/BeanificationTestCase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
index 9dbc4930..b97f4386 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
@@ -198,7 +198,7 @@ public class BeanificationTestCase extends TestCase {
public void run() {
try {
signal.setSignal(3);
- Converter c = (type, value) -> ConvertUtils.primitiveToWrapper(Integer.TYPE).cast(new Integer(9));
+ final Converter c = (type, value) -> ConvertUtils.primitiveToWrapper(Integer.TYPE).cast(new Integer(9));
ConvertUtils.register(c, Integer.TYPE);
BeanUtils.setProperty(bean, "int", new Integer(1));
} catch (final Exception e) {
@@ -217,7 +217,7 @@ public class BeanificationTestCase extends TestCase {
BeanUtils.setProperty(bean, "int", new Integer(1));
assertEquals("Wrong property value (1)", 1, bean.getInt());
- Converter c = (type, value) -> ConvertUtils.primitiveToWrapper(type).cast(new Integer(5));
+ final Converter c = (type, value) -> ConvertUtils.primitiveToWrapper(type).cast(new Integer(5));
ConvertUtils.register(c, Integer.TYPE);
BeanUtils.setProperty(bean, "int", new Integer(1));
assertEquals("Wrong property value(2)", 5, bean.getInt());
(commons-beanutils) 15/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit bd6580247fdfb91f8a9219def5a53de2fba1c304
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:25:06 2024 -0400
Remove redundant call to super()
Use final
---
.../org/apache/commons/beanutils2/converters/InetAddressConverter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
index d07ca101..4f98bdc3 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/InetAddressConverter.java
@@ -34,7 +34,6 @@ public class InetAddressConverter extends AbstractConverter<InetAddress> {
* occurs.
*/
public InetAddressConverter() {
- super();
}
/**
@@ -75,7 +74,7 @@ public class InetAddressConverter extends AbstractConverter<InetAddress> {
try {
return type.cast(InetAddress.getByName(stringValue));
- } catch (UnknownHostException ex) {
+ } catch (final UnknownHostException ex) {
throw new IllegalArgumentException("Unable to get IP address of the named host.", ex);
}
}
(commons-beanutils) 19/34: Use diamonds
Posted by gg...@apache.org.
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-beanutils.git
commit ec25ea6a5e90169d3f58a7af116d726d681f99fa
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:26:55 2024 -0400
Use diamonds
---
.../java/org/apache/commons/beanutils2/LazyDynaListTestCase.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index 1d0dad23..8c3e3067 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -54,8 +54,8 @@ public class LazyDynaListTestCase extends TestCase {
return new TestSuite(LazyDynaListTestCase.class);
}
protected DynaProperty[] properties = { new DynaProperty(BASIC_PROP1, String.class), new DynaProperty(BASIC_PROP2, HashMap.class) };
- protected DynaClass treeMapDynaClass = new LazyDynaMap(new TreeMap<String, Object>());
- protected DynaClass hashMapDynaClass = new LazyDynaMap(new HashMap<String, Object>());
+ protected DynaClass treeMapDynaClass = new LazyDynaMap(new TreeMap<>());
+ protected DynaClass hashMapDynaClass = new LazyDynaMap(new HashMap<>());
protected DynaClass pojoDynaClass = new WrapDynaBean(new TestBean()).getDynaClass();
@@ -421,7 +421,7 @@ public class LazyDynaListTestCase extends TestCase {
*/
public void testNullType() {
final LazyDynaList lazyList = new LazyDynaList();
- lazyList.add(new HashMap<String, Object>());
+ lazyList.add(new HashMap<>());
}
/**
(commons-beanutils) 12/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 1e1fb71dce565ccc72a7ba5d24dd4ce2f735b95f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:24:23 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/DurationConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DurationConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DurationConverter.java
index c9c0bd47..ecbe8308 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DurationConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DurationConverter.java
@@ -63,7 +63,7 @@ public final class DurationConverter extends AbstractConverter<Duration> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (Duration.class.equals(type)) {
- return type.cast(Duration.parse((String.valueOf(value))));
+ return type.cast(Duration.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 31/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 532c3b24db2213b308e63a45c4069524df3100e9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:53 2024 -0400
Remove redundant parentheses
---
.../java/org/apache/commons/beanutils2/converters/ZoneIdConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ZoneIdConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ZoneIdConverter.java
index 4c1a9501..84de794d 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ZoneIdConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ZoneIdConverter.java
@@ -63,7 +63,7 @@ public final class ZoneIdConverter extends AbstractConverter<ZoneId> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (ZoneId.class.equals(type)) {
- return type.cast(ZoneId.of((String.valueOf(value))));
+ return type.cast(ZoneId.of(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 28/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit f9a7389877e8dee88210efe0fa0547e3ef033a1b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:30 2024 -0400
Remove redundant call to super()
---
.../java/org/apache/commons/beanutils2/converters/PointConverter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
index b6434e58..6991eaab 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/PointConverter.java
@@ -35,7 +35,6 @@ public class PointConverter extends AbstractConverter<Point> {
* Construct a <b>{@link Point}</b> <em>Converter</em> that throws a {@code ConversionException} if an error occurs.
*/
public PointConverter() {
- super();
}
/**
(commons-beanutils) 11/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit 4f8ab90bce8a8f339e35d9cd55220b2da28d88a0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:24:10 2024 -0400
Remove redundant call to super()
Use final
---
.../commons/beanutils2/converters/DimensionConverter.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
index 0d4de490..58d27942 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DimensionConverter.java
@@ -43,7 +43,6 @@ public class DimensionConverter extends AbstractConverter<Dimension> {
* occurs.
*/
public DimensionConverter() {
- super();
}
/**
@@ -86,18 +85,18 @@ public class DimensionConverter extends AbstractConverter<Dimension> {
throw new IllegalArgumentException("Dimensions can not be empty.");
}
- Matcher matcher = DIMENSION_PATTERN.matcher(stringValue);
+ final Matcher matcher = DIMENSION_PATTERN.matcher(stringValue);
if (!matcher.matches()) {
throw new IllegalArgumentException(
"Dimension doesn't match format: {width/height} or {width}x{height}");
}
- String x = matcher.group(1);
- String y = matcher.group(2);
+ final String x = matcher.group(1);
+ final String y = matcher.group(2);
- int xValue = Integer.parseInt(x);
- int yValue = (y == null || x.equals(y)) ? xValue : Integer.parseInt(y);
+ final int xValue = Integer.parseInt(x);
+ final int yValue = y == null || x.equals(y) ? xValue : Integer.parseInt(y);
return type.cast(new Dimension(xValue, yValue));
}
(commons-beanutils) 21/34: Use diamonds
Posted by gg...@apache.org.
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-beanutils.git
commit 91ef81ab8af0deb9699658b35747863cad66eb1f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:27:15 2024 -0400
Use diamonds
---
src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
index 77cd0967..f57f2d9e 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
@@ -429,7 +429,7 @@ public class LazyDynaMapTestCase extends TestCase {
// Create LazyDynaMap using TreeMap
// containing some properties
- final LazyDynaMap orig = new LazyDynaMap(new TreeMap<String, Object>());
+ final LazyDynaMap orig = new LazyDynaMap(new TreeMap<>());
orig.set("indexProp", 0, "indexVal0");
orig.set("indexProp", 1, "indexVal1");
assertEquals("Index prop size", 2, ((List<?>) orig.get("indexProp")).size());
(commons-beanutils) 22/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit 4aae1ca370413461df53170667449b6b8b0f23ad
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:27:35 2024 -0400
Remove redundant call to super()
---
.../java/org/apache/commons/beanutils2/converters/LocaleConverter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
index 029d0b88..d0ee5e13 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/LocaleConverter.java
@@ -31,7 +31,6 @@ public class LocaleConverter extends AbstractConverter<Locale> {
* Construct a <b>{@link Locale}</b> <em>Converter</em> that throws a {@code ConversionException} if an error occurs.
*/
public LocaleConverter() {
- super();
}
/**
(commons-beanutils) 34/34: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-beanutils.git
Posted by gg...@apache.org.
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-beanutils.git
commit 783355be7cc27cb8877026584370f8fc6377853e
Merge: c301062c ccfa4303
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:38:01 2024 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-beanutils.git
.github/workflows/maven.yml | 2 +-
.github/workflows/scorecards-analysis.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(commons-beanutils) 01/34: Use final
Posted by gg...@apache.org.
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-beanutils.git
commit 89c99d4743cf3b4659b3395af5bb2f63be6c725d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 07:35:07 2024 -0400
Use final
---
.../java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
index 266020c9..2688fc18 100644
--- a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
+++ b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
@@ -63,7 +63,7 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
(commons-beanutils) 09/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit debc0b2d5e08fc33e801a3696d3e4fb9010b246a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:23:29 2024 -0400
Remove redundant parentheses
---
.../apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java b/src/test/java/org/apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java
index 3be97007..a12f2d7a 100644
--- a/src/test/java/org/apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DefaultIntrospectionContextTestCase.java
@@ -92,7 +92,7 @@ public class DefaultIntrospectionContextTestCase extends TestCase {
assertEquals("Wrong number of property names", count + 1, names.size());
assertTrue("Property not found: " + PROP, names.contains(PROP));
for (int i = 0; i < count; i++) {
- assertTrue("Property not found: " + (PROP + i), names.contains(PROP + i));
+ assertTrue("Property not found: " + PROP + i, names.contains(PROP + i));
}
final PropertyDescriptor[] addedDescs = context.getPropertyDescriptors();
assertEquals("Wrong number of added descriptors", count + 1, addedDescs.length);
(commons-beanutils) 25/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit dab715aa0d31b833114505bc3d9a982640a71b2b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:05 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/OffsetTimeConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/OffsetTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/OffsetTimeConverter.java
index 57fad9ea..8f70f0f8 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/OffsetTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/OffsetTimeConverter.java
@@ -63,7 +63,7 @@ public final class OffsetTimeConverter extends AbstractConverter<OffsetTime> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (OffsetTime.class.equals(type)) {
- return type.cast(OffsetTime.parse((String.valueOf(value))));
+ return type.cast(OffsetTime.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 04/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 6e6d2317309f0b4e537776480d4991013724717c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 07:36:20 2024 -0400
Remove redundant parentheses
---
.../commons/beanutils2/locale/converters/DateLocaleConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
index 30714bf2..0adbf6f5 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
@@ -186,7 +186,7 @@ public class DateLocaleConverter<D extends Date> extends BaseLocaleConverter<D>
}
} else if (thisChar == '\'') {
quoted = true;
- } else if ((thisChar >= 'a' && thisChar <= 'z') || (thisChar >= 'A' && thisChar <= 'Z')) {
+ } else if (thisChar >= 'a' && thisChar <= 'z' || thisChar >= 'A' && thisChar <= 'Z') {
final int index = fromChars.indexOf(thisChar);
if (index == -1) {
throw new IllegalArgumentException("Illegal pattern character '" + thisChar + "'");
(commons-beanutils) 24/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 303057068ff01a088cfc9348859f973233b6d5d4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:27:57 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/MonthDayConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/MonthDayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/MonthDayConverter.java
index 8f48d088..76644dff 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/MonthDayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/MonthDayConverter.java
@@ -63,7 +63,7 @@ public final class MonthDayConverter extends AbstractConverter<MonthDay> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (MonthDay.class.equals(type)) {
- return type.cast(MonthDay.parse((String.valueOf(value))));
+ return type.cast(MonthDay.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 29/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit c797485917e67173fb380f3547ad9424ce134e32
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:39 2024 -0400
Remove redundant parentheses
---
.../java/org/apache/commons/beanutils2/converters/YearConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/YearConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/YearConverter.java
index 8d2dc95c..031b530b 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/YearConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/YearConverter.java
@@ -63,7 +63,7 @@ public final class YearConverter extends AbstractConverter<Year> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (Year.class.equals(type)) {
- return type.cast(Year.parse((String.valueOf(value))));
+ return type.cast(Year.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 27/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 04d05e471d78e4349d56adbbbbbf34a88f73eff7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:22 2024 -0400
Remove redundant parentheses
---
.../java/org/apache/commons/beanutils2/converters/PeriodConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PeriodConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PeriodConverter.java
index 224236ea..0663bfce 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/PeriodConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/PeriodConverter.java
@@ -63,7 +63,7 @@ public final class PeriodConverter extends AbstractConverter<Period> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (Period.class.equals(type)) {
- return type.cast(Period.parse((String.valueOf(value))));
+ return type.cast(Period.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 13/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit b05bc7bffc100cc6fef4f3678c821372ade58151
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:24:38 2024 -0400
Remove redundant parentheses
---
src/main/java/org/apache/commons/beanutils2/DynaProperty.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index d40a6f78..9f757902 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -124,9 +124,9 @@ public class DynaProperty implements Serializable {
if (!result && obj instanceof DynaProperty) {
final DynaProperty that = (DynaProperty) obj;
result =
- (Objects.equals(this.name, that.name)) &&
- (Objects.equals(this.type, that.type)) &&
- (Objects.equals(this.contentType, that.contentType));
+ Objects.equals(this.name, that.name) &&
+ Objects.equals(this.type, that.type) &&
+ Objects.equals(this.contentType, that.contentType);
}
return result;
(commons-beanutils) 20/34: Remove redundant keyword
Posted by gg...@apache.org.
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-beanutils.git
commit 22a16fdef10cf01850e85cf26b56ca6bce8cea00
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:27:05 2024 -0400
Remove redundant keyword
---
src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index f1979c26..7c19220e 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -360,7 +360,7 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
// Crate new LazyDynaMap and initialize properties
final LazyDynaMap lazyMap = new LazyDynaMap(newMap);
- final DynaProperty[] properties = this.getDynaProperties();
+ final DynaProperty[] properties = getDynaProperties();
if (properties != null) {
for (final DynaProperty property : properties) {
lazyMap.add(property);
(commons-beanutils) 06/34: Use method reference
Posted by gg...@apache.org.
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-beanutils.git
commit 1736fb659ee02bc94ec911fea1a0c5a34ca2611d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:21:37 2024 -0400
Use method reference
---
src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
index e3fe824e..d8028281 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanPredicateTestCase.java
@@ -38,7 +38,7 @@ public class BeanPredicateTestCase extends TestCase {
}
public void testInstanceOf() {
- final Predicate<String> p = s -> s instanceof String;
+ final Predicate<String> p = String.class::isInstance;
final BeanPredicate<String> predicate = new BeanPredicate<>("stringProperty", p);
assertTrue(predicate.test(new TestBean("foo")));
assertTrue(predicate.test(new TestBean("bar")));
(commons-beanutils) 10/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 38c26ab4dbb586affd0b88b11780afbab14ec114
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:23:55 2024 -0400
Remove redundant parentheses
---
.../java/org/apache/commons/beanutils2/expression/DefaultResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
index 45d21a6e..8d3f3178 100644
--- a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
+++ b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
@@ -148,7 +148,7 @@ public class DefaultResolver implements Resolver {
}
for (int i = 0; i < expression.length(); i++) {
final char c = expression.charAt(i);
- if ((c == NESTED) || (c == MAPPED_START || c == INDEXED_START)) {
+ if (c == NESTED || c == MAPPED_START || c == INDEXED_START) {
return expression.substring(0, i);
}
}
(commons-beanutils) 03/34: Remove redundant keyword
Posted by gg...@apache.org.
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-beanutils.git
commit 917ffbeb906d7f1972c4119d4e6fcd7b99d6d9f7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 07:35:53 2024 -0400
Remove redundant keyword
---
src/main/java/org/apache/commons/beanutils2/BeanMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanMap.java b/src/main/java/org/apache/commons/beanutils2/BeanMap.java
index 3af278ff..11c28fca 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanMap.java
@@ -644,7 +644,7 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
public void putAllWriteable(final BeanMap map) {
map.readMethods.keySet().forEach(key -> {
if (getWriteMethod(key) != null) {
- this.put(key, map.get(key));
+ put(key, map.get(key));
}
});
}
(commons-beanutils) 16/34: Use final
Posted by gg...@apache.org.
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-beanutils.git
commit 88ced6c3f1f8ba57c9726d87f63f672600ec86f8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:25:20 2024 -0400
Use final
---
.../apache/commons/beanutils2/bugs/Jira541TestCase.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
index 16edece0..6f073b00 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira541TestCase.java
@@ -45,16 +45,16 @@ public class Jira541TestCase {
@Test
public void testFluentBeanIntrospectorOnOverriddenSetterConcurrent() throws Exception {
- ExecutorService executionService = Executors.newFixedThreadPool(256);
+ final ExecutorService executionService = Executors.newFixedThreadPool(256);
try {
- List<Future<?>> futures = new ArrayList<>();
+ final List<Future<?>> futures = new ArrayList<>();
for (int i = 0; i < 10000; i++) {
futures.add(executionService.submit(() -> {
testImpl();
return null;
}));
}
- for (Future<?> future : futures) {
+ for (final Future<?> future : futures) {
future.get();
}
} finally {
@@ -63,15 +63,15 @@ public class Jira541TestCase {
}
private static void testImpl() throws ReflectiveOperationException {
- PropertyUtilsBean propertyUtilsBean = new PropertyUtilsBean();
+ final PropertyUtilsBean propertyUtilsBean = new PropertyUtilsBean();
propertyUtilsBean.addBeanIntrospector(new FluentPropertyBeanIntrospector());
// note: we should setProperty first on SubTypeA (with overridden setter), then on subTypeB
// but not vice versa
- SubTypeA subTypeA = new SubTypeA();
+ final SubTypeA subTypeA = new SubTypeA();
propertyUtilsBean.setProperty(subTypeA, FIELD_NAME, FIELD_VALUE);
- SubTypeB subTypeB = new SubTypeB();
+ final SubTypeB subTypeB = new SubTypeB();
propertyUtilsBean.setProperty(subTypeB, FIELD_NAME, FIELD_VALUE);
assertEquals(FIELD_VALUE, subTypeA.getField());
@@ -82,7 +82,7 @@ public class Jira541TestCase {
private String field;
- public BaseType setField(String objectName) {
+ public BaseType setField(final String objectName) {
this.field = objectName;
return this;
}
@@ -95,7 +95,7 @@ public class Jira541TestCase {
public static class SubTypeA extends BaseType {
@Override
- public SubTypeA setField(String field) {
+ public SubTypeA setField(final String field) {
super.setField(field);
return this;
}
(commons-beanutils) 17/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit d37101d13ac713dcbaca06a36f052c4784818949
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:25:32 2024 -0400
Remove redundant parentheses
---
src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index ab711503..0775625a 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -294,7 +294,7 @@ public class LazyDynaBean implements DynaBean, Serializable {
// Create the mapped object
Object mappedProperty = null;
- if ((type == null) || type.isInterface()) {
+ if (type == null || type.isInterface()) {
mappedProperty = defaultMappedProperty(name);
(commons-beanutils) 08/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 39929537e4f33fcb46c66e04034f04d1a8a9be7f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:22:51 2024 -0400
Remove redundant parentheses
Use final
---
.../commons/beanutils2/converters/DateTimeConverter.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
index 788e8b21..d3cd30d4 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
@@ -142,16 +142,16 @@ public abstract class DateTimeConverter<D> extends AbstractConverter<D> {
} else if (value instanceof Long) {
date = new Date(((Long) value).longValue());
} else if (value instanceof LocalDateTime) {
- date = java.sql.Timestamp.valueOf(((LocalDateTime) value));
+ date = java.sql.Timestamp.valueOf((LocalDateTime) value);
} else if (value instanceof LocalDate) {
- date = java.sql.Date.valueOf(((LocalDate) value));
+ date = java.sql.Date.valueOf((LocalDate) value);
} else if (value instanceof ZonedDateTime) {
date = Date.from(((ZonedDateTime) value).toInstant());
} else if (value instanceof OffsetDateTime) {
date = Date.from(((OffsetDateTime) value).toInstant());
} else if (value instanceof TemporalAccessor) {
// Backstop for other TemporalAccessor implementations.
- date = Date.from(Instant.from(((TemporalAccessor) value)));
+ date = Date.from(Instant.from((TemporalAccessor) value));
}
String result = null;
@@ -221,7 +221,7 @@ public abstract class DateTimeConverter<D> extends AbstractConverter<D> {
// didn't include the milliseconds. The following code
// ensures it works consistently across JDK versions
final java.sql.Timestamp timestamp = (java.sql.Timestamp)value;
- long timeInMillis = ((timestamp.getTime() / 1000) * 1000);
+ long timeInMillis = timestamp.getTime() / 1000 * 1000;
timeInMillis += timestamp.getNanos() / 1000000;
return toDate(targetType, timeInMillis);
@@ -449,7 +449,7 @@ public abstract class DateTimeConverter<D> extends AbstractConverter<D> {
format.setLenient(false);
final ParsePosition pos = new ParsePosition(0);
final Date parsedDate = format.parse(value, pos); // ignore the result (use the Calendar)
- int errorIndex = pos.getErrorIndex();
+ final int errorIndex = pos.getErrorIndex();
if (errorIndex >= 0 || pos.getIndex() != value.length() || parsedDate == null) {
String msg = "Error converting '" + toString(sourceType) + "' to '" + toString(targetType) + "'";
if (format instanceof SimpleDateFormat) {
(commons-beanutils) 18/34: Use final
Posted by gg...@apache.org.
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-beanutils.git
commit 135b783c034f487c969afdf068de69e0d5f8c918
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:25:56 2024 -0400
Use final
USe else if
---
src/main/java/org/apache/commons/beanutils2/LazyDynaList.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
index cc0f8fe4..0de80d4e 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
@@ -316,7 +316,7 @@ public class LazyDynaList extends ArrayList<Object> {
return false;
}
- ensureCapacity((Math.max(index, size())) + collection.size());
+ ensureCapacity(Math.max(index, size()) + collection.size());
// Call "transform" with first element, before
// List is "grown" to ensure the correct DynaClass
@@ -433,11 +433,12 @@ public class LazyDynaList extends ArrayList<Object> {
if (WrapDynaBean.class.isAssignableFrom(elementDynaBeanType)) {
this.elementType = ((WrapDynaBean)dynaBean).getInstance().getClass();
this.wrapDynaClass = (WrapDynaClass)elementDynaClass;
- } else if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType)) {
- this.elementType = ((LazyDynaMap)dynaBean).getMap().getClass();
- this.elementDynaClass = elementDynaClass;
} else {
- this.elementType = dynaBean.getClass();
+ if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType)) {
+ this.elementType = ((LazyDynaMap)dynaBean).getMap().getClass();
+ } else {
+ this.elementType = dynaBean.getClass();
+ }
this.elementDynaClass = elementDynaClass;
}
} catch (final Exception e) {
(commons-beanutils) 14/34: Use final
Posted by gg...@apache.org.
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-beanutils.git
commit a38901bf59a3d92a4b225dd07a34433206453bb1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:24:55 2024 -0400
Use final
---
.../org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
index d176c6ef..a1fec561 100644
--- a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
+++ b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
@@ -155,7 +155,7 @@ public class FluentPropertyBeanIntrospector implements BeanIntrospector {
// We should not change statically cached PropertyDescriptor as it can be from super-type,
// it may affect other subclasses of targetClass supertype.
// See BEANUTILS-541 for more details.
- PropertyDescriptor fluentPropertyDescriptor = new PropertyDescriptor(
+ final PropertyDescriptor fluentPropertyDescriptor = new PropertyDescriptor(
pd.getName(), pd.getReadMethod(), m);
// replace existing (possibly inherited from super-class) to one specific to current class
icontext.addPropertyDescriptor(fluentPropertyDescriptor);
(commons-beanutils) 23/34: Remove redundant parentheses
Posted by gg...@apache.org.
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-beanutils.git
commit 2ff6aae1652c0d9d63128528d9445154429fd539
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:27:47 2024 -0400
Remove redundant parentheses
---
.../org/apache/commons/beanutils2/converters/LocalTimeConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/LocalTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/LocalTimeConverter.java
index 309aad95..ae5cf7b3 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/LocalTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/LocalTimeConverter.java
@@ -63,7 +63,7 @@ public final class LocalTimeConverter extends AbstractConverter<LocalTime> {
@Override
protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (LocalTime.class.equals(type)) {
- return type.cast(LocalTime.parse((String.valueOf(value))));
+ return type.cast(LocalTime.parse(String.valueOf(value)));
}
throw conversionException(type, value);
(commons-beanutils) 26/34: Remove redundant call to super()
Posted by gg...@apache.org.
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-beanutils.git
commit 56835b1899911e17c94b46fca86bfd8f0dd76c52
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 18 08:28:15 2024 -0400
Remove redundant call to super()
---
.../java/org/apache/commons/beanutils2/converters/PatternConverter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
index 64bf9b92..c338e52d 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/PatternConverter.java
@@ -31,7 +31,6 @@ public class PatternConverter extends AbstractConverter<Pattern> {
* Construct a <b>{@link Pattern}</b> <em>Converter</em> that throws a {@code ConversionException} if an error occurs.
*/
public PatternConverter() {
- super();
}
/**