Skip to content

Commit

Permalink
fix: the invalid of "nullEqualsEmpty" (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
@coryhh
coryhh authored Nov 9, 2023
1 parent 6a660fd commit 512d867
Show file tree
Hide file tree
Showing 119 changed files with 7,994 additions and 7,849 deletions.
2 changes: 1 addition & 1 deletion arex-compare-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arex-compare-parent</artifactId>
<groupId>com.arextest</groupId>
<version>0.2.0</version>
<version>0.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
217 changes: 112 additions & 105 deletions arex-compare-core/src/main/java/com/arextest/diff/compare/ArrayCompare.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.arextest.diff.model.log.NodeEntity;
import com.arextest.diff.utils.ListUti;
import com.fasterxml.jackson.databind.node.ArrayNode;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Expand All @@ -19,117 +18,125 @@
*/
public class ArrayCompare {

public static void arrayCompare(Object obj1, Object obj2, CompareContext compareContext) throws Exception {
public static void arrayCompare(Object obj1, Object obj2, CompareContext compareContext)
throws Exception {

ArrayNode obj1Array = (ArrayNode) obj1;
ArrayNode obj2Array = (ArrayNode) obj2;
ArrayNode obj1Array = (ArrayNode) obj1;
ArrayNode obj2Array = (ArrayNode) obj2;

if (obj1Array.size() != obj2Array.size()) {
LogRegister.register(obj1Array.size(), obj2Array.size(), LogMarker.DIFF_ARRAY_COUNT, compareContext);
}
if (obj1Array.size() != obj2Array.size()) {
LogRegister.register(obj1Array.size(), obj2Array.size(), LogMarker.DIFF_ARRAY_COUNT,
compareContext);
}

List<Integer> leftComparedIndexes = new ArrayList<>();
List<Integer> rightComparedIndexes = new ArrayList<>();


// decide to use which indexSelector
IndexSelector indexSelector = IndexSelectorFactory.getIndexSelector(compareContext.currentNodeLeft,
compareContext.currentNodeRight, compareContext);

String currentListPath = ListUti.convertPathToStringForShow(compareContext.currentNodeLeft);

for (int i = 0; i < obj1Array.size(); i++) {
leftComparedIndexes.add(i);

compareContext.currentNodeLeft.add(new NodeEntity(null, i));
compareContext.currentListKeysLeft.add(currentListPath);
compareContext.currentListKeysLeft.add(indexSelector.judgeLeftIndexStandard(i));

int correspondRightIndex = indexSelector.findCorrespondRightIndex(i, rightComparedIndexes,
obj1Array, obj2Array);

Object element1 = obj1Array.get(i);
Object element2 = null;
boolean rightExist = false;

if (correspondRightIndex == -1) {
LogRegister.register(element1, element2, LogMarker.RIGHT_ARRAY_MISSING_KEY, compareContext);
} else {
element2 = obj2Array.get(correspondRightIndex);
rightExist = true;
rightComparedIndexes.add(correspondRightIndex);

compareContext.currentNodeRight.add(new NodeEntity(null, correspondRightIndex));
compareContext.currentListKeysRight.add(currentListPath);
compareContext.currentListKeysRight.add(indexSelector.judgeRightIndexStandard(correspondRightIndex));

boolean needCompare = !isComparedByRefer(i, correspondRightIndex, compareContext.pkListIndexPair,
compareContext.currentNodeLeft);
if (needCompare && element1 != null && element2 != null) {
GenericCompare.jsonCompare(element1, element2, compareContext);
}
}
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentNodeLeft);
if (rightExist) {
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentNodeRight);
}
}
List<Integer> leftComparedIndexes = new ArrayList<>();
List<Integer> rightComparedIndexes = new ArrayList<>();

// decide to use which indexSelector
IndexSelector indexSelector = IndexSelectorFactory.getIndexSelector(
compareContext.currentNodeLeft,
compareContext.currentNodeRight, compareContext);

String currentListPath = ListUti.convertPathToStringForShow(compareContext.currentNodeLeft);

for (int i = 0; i < obj1Array.size(); i++) {
leftComparedIndexes.add(i);

for (int i = 0; i < obj2Array.size(); i++) {
if (rightComparedIndexes.contains(i)) {
continue;
}
compareContext.currentNodeRight.add(new NodeEntity(null, i));
compareContext.currentListKeysRight.add(currentListPath);
compareContext.currentListKeysRight.add(indexSelector.judgeRightIndexStandard(i));

int correspondLeftIndex = indexSelector.findCorrespondLeftIndex(i, leftComparedIndexes, obj1Array, obj2Array);

Object element1 = null;
Object element2 = obj2Array.get(i);
boolean leftExist = false;
if (correspondLeftIndex == -1) {
LogRegister.register(element1, element2, LogMarker.LEFT_ARRAY_MISSING_KEY, compareContext);
} else {
element1 = obj1Array.get(correspondLeftIndex);
leftExist = true;
compareContext.currentListKeysLeft.add(currentListPath);
compareContext.currentListKeysLeft.add(indexSelector.judgeLeftIndexStandard(correspondLeftIndex));
compareContext.currentNodeLeft.add(new NodeEntity(null, correspondLeftIndex));

boolean needCompare = !isComparedByRefer(correspondLeftIndex, i, compareContext.pkListIndexPair,
compareContext.currentNodeRight);
if (needCompare && element1 != null && element2 != null) {
GenericCompare.jsonCompare(element1, element2, compareContext);
}
}

if (leftExist) {
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentNodeLeft);
}
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentNodeRight);
compareContext.currentNodeLeft.add(new NodeEntity(null, i));
compareContext.currentListKeysLeft.add(currentListPath);
compareContext.currentListKeysLeft.add(indexSelector.judgeLeftIndexStandard(i));

int correspondRightIndex = indexSelector.findCorrespondRightIndex(i, rightComparedIndexes,
obj1Array, obj2Array);

Object element1 = obj1Array.get(i);
Object element2 = null;
boolean rightExist = false;

if (correspondRightIndex == -1) {
LogRegister.register(element1, element2, LogMarker.RIGHT_ARRAY_MISSING_KEY, compareContext);
} else {
element2 = obj2Array.get(correspondRightIndex);
rightExist = true;
rightComparedIndexes.add(correspondRightIndex);

compareContext.currentNodeRight.add(new NodeEntity(null, correspondRightIndex));
compareContext.currentListKeysRight.add(currentListPath);
compareContext.currentListKeysRight.add(
indexSelector.judgeRightIndexStandard(correspondRightIndex));

boolean needCompare = !isComparedByRefer(i, correspondRightIndex,
compareContext.pkListIndexPair,
compareContext.currentNodeLeft);
if (needCompare && element1 != null && element2 != null) {
GenericCompare.jsonCompare(element1, element2, compareContext);
}
}
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentNodeLeft);
if (rightExist) {
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentNodeRight);
}
}

private static boolean isComparedByRefer(int leftIndex, int rightIndex,
Map<List<String>, List<IndexPair>> pkListIndexPair,
List<NodeEntity> currentListNode) {
boolean result = false;
IndexPair indexPair = new IndexPair(leftIndex, rightIndex);
List<IndexPair> comparedIndexPairs = pkListIndexPair.get(ListUti.convertToStringList(currentListNode));
if (comparedIndexPairs != null && comparedIndexPairs.contains(indexPair)) {
result = true;
} else if (comparedIndexPairs != null) {
comparedIndexPairs.add(indexPair);
for (int i = 0; i < obj2Array.size(); i++) {
if (rightComparedIndexes.contains(i)) {
continue;
}
compareContext.currentNodeRight.add(new NodeEntity(null, i));
compareContext.currentListKeysRight.add(currentListPath);
compareContext.currentListKeysRight.add(indexSelector.judgeRightIndexStandard(i));

int correspondLeftIndex = indexSelector.findCorrespondLeftIndex(i, leftComparedIndexes,
obj1Array, obj2Array);

Object element1 = null;
Object element2 = obj2Array.get(i);
boolean leftExist = false;
if (correspondLeftIndex == -1) {
LogRegister.register(element1, element2, LogMarker.LEFT_ARRAY_MISSING_KEY, compareContext);
} else {
element1 = obj1Array.get(correspondLeftIndex);
leftExist = true;
compareContext.currentListKeysLeft.add(currentListPath);
compareContext.currentListKeysLeft.add(
indexSelector.judgeLeftIndexStandard(correspondLeftIndex));
compareContext.currentNodeLeft.add(new NodeEntity(null, correspondLeftIndex));

boolean needCompare = !isComparedByRefer(correspondLeftIndex, i,
compareContext.pkListIndexPair,
compareContext.currentNodeRight);
if (needCompare && element1 != null && element2 != null) {
GenericCompare.jsonCompare(element1, element2, compareContext);
}
return result;
}

if (leftExist) {
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentListKeysLeft);
ListUti.removeLast(compareContext.currentNodeLeft);
}
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentListKeysRight);
ListUti.removeLast(compareContext.currentNodeRight);
}
}

private static boolean isComparedByRefer(int leftIndex, int rightIndex,
Map<List<String>, List<IndexPair>> pkListIndexPair,
List<NodeEntity> currentListNode) {
boolean result = false;
IndexPair indexPair = new IndexPair(leftIndex, rightIndex);
List<IndexPair> comparedIndexPairs = pkListIndexPair.get(
ListUti.convertToStringList(currentListNode));
if (comparedIndexPairs != null && comparedIndexPairs.contains(indexPair)) {
result = true;
} else if (comparedIndexPairs != null) {
comparedIndexPairs.add(indexPair);
}
return result;
}
}
Loading

0 comments on commit 512d867

Please sign in to comment.