Skip to content
Permalink
Browse files
8241770: Module xxxAnnotation() methods throw NCDFE if module-info.cl…
…ass found as resource in unnamed module

Reviewed-by: mchung
  • Loading branch information
Alan Bateman committed Jun 11, 2020
1 parent 96fadef commit c563c3d15bfd8409a7318539d59643828470b0bc
Showing 3 changed files with 114 additions and 52 deletions.
@@ -42,7 +42,6 @@
import java.security.PrivilegedAction;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -1504,6 +1503,24 @@ protected Class<?> findClass(String cn)throws ClassNotFoundException {
throw new ClassNotFoundException(cn);
}
}
@Override
protected Class<?> loadClass(String cn, boolean resolve)
throws ClassNotFoundException
{
synchronized (getClassLoadingLock(cn)) {
Class<?> c = findLoadedClass(cn);
if (c == null) {
if (cn.equals(MODULE_INFO)) {
c = findClass(cn);
} else {
c = super.loadClass(cn, resolve);
}
}
if (resolve)
resolveClass(c);
return c;
}
}
};

try {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -212,6 +212,14 @@ public static void write(ModuleDescriptor descriptor, OutputStream out)
write(descriptor, null, null, out);
}

/**
* Returns a byte array containing the given module descriptor in
* module-info.class format.
*/
public static byte[] toBytes(ModuleDescriptor descriptor) {
return toModuleInfo(descriptor, null, null);
}

/**
* Returns a {@code ByteBuffer} containing the given module descriptor
* in module-info.class format.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,17 +23,20 @@

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.module.Configuration;
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleFinder;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import jdk.internal.module.ModuleInfoWriter;
import jdk.internal.org.objectweb.asm.AnnotationVisitor;
import jdk.internal.org.objectweb.asm.Attribute;
import jdk.internal.org.objectweb.asm.ClassReader;
@@ -50,7 +53,6 @@
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.org.objectweb.asm.commons
* java.base/jdk.internal.module
* java.xml
* @run testng AnnotationsTest
* @summary Basic test of annotations on modules
*/
@@ -68,19 +70,20 @@ public void testUnnamedModule() {
}

/**
* Test loading a module with a RuntimeVisibleAnnotation attribute.
* The test copies the module-info.class for java.xml, adds the attribute,
* and then loads the updated module.
* Test reflectively reading the annotations on a named module.
*/
@Test
public void testNamedModule() throws IOException {
Path mods = Files.createTempDirectory(Path.of(""), "mods");

// "deprecate" java.xml
Path dir = Files.createTempDirectory(Paths.get(""), "mods");
deprecateModule("java.xml", true, "9", dir);
// @Deprecated(since="9", forRemoval=true) module foo { }
ModuleDescriptor descriptor = ModuleDescriptor.newModule("foo").build();
byte[] classBytes = ModuleInfoWriter.toBytes(descriptor);
classBytes = addDeprecated(classBytes, true, "9");
Files.write(mods.resolve("module-info.class"), classBytes);

// "load" the cloned java.xml
Module module = loadModule(dir, "java.xml");
// create module layer with module foo
Module module = loadModule(mods, "foo");

// check the annotation is present
assertTrue(module.isAnnotationPresent(Deprecated.class));
@@ -94,62 +97,96 @@ public void testNamedModule() throws IOException {
assertEquals(module.getDeclaredAnnotations(), a);
}


/**
* Copy the module-info.class for the given module, add the
* Deprecated annotation, and write the updated module-info.class
* to a directory.
* Test reflectively reading annotations on a named module where the module
* is mapped to a class loader that can locate a module-info.class.
*/
static void deprecateModule(String name,
boolean forRemoval,
String since,
Path output) throws IOException {
Module module = ModuleLayer.boot().findModule(name).orElse(null);
assertNotNull(module, name + " not found");

InputStream in = module.getResourceAsStream("module-info.class");
assertNotNull(in, "No module-info.class for " + name);

try (in) {
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
+ ClassWriter.COMPUTE_FRAMES);

ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) { };

ClassReader cr = new ClassReader(in);
List<Attribute> attrs = new ArrayList<>();
attrs.add(new ModuleTargetAttribute());
cr.accept(cv, attrs.toArray(new Attribute[0]), 0);

AnnotationVisitor annotationVisitor
= cv.visitAnnotation("Ljava/lang/Deprecated;", true);
annotationVisitor.visit("forRemoval", forRemoval);
annotationVisitor.visit("since", since);
annotationVisitor.visitEnd();

byte[] bytes = cw.toByteArray();
Path mi = output.resolve("module-info.class");
Files.write(mi, bytes);
@Test
public void testWithModuleInfoResourceXXXX() throws IOException {
Path mods = Files.createTempDirectory(Path.of(""), "mods");

// classes directory with module-info.class
Path classes = Files.createTempDirectory(Path.of("."), "classes");
Path mi = classes.resolve("module-info.class");
try (OutputStream out = Files.newOutputStream(mi)) {
ModuleDescriptor descriptor = ModuleDescriptor.newModule("lurker").build();
ModuleInfoWriter.write(descriptor, out);
}

// URLClassLoader that can locate a module-info.class resource
URL url = classes.toUri().toURL();
URLClassLoader loader = new URLClassLoader(new URL[] { url });
assertTrue(loader.findResource("module-info.class") != null);

// module foo { }
ModuleDescriptor descriptor = ModuleDescriptor.newModule("foo").build();
byte[] classBytes = ModuleInfoWriter.toBytes(descriptor);
Files.write(mods.resolve("module-info.class"), classBytes);

// create module layer with module foo
Module foo = loadModule(mods, "foo", loader);

// check the annotation is not present
assertFalse(foo.isAnnotationPresent(Deprecated.class));

// @Deprecated(since="11", forRemoval=true) module bar { }
descriptor = ModuleDescriptor.newModule("bar").build();
classBytes = ModuleInfoWriter.toBytes(descriptor);
classBytes = addDeprecated(classBytes, true, "11");
Files.write(mods.resolve("module-info.class"), classBytes);

// create module layer with module bar
Module bar = loadModule(mods, "bar", loader);

// check the annotation is present
assertTrue(bar.isAnnotationPresent(Deprecated.class));
}

/**
* Adds the Deprecated annotation to the given module-info class file.
*/
static byte[] addDeprecated(byte[] bytes, boolean forRemoval, String since) {
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
+ ClassWriter.COMPUTE_FRAMES);

ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) { };

ClassReader cr = new ClassReader(bytes);
List<Attribute> attrs = new ArrayList<>();
attrs.add(new ModuleTargetAttribute());
cr.accept(cv, attrs.toArray(new Attribute[0]), 0);

AnnotationVisitor annotationVisitor
= cv.visitAnnotation("Ljava/lang/Deprecated;", true);
annotationVisitor.visit("forRemoval", forRemoval);
annotationVisitor.visit("since", since);
annotationVisitor.visitEnd();

return cw.toByteArray();
}

/**
* Load the module of the given name in the given directory into a
* child layer.
* child layer with the given class loader as the parent class loader.
*/
static Module loadModule(Path dir, String name) throws IOException {
static Module loadModule(Path dir, String name, ClassLoader parent)
throws IOException
{
ModuleFinder finder = ModuleFinder.of(dir);

ModuleLayer bootLayer = ModuleLayer.boot();

Configuration cf = bootLayer.configuration()
.resolve(finder, ModuleFinder.of(), Set.of(name));

ClassLoader scl = ClassLoader.getSystemClassLoader();
ModuleLayer layer = bootLayer.defineModulesWithOneLoader(cf, scl);
ModuleLayer layer = bootLayer.defineModulesWithOneLoader(cf, parent);

Module module = layer.findModule(name).orElse(null);
assertNotNull(module, name + " not loaded");
return module;
}

static Module loadModule(Path dir, String name) throws IOException {
return loadModule(dir, name, ClassLoader.getSystemClassLoader());
}
}

0 comments on commit c563c3d

Please sign in to comment.