FISH-1014 Variables (ENV=...) in @DatasourceDefinition not applied to 'className' #5095 #5142
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
added 2 commits
February 26, 2021 22:54
lprimak
suggested changes
Mar 6, 2021
...va/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java
Outdated
Show resolved
Hide resolved
.../java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionImpl.java
Outdated
Show resolved
Hide resolved
…est. Integrated into one test. Removed unnecessary files.
lprimak
reviewed
Mar 8, 2021
| @@ -48,6 +48,7 @@ | |||
| import org.glassfish.apf.AnnotationInfo; | |||
| import org.glassfish.apf.AnnotationProcessorException; | |||
| import org.glassfish.apf.HandlerProcessingResult; | |||
| import org.glassfish.config.support.TranslatedConfigView; | |||
There was a problem hiding this comment.
You could import static TranslatedConfigView.expandValue so you only use expandValue() so it could be more concise :)
lprimak
approved these changes
Mar 8, 2021
AlanRoth
added
PR: CLA
AlanRoth
changed the title
|
jenkins test please |
Pandrex247
pushed a commit
to Pandrex247/Payara
that referenced
this pull request
May 4, 2021
FISH-1014 Variables (ENV=...) in @DatasourceDefinition not applied to 'className' payara#5095
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
This is a simple fix in DataSourceDefinitionHandler where all String base properties from the DataSourceDefinition are expanded using the
TranslatedConfigView.expandValue(value)Testing
New tests
TranslatedConfigView.expandValue() is a static method so cannot be easily mocked.
So I created EnvironmentUtil which can set the current environment (not sure if this will cause problems)
I created DataSourceDefinitionExpansionTest.java which only tests expansion of environment variables.
This proves that TranslatedConfigView is called.
Testing Performed
I built payara and tested using payara-micro. My test project (see ticket) works fine now.
Testing Environment
I tested on Mac
java -version
java version "1.8.0_201"
Java(TM) SE Runtime Environment (build 1.8.0_201-b09)
Java HotSpot(TM) 64-Bit Server VM (build 25.201-b09, mixed mode)
Apache Maven 3.6.2 (40f52333136460af0dc0d7232c0dc0bcf0d9e117; 2019-08-27T17:06:16+02:00)
Maven home: /usr/local/Cellar/maven/3.6.2/libexec
Java version: 1.8.0_201, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/jre
Default locale: nl_NL, platform encoding: UTF-8
OS name: "mac os x", version: "10.15.7", arch: "x86_64", family: "mac"
Documentation
n/a
Notes for Reviewers
This is the first time I created a pull-request so I'd like to hear how to proceed.
Can I run tests locally (they currently fail in the master branch).
Or is there a way I can run the jenkins tests locally?