Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add latest Java support #796

Merged
merged 2 commits into from
Mar 15, 2023
Merged

Add latest Java support #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f00e5
Update ASM API to version 9
avpinchuk Mar 13, 2023
20283ec
Replace deprecated ASM API
avpinchuk Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...el/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/FieldSignatureVisitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -32,7 +33,7 @@ public class FieldSignatureVisitorImpl extends SignatureVisitor {
private final ArrayDeque<ParameterizedType> parentType = new ArrayDeque<>();

public FieldSignatureVisitorImpl(TypeBuilder typeBuilder, FieldModel fieldModel) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.typeBuilder = typeBuilder;
parentType.add(fieldModel);
Expand Down
3 changes: 2 additions & 1 deletion ...l/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -39,7 +40,7 @@ public class MethodSignatureVisitorImpl extends SignatureVisitor {
private final ArrayDeque<ParameterizedType> parentType = new ArrayDeque<>();

public MethodSignatureVisitorImpl(TypeBuilder typeBuilder, MethodModel methodModel) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.typeBuilder = typeBuilder;
this.methodModel = methodModel;
Expand Down
13 changes: 7 additions & 6 deletions class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -58,7 +59,7 @@ public class ModelClassVisitor extends ClassVisitor {

public ModelClassVisitor(ParsingContext ctx, URI definingURI, String entryName,
boolean isApplicationClass) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.ctx = ctx;
this.definingURI = definingURI;
Expand Down Expand Up @@ -342,7 +343,7 @@ private class ModelMethodVisitor extends MethodVisitor {
private final MethodVisitingContext context;

private ModelMethodVisitor(MemberVisitingContext context) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.context = new MethodVisitingContext(context.modelUnAnnotatedMembers);
}
Expand Down Expand Up @@ -411,7 +412,7 @@ private class ModelDefaultAnnotationVisitor extends AnnotationVisitor {
private final MethodVisitingContext context;

public ModelDefaultAnnotationVisitor(MethodVisitingContext visitingContext) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);
this.context = visitingContext;
}

Expand All @@ -427,7 +428,7 @@ private class ModelFieldVisitor extends FieldVisitor {
private final FieldVisitingContext context;

private ModelFieldVisitor(MemberVisitingContext context) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.context = new FieldVisitingContext(context.modelUnAnnotatedMembers);
}
Expand Down Expand Up @@ -480,7 +481,7 @@ private class ModelAnnotationVisitor extends AnnotationVisitor {
private final AnnotationVisitingContext context;

private ModelAnnotationVisitor() {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.context = new AnnotationVisitingContext();
}
Expand Down Expand Up @@ -555,7 +556,7 @@ private class ArrayVisitor extends AnnotationVisitor {
protected List values = new ArrayList();

public ArrayVisitor(AnnotationVisitor av) {
super(Opcodes.ASM7, av);
super(Opcodes.ASM9, av);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...s-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -36,7 +37,7 @@ public class SignatureVisitorImpl extends SignatureVisitor {
private final List<ParameterizedInterfaceModelImpl> parameterizedIntf = new ArrayList<>();

public SignatureVisitorImpl(TypeBuilder typeBuilder) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);
this.typeBuilder = typeBuilder;
}

Expand Down
3 changes: 2 additions & 1 deletion .../hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -47,7 +48,7 @@ public class ClassVisitorImpl extends ClassVisitor {
* @param excludes The set of implementations to NOT add to the locator
*/
public ClassVisitorImpl(ServiceLocator locator, boolean verbose, Set<String> excludes) {
super(Opcodes.ASM7);
super(Opcodes.ASM9);

this.locator = locator;
this.verbose = verbose;
Expand Down
5 changes: 3 additions & 2 deletions ...t-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -168,10 +169,10 @@ public void visitMaxs(int arg0, int arg1) {
}

/* (non-Javadoc)
* @see org.objectweb.asm.MethodVisitor#visitMethodInsn(int, java.lang.String, java.lang.String, java.lang.String)
* @see org.objectweb.asm.MethodVisitor#visitMethodInsn(int, java.lang.String, java.lang.String, java.lang.String, boolean)
*/
@Override
public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3) {
public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3, boolean arg4) {

}

Expand Down