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/12/02 15:25:47 UTC
(commons-lang) branch master updated: Refactor copy pasta
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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 50a4eeab1 Refactor copy pasta
50a4eeab1 is described below
commit 50a4eeab10bc40383b27e74adc1ad9788cd6f3a4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Dec 2 10:25:41 2024 -0500
Refactor copy pasta
---
.../commons/lang3/builder/ToStringStyle.java | 163 +++++----------------
1 file changed, 38 insertions(+), 125 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
index fe2570135..a5dc4c1e7 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
@@ -150,162 +150,62 @@ public abstract class ToStringStyle implements Serializable {
}
@Override
- public void append(final StringBuffer buffer, final String fieldName,
- final boolean[] array, final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final boolean[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName, final byte[] array,
- final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final byte[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName, final char[] array,
- final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final char[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName,
- final double[] array, final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final double[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName,
- final float[] array, final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final float[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName, final int[] array,
- final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final int[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName, final long[] array,
- final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final long[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName, final Object value,
- final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final Object value, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, value, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName,
- final Object[] array, final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final Object[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@Override
- public void append(final StringBuffer buffer, final String fieldName,
- final short[] array, final Boolean fullDetail) {
-
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
- if (!isFullDetail(fullDetail)) {
- throw new UnsupportedOperationException(
- "FullDetail must be true when using JsonToStringStyle");
- }
-
+ public void append(final StringBuffer buffer, final String fieldName, final short[] array, final Boolean fullDetail) {
+ checkAppendInput(fieldName, fullDetail);
super.append(buffer, fieldName, array, fullDetail);
}
@@ -325,7 +225,6 @@ public abstract class ToStringStyle implements Serializable {
buffer.append(getArrayEnd());
return;
}
-
buffer.append(coll);
}
@@ -390,10 +289,7 @@ public abstract class ToStringStyle implements Serializable {
@Override
protected void appendFieldStart(final StringBuffer buffer, final String fieldName) {
- if (fieldName == null) {
- throw new UnsupportedOperationException(
- "Field names are mandatory when using JsonToStringStyle");
- }
+ checkFieldName(fieldName);
super.appendFieldStart(buffer, FIELD_NAME_QUOTE + StringEscapeUtils.escapeJson(fieldName)
+ FIELD_NAME_QUOTE);
@@ -409,6 +305,23 @@ public abstract class ToStringStyle implements Serializable {
buffer.append('"').append(StringEscapeUtils.escapeJson(value)).append('"');
}
+ private void checkAppendInput(final String fieldName, final Boolean fullDetail) {
+ checkFieldName(fieldName);
+ checkIsFullDetail(fullDetail);
+ }
+
+ private void checkFieldName(final String fieldName) {
+ if (fieldName == null) {
+ throw new UnsupportedOperationException("Field names are mandatory when using JsonToStringStyle");
+ }
+ }
+
+ private void checkIsFullDetail(final Boolean fullDetail) {
+ if (!isFullDetail(fullDetail)) {
+ throw new UnsupportedOperationException("FullDetail must be true when using JsonToStringStyle");
+ }
+ }
+
private boolean isJsonArray(final String valueAsString) {
return valueAsString.startsWith(getArrayStart())
&& valueAsString.endsWith(getArrayEnd());