Skip to content

Commit b3edb14

Browse files
committed
fix: restore three-branch parity and Jackson 3 compatibility
1 parent 286ef9d commit b3edb14

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

‎scripts/check-branch-parity.sh‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@ set -eu
44
TMP="$(mktemp -d)"
55
trap 'rm -rf "$TMP"' EXIT
66

7-
git fetch --no-tags origin \
8-
feature/1.0.x:refs/remotes/origin/feature/1.0.x \
9-
feature/2.0.x:refs/remotes/origin/feature/2.0.x \
10-
feature/3.0.x:refs/remotes/origin/feature/3.0.x
7+
git fetch --no-tags origin feature/1.0.x:refs/remotes/origin/feature/1.0.x feature/2.0.x:refs/remotes/origin/feature/2.0.x feature/3.0.x:refs/remotes/origin/feature/3.0.x
118

129
extract_branch() {
1310
ref="$1"
1411
dir="$2"
1512
mkdir -p "$TMP/$dir"
16-
git archive --format=tar "$ref" src/main/java src/test/java src/test/resources \
17-
| tar -xf - -C "$TMP/$dir"
13+
git archive --format=tar "$ref" src/main/java src/test/java src/test/resources | tar -xf - -C "$TMP/$dir"
1814

1915
find "$TMP/$dir" -type f -name '*.java' -print | while IFS= read -r file; do
20-
sed 's/tools\.jackson/com.fasterxml.jackson/g' "$file" > "$file.norm"
16+
sed -e 's/tools\.jackson/com.fasterxml.jackson/g' -e 's/\.properties()/\.fields()/g' "$file" > "$file.norm"
2117
mv "$file.norm" "$file"
2218
done
2319
}

‎src/main/java/io/github/easy4j/comfy/model/ComfyCapabilityCatalog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private static boolean contains(JsonNode node, String value) {
2929
return false;
3030
}
3131
if (node.isObject()) {
32-
Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
32+
Iterator<Map.Entry<String, JsonNode>> fields = node.properties().iterator();
3333
while (fields.hasNext()) {
3434
Map.Entry<String, JsonNode> field = fields.next();
3535
if (value.equals(field.getKey()) || contains(field.getValue(), value)) return true;

0 commit comments

Comments
 (0)