Merged
Conversation
no initialization playHome
…e_fixes [playframework#1401] 🐛 Fix python3 incompatibilities in module manipulation code
fixed playframework#1399 "UnboundLocalError: local variable 'playHome' referenced before assignment
…ndency_update_20220403 Third party dependency update 20220403
…e in application root folder * Restore the old reflection code that completely replace the OUTPUT phase of Groovy compilation unit * Fix the compilation exception handling that was producing cast error as not checking properly exception type
…d instead of Groovy native methods
…ation_fixes [playframework#1403] 🐛 Fix Groovy compilation unit that tries to write in applicat…
playframework#1405: replace HashMap be ConcurrentHashMap
Co-authored-by: Christophe Maillard <christophe@qudini.com>
Do not overwrite system property net.spy.log.LoggerImpl -> 1.7.1
…-java-version-before-startup update check of java version
…ease Prepare release 1.7.1
* Updated dependencies as of 20220618 * Fixed source formatting
* remove unnecessary checks for null * remove the use of the deprecated methods and constructors * use computeIfAbsent() instead of get()/put()
* remove unused constant * simplify if expression
…0828 playframework#1425 Updated dependencies
# Conflicts: # framework/dependencies.yml # framework/src/play/server/HttpServerPipelineFactory.java # framework/src/play/templates/GroovyTemplate.java # framework/src/play/test/TestEngine.java # framework/test-src/play/test/PlayJUnitRunnerTest.java # modules/testrunner/src/play/modules/testrunner/FirePhoque.java
renat-nosto
force-pushed
the
play_1.7.1
branch
from
263dd7e to
400e648
Compare
leanish
reviewed
Oct 18, 2022
| } | ||
| } | ||
| Collections.sort(parameterNames, Comparator.comparing(o -> o._1)); | ||
| parameterNames.sort(Comparator.comparing(o -> o._1)); |
There was a problem hiding this comment.
isn't this a dead class? (as in, java 7 is explicitly not supported anymore)
Member
Author
There was a problem hiding this comment.
Im under impression it means 7+
Member
Author
There was a problem hiding this comment.
Or not, anyway i'd rather just keep minor details in sync with upstream
There was a problem hiding this comment.
yeah, there's another LocalvariablesNamesEnhancer.java... but I agree with the sync with upstream
renat-nosto
commented
Oct 18, 2022
| shutil.copyfile(os.path.join(play_env["basedir"], 'resources/idea/imlTemplate.xml'), imlFile) | ||
| cpXML = "" | ||
|
|
||
| playHome = play_env["basedir"].replace('\\', '/') |
Member
Author
There was a problem hiding this comment.
fix for play idealize
renat-nosto
commented
Oct 18, 2022
Comment on lines
+149
to
+160
| // Play needs to handle writing the generated Groovy class to the file system but the Groovy | ||
| // compilation unit by default adds it's own output phase operation to do this that cannot | ||
| // be replaced using the available public methods. Until Groovy provides this capability | ||
| // it's necessary to access the compilation unit directly using reflection to replace the | ||
| // default output operation with the Play Groovy class handler. | ||
| Field phasesF = compilationUnit.getClass().getDeclaredField("phaseOperations"); | ||
| phasesF.setAccessible(true); | ||
| Collection[] phases = (Collection[]) phasesF.get(compilationUnit); | ||
| LinkedList<IGroovyClassOperation> output = new LinkedList<>(); | ||
| phases[Phases.OUTPUT] = output; | ||
| output.add(groovyClassesForThisTemplate::add); | ||
|
|
Member
Author
There was a problem hiding this comment.
revert to old way of handling templates to prevent spamming
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Pull Request Checklist
Helpful things
Fixes
Fixes #xxxx
Purpose
What does this PR do?
Background Context
Why did you take this approach?
References
Are there any relevant issues / PRs / mailing lists discussions?