Skip to content

Fix #14 module calculator #18

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
mnowrot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #14 module calculator #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2836e05
Fixing exception during incremental build
mnowrot Jun 23, 2018
863a1e7
Fixing module calculator so it does not return parent modules when th…
mnowrot Jun 23, 2018
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
6 changes: 2 additions & 4 deletions src/main/java/com/soebes/maven/extensions/incremental/IncrementalModuleBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ class IncrementalModuleBuilderImpl
public void build()
throws ExecutionException, InterruptedException
{
this.mavenSession.setProjects( this.projects );

logger.info( "Recalculated reactor:" );
for ( MavenProject mavenProject : this.mavenSession.getProjects() )
for ( MavenProject mavenProject : this.projects )
{
logger.info( " {}", mavenProject.getName() );
}
Expand All @@ -108,7 +106,7 @@ public void build()
{
logger.debug( " task:" + task );
}
for ( MavenProject mavenProject : mavenSession.getProjects() )
for ( MavenProject mavenProject : this.projects )
{
logger.info( "Building project: {}", mavenProject.getId() );
lifecycleModuleBuilder.buildProject( mavenSession, reactorContext, mavenProject, taskSegment );
Expand Down
26 changes: 16 additions & 10 deletions src/main/java/com/soebes/maven/extensions/incremental/ModuleCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,28 @@ public List<MavenProject> calculateChangedModules( Path projectRootpath )
// TODO: Think about if we got only pom packaging modules? Do we
// need to do something special there?
List<MavenProject> result = new ArrayList<>();
for ( MavenProject project : projectList )
for ( ScmFile fileItem : changeList )
{
Path relativize = projectRootpath.relativize( project.getBasedir().toPath() );
for ( ScmFile fileItem : changeList )
MavenProject project = null;
int longestRelativePathLength = -1;
for ( MavenProject currProject : projectList )
{
boolean startsWith = new File( fileItem.getPath() ).toPath().startsWith( relativize );
logger.debug( "startswith: " + startsWith + " " + fileItem.getPath() + " " + relativize );
if ( startsWith )
Path relativize = projectRootpath.relativize( currProject.getBasedir().toPath() );
boolean startsWith = "".equals(relativize.toString()) || ".".equals(relativize.toString())
|| new File(fileItem.getPath()).toPath().startsWith(relativize);
logger.debug("startswith: " + startsWith + " " + fileItem.getPath() + " " + relativize);
int currRelativePathLength = relativize.toString().length();
if (startsWith && longestRelativePathLength < currRelativePathLength)
{
if ( !result.contains( project ) )
{
result.add( project );
}
longestRelativePathLength = currRelativePathLength;
project = currProject;
}
}
if (project != null && !result.contains(project)) {
result.add(project);
}
}

return result;
}

Expand Down
18 changes: 17 additions & 1 deletion src/test/java/com/soebes/maven/extensions/incremental/ModuleCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public class ModuleCalculatorTest

private MavenProject subdomain = createProject( "subdomain", new File( baseDir, "domain/subdomain" ) );

private MavenProject subsubdomain = createProject( "subsubdomain", new File( baseDir, "domain/subdomain/subsubdomain" ) );

private ModuleCalculator moduleCalculator;

@Before
Expand All @@ -61,6 +63,7 @@ public void before()
projectList.add( assembly );
projectList.add( domain );
projectList.add( subdomain );
projectList.add( subsubdomain );
}

private MavenProject createProject( String artifactId, File baseDir )
Expand Down Expand Up @@ -125,7 +128,7 @@ public void shouldResultInTwoModulesDomainAndSubDomain()
assertThat( changedModules ).hasSize( 2 ).containsOnly( domain, subdomain );
}

@Ignore
@Test
public void shouldResultInThreeModules()
{
// TODO: Think about this test case. What
Expand All @@ -143,4 +146,17 @@ public void shouldResultInThreeModules()
assertThat( changedModules ).hasSize( 3 ).containsOnly( domain, subdomain, parent );
}

@Test
public void shouldReturnOnlyChangedModules() {
Path root = baseDir.toPath();
List<ScmFile> changeList = Arrays.asList(
new ScmFile( "domain/subdomain/subsubdomain/pom.xml", ScmFileStatus.MODIFIED ),
new ScmFile( "domain/pom.xml", ScmFileStatus.MODIFIED )
);
moduleCalculator = new ModuleCalculator( projectList, changeList );
List<MavenProject> changedModules = moduleCalculator.calculateChangedModules( root );

assertThat( changedModules ).hasSize( 2 ).containsOnly( subsubdomain, domain );
}

}