Skip to content

Include non affected #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: mixed-granularity
Choose a base branch
from
Open

Include non affected #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea1d641
add includeNonAffected Methods
mmk-1 Nov 12, 2023
0d499c8
added non affected classes for methods mojo
mmk-1 Nov 12, 2023
0637956
add setter for methods
mmk-1 Nov 12, 2023
03b02c3
added relevant code for non affected in hybrid mojo
mmk-1 Nov 12, 2023
5596492
changed default to true
mmk-1 Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions starts-plugin/src/main/java/edu/illinois/starts/jdeps/HybridMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class HybridMojo extends DiffMojo {
private Set<String> oldClasses;
private Set<String> affectedTestClasses;
private Set<String> nonAffectedMethods;
private Set<String> nonAffectedClasses;
private Map<String, String> methodsCheckSum;
private Map<String, List<String>> classesChecksum;
private Map<String, Set<String>> methodToTestClasses;
Expand Down Expand Up @@ -69,6 +70,12 @@ public class HybridMojo extends DiffMojo {
@Parameter(property = "computeAffectedTests", defaultValue = FALSE)
private boolean computeAffectedTests;

/*
* Set this to "true" to include non-affected classes as well.
*/
@Parameter(property = "includeNonAffectedClasses", required = false, defaultValue = "true")
private boolean includeNonAffectedClasses;

public void setComputeImpactedMethods(boolean computeImpactedMethods) {
this.computeImpactedMethods = computeImpactedMethods;
}
Expand All @@ -81,6 +88,10 @@ public void setComputeAffectedTests(boolean computeAffectedTests) {
this.computeAffectedTests = computeAffectedTests;
}

public void setIncludeNonAffectedClasses(boolean includeNonAffectedClasses) {
this.includeNonAffectedClasses = includeNonAffectedClasses;
}

public Set<String> getAffectedMethods() {
Set<String> affectedMethods = new HashSet<>();
affectedMethods.addAll(changedMethods);
Expand Down Expand Up @@ -151,6 +162,10 @@ public Set<String> getNonAffectedMethods() {
return Collections.unmodifiableSet(nonAffectedMethods);
}

public Set<String> getNonAffectedClasses() {
return Collections.unmodifiableSet(nonAffectedClasses);
}

/**
* This method first builds the method-level static dependencies by calling
* MethodLevelStaticDepsBuilder.buildMethodsGraph().
Expand Down Expand Up @@ -215,6 +230,7 @@ protected void runHybrid(boolean impacted) throws MojoExecutionException {
changedClassesWithChangedHeaders = new HashSet<>();
changedClassesWithoutChangedHeaders = new HashSet<>();
nonAffectedMethods = new HashSet<>();
nonAffectedClasses = new HashSet<>();

if (computeAffectedTests) {
affectedTestClasses = MethodLevelStaticDepsBuilder.computeTestClasses();
Expand Down Expand Up @@ -302,6 +318,10 @@ private void logInfo(boolean impacted) {
logger.log(Level.INFO, "ImpactedClasses: " + impactedClasses.size());
}

if (includeNonAffectedClasses) {
logger.log(Level.INFO, "NonAffectedClasses: " + nonAffectedClasses.size());
}

// DEBUG PRINTS
if (debug) {
logger.log(Level.INFO, "ImpactedMethods: " + impactedMethods);
Expand All @@ -313,6 +333,9 @@ private void logInfo(boolean impacted) {
logger.log(Level.INFO, "AffectedTestClasses: " + affectedTestClasses);
logger.log(Level.INFO, "ClassToTestClassGraph: " + classToTestClassGraph);
}
if (includeNonAffectedClasses) {
logger.log(Level.INFO, "NonAffectedClasses: " + nonAffectedClasses);
}
}
}

Expand Down Expand Up @@ -360,6 +383,14 @@ protected void setChangedAndNonaffectedMethods() throws MojoExecutionException {
.addAll(classToTestClassGraph.getOrDefault(changedClassesWithChangedHeader, new HashSet<>()));
}
}

if (includeNonAffectedClasses) {
nonAffectedClasses = MethodLevelStaticDepsBuilder.getClasses();
nonAffectedClasses.removeAll(newClasses);
nonAffectedClasses.removeAll(deletedClasses);
nonAffectedClasses.removeAll(changedClassesWithChangedHeaders);
nonAffectedClasses.removeAll(changedClassesWithoutChangedHeaders);
}
}

/**
Expand Down
35 changes: 31 additions & 4 deletions starts-plugin/src/main/java/edu/illinois/starts/jdeps/MethodsMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package edu.illinois.starts.jdeps;

import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
Expand Down Expand Up @@ -40,7 +41,8 @@ public class MethodsMojo extends DiffMojo {
private Set<String> oldClasses;
private Set<String> changedClasses;
private Set<String> affectedTestClasses;
private Set<String> nonAffectedMethods; // This may not be needed at all
private Set<String> nonAffectedMethods;
private Set<String> nonAffectedClasses;
private Map<String, String> methodsCheckSum;
private Map<String, Set<String>> methodToTestClasses;
private ClassLoader loader;
Expand Down Expand Up @@ -78,6 +80,12 @@ public class MethodsMojo extends DiffMojo {
@Parameter(property = "computeAffectedTests", defaultValue = FALSE)
private boolean computeAffectedTests;

/*
* Set this to "true" to include non-affected classes as well.
*/
@Parameter(property = "includeNonAffectedClasses", required = false, defaultValue = "true")
private boolean includeNonAffectedClasses;

public void setDebug(boolean debug) {
this.debug = debug;
}
Expand All @@ -98,6 +106,10 @@ public void setComputeAffectedTests(boolean computeAffectedTests) {
this.computeAffectedTests = computeAffectedTests;
}

public void setIncludeNonAffectedClasses(boolean includeNonAffectedClasses) {
this.includeNonAffectedClasses = includeNonAffectedClasses;
}

public Set<String> getAffectedMethods() {
Set<String> affectedMethods = new HashSet<>();
affectedMethods.addAll(changedMethods);
Expand Down Expand Up @@ -132,6 +144,10 @@ public Set<String> getNonAffectedMethods() {
return Collections.unmodifiableSet(nonAffectedMethods);
}

public Set<String> getNonAffectedClasses() {
return Collections.unmodifiableSet(nonAffectedClasses);
}

/**
* This method first builds the method-level static dependencies by calling
* MethodLevelStaticDepsBuilder.buildMethodsGraph().
Expand Down Expand Up @@ -187,6 +203,7 @@ protected void runMethods(boolean impacted) throws MojoExecutionException {
changedClasses = new HashSet<>();
newClasses = MethodLevelStaticDepsBuilder.getClasses();
nonAffectedMethods = new HashSet<>();
nonAffectedClasses = new HashSet<>();

if (computeAffectedTests) {
affectedTestClasses = MethodLevelStaticDepsBuilder.computeTestClasses();
Expand Down Expand Up @@ -253,13 +270,20 @@ private void logInfoStatements(boolean impacted) {
logger.log(Level.INFO, "AffectedTestClasses: " + affectedTestClasses.size());
}

if (includeNonAffectedClasses) {
logger.log(Level.INFO, "NonAffectedClasses: " + nonAffectedClasses.size());
}

// DEBUG PRINTS
if (debug) {
logger.log(Level.INFO, "ChangedMethods: " + changedMethods);
logger.log(Level.INFO, "ImpactedMethods: " + impactedMethods);
if (computeAffectedTests) {
logger.log(Level.INFO, "AffectedTestClasses: " + affectedTestClasses);
}
if (includeNonAffectedClasses) {
logger.log(Level.INFO, "NonAffectedClasses: " + nonAffectedClasses);
}
}
}

Expand All @@ -285,9 +309,12 @@ protected void computeChangedMethods() throws MojoExecutionException {
changedClasses = dataList == null ? new HashSet<String>() : dataList.get(4);
newClasses = MethodLevelStaticDepsBuilder.getClasses();
newClasses.removeAll(oldClasses);
// nonAffectedMethods = MethodLevelStaticDepsBuilder.computeMethods();
// nonAffectedMethods.removeAll(changedMethods);
// nonAffectedMethods.removeAll(newMethods);

if (includeNonAffectedClasses) {
nonAffectedClasses = MethodLevelStaticDepsBuilder.getClasses();
nonAffectedClasses.removeAll(changedClasses);
nonAffectedClasses.removeAll(newClasses);
}
}

/**
Expand Down