-
Notifications
You must be signed in to change notification settings - Fork 112
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
Avoid unnecessary use of reflection #214
Draft
basil
wants to merge
1
commit into
jenkinsci:master
Choose a base branch
from
basil:reflection
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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
52 changes: 5 additions & 47 deletions
52
src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectMasterEnvVarsSetter.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 |
|---|---|---|
| @@ -1,68 +1,26 @@ | ||
| package org.jenkinsci.plugins.envinject.service; | ||
|
|
||
| import hudson.EnvVars; | ||
| import hudson.Main; | ||
| import hudson.Platform; | ||
| import java.util.NavigableMap; | ||
| import jenkins.security.MasterToSlaveCallable; | ||
| import org.jenkinsci.lib.envinject.EnvInjectException; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Modifier; | ||
|
|
||
| import edu.umd.cs.findbugs.annotations.NonNull; | ||
|
|
||
| /** | ||
| * @author Gregory Boissinot | ||
| */ | ||
| public class EnvInjectMasterEnvVarsSetter extends MasterToSlaveCallable<Void, EnvInjectException> { | ||
|
|
||
| private @NonNull EnvVars enVars; | ||
| private @NonNull NavigableMap<String, String> enVars; | ||
|
|
||
| public EnvInjectMasterEnvVarsSetter(@NonNull EnvVars enVars) { | ||
| public EnvInjectMasterEnvVarsSetter(@NonNull NavigableMap<String, String> enVars) { | ||
| this.enVars = enVars; | ||
| } | ||
|
|
||
| private Field getModifiers() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException { | ||
| Method getDeclaredFields0 = Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class); | ||
| getDeclaredFields0.setAccessible(true); | ||
| Field[] fields = (Field[]) getDeclaredFields0.invoke(Field.class, false); | ||
| Field modifiers = null; | ||
| for (Field each : fields) { | ||
| if ("modifiers".equals(each.getName())) { | ||
| modifiers = each; | ||
| break; | ||
| } | ||
| } | ||
| if (modifiers == null) { | ||
| throw new NoSuchFieldException(); | ||
| } | ||
| return modifiers; | ||
| } | ||
|
|
||
| @Override | ||
| public Void call() throws EnvInjectException { | ||
| try { | ||
| Field platformField = EnvVars.class.getDeclaredField("platform"); | ||
| platformField.setAccessible(true); | ||
| platformField.set(enVars, Platform.current()); | ||
| if (Main.isUnitTest || Main.isDevelopmentMode) { | ||
| enVars.remove("MAVEN_OPTS"); | ||
| } | ||
| Field masterEnvVarsFiled = EnvVars.class.getDeclaredField("masterEnvVars"); | ||
| masterEnvVarsFiled.setAccessible(true); | ||
| Field modifiersField = getModifiers(); | ||
| modifiersField.setAccessible(true); | ||
| modifiersField.setInt(masterEnvVarsFiled, masterEnvVarsFiled.getModifiers() & ~Modifier.FINAL); | ||
| masterEnvVarsFiled.set(null, enVars); | ||
| } catch (IllegalAccessException | NoSuchFieldException iae) { | ||
| throw new EnvInjectException(iae); | ||
| } catch (InvocationTargetException | NoSuchMethodException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| public Void call() { | ||
| EnvVars.masterEnvVars.putAll(enVars); | ||
| return null; | ||
| } | ||
|
|
||
| } | ||
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.
Not sure how this would work with multiple calls to
EnvInjectMasterEnvVarsSetter#call. This very well may be incorrect. 😕