From 4726f7bf95eb3ade340622ab3e597cf6907fa75e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 31 Jan 2019 19:53:06 +0100
Subject: [PATCH] simplify as now allowNonPublicClasses is true by default

---
 .../src/org/jetbrains/io/jsonRpc/JsonRpcDomainBean.java       | 3 ++-
 .../openapi/extensions/AbstractExtensionPointBean.java        | 1 +
 .../src/com/intellij/openapi/options/ConfigurableEP.java      | 4 ++--
 .../src/com/intellij/util/xml/impl/DomFileMetaData.java       | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcDomainBean.java b/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcDomainBean.java
index 2a49cf44d016..8f3f2076ec98 100644
--- a/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcDomainBean.java
+++ b/platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcDomainBean.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.io.jsonRpc;
 
 import com.intellij.openapi.application.ApplicationManager;
@@ -39,7 +40,7 @@ public class JsonRpcDomainBean extends AbstractExtensionPointBean {
           try {
             if (service == null) {
               Class<Object> aClass = findClass(implementation);
-              return asInstance ? instantiate(aClass, ApplicationManager.getApplication().getPicoContainer(), true) : aClass;
+              return asInstance ? instantiate(aClass, ApplicationManager.getApplication().getPicoContainer()) : aClass;
             }
             else {
               return ServiceManager.getService(findClass(service));
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java b/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
index 6a39ac827741..d4978ce31bfb 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
@@ -64,6 +64,7 @@ public abstract class AbstractExtensionPointBean implements PluginAware {
   public static <T> T instantiate(@NotNull final Class<T> aClass,
                                   @NotNull final PicoContainer container,
                                   final boolean allowNonPublicClasses) {
+    //noinspection unchecked
     return (T)new CachingConstructorInjectionComponentAdapter(aClass.getName(), aClass, null, allowNonPublicClasses).getComponentInstance(container);
   }
 
diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
index 62e85b2794d4..e8c617dd0356 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
@@ -271,7 +271,7 @@ public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExten
       return null;
     }
     try {
-      return instantiate(findClass(treeRendererClass), myPicoContainer, true);
+      return instantiate(findClass(treeRendererClass), myPicoContainer);
     }
     catch (ProcessCanceledException exception) {
       throw exception;
@@ -350,7 +350,7 @@ public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExten
     @Override
     protected Object createElement() {
       try {
-        return instantiate(myType, myContainer, true);
+        return instantiate(myType, myContainer);
       }
       catch (ProcessCanceledException exception) {
         throw exception;
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileMetaData.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileMetaData.java
index 0b142d57453f..32de30afb2f5 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileMetaData.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomFileMetaData.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.util.xml.impl;
 
 import com.intellij.diagnostic.PluginException;
@@ -61,7 +61,7 @@ public class DomFileMetaData extends AbstractExtensionPointBean {
     DomFileDescription instance = lazyInstance;
     if (instance == null) {
       try {
-        instance = instantiate(findClass(implementation), ApplicationManager.getApplication().getPicoContainer(), true);
+        instance = instantiate(findClass(implementation), ApplicationManager.getApplication().getPicoContainer());
         if (StringUtil.isEmpty(rootTagName)) {
           if (!instance.acceptsOtherRootTagNames()) {
             throw new PluginException(implementation + " should either specify a root tag name in XML, or return true from 'acceptsOtherRootTagNames'", getPluginId());