Skip to content

Commit f6b9740

Browse files
drdavellanahsra
authored andcommitted
Update CodeTFChange to include explicit DiffSide
1 parent b8c58f3 commit f6b9740

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

framework/codemodder-base/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
api(libs.java.security.toolkit)
2222
api(libs.commons.lang3)
2323

24-
api("io.codemodder:codetf-java:2.1.4")
24+
api("io.codemodder:codetf-java:3.0.0")
2525
api(libs.slf4j.api)
2626
api(libs.javaparser.core)
2727
api(libs.javaparser.symbolsolver.core)

framework/codemodder-base/src/main/java/io/codemodder/DefaultCodemodExecutor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.github.difflib.UnifiedDiffUtils;
77
import io.codemodder.codetf.CodeTFChange;
88
import io.codemodder.codetf.CodeTFChangesetEntry;
9+
import io.codemodder.codetf.CodeTFDiffSide;
910
import io.codemodder.codetf.CodeTFPackageAction;
1011
import io.codemodder.codetf.CodeTFResult;
1112
import io.codemodder.javaparser.JavaParserChanger;
@@ -274,6 +275,7 @@ private CodeTFChange translateCodemodChangetoCodeTFChange(
274275
codemodChange.lineNumber(),
275276
emptyMap(),
276277
changeDescription,
278+
CodeTFDiffSide.LEFT,
277279
pkgActions,
278280
codemodChange.getParameters());
279281

framework/codemodder-base/src/test/java/io/codemodder/DefaultCodemodExecutorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.nio.file.Files;
2222
import java.nio.file.Path;
2323
import java.util.*;
24-
import java.util.concurrent.*;
2524
import java.util.stream.Collectors;
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
@@ -135,6 +134,7 @@ public DependencyUpdateResult updateDependencies(
135134
oldDeps.size() + 1,
136135
Collections.emptyMap(),
137136
"updated deps",
137+
CodeTFDiffSide.LEFT,
138138
List.of(packageAddResult),
139139
List.of());
140140
CodeTFChangesetEntry entry = new CodeTFChangesetEntry("deps.txt", diff, List.of(change));

plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/CodeTFGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.codemodder.DependencyGAV;
99
import io.codemodder.codetf.CodeTFChange;
1010
import io.codemodder.codetf.CodeTFChangesetEntry;
11+
import io.codemodder.codetf.CodeTFDiffSide;
1112
import io.codemodder.plugins.maven.operator.POMDocument;
1213
import java.io.File;
1314
import java.net.URISyntaxException;
@@ -64,8 +65,10 @@ CodeTFChangesetEntry getChanges(
6465

6566
final String description = dependencyDescriptor.create(newDependency);
6667
final Map<String, String> properties = buildPropertiesMap(description);
68+
// Use RIGHT side as the diff side for now, as we are only adding dependencies.
6769
final CodeTFChange change =
68-
new CodeTFChange(position, properties, description, List.of(), List.of());
70+
new CodeTFChange(
71+
position, properties, description, CodeTFDiffSide.RIGHT, List.of(), List.of());
6972

7073
final List<String> patchDiff =
7174
UnifiedDiffUtils.generateUnifiedDiff(

plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/MavenProviderTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.codemodder.*;
1010
import io.codemodder.codetf.CodeTFChange;
1111
import io.codemodder.codetf.CodeTFChangesetEntry;
12+
import io.codemodder.codetf.CodeTFDiffSide;
1213
import java.io.IOException;
1314
import java.nio.charset.StandardCharsets;
1415
import java.nio.file.Files;
@@ -244,18 +245,22 @@ void it_returns_expected_changeset_when_using_parent_pom() throws IOException {
244245
// module1/pom.xml adding mars1 to dependencies
245246
assertThat(changes.get(0).getPath()).isEqualTo("module1/pom.xml");
246247
assertThat(changes.get(0).getChanges().get(0).getLineNumber()).isEqualTo(19);
248+
assertThat(changes.get(0).getChanges().get(0).getDiffSide()).isEqualTo(CodeTFDiffSide.RIGHT);
247249

248250
// pom.xml adding mars1 to dependency management
249251
assertThat(changes.get(1).getPath()).isEqualTo("pom.xml");
250252
assertThat(changes.get(1).getChanges().get(0).getLineNumber()).isEqualTo(15);
253+
assertThat(changes.get(1).getChanges().get(0).getDiffSide()).isEqualTo(CodeTFDiffSide.RIGHT);
251254

252255
// module1/pom.xml adding mars2 to dependencies
253256
assertThat(changes.get(2).getPath()).isEqualTo("module1/pom.xml");
254257
assertThat(changes.get(2).getChanges().get(0).getLineNumber()).isEqualTo(23);
258+
assertThat(changes.get(2).getChanges().get(0).getDiffSide()).isEqualTo(CodeTFDiffSide.RIGHT);
255259

256260
// pom.xml adding mars2 to dependency management
257261
assertThat(changes.get(3).getPath()).isEqualTo("pom.xml");
258262
assertThat(changes.get(3).getChanges().get(0).getLineNumber()).isEqualTo(20);
263+
assertThat(changes.get(3).getChanges().get(0).getDiffSide()).isEqualTo(CodeTFDiffSide.RIGHT);
259264

260265
// we don't have license facts for these dependencies, so we should be silent on their license!
261266
boolean matchedLicenseFacts =

0 commit comments

Comments
 (0)