Skip to content

Resolved Idea warnings #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 12, 2025
Merged

Resolved Idea warnings #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ce12b
Resolved Idea warnings
javadev Apr 9, 2025
1c25a4b
Improved format
javadev Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/github/underscore/U.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,8 @@ public static String xmlOrJsonToJson(String xmlOrJson) {
return xmlOrJsonToJson(xmlOrJson, Json.JsonStringBuilder.Step.TWO_SPACES);
}

public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons, Json.JsonStringBuilder.Step identStep) {
public static String mergeXmlsOrJsonsToJson(
List<String> xmlsOrJsons, Json.JsonStringBuilder.Step identStep) {
Map<String, Object> resultJsonMap = new LinkedHashMap<>();
for (String xmlOrJsonToJson : xmlsOrJsons) {
TextType textType = getTextType(xmlOrJsonToJson);
Expand All @@ -2819,7 +2820,8 @@ public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons) {
return mergeXmlsOrJsonsToJson(xmlsOrJsons, Json.JsonStringBuilder.Step.TWO_SPACES);
}

public static String mergeXmlsOrJsonsToXml(List<String> xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) {
public static String mergeXmlsOrJsonsToXml(
List<String> xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) {
Map<String, Object> resultXmlMap = new LinkedHashMap<>();
for (String xmlOrJsonToXml : xmlsOrJsons) {
TextType textType = getTextType(xmlOrJsonToXml);
Expand Down
82 changes: 39 additions & 43 deletions src/test/java/com/github/underscore/ChainingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,24 @@ class ChainingTest {
@Test
void chain() {
final List<Map<String, Object>> stooges =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "curly");
put("age", 25);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "moe");
put("age", 21);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "larry");
put("age", 23);
Expand All @@ -94,24 +94,24 @@ void chain() {
@Test
void chainSet() {
final Set<Map<String, Object>> stooges =
new HashSet<Map<String, Object>>() {
new HashSet<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "curly");
put("age", 25);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "moe");
put("age", 21);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "larry");
put("age", 23);
Expand All @@ -133,24 +133,24 @@ void chainSet() {
@SuppressWarnings("unchecked")
void chainObj() {
final Set<Map<String, Object>> stooges =
new HashSet<Map<String, Object>>() {
new HashSet<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "curly");
put("age", 25);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "moe");
put("age", 21);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "larry");
put("age", 23);
Expand All @@ -159,42 +159,38 @@ void chainObj() {
}
};
final String youngest =
new Underscore(stooges)
new Underscore<>(stooges)
.chain()
.sortBy(
(Function<Map<String, Object>, Integer>)
item -> (Integer) item.get("age"))
.map(
(Function<Map<String, Object>, String>)
item -> item.get("name") + " is " + item.get("age"))
.sortBy(item -> (Integer) item.get("age"))
.map(item -> item.get("name") + " is " + item.get("age"))
.first()
.item()
.toString();
assertEquals("moe is 21", youngest);
new Underscore(stooges).of();
new Underscore<>(stooges).of();
}

@Test
void chainArray() {
final List<Map<String, Object>> stooges =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "curly");
put("age", 25);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "moe");
put("age", 21);
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("name", "larry");
put("age", 23);
Expand Down Expand Up @@ -236,31 +232,31 @@ void chainArray() {
@SuppressWarnings("unchecked")
void chain2() {
final List<Map<String, Object>> lyrics =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 1);
put("words", "I'm a lumberjack and I'm okay");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 2);
put("words", "I sleep all night and I work all day");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 3);
put("words", "He's a lumberjack and he's okay");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 4);
put("words", "He sleeps all night and he works all day");
Expand Down Expand Up @@ -314,31 +310,31 @@ void chain2() {
@SuppressWarnings("unchecked")
void chain3() {
final List<Map<String, Object>> lyrics =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 1);
put("words", "I'm a lumberjack and I'm okay");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 2);
put("words", "I sleep all night and I work all day");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 3);
put("words", "He's a lumberjack and he's okay");
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("line", 4);
put("words", "He sleeps all night and he works all day");
Expand Down Expand Up @@ -396,10 +392,10 @@ void chain3() {
@Test
void chain4() {
final List<Map<String, Object>> doctors =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 1);
put("actor", "William Hartnell");
Expand All @@ -408,7 +404,7 @@ void chain4() {
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 9);
put("actor", "Christopher Eccleston");
Expand All @@ -417,7 +413,7 @@ void chain4() {
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 10);
put("actor", "David Tennant");
Expand All @@ -434,7 +430,7 @@ void chain4() {
.map(
(Function<Map<String, Object>, Map<String, Object>>)
item ->
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put(
"doctorNumber",
Expand Down Expand Up @@ -470,10 +466,10 @@ void chain4() {
@Test
void chain5() {
final List<Map<String, Object>> doctors =
new ArrayList<Map<String, Object>>() {
new ArrayList<>() {
{
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 1);
put("actor", "William Hartnell");
Expand All @@ -482,7 +478,7 @@ void chain5() {
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 9);
put("actor", "Christopher Eccleston");
Expand All @@ -491,7 +487,7 @@ void chain5() {
}
});
add(
new LinkedHashMap<String, Object>() {
new LinkedHashMap<>() {
{
put("number", 10);
put("actor", "David Tennant");
Expand Down
Loading
Loading