-
Notifications
You must be signed in to change notification settings - Fork 135
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
More laziness to prevent Stackoverflow exceptions. #2260
Merged
+148
−62
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9d55b77
Map thing
CRogers e76d846
UNCONTROLLABLE SCREAMING
CRogers fbe56c5
Keep the backup
CRogers ac715df
Comment
CRogers fb621ce
Delete LazyConfigurableMap.java
CRogers 981b188
Handle internal javadoc thing
CRogers aacaddd
format
CRogers 19a9bc0
Add generated changelog entries
svc-changelog File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
type: fix | ||
fix: | ||
description: Make interactions with gradle java toolchains more lazy, so `StackOverflowError`s | ||
do not occur | ||
links: | ||
- https://github.com/palantir/gradle-baseline/pull/2260 |
55 changes: 55 additions & 0 deletions
55
...rc/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavadocToolAdapter.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* (c) Copyright 2022 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.palantir.baseline.plugins.javaversions; | ||
|
||
// CHECKSTYLE:OFF | ||
|
||
import javax.inject.Inject; | ||
import org.gradle.api.file.RegularFile; | ||
import org.gradle.api.model.ObjectFactory; | ||
import org.gradle.api.tasks.javadoc.internal.JavadocToolAdapter; | ||
import org.gradle.jvm.toolchain.JavaInstallationMetadata; | ||
import org.gradle.process.internal.ExecActionFactory; | ||
// CHECKSTYLE:ON | ||
|
||
final class BaselineJavadocToolAdapter extends JavadocToolAdapter { | ||
private final BaselineJavadocTool javadocTool; | ||
|
||
BaselineJavadocToolAdapter(ExecActionFactory execActionFactory, BaselineJavadocTool javadocTool) { | ||
super(execActionFactory, null); | ||
this.javadocTool = javadocTool; | ||
} | ||
|
||
@Override | ||
public JavaInstallationMetadata getMetadata() { | ||
return javadocTool.getMetadata(); | ||
} | ||
|
||
@Override | ||
public RegularFile getExecutablePath() { | ||
return javadocTool.getExecutablePath(); | ||
} | ||
|
||
public static BaselineJavadocToolAdapter create(ObjectFactory objectFactory, BaselineJavadocTool javadocTool) { | ||
return new BaselineJavadocToolAdapter( | ||
objectFactory.newInstance(ExecActionFactoryGrabber.class).getExecActionFactory(), javadocTool); | ||
} | ||
|
||
interface ExecActionFactoryGrabber { | ||
@Inject | ||
ExecActionFactory getExecActionFactory(); | ||
} | ||
} |
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
51 changes: 0 additions & 51 deletions
51
...c/main/groovy/com/palantir/baseline/plugins/javaversions/FallbackGradleJavaToolchain.java
This file was deleted.
Oops, something went wrong.
64 changes: 64 additions & 0 deletions
64
...in/groovy/com/palantir/baseline/plugins/javaversions/JavaInstallationMetadataWrapper.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* (c) Copyright 2022 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.palantir.baseline.plugins.javaversions; | ||
|
||
import org.gradle.api.file.Directory; | ||
import org.gradle.api.provider.Provider; | ||
import org.gradle.jvm.toolchain.JavaInstallationMetadata; | ||
import org.gradle.jvm.toolchain.JavaLanguageVersion; | ||
|
||
/** | ||
* The purpose of this class is to provide the JavaLanguageVersion, which we know upfront, without having to resolve an | ||
* entire JDK, which often involves resolution, which causes Gradle to resolve the JavaCompiler/JavaLauncher etc to | ||
* check if toolchains are enabled. That can cause a dependency cycle, which causes a StackOverflowException. | ||
* This class breaks that cycle by immediately providing the JavaLanguageVersion without possibly causing a resolution. | ||
*/ | ||
final class JavaInstallationMetadataWrapper implements JavaInstallationMetadata { | ||
private final JavaLanguageVersion javaLanguageVersion; | ||
private final Provider<JavaInstallationMetadata> delegate; | ||
|
||
JavaInstallationMetadataWrapper( | ||
JavaLanguageVersion javaLanguageVersion, Provider<JavaInstallationMetadata> delegate) { | ||
this.javaLanguageVersion = javaLanguageVersion; | ||
this.delegate = delegate; | ||
} | ||
|
||
@Override | ||
public JavaLanguageVersion getLanguageVersion() { | ||
return javaLanguageVersion; | ||
} | ||
|
||
@Override | ||
public String getJavaRuntimeVersion() { | ||
return delegate.get().getJavaRuntimeVersion(); | ||
} | ||
|
||
@Override | ||
public String getJvmVersion() { | ||
return delegate.get().getJvmVersion(); | ||
} | ||
|
||
@Override | ||
public String getVendor() { | ||
return delegate.get().getVendor(); | ||
} | ||
|
||
@Override | ||
public Directory getInstallationPath() { | ||
return delegate.get().getInstallationPath(); | ||
} | ||
} |
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
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.
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.
@carterkozak Very, very unfortunately Gradle casts the public interface for
JavadocTool
to the internalJavadocToolAdapter
:https://github.com/gradle/gradle/blob/v7.4.2/subprojects/language-java/src/main/java/org/gradle/api/tasks/javadoc/Javadoc.java#L207
So I've had to extend that class (thankfully none of it is final) and managed to inject what it needs to work. It feels brittle doing this but we don't have a choice. The only possibly redeeming factor is this seems to not have changed in 2 years since it was created.