Skip to content

Commit 652ff15

Browse files
committed
minor change
1 parent f1b365b commit 652ff15

File tree

2 files changed

+41
-47
lines changed

2 files changed

+41
-47
lines changed

src/main/java/org/xmlobjects/xml/TextContent.java

Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -948,60 +948,23 @@ private <T> List<T> getAsList(Class<T> type) {
948948
null;
949949
}
950950

951-
private static TextContent ofObject(Object content) {
952-
return content != null ? new TextContent(content.toString()) : ABSENT;
951+
private static TextContent ofObject(Object value) {
952+
return value != null ? new TextContent(value.toString()) : ABSENT;
953953
}
954954

955-
private static TextContent ofObjectList(List<?> content) {
956-
if (content != null && !content.isEmpty()) {
957-
StringBuilder builder = new StringBuilder();
958-
boolean first = true;
959-
960-
for (Object object : content) {
961-
if (object != null) {
962-
if (!first) {
963-
builder.append(" ");
964-
} else {
965-
first = false;
966-
}
967-
968-
builder.append(object);
969-
}
970-
}
971-
972-
return new TextContent(builder.toString());
973-
} else {
974-
return ABSENT;
975-
}
955+
private static TextContent ofObjectList(List<?> values) {
956+
return values != null && !values.isEmpty() ? new TextContent(TextHelper.toContent(values)) : ABSENT;
976957
}
977958

978-
private static TextContent ofOffsetDateTime(OffsetDateTime content, EnumSet<CalendarField> fields, boolean withOffset) {
979-
XMLGregorianCalendar calendar = TextHelper.toCalendar(content, fields, withOffset);
959+
private static TextContent ofOffsetDateTime(OffsetDateTime dateTime, EnumSet<CalendarField> fields, boolean withOffset) {
960+
XMLGregorianCalendar calendar = TextHelper.toCalendar(dateTime, fields, withOffset);
980961
return calendar != null ? new TextContent(calendar.toXMLFormat()) : ABSENT;
981962
}
982963

983-
private static TextContent ofOffsetDateTimeList(List<OffsetDateTime> content, EnumSet<CalendarField> fields, boolean withOffset) {
984-
if (content != null && !content.isEmpty()) {
985-
StringBuilder builder = new StringBuilder(content.size());
986-
boolean first = true;
987-
988-
for (OffsetDateTime dateTime : content) {
989-
XMLGregorianCalendar calendar = TextHelper.toCalendar(dateTime, fields, withOffset);
990-
if (calendar != null) {
991-
if (!first) {
992-
builder.append(" ");
993-
} else {
994-
first = false;
995-
}
996-
997-
builder.append(calendar.toXMLFormat());
998-
}
999-
}
1000-
1001-
return new TextContent(builder.toString());
1002-
} else {
1003-
return ABSENT;
1004-
}
964+
private static TextContent ofOffsetDateTimeList(List<OffsetDateTime> dateTimes, EnumSet<CalendarField> fields, boolean withOffset) {
965+
return dateTimes != null && !dateTimes.isEmpty() ?
966+
new TextContent(TextHelper.toContent(dateTimes, fields, withOffset)) :
967+
ABSENT;
1005968
}
1006969

1007970
public static void setZoneOffsetProvider(Function<LocalDateTime, ZoneOffset> zoneOffsetProvider) {

src/main/java/org/xmlobjects/xml/TextHelper.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,37 @@ static List<OffsetDateTime> toOffsetDateTimeList(List<XMLGregorianCalendar> cale
144144
}
145145
}
146146

147+
static String toContent(List<?> values) {
148+
StringBuilder builder = new StringBuilder();
149+
for (Object value : values) {
150+
if (value == null) {
151+
continue;
152+
} else if (!builder.isEmpty()) {
153+
builder.append(' ');
154+
}
155+
156+
builder.append(value);
157+
}
158+
159+
return builder.toString();
160+
}
161+
162+
static String toContent(List<OffsetDateTime> dateTimes, EnumSet<CalendarField> fields, boolean withOffset) {
163+
StringBuilder builder = new StringBuilder();
164+
for (OffsetDateTime dateTime : dateTimes) {
165+
XMLGregorianCalendar calendar = TextHelper.toCalendar(dateTime, fields, withOffset);
166+
if (calendar == null) {
167+
continue;
168+
} else if (!builder.isEmpty()) {
169+
builder.append(' ');
170+
}
171+
172+
builder.append(calendar.toXMLFormat());
173+
}
174+
175+
return builder.toString();
176+
}
177+
147178
static String normalize(String value) {
148179
int length = value.length();
149180
if (length != 0) {

0 commit comments

Comments
 (0)