From f3e4ee55baa52965d3cb568f10165d9e47b788e1 Mon Sep 17 00:00:00 2001 From: Dana Dahlstrom Date: Tue, 6 Dec 2016 14:59:22 -0800 Subject: [PATCH] Replace calls to FieldAccessor.get MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … which fail in JDK 9, with ReflectionUtil.getField. --- .../idea/maven/server/Maven3ServerEmbedderImpl.java | 6 +++--- .../idea/maven/server/Maven30ServerEmbedderImpl.java | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java index b683b433d4f9..3cb76ab5e162 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java @@ -239,18 +239,18 @@ public class Maven3ServerEmbedderImpl extends Maven3ServerEmbedder { myContainer.getLoggerManager().setThreshold(serverSettings.getLoggingLevel()); - mySystemProperties = FieldAccessor.get(cliRequestClass, cliRequest, "systemProperties"); + mySystemProperties = ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "systemProperties"); if (serverSettings.getProjectJdk() != null) { mySystemProperties.setProperty("java.home", serverSettings.getProjectJdk()); } if (settingsBuilder == null) { - settingsBuilder = FieldAccessor.get(MavenCli.class, cli, "settingsBuilder"); + settingsBuilder = ReflectionUtil.getField(MavenCli.class, cli, SettingsBuilder.class, "settingsBuilder"); } myMavenSettings = buildSettings(settingsBuilder, serverSettings, mySystemProperties, - FieldAccessor.get(cliRequestClass, cliRequest, "userProperties")); + ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "userProperties")); myLocalRepository = createLocalRepository(); } diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java index 97dfa02a6e08..5f8c6d06add8 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ExceptionUtil; import com.intellij.util.Function; +import com.intellij.util.ReflectionUtil; import com.intellij.util.SystemProperties; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashMap; @@ -203,18 +204,18 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { } // reset threshold - myContainer = FieldAccessor.get(MavenCli.class, cli, "container"); + myContainer = ReflectionUtil.getField(MavenCli.class, cli, DefaultPlexusContainer.class, "container"); myContainer.getLoggerManager().setThreshold(settings.getLoggingLevel()); - mySystemProperties = FieldAccessor.get(cliRequestClass, cliRequest, "systemProperties"); + mySystemProperties = ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "systemProperties"); if (settings.getProjectJdk() != null) { mySystemProperties.setProperty("java.home", settings.getProjectJdk()); } myMavenSettings = - buildSettings(FieldAccessor.get(MavenCli.class, cli, "settingsBuilder"), settings, mySystemProperties, - FieldAccessor.get(cliRequestClass, cliRequest, "userProperties")); + buildSettings(ReflectionUtil.getField(MavenCli.class, cli, SettingsBuilder.class, "settingsBuilder"), settings, mySystemProperties, + ReflectionUtil.getField(cliRequestClass, cliRequest, Properties.class, "userProperties")); myLocalRepository = createLocalRepository(); }