src/java.base/share/classes/java/lang/Class.java

*** 62,74 ****
  import java.util.StringJoiner;
  
  import jdk.internal.HotSpotIntrinsicCandidate;
  import jdk.internal.loader.BootLoader;
  import jdk.internal.loader.BuiltinClassLoader;
- import jdk.internal.loader.ResourceHelper;
  import jdk.internal.misc.Unsafe;
  import jdk.internal.misc.VM;
  import jdk.internal.reflect.CallerSensitive;
  import jdk.internal.reflect.ConstantPool;
  import jdk.internal.reflect.Reflection;
  import jdk.internal.reflect.ReflectionFactory;
  import jdk.internal.vm.annotation.ForceInline;
--- 62,74 ----
  import java.util.StringJoiner;
  
  import jdk.internal.HotSpotIntrinsicCandidate;
  import jdk.internal.loader.BootLoader;
  import jdk.internal.loader.BuiltinClassLoader;
  import jdk.internal.misc.Unsafe;
  import jdk.internal.misc.VM;
+ import jdk.internal.module.Resources;
  import jdk.internal.reflect.CallerSensitive;
  import jdk.internal.reflect.ConstantPool;
  import jdk.internal.reflect.Reflection;
  import jdk.internal.reflect.ReflectionFactory;
  import jdk.internal.vm.annotation.ForceInline;
*** 2561,2575 ****
      public InputStream getResourceAsStream(String name) {
          name = resolveName(name);
  
          Module module = getModule();
          if (module.isNamed()) {
!             if (!ResourceHelper.isSimpleResource(name)) {
                  Module caller = Reflection.getCallerClass().getModule();
                  if (caller != module) {
                      Set<String> packages = module.getDescriptor().packages();
!                     String pn = ResourceHelper.getPackageName(name);
                      if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                          // resource is in package not open to caller
                          return null;
                      }
                  }
--- 2561,2575 ----
      public InputStream getResourceAsStream(String name) {
          name = resolveName(name);
  
          Module module = getModule();
          if (module.isNamed()) {
!             if (Resources.canEncapsulate(name)) {
                  Module caller = Reflection.getCallerClass().getModule();
                  if (caller != module) {
                      Set<String> packages = module.getDescriptor().packages();
!                     String pn = Resources.toPackageName(name);
                      if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                          // resource is in package not open to caller
                          return null;
                      }
                  }
*** 2663,2677 ****
      public URL getResource(String name) {
          name = resolveName(name);
  
          Module module = getModule();
          if (module.isNamed()) {
!             if (!ResourceHelper.isSimpleResource(name)) {
                  Module caller = Reflection.getCallerClass().getModule();
                  if (caller != module) {
                      Set<String> packages = module.getDescriptor().packages();
!                     String pn = ResourceHelper.getPackageName(name);
                      if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                          // resource is in package not open to caller
                          return null;
                      }
                  }
--- 2663,2677 ----
      public URL getResource(String name) {
          name = resolveName(name);
  
          Module module = getModule();
          if (module.isNamed()) {
!             if (Resources.canEncapsulate(name)) {
                  Module caller = Reflection.getCallerClass().getModule();
                  if (caller != module) {
                      Set<String> packages = module.getDescriptor().packages();
!                     String pn = Resources.toPackageName(name);
                      if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                          // resource is in package not open to caller
                          return null;
                      }
                  }