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.
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
Fix wrong resources directory path #2880
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.eclipse.jkube.kit.common; | ||
|
||
import java.net.URL; | ||
import java.util.Properties; | ||
|
||
public class PropertiesExtender extends Properties { | ||
private URL propertiesFile; | ||
|
||
public void setPropertiesFile(URL file) { | ||
this.propertiesFile = file; | ||
} | ||
|
||
public URL getPropertiesFile() { | ||
return this.propertiesFile; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We're using Lombok, You can directly use |
||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -57,6 +57,7 @@ public List<ImageConfiguration> generate(List<ImageConfiguration> imageConfigs) | |||||
if (generator.isApplicable(ret)) { | ||||||
log.info("Running generator %s", generator.getName()); | ||||||
ret = generator.customize(ret, genCtx.isPrePackagePhase()); | ||||||
log.info("The following properties file is used %s", genCtx.getProject().getPropertiesFile()); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
} | ||||||
return ret; | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,7 @@ | |
import java.util.List; | ||
import java.util.stream.Collectors; | ||
|
||
import org.eclipse.jkube.kit.common.JavaProject; | ||
import org.eclipse.jkube.kit.common.KitLogger; | ||
import org.eclipse.jkube.kit.config.image.GeneratorManager; | ||
import org.eclipse.jkube.kit.config.image.ImageConfiguration; | ||
|
@@ -43,6 +44,7 @@ void setUp() { | |
GeneratorContext generatorContext = GeneratorContext.builder() | ||
.config(processorConfig) | ||
.logger(logger) | ||
.project(new JavaProject(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this change needed? How is this change verifying the bug this patch is fixing? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe you can directly use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you for your very valuable feedback! I take into account your remarks. |
||
.build(); | ||
generatorManager = new DefaultGeneratorManager(generatorContext); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure about the motivation behind using this POJO. Why not use a
URL
field directly?