From a0ce77463abb05a794a09aba7d28d700b82eeec2 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 23 May 2018 15:42:05 +0200 Subject: Java 9: Use Opcodes.ASM6 --- .../yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.scala | 6 +++--- .../yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.scala | 2 +- .../container/plugin/classanalysis/AnalyzeSignatureVisitor.scala | 2 +- .../container/plugin/classanalysis/AnnotationVisitorTrait.scala | 2 +- .../container/servlet/jersey/ResourceOrProviderClassVisitor.scala | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.scala index 903ad94e9e8..539684f2024 100644 --- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.scala +++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.scala @@ -9,7 +9,7 @@ import collection.mutable * Picks up classes used in class files. * @author tonytv */ -private class AnalyzeClassVisitor extends ClassVisitor(Opcodes.ASM5) with AnnotationVisitorTrait with AttributeVisitorTrait { +private class AnalyzeClassVisitor extends ClassVisitor(Opcodes.ASM6) with AnnotationVisitorTrait with AttributeVisitorTrait { private var name : String = null protected val imports : ImportsSet = mutable.Set() protected var exportPackageAnnotation: Option[ExportPackageAnnotation] = None @@ -32,7 +32,7 @@ private class AnalyzeClassVisitor extends ClassVisitor(Opcodes.ASM5) with Annota imports ++= getClassName(Type.getType(desc)).toList AnalyzeSignatureVisitor.analyzeField(signature, this) - new FieldVisitor(Opcodes.ASM5) with SubVisitorTrait with AttributeVisitorTrait with AnnotationVisitorTrait { + new FieldVisitor(Opcodes.ASM6) with SubVisitorTrait with AttributeVisitorTrait with AnnotationVisitorTrait { val analyzeClassVisitor = AnalyzeClassVisitor.this override def visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor = super.visitAnnotation(desc, visible) @@ -68,7 +68,7 @@ private class AnalyzeClassVisitor extends ClassVisitor(Opcodes.ASM5) with Annota def visitExportPackage(): AnnotationVisitor = { def defaultVersionValue[T](name: String) = classOf[Version].getMethod(name).getDefaultValue().asInstanceOf[T] - new AnnotationVisitor(Opcodes.ASM5) { + new AnnotationVisitor(Opcodes.ASM6) { var major: Int = defaultVersionValue("major") var minor: Int = defaultVersionValue("minor") var micro: Int = defaultVersionValue("micro") diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.scala index 535ee2832c8..a8032b6a912 100644 --- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.scala +++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.scala @@ -8,7 +8,7 @@ import org.objectweb.asm._ * @author tonytv */ private class AnalyzeMethodVisitor(val analyzeClassVisitor : AnalyzeClassVisitor) - extends MethodVisitor(Opcodes.ASM5) with AnnotationVisitorTrait with AttributeVisitorTrait with SubVisitorTrait { + extends MethodVisitor(Opcodes.ASM6) with AnnotationVisitorTrait with AttributeVisitorTrait with SubVisitorTrait { override def visitParameterAnnotation(parameter: Int, desc: String, visible: Boolean): AnnotationVisitor = super.visitParameterAnnotation(parameter, desc, visible) diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.scala index 58a43b04d20..5bb8304cf1e 100644 --- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.scala +++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.scala @@ -10,7 +10,7 @@ import org.objectweb.asm.signature.{SignatureReader, SignatureVisitor} */ private class AnalyzeSignatureVisitor(val analyzeClassVisitor: AnalyzeClassVisitor) - extends SignatureVisitor(Opcodes.ASM5) + extends SignatureVisitor(Opcodes.ASM6) with SubVisitorTrait { diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnnotationVisitorTrait.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnnotationVisitorTrait.scala index 0ceaced1440..0bf6ee4a6b4 100644 --- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnnotationVisitorTrait.scala +++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/classanalysis/AnnotationVisitorTrait.scala @@ -17,7 +17,7 @@ private trait AnnotationVisitorTrait { } def visitAnnotationDefault(): AnnotationVisitor = - new AnnotationVisitor(Opcodes.ASM5) { + new AnnotationVisitor(Opcodes.ASM6) { override def visit(name: String, value: AnyRef) {} override def visitEnum(name: String, desc: String, value: String) { diff --git a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.scala b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.scala index c015f11360e..52674026c25 100644 --- a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.scala +++ b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.scala @@ -10,7 +10,7 @@ import org.objectweb.asm.{ClassVisitor, Opcodes, Type, AnnotationVisitor, ClassR /** * @author tonytv */ -class ResourceOrProviderClassVisitor private () extends ClassVisitor(Opcodes.ASM5) { +class ResourceOrProviderClassVisitor private () extends ClassVisitor(Opcodes.ASM6) { private var className: String = null private var isPublic: Boolean = false private var isAbstract = false -- cgit v1.2.3