Skip to content

Commit

Permalink
changing constructore per review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>
  • Loading branch information
arunvenmany-ibm committed Jan 9, 2025
1 parent 7104f53 commit d4275b2
Showing 1 changed file with 28 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,9 @@ private enum FileTrackMode {

protected boolean skipInstallFeature;
// for gradle, this map will be kept as empty map
protected Map<String,Boolean> projectRecompileMap;
protected Map<String, Boolean> projectRecompileMap = new HashMap<>();

// constructor for maven
public DevUtil(File buildDirectory, File serverDirectory, File sourceDirectory, File testSourceDirectory,
File configDirectory, File projectDirectory, File multiModuleProjectDirectory, List<File> resourceDirs, boolean changeOnDemandTestsAction,
boolean hotTests, boolean skipTests, boolean skipUTs, boolean skipITs, boolean skipInstallFeature, String applicationId,
Expand All @@ -453,8 +454,31 @@ public DevUtil(File buildDirectory, File serverDirectory, File sourceDirectory,
boolean skipDefaultPorts, JavaCompilerOptions compilerOptions, boolean keepTempContainerfile,
String mavenCacheLocation, List<ProjectModule> upstreamProjects, boolean recompileDependencies,
String packagingType, File buildFile, Map<String, List<String>> parentBuildFiles, boolean generateFeatures,
Set<String> compileArtifactPaths, Set<String> testArtifactPaths, List<Path> monitoredWebResourceDirs,
Map<String, Boolean> projectRecompileMap) {
Set<String> compileArtifactPaths, Set<String> testArtifactPaths, List<Path> monitoredWebResourceDirs, Map<String, Boolean> projectRecompileMap) {
this(buildDirectory, serverDirectory, sourceDirectory, testSourceDirectory,
configDirectory, projectDirectory, multiModuleProjectDirectory, resourceDirs, changeOnDemandTestsAction,
hotTests, skipTests, skipUTs, skipITs, skipInstallFeature, applicationId,
serverStartTimeout, appStartupTimeout, appUpdateTimeout, compileWaitMillis,
libertyDebug, useBuildRecompile, gradle, pollingTest, container,
containerfile, containerBuildContext, containerRunOpts, containerBuildTimeout,
skipDefaultPorts, compilerOptions, keepTempContainerfile,
mavenCacheLocation, upstreamProjects, recompileDependencies,
packagingType, buildFile, parentBuildFiles, generateFeatures,
compileArtifactPaths, testArtifactPaths, monitoredWebResourceDirs);
this.projectRecompileMap = projectRecompileMap;
}

// constructor for gradle
public DevUtil(File buildDirectory, File serverDirectory, File sourceDirectory, File testSourceDirectory,
File configDirectory, File projectDirectory, File multiModuleProjectDirectory, List<File> resourceDirs, boolean changeOnDemandTestsAction,
boolean hotTests, boolean skipTests, boolean skipUTs, boolean skipITs, boolean skipInstallFeature, String applicationId,
long serverStartTimeout, int appStartupTimeout, int appUpdateTimeout, long compileWaitMillis,
boolean libertyDebug, boolean useBuildRecompile, boolean gradle, boolean pollingTest, boolean container,
File containerfile, File containerBuildContext, String containerRunOpts, int containerBuildTimeout,
boolean skipDefaultPorts, JavaCompilerOptions compilerOptions, boolean keepTempContainerfile,
String mavenCacheLocation, List<ProjectModule> upstreamProjects, boolean recompileDependencies,
String packagingType, File buildFile, Map<String, List<String>> parentBuildFiles, boolean generateFeatures,
Set<String> compileArtifactPaths, Set<String> testArtifactPaths, List<Path> monitoredWebResourceDirs) {
this.buildDirectory = buildDirectory;
this.serverDirectory = serverDirectory;
this.sourceDirectory = sourceDirectory;
Expand Down Expand Up @@ -494,7 +518,7 @@ public DevUtil(File buildDirectory, File serverDirectory, File sourceDirectory,
this.containerfile = containerfile;
this.containerBuildContext = containerBuildContext;
this.containerRunOpts = containerRunOpts;
this.projectRecompileMap = projectRecompileMap;

if (projectDirectory != null) {
//Use Containerfile if it exists, but default to Dockerfile if both present or neither exist
File defaultDockerFile = new File(projectDirectory, "Dockerfile");
Expand Down

0 comments on commit d4275b2

Please sign in to comment.