Adapt file trackers to RMiner API changes

jodavimehran · Jan 19, 2025 · 4c9c4a6 · 4c9c4a6
1 parent 635a67e
commit 4c9c4a6
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 121 deletions.
diff --git a/src/main/java/org/codetracker/FileTrackerImpl.java b/src/main/java/org/codetracker/FileTrackerImpl.java
@@ -1322,7 +1322,7 @@ private boolean matchingPeekMethod(Method rightMethod, BlockTrackerChangeHistory
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;
@@ -1335,7 +1335,7 @@ private boolean matchingPeekMethod(Method rightMethod, CommentTrackerChangeHisto
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;
@@ -1349,7 +1349,7 @@ private boolean matchingPeekMethod(Method rightMethod, AnnotationTrackerChangeHi
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;

diff --git a/src/main/java/org/codetracker/FileTrackerWithLocalFilesImpl.java b/src/main/java/org/codetracker/FileTrackerWithLocalFilesImpl.java
@@ -1329,7 +1329,7 @@ private boolean matchingPeekMethod(Method rightMethod, BlockTrackerChangeHistory
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;
@@ -1342,7 +1342,7 @@ private boolean matchingPeekMethod(Method rightMethod, CommentTrackerChangeHisto
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;
@@ -1356,7 +1356,7 @@ private boolean matchingPeekMethod(Method rightMethod, AnnotationTrackerChangeHi
 				return true;
 			}
 			if(rightMethod.getUmlOperation() instanceof UMLOperation && container instanceof UMLOperation) {
-				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgoringTypeParameters((UMLOperation)container);
+				return ((UMLOperation)rightMethod.getUmlOperation()).equalsIgnoringTypeParameters((UMLOperation)container);
 			}
 		}
 		return false;

diff --git a/...n/resources/oracle/attribute/test/elasticsearch-IndicesService-indicesFieldDataCache.json b/...n/resources/oracle/attribute/test/elasticsearch-IndicesService-indicesFieldDataCache.json
@@ -22,56 +22,12 @@
       "parentCommitId": "4d0feff2efc358914f2d29634eafdb4dec1e5c0f",
       "commitId": "4bb5b4100d0687f29d758ce5a329c831c563ebe5",
       "commitTime": 1455288811,
-      "changeType": "moved",
-      "elementFileBefore": "core/src/main/java/org/elasticsearch/index/NodeServicesProvider.java",
-      "elementNameBefore": "core/src/main/java/org.elasticsearch.index.NodeServicesProvider@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(50)",
+      "changeType": "introduced",
+      "elementFileBefore": "core/src/main/java/org/elasticsearch/indices/IndicesService.java",
+      "elementNameBefore": "core/src/main/java/org.elasticsearch.indices.IndicesService@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(127)",
       "elementFileAfter": "core/src/main/java/org/elasticsearch/indices/IndicesService.java",
       "elementNameAfter": "core/src/main/java/org.elasticsearch.indices.IndicesService@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(127)",
-      "comment": "Move Attribute private indicesFieldDataCache : IndicesFieldDataCache from class org.elasticsearch.index.NodeServicesProvider to private indicesFieldDataCache : IndicesFieldDataCache from class org.elasticsearch.indices.IndicesService"
-    },
-    {
-      "parentCommitId": "45f7844948d0a639b28fff08ddf1ede5637c0a49",
-      "commitId": "487af301ea4fc11d635fa9fa993be8b9aa261466",
-      "commitTime": 1446718691,
-      "changeType": "type change",
-      "elementFileBefore": "core/src/main/java/org/elasticsearch/index/IndexServicesProvider.java",
-      "elementNameBefore": "core/src/main/java/org.elasticsearch.index.IndexServicesProvider@(final)(private)indexFieldDataService:IndexFieldDataService(52)",
-      "elementFileAfter": "core/src/main/java/org/elasticsearch/index/NodeServicesProvider.java",
-      "elementNameAfter": "core/src/main/java/org.elasticsearch.index.NodeServicesProvider@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(52)",
-      "comment": "Change Attribute Type indexFieldDataService : IndexFieldDataService to indicesFieldDataCache : IndicesFieldDataCache in class org.elasticsearch.index.NodeServicesProvider"
-    },
-    {
-      "parentCommitId": "45f7844948d0a639b28fff08ddf1ede5637c0a49",
-      "commitId": "487af301ea4fc11d635fa9fa993be8b9aa261466",
-      "commitTime": 1446718691,
-      "changeType": "rename",
-      "elementFileBefore": "core/src/main/java/org/elasticsearch/index/IndexServicesProvider.java",
-      "elementNameBefore": "core/src/main/java/org.elasticsearch.index.IndexServicesProvider@(final)(private)indexFieldDataService:IndexFieldDataService(52)",
-      "elementFileAfter": "core/src/main/java/org/elasticsearch/index/NodeServicesProvider.java",
-      "elementNameAfter": "core/src/main/java/org.elasticsearch.index.NodeServicesProvider@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(52)",
-      "comment": "Rename Attribute indexFieldDataService : IndexFieldDataService to indicesFieldDataCache : IndicesFieldDataCache in class org.elasticsearch.index.NodeServicesProvider"
-    },
-    {
-      "parentCommitId": "45f7844948d0a639b28fff08ddf1ede5637c0a49",
-      "commitId": "487af301ea4fc11d635fa9fa993be8b9aa261466",
-      "commitTime": 1446718691,
-      "changeType": "container change",
-      "elementFileBefore": "core/src/main/java/org/elasticsearch/index/IndexServicesProvider.java",
-      "elementNameBefore": "core/src/main/java/org.elasticsearch.index.IndexServicesProvider@(final)(private)indexFieldDataService:IndexFieldDataService(52)",
-      "elementFileAfter": "core/src/main/java/org/elasticsearch/index/NodeServicesProvider.java",
-      "elementNameAfter": "core/src/main/java/org.elasticsearch.index.NodeServicesProvider@(final)(private)indicesFieldDataCache:IndicesFieldDataCache(52)",
-      "comment": "Rename Class org.elasticsearch.index.IndexServicesProvider renamed to org.elasticsearch.index.NodeServicesProvider"
-    },
-    {
-      "parentCommitId": "c5971272ee71a24f17e4958d729588c59266ab05",
-      "commitId": "a0821355384ec6881bade28dd3d29e1a64bea550",
-      "commitTime": 1444119596,
-      "changeType": "introduced",
-      "elementFileBefore": "core/src/main/java/org/elasticsearch/index/IndexServicesProvider.java",
-      "elementNameBefore": "core/src/main/java/org.elasticsearch.index.IndexServicesProvider@(final)(private)indexFieldDataService:IndexFieldDataService(57)",
-      "elementFileAfter": "core/src/main/java/org/elasticsearch/index/IndexServicesProvider.java",
-      "elementNameAfter": "core/src/main/java/org.elasticsearch.index.IndexServicesProvider@(final)(private)indexFieldDataService:IndexFieldDataService(57)",
-      "comment": "added with new class"
+      "comment": "new attribute"
     }
   ]
 }
diff --git a/src/test/resources/attribute/test-expected.txt b/src/test/resources/attribute/test-expected.txt
@@ -8,7 +8,7 @@ commons-io-Tailer-listener.json, 2, 0, 0
 commons-io-Tailer-reOpen.json, 1, 0, 0
 elasticsearch-BulkRequest-requests.json, 12, 0, 0
 elasticsearch-ESFileStore-in.json, 3, 0, 0
-elasticsearch-IndicesService-indicesFieldDataCache.json, 6, 0, 0
+elasticsearch-IndicesService-indicesFieldDataCache.json, 2, 0, 0
 elasticsearch-IndicesService-indicesQueryCache.json, 2, 0, 0
 elasticsearch-NodesFaultDetection-nodesFD.json, 5, 0, 0
 elasticsearch-RestRequest-httpRequest.json, 1, 0, 0