Attachment #131034 for bug #225528

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 225528
Collapse All | Expand All




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
	<change id="Java7Support">
            <api name="general"/>
            <summary>Support for Java 7 classfile enhancements.</summary>
            <version major="1" minor="40"/>
            <date day="13" month="2" year="2013"/>
            <author login="jlahoda"/>
            <compatibility addition="yes"/>
            <description>
                Java 7 added a several new constant pool entry types to support the
                invokeDynamic instruction. These need to be modeled by the library.
            </description>
            <class package="org.netbeans.modules.classfile" name="ClassFile"/>
            <issue number="225528"/>
	</change>
	<change id="Java6Support">
            <api name="general"/>
            <summary>Support for Java 6 classfile enhancements.</summary>

Lines 1-5 Link Here

(-)a/classfile/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.classfile/1	2	OpenIDE-Module: org.netbeans.modules.classfile/1
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/classfile/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/classfile/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.39	4	OpenIDE-Module-Specification-Version: 1.40
5		5




/*
 * InnerClass.java
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 2013 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL

 * An InnerClass attribute of a classfile.
 *
 * @author  Thomas Ball
 * @since 1.40
 */
public final class BootstrapMethod {

    int methodRef;
    int[] arguments;
    String simpleName;
    int access;

    static BootstrapMethod[] loadBootstrapMethod(DataInputStream in, ConstantPool pool)
      throws IOException {
        int n = in.readUnsignedShort();
        BootstrapMethod[] innerClasses = new BootstrapMethod[n];
        for (int i = 0; i < n; i++)
            innerClasses[i] = new BootstrapMethod(in, pool);
        return innerClasses;
    }

    BootstrapMethod(DataInputStream in, ConstantPool pool) throws IOException {
        this.methodRef = in.readUnsignedShort();
        int args = in.readUnsignedShort();
        arguments = new int[args];
        for (int i = 0; i < args; i++) {
            arguments[i] = in.readUnsignedShort();
        }
    }

    public int getMethodRef() {
        return methodRef;
        int index = in.readUnsignedShort();
        name = (index > 0) ? pool.getClass(index).getClassName() : null;
        index = in.readUnsignedShort();
	outerClassName = (index > 0) ? pool.getClass(index).getClassName() : null;
        index = in.readUnsignedShort();
        if (index > 0) {
            CPUTF8Info entry = (CPUTF8Info)pool.get(index);
            simpleName = entry.getName();
        }
        access = in.readUnsignedShort();
    }

    public int[] getArguments() {
        return arguments.clone();
     * "<not defined>" is returned.
     * @return the name of this class.
     */    
    public final ClassName getName() {
        return name;
    }
    
    /** Returns the name of the enclosing outer class, including 
     *  its package (if any).  
     * @return the name of this class, or null if not available.
     */    
    public final ClassName getOuterClassName() {
        return outerClassName;
    }

    /**
     * Returns the original simple name as given in the source code.
     * If this is an anonymous class, null is returned instead.
     * @return the simple name of this class, or null if anonymous.
     */
    public final String getSimpleName() {
        return simpleName;
    }

    /**
     * Returns the access flags of this class.
     */
    public final int getAccess() {
        return access;
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append("bootstrapmethod=");
        sb.append(methodRef);
        sb.append("(");
        for (int i = 0; i < arguments.length; i++) {
            if (i > 0) sb.append(", ");
            sb.append(arguments[i]);
        }
        sb.append(")");
        sb.append(outerClassName);
        return sb.toString();
    }
}




 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2013 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL



/**
 * A class representing the CONSTANT_InvokeDynamic constant pool type.
 *
 * @author Thomas Ball
 * @since 1.40
 */
public class CPInvokeDynamicInfo extends CPEntry {
    int iBootstrapMethod;
    int iNameAndType;

    CPInvokeDynamicInfo(ConstantPool pool,int iBootstrapMethod,int iNameAndType) {
	super(pool);
        this.iBootstrapMethod = iBootstrapMethod;
        this.iNameAndType = iNameAndType;
    }

    protected CPNameAndTypeInfo(ConstantPool pool) {
        super(pool);
        iName = CPName.INVALID_INDEX;
        iDesc = CPName.INVALID_INDEX;
    }

    public final String getName() {
	return ((CPName)pool.cpEntries[iName]).getName();
    }

    void setNameIndex(int index) {
	iName = index;
    }

    public final String getDescriptor() {
	return ((CPName)pool.cpEntries[iDesc]).getName();
    }

    void setDescriptorIndex(int index) {
	iDesc = index;
    }

    public int getTag() {
	return ConstantPool.CONSTANT_InvokeDynamic;
    }
    
    public int getBootstrapMethod() {
        return iBootstrapMethod;
    }
    
    public int getNameAndType() {
        return iNameAndType;
    }

    @Override
    public String toString() {
        return getClass().getName() + ": bootstrapMethod=" + iBootstrapMethod + //NOI18N
            ", nameAndType=" + iNameAndType; //NOI18N
    }
}




 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2013 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL



/**
 * A class representing the CONSTANT_MethodHandle constant pool type.
 *
 * @author Thomas Ball
 * @since 1.40
 */
public class CPMethodHandleInfo extends CPEntry {
    ReferenceKind referenceKind;
    int iReference;

    CPMethodHandleInfo(ConstantPool pool, int referenceKind,int iReference) {
	super(pool);
        this.referenceKind = ReferenceKind.from(referenceKind);
        this.iReference = iReference;
    }

    protected CPNameAndTypeInfo(ConstantPool pool) {
        super(pool);
        iName = CPName.INVALID_INDEX;
        iDesc = CPName.INVALID_INDEX;
    }

    public final String getName() {
	return ((CPName)pool.cpEntries[iName]).getName();
    }

    void setNameIndex(int index) {
	iName = index;
    }

    public final String getDescriptor() {
	return ((CPName)pool.cpEntries[iDesc]).getName();
    }

    void setDescriptorIndex(int index) {
	iDesc = index;
    }

    public int getTag() {
	return ConstantPool.CONSTANT_MethodHandle;
    }

    public ReferenceKind getReferenceKind() {
        return referenceKind;
    }

    public int getReference() {
        return iReference;
    }

    @Override
    public String toString() {
        return getClass().getName() + ": kind=" + referenceKind + //NOI18N
            ", index=" + iReference; //NOI18N
    }
    
    public enum ReferenceKind {
        getField(1),
        getStatic(2),
        putField(3),
        putStatic(4),
        invokeVirtual(5),
        invokeStatic(6),
        invokeSpecial(7),
        newInvokeSpecial(8),
        invokeInterface(9);
        
        private final int kindInt;

        private ReferenceKind(int kindInt) {
            this.kindInt = kindInt;
        }
        
        static ReferenceKind from(int referenceKind) {
            for (ReferenceKind k : values()) {
                if (k.kindInt == referenceKind) return k;
            }
            
            throw new IllegalStateException("Unknown ref kind: " + referenceKind);
        }
    }
}




 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2013 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL



/**
 * A class representing the CONSTANT_MethodType constant pool type.
 *
 * @author Thomas Ball
 * @since 1.40
 */
public class CPMethodTypeInfo extends CPEntry {
    int iDescriptor;
    int iDesc;

    CPMethodTypeInfo(ConstantPool pool, int iDescriptor) {
	super(pool);
        this.iDescriptor = iDescriptor;
        this.iDesc = iDesc;
    }

    protected CPNameAndTypeInfo(ConstantPool pool) {
        super(pool);
        iName = CPName.INVALID_INDEX;
        iDesc = CPName.INVALID_INDEX;
    }

    public final String getName() {
	return ((CPName)pool.cpEntries[iName]).getName();
    }

    void setNameIndex(int index) {
	iName = index;
    }

    public final String getDescriptor() {
	return ((CPName)pool.cpEntries[iDesc]).getName();
    }

    void setDescriptorIndex(int index) {
	iDesc = index;
    }

    public int getTag() {
	return ConstantPool.CONSTANT_MethodType;
    }

    public int getDescriptor() {
        return iDescriptor;
    }

    @Override
    public String toString() {
        return getClass().getName() + ": descriptor=" + iDescriptor; //NOI18N
            ", descriptor=" + getDescriptor(); //NOI18N
    }
}




    Method[] methods;
    String sourceFileName;
    InnerClass[] innerClasses;
    BootstrapMethod[] bootstrapMethods;
    private AttributeMap attributes;
    private Map<ClassName,Annotation> annotations;
    short majorVersion;

	}
        return Arrays.asList(innerClasses);
    }
    
    /**Return the content of the <code>BootstrapMethods</code> attribute.
     * 
     * @return 
     * @since 1.40
     */
    public final List<BootstrapMethod> getBootstrapMethods(){
	if (bootstrapMethods == null) {
	    DataInputStream in = attributes.getStream("BootstrapMethods"); // NOI18N
	    if (in != null) {
		try {
		    bootstrapMethods = 
			BootstrapMethod.loadBootstrapMethod(in, constantPool);
		    in.close();
		} catch (IOException e) {
		    throw new InvalidClassFileAttributeException("invalid InnerClasses attribute", e);
		}
	    } else
		bootstrapMethods = new BootstrapMethod[0];
	}
        return Arrays.asList(bootstrapMethods);
    }

    /**
     * Returns the major version number of this classfile.

Lines 74-79 Link Here

(-)a/classfile/src/org/netbeans/modules/classfile/ConstantPool.java (+23 lines)
74	static final int CONSTANT_MethodRef = 10;	74	static final int CONSTANT_MethodRef = 10;
75	static final int CONSTANT_InterfaceMethodRef = 11;	75	static final int CONSTANT_InterfaceMethodRef = 11;
76	static final int CONSTANT_NameAndType = 12;	76	static final int CONSTANT_NameAndType = 12;
		77	static final int CONSTANT_MethodHandle = 15;
		78	static final int CONSTANT_MethodType = 16;
		79	static final int CONSTANT_InvokeDynamic = 18;
77		80
78	CPEntry[] cpEntries;	81	CPEntry[] cpEntries;
79		82
Lines 265-270 Link Here
265	newEntry = new CPNameAndTypeInfo(this, nameIndex, descIndex);	268	newEntry = new CPNameAndTypeInfo(this, nameIndex, descIndex);
266	break;	269	break;
267	}	270	}
		271
		272	case CONSTANT_MethodHandle: {
		273	int kind = cpr.readUnsignedByte();
		274	int index = cpr.readUnsignedShort();
		275	newEntry = new CPMethodHandleInfo(this, kind, index);
		276	break;
		277	}
		278
		279	case CONSTANT_MethodType: {
		280	int index = cpr.readUnsignedShort();
		281	newEntry = new CPMethodTypeInfo(this, index);
		282	break;
		283	}
		284
		285	case CONSTANT_InvokeDynamic: {
		286	int bootstrapMethod = cpr.readUnsignedShort();
		287	int nameAndType = cpr.readUnsignedShort();
		288	newEntry = new CPInvokeDynamicInfo(this, bootstrapMethod, nameAndType);
		289	break;
		290	}
268		291
269	default:	292	default:
270	throw new IllegalArgumentException(	293	throw new IllegalArgumentException(




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.classfile;

import java.io.InputStream;
import java.util.Arrays;
import junit.framework.TestCase;
import org.netbeans.modules.classfile.CPMethodHandleInfo.ReferenceKind;

/**
 *
 * @author lahvac
 */
public class JDK8ClassFilesTest extends TestCase {
    
    public JDK8ClassFilesTest(String testName) {
        super(testName);
    }
    
    public void testDefenderMethods() throws Exception {
        InputStream classData = 
            getClass().getResourceAsStream("datafiles/WithLambda.classx");
        ClassFile classFile = new ClassFile(classData);
        CPInvokeDynamicInfo invokeDynamic = (CPInvokeDynamicInfo) classFile.getConstantPool().get(2);
        assertEquals(ConstantPool.CONSTANT_InvokeDynamic, invokeDynamic.getTag());
        BootstrapMethod bootstrapMethod = classFile.getBootstrapMethods().get(invokeDynamic.getBootstrapMethod());
        assertEquals("[23, 24, 25]", Arrays.toString(bootstrapMethod.getArguments()));
        CPMethodHandleInfo bootstrapMH = (CPMethodHandleInfo) classFile.getConstantPool().get(bootstrapMethod.getMethodRef());
        assertEquals(ConstantPool.CONSTANT_MethodHandle, bootstrapMH.getTag());
        assertEquals(ReferenceKind.invokeStatic, bootstrapMH.getReferenceKind());
        CPMethodInfo bootstrapMethodInfo = (CPMethodInfo) classFile.getConstantPool().get(bootstrapMH.getReference());
        assertEquals("CallSite metaFactory(MethodHandles$Lookup,String,MethodType,MethodHandle,MethodHandle,MethodType)", bootstrapMethodInfo.getFullMethodName());
        CPNameAndTypeInfo nameAndType = (CPNameAndTypeInfo) classFile.getConstantPool().get(invokeDynamic.getNameAndType());
        assertEquals("()Ljava/lang/Runnable;", nameAndType.getDescriptor());
        assertEquals("lambda", nameAndType.getName());
        CPMethodTypeInfo methodType = (CPMethodTypeInfo) classFile.getConstantPool().get(25);
        assertEquals(ConstantPool.CONSTANT_MethodType, methodType.getTag());
        CPUTF8Info descriptor = (CPUTF8Info) classFile.getConstantPool().get(methodType.getDescriptor());
        assertEquals("()V", descriptor.getName());
    }
}

Return to bug 225528

Lines 107-112 Link Here

(-)a/classfile/apichanges.xml (+14 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
		110	<change id="Java7Support">
		111	<api name="general"/>
		112	<summary>Support for Java 7 classfile enhancements.</summary>
		113	<version major="1" minor="40"/>
		114	<date day="13" month="2" year="2013"/>
		115	<author login="jlahoda"/>
		116	<compatibility addition="yes"/>
		117	<description>
		118	Java 7 added a several new constant pool entry types to support the
		119	invokeDynamic instruction. These need to be modeled by the library.
		120	</description>
		121	<class package="org.netbeans.modules.classfile" name="ClassFile"/>
		122	<issue number="225528"/>
		123	</change>
110	<change id="Java6Support">	124	<change id="Java6Support">
111	<api name="general"/>	125	<api name="general"/>
112	<summary>Support for Java 6 classfile enhancements.</summary>	126	<summary>Support for Java 6 classfile enhancements.</summary>

Lines 1-9 Link Here

(-)a/classfile/src/org/netbeans/modules/classfile/InnerClass.java (-67 / +28 lines)
1	/*	1	/*
2	* InnerClass.java
3	*
4	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5	*	3	*
6	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
7	*	5	*
8	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
9	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 29-35 Link Here
29	* Contributor(s):	27	* Contributor(s):
30	*	28	*
31	* The Original Software is NetBeans. The Initial Developer of the Original	29	* The Original Software is NetBeans. The Initial Developer of the Original
32	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	30	* Software is Sun Microsystems, Inc. Portions Copyright 2013 Sun
33	* Microsystems, Inc. All Rights Reserved.	31	* Microsystems, Inc. All Rights Reserved.
34	*	32	*
35	* If you wish your version of this file to be governed by only the CDDL	33	* If you wish your version of this file to be governed by only the CDDL
Lines 57-143 Link Here
57	* An InnerClass attribute of a classfile.	55	* An InnerClass attribute of a classfile.
58	*	56	*
59	* @author Thomas Ball	57	* @author Thomas Ball
		58	* @since 1.40
60	*/	59	*/
61	public final class InnerClass {	60	public final class BootstrapMethod {
62		61
63	ClassName name;	62	int methodRef;
64	ClassName outerClassName;	63	int[] arguments;
65	String simpleName;
66	int access;
67		64
68	static InnerClass[] loadInnerClasses(DataInputStream in, ConstantPool pool)	65	static BootstrapMethod[] loadBootstrapMethod(DataInputStream in, ConstantPool pool)
69	throws IOException {	66	throws IOException {
70	int n = in.readUnsignedShort();	67	int n = in.readUnsignedShort();
71	InnerClass[] innerClasses = new InnerClass[n];	68	BootstrapMethod[] innerClasses = new BootstrapMethod[n];
72	for (int i = 0; i < n; i++)	69	for (int i = 0; i < n; i++)
73	innerClasses[i] = new InnerClass(in, pool);	70	innerClasses[i] = new BootstrapMethod(in, pool);
74	return innerClasses;	71	return innerClasses;
75	}	72	}
76		73
77	InnerClass(DataInputStream in, ConstantPool pool)	74	BootstrapMethod(DataInputStream in, ConstantPool pool) throws IOException {
78	throws IOException {	75	this.methodRef = in.readUnsignedShort();
79	loadInnerClass(in, pool);	76	int args = in.readUnsignedShort();
		77	arguments = new int[args];
		78	for (int i = 0; i < args; i++) {
		79	arguments[i] = in.readUnsignedShort();
		80	}
80	}	81	}
81		82
82	private void loadInnerClass(DataInputStream in, ConstantPool pool)	83	public int getMethodRef() {
83	throws IOException {	84	return methodRef;
84	int index = in.readUnsignedShort();
85	name = (index > 0) ? pool.getClass(index).getClassName() : null;
86	index = in.readUnsignedShort();
87	outerClassName = (index > 0) ? pool.getClass(index).getClassName() : null;
88	index = in.readUnsignedShort();
89	if (index > 0) {
90	CPUTF8Info entry = (CPUTF8Info)pool.get(index);
91	simpleName = entry.getName();
92	}
93	access = in.readUnsignedShort();
94	}	85	}
95		86
96	/** Returns the name of this class, including its package (if any).	87	public int[] getArguments() {
97	* If the compiler didn't define this value, the string	88	return arguments.clone();
98	* "<not defined>" is returned.
99	* @return the name of this class.
100	*/
101	public final ClassName getName() {
102	return name;
103	}
104
105	/** Returns the name of the enclosing outer class, including
106	* its package (if any).
107	* @return the name of this class, or null if not available.
108	*/
109	public final ClassName getOuterClassName() {
110	return outerClassName;
111	}
112
113	/**
114	* Returns the original simple name as given in the source code.
115	* If this is an anonymous class, null is returned instead.
116	* @return the simple name of this class, or null if anonymous.
117	*/
118	public final String getSimpleName() {
119	return simpleName;
120	}
121
122	/**
123	* Returns the access flags of this class.
124	*/
125	public final int getAccess() {
126	return access;
127	}	89	}
128		90
129	@Override	91	@Override
130	public String toString() {	92	public String toString() {
131	StringBuffer sb = new StringBuffer();	93	StringBuilder sb = new StringBuilder();
132	sb.append("innerclass=");	94	sb.append("bootstrapmethod=");
133	sb.append(name);	95	sb.append(methodRef);
134	if (simpleName != null) {	96	sb.append("(");
135	sb.append(" (");	97	for (int i = 0; i < arguments.length; i++) {
136	sb.append(simpleName);	98	if (i > 0) sb.append(", ");
137	sb.append(')');	99	sb.append(arguments[i]);
138	}	100	}
139	sb.append(", outerclass=");	101	sb.append(")");
140	sb.append(outerClassName);
141	return sb.toString();	102	return sb.toString();
142	}	103	}
143	}	104	}

Lines 69-74 Link Here

(-)a/classfile/src/org/netbeans/modules/classfile/ClassFile.java (+23 lines)
69	Method[] methods;	69	Method[] methods;
70	String sourceFileName;	70	String sourceFileName;
71	InnerClass[] innerClasses;	71	InnerClass[] innerClasses;
		72	BootstrapMethod[] bootstrapMethods;
72	private AttributeMap attributes;	73	private AttributeMap attributes;
73	private Map<ClassName,Annotation> annotations;	74	private Map<ClassName,Annotation> annotations;
74	short majorVersion;	75	short majorVersion;
Lines 414-419 Link Here
414	}	415	}
415	return Arrays.asList(innerClasses);	416	return Arrays.asList(innerClasses);
416	}	417	}
		418
		419	/**Return the content of the <code>BootstrapMethods</code> attribute.
		420	*
		421	* @return
		422	* @since 1.40
		423	*/
		424	public final List<BootstrapMethod> getBootstrapMethods(){
		425	if (bootstrapMethods == null) {
		426	DataInputStream in = attributes.getStream("BootstrapMethods"); // NOI18N
		427	if (in != null) {
		428	try {
		429	bootstrapMethods =
		430	BootstrapMethod.loadBootstrapMethod(in, constantPool);
		431	in.close();
		432	} catch (IOException e) {
		433	throw new InvalidClassFileAttributeException("invalid InnerClasses attribute", e);
		434	}
		435	} else
		436	bootstrapMethods = new BootstrapMethod[0];
		437	}
		438	return Arrays.asList(bootstrapMethods);
		439	}
417		440
418	/**	441	/**
419	* Returns the major version number of this classfile.	442	* Returns the major version number of this classfile.

Line 0 Link Here

(-)a/classfile/test/unit/src/org/netbeans/modules/classfile/JDK8ClassFilesTest.java (+80 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.classfile;
		43
		44	import java.io.InputStream;
		45	import java.util.Arrays;
		46	import junit.framework.TestCase;
		47	import org.netbeans.modules.classfile.CPMethodHandleInfo.ReferenceKind;
		48
		49	/**
		50	*
		51	* @author lahvac
		52	*/
		53	public class JDK8ClassFilesTest extends TestCase {
		54
		55	public JDK8ClassFilesTest(String testName) {
		56	super(testName);
		57	}
		58
		59	public void testDefenderMethods() throws Exception {
		60	InputStream classData =
		61	getClass().getResourceAsStream("datafiles/WithLambda.classx");
		62	ClassFile classFile = new ClassFile(classData);
		63	CPInvokeDynamicInfo invokeDynamic = (CPInvokeDynamicInfo) classFile.getConstantPool().get(2);
		64	assertEquals(ConstantPool.CONSTANT_InvokeDynamic, invokeDynamic.getTag());
65	BootstrapMethod bootstrapMethod = classFile.getBootstrapMethods().get(invokeDynamic.getBootstrapMethod());
66	assertEquals("[23, 24, 25]", Arrays.toString(bootstrapMethod.getArguments()));
67	CPMethodHandleInfo bootstrapMH = (CPMethodHandleInfo) classFile.getConstantPool().get(bootstrapMethod.getMethodRef());
68	assertEquals(ConstantPool.CONSTANT_MethodHandle, bootstrapMH.getTag());
69	assertEquals(ReferenceKind.invokeStatic, bootstrapMH.getReferenceKind());
70	CPMethodInfo bootstrapMethodInfo = (CPMethodInfo) classFile.getConstantPool().get(bootstrapMH.getReference());
71	assertEquals("CallSite metaFactory(MethodHandles$Lookup,String,MethodType,MethodHandle,MethodHandle,MethodType)", bootstrapMethodInfo.getFullMethodName());
72	CPNameAndTypeInfo nameAndType = (CPNameAndTypeInfo) classFile.getConstantPool().get(invokeDynamic.getNameAndType());
73	assertEquals("()Ljava/lang/Runnable;", nameAndType.getDescriptor());
74	assertEquals("lambda", nameAndType.getName());
75	CPMethodTypeInfo methodType = (CPMethodTypeInfo) classFile.getConstantPool().get(25);
76	assertEquals(ConstantPool.CONSTANT_MethodType, methodType.getTag());
77	CPUTF8Info descriptor = (CPUTF8Info) classFile.getConstantPool().get(methodType.getDescriptor());
78	assertEquals("()V", descriptor.getName());
79	}
80	}