Skip to content
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

Call generate features on compile dependency changes in dev mode flow #724

Merged
merged 2 commits into from
Mar 23, 2022
+14 −11
Merged

Call generate features on compile dependency changes in dev mode flow #724

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1378b86
Skip install features if generate features fails
kathrynkodama Mar 18, 2022
d29ef2e
Call generate features on compile dependency changes
kathrynkodama Mar 21, 2022
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
25 changes: 14 additions & 11 deletions src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ class DevTask extends AbstractFeatureTask {
}

@Override
public boolean updateArtifactPaths(ProjectModule projectModule, boolean redeployCheck, ThreadPoolExecutor executor)
public boolean updateArtifactPaths(ProjectModule projectModule, boolean redeployCheck, boolean generateFeatures, ThreadPoolExecutor executor)
throws PluginExecutionException {
// not supported for Gradle, only used for multi module Maven projects
return false;
Expand Down Expand Up @@ -442,10 +442,10 @@ class DevTask extends AbstractFeatureTask {
}

@Override
public boolean recompileBuildFile(File buildFile, Set<String> compileArtifactPaths, Set<String> testArtifactPaths, ThreadPoolExecutor executor) {
public boolean recompileBuildFile(File buildFile, Set<String> compileArtifactPaths, Set<String> testArtifactPaths, boolean generateFeatures, ThreadPoolExecutor executor) {
boolean restartServer = false;
boolean installFeatures = false;
boolean compileDependenciesChanged = false;
boolean optimizeGenerateFeatures = false;

ProjectBuilder builder = ProjectBuilder.builder();
Project newProject;
Expand Down Expand Up @@ -556,7 +556,7 @@ class DevTask extends AbstractFeatureTask {
newProjectCompileDependencies.removeAll(existingProjectCompileDependencies);
if (!newProjectCompileDependencies.isEmpty()) {
logger.debug("Compile dependencies changed");
compileDependenciesChanged = true;
optimizeGenerateFeatures = true;
}

Configuration newLibertyFeatureConfiguration = newProject.configurations.getByName('libertyFeature');
Expand All @@ -572,21 +572,24 @@ class DevTask extends AbstractFeatureTask {
}

}
if (optimizeGenerateFeatures && generateFeatures) {
logger.debug("Detected a change in the compile dependencies, regenerating features");
// optimize generate features on build dependency change
boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true);
if (generateFeaturesSuccess) {
util.javaSourceClassPaths.clear();
} else {
installFeatures = false;
}
}
if (restartServer) {
// - stop Server
// - generate features (if generateFeatures=true)
// - create server or runBoostMojo
// - install feature
// - deploy app
// - start server
util.restartServer();
return true;
} else if (compileDependenciesChanged && generateFeatures) { // generate features if compile dependencies have been modified
// optimize generate features on build dependency change
boolean generateFeaturesSuccess = libertyGenerateFeatures(null, true);
if (generateFeaturesSuccess) {
util.javaSourceClassPaths.clear();
};
} else if (installFeatures) {
libertyInstallFeature();
}
Expand Down