-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tJSONDocDiff fixed and project structure simplified
Diff counter and test fixed Sources for components moved under src folder (plugin standard)
- Loading branch information
Showing
79 changed files
with
141 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file renamed
BIN
+69.1 KB
...cInputStream/jlo-talendcomp-json-16.8.jar → ...InputStream/jlo-talendcomp-json-16.10.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /** | ||
| * Copyright 2015 Jan Lolling [email protected] | ||
| * Copyright 2023 Jan Lolling [email protected] | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,18 @@ | ||
| /** | ||
| * Copyright 2023 Jan Lolling [email protected] | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.jlo.talendcomp.json; | ||
|
|
||
| import java.net.URI; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,28 @@ | ||
| /** | ||
| * Copyright 2023 Jan Lolling [email protected] | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.jlo.talendcomp.json.ops; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.text.NumberFormat; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.Comparator; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
|
|
@@ -27,8 +45,13 @@ public class Diff { | |
| private String refJsonPath = null; | ||
| private String testJsonPath = null; | ||
| private List<Difference> result = null; | ||
| private int countDifferences = 0; | ||
| private String rootArraySortAttribute = null; | ||
| private NumberFormat nf = null; | ||
|
|
||
| public Diff() { | ||
| nf = NumberFormat.getInstance(Locale.UK); | ||
| nf.setGroupingUsed(false); | ||
| } | ||
|
|
||
| /** | ||
| * A class describing one difference between 2 JsonNodes | ||
|
|
@@ -118,7 +141,8 @@ public void executeDiff() throws Exception { | |
| * @return List of Differences | ||
| */ | ||
| public List<Difference> findDifference(String reference, String test) throws Exception { | ||
| return findDifference(reference, null, test, null); | ||
| result = findDifference(reference, null, test, null); | ||
| return result; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -414,9 +438,24 @@ private boolean containsDiff(List<Difference> listDiff, Object test) { | |
| } | ||
| } | ||
|
|
||
| private String toStringValue(JsonNode n) { | ||
| if (n.isMissingNode()) { | ||
| return "missing"; | ||
| } else if (n.isNull()) { | ||
| return "null"; | ||
| } else if (n.isBigDecimal()) { | ||
| BigDecimal v = n.decimalValue(); | ||
| return nf.format(v.doubleValue()); | ||
| } else if (n.isDouble()) { | ||
| return nf.format(n.asDouble()); | ||
| } else { | ||
| return n.toString(); | ||
| } | ||
| } | ||
|
|
||
| private boolean equals(JsonNode n1, JsonNode n2) { | ||
| if (Util.isNull(n1, takeEmptyLikeNull) == false && Util.isNull(n2, takeEmptyLikeNull) == false) { | ||
| return n1.toString().equals(n2.toString()); | ||
| return toStringValue(n1).equals(toStringValue(n2)); | ||
| } else { | ||
| return false; | ||
| } | ||
|
|
@@ -508,7 +547,10 @@ public List<Difference> getResult() { | |
| } | ||
|
|
||
| public int getCountDifferences() { | ||
| return countDifferences; | ||
| if (result == null) { | ||
| throw new IllegalStateException("No diff result available, please call executeDiff() or findDifferences before"); | ||
| } | ||
| return result.size(); | ||
| } | ||
|
|
||
| public void setSortKeyAttribute(String keypath) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,18 @@ | ||
| /** | ||
| * Copyright 2023 Jan Lolling [email protected] | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.jlo.talendcomp.json.ops; | ||
|
|
||
| import java.util.List; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,18 @@ | ||
| /** | ||
| * Copyright 2023 Jan Lolling [email protected] | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.jlo.talendcomp.json.ops; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
Oops, something went wrong.