Fix wrong resources directory path #2880
Open
+57
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Eclipse JKube CI ReportStarted new GH workflow run for #2880 (2024-04-23T19:07:16Z) ⚙️ JKube E2E Tests (8805703941)
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2880 +/- ##
=============================================
+ Coverage 59.36% 70.62% +11.26%
- Complexity 4586 5012 +426
=============================================
Files 500 486 -14
Lines 21211 19453 -1758
Branches 2830 2505 -325
=============================================
+ Hits 12591 13739 +1148
+ Misses 7370 4491 -2879
+ Partials 1250 1223 -27 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Oleksandr Krutko <alexander.krutko@gmail.com> fix typo of resourcesDirectory javadoc in JavaProject class Signed-off-by: Oleksandr Krutko <alexander.krutko@gmail.com>
arsenalzp
force-pushed
the
k8s-probes-port
branch
from
0c6dd01
to
4f19318
Compare
|
Let's discuss this on the issue first. |
Signed-off-by: Oleksandr Krutko <alexander.krutko@gmail.com>
Signed-off-by: Oleksandr Krutko <alexander.krutko@gmail.com>
arsenalzp
force-pushed
the
k8s-probes-port
branch
from
2bd807b
to
57f9e2a
Compare
|
| @@ -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.
Why is this change needed? How is this change verifying the bug this patch is fixing?
There was a problem hiding this comment.
Maybe you can directly use JavaProject.builder().build()?
There was a problem hiding this comment.
Thank you for your very valuable feedback! I take into account your remarks.
| @@ -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.
Suggested change
| log.info("The following properties file is used %s", genCtx.getProject().getPropertiesFile()); | |
| log.info("The following properties file are used %s", genCtx.getProject().getPropertiesFile()); |
|
|
||
| public URL getPropertiesFile() { | ||
| return this.propertiesFile; | ||
| } |
There was a problem hiding this comment.
We're using Lombok, You can directly use @Getter/@Setter here.
| import java.net.URL; | ||
| import java.util.Properties; | ||
|
|
||
| public class PropertiesExtender extends Properties { |
There was a problem hiding this comment.
I'm not sure about the motivation behind using this POJO. Why not use a URL field directly?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #2832
This PR brings the bug fix of wrong resources directory path.
URLClassLoaderinstance was unable to find out neitherapplication.ymlnorapplication.propertiesresources files due to wrong URLs paths defined.Method
findResourcesearches for resources files among URLs list, however URL wasbaseDir+/target/classes, which was given byjKubeProject.getOutputDirectory().getAbsolutePath()call.I decided to add separate field for resources dir in the
JavaProjectclass and add anotherjKubeProject.getResourcesDirectory().getAbsolutePath()call to get the right resources path, which should bebaseDir+/src/main/resourcesType of change
test, version modification, documentation, etc.)
Checklist