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

merge of the actual 2.x into 3.0 branch #5583

Merged
merged 3 commits into from
Mar 27, 2024
Merged

merge of the actual 2.x into 3.0 branch #5583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f07195a
Backing up CI/CD and TCK jobs into the Jersey project (#5574)
senivam Mar 27, 2024
9c5b688
Adopt ASM 9.7
jansupol Mar 26, 2024
4e08dd4
Merge remote-tracking branch 'origin/2.x' into 'origin/3.0'
senivam Mar 27, 2024
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
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ KineticJS, v4.7.1
* Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS
* Copyright: Eric Rowell

org.objectweb.asm Version 9.6
org.objectweb.asm Version 9.7
* License: Modified BSD (https://asm.ow2.io/license.html)
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.

Expand Down
8 changes: 4 additions & 4 deletions core-server/src/main/java/jersey/repackaged/org/objectweb/asm/AnnotationWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static AnnotationWriter create(
// Write type_index and reserve space for num_element_value_pairs.
annotation.putShort(symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(
symbolTable, /* useNamedValues = */ true, annotation, previousAnnotation);
symbolTable, /* useNamedValues= */ true, annotation, previousAnnotation);
}

/**
Expand Down Expand Up @@ -179,7 +179,7 @@ static AnnotationWriter create(
// Write type_index and reserve space for num_element_value_pairs.
typeAnnotation.putShort(symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(
symbolTable, /* useNamedValues = */ true, typeAnnotation, previousAnnotation);
symbolTable, /* useNamedValues= */ true, typeAnnotation, previousAnnotation);
}

// -----------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -284,7 +284,7 @@ public AnnotationVisitor visitAnnotation(final String name, final String descrip
}
// Write tag and type_index, and reserve 2 bytes for num_element_value_pairs.
annotation.put12('@', symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(symbolTable, /* useNamedValues = */ true, annotation, null);
return new AnnotationWriter(symbolTable, /* useNamedValues= */ true, annotation, null);
}

@Override
Expand All @@ -303,7 +303,7 @@ public AnnotationVisitor visitArray(final String name) {
// visit the array elements. Its num_element_value_pairs will correspond to the number of array
// elements and will be stored in what is in fact num_values.
annotation.put12('[', 0);
return new AnnotationWriter(symbolTable, /* useNamedValues = */ false, annotation, null);
return new AnnotationWriter(symbolTable, /* useNamedValues= */ false, annotation, null);
}

@Override
Expand Down
109 changes: 53 additions & 56 deletions core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public ClassReader(
final byte[] classFileBuffer,
final int classFileOffset,
final int classFileLength) { // NOPMD(UnusedFormalParameter) used for backward compatibility.
this(classFileBuffer, classFileOffset, /* checkClassVersion = */ true);
this(classFileBuffer, classFileOffset, /* checkClassVersion= */ true);
}

/**
Expand All @@ -195,7 +195,7 @@ public ClassReader(
this.b = classFileBuffer;
// Check the class' major_version. This field is after the magic and minor_version fields, which
// use 4 and 2 bytes respectively.
if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V22) {
if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V23) {
throw new IllegalArgumentException(
"Unsupported class file major version " + readShort(classFileOffset + 6));
}
Expand Down Expand Up @@ -607,9 +607,9 @@ public void accept(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
classVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
classVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -625,9 +625,9 @@ public void accept(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
classVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
classVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -649,9 +649,9 @@ public void accept(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -673,9 +673,9 @@ public void accept(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand Down Expand Up @@ -967,9 +967,9 @@ private int readRecordComponent(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -985,9 +985,9 @@ private int readRecordComponent(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1009,9 +1009,9 @@ private int readRecordComponent(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1033,9 +1033,9 @@ private int readRecordComponent(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand Down Expand Up @@ -1151,9 +1151,9 @@ private int readField(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1169,9 +1169,9 @@ private int readField(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1193,9 +1193,9 @@ private int readField(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1217,9 +1217,9 @@ private int readField(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand Down Expand Up @@ -1412,9 +1412,9 @@ private int readMethod(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
methodVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
methodVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1430,9 +1430,9 @@ private int readMethod(
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
methodVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
methodVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1454,9 +1454,9 @@ private int readMethod(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -1478,26 +1478,23 @@ private int readMethod(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}

// Visit the RuntimeVisibleParameterAnnotations attribute.
if (runtimeVisibleParameterAnnotationsOffset != 0) {
readParameterAnnotations(
methodVisitor, context, runtimeVisibleParameterAnnotationsOffset, /* visible = */ true);
methodVisitor, context, runtimeVisibleParameterAnnotationsOffset, /* visible= */ true);
}

// Visit the RuntimeInvisibleParameterAnnotations attribute.
if (runtimeInvisibleParameterAnnotationsOffset != 0) {
readParameterAnnotations(
methodVisitor,
context,
runtimeInvisibleParameterAnnotationsOffset,
/* visible = */ false);
methodVisitor, context, runtimeInvisibleParameterAnnotationsOffset, /* visible= */ false);
}

// Visit the non standard attributes.
Expand Down Expand Up @@ -1926,7 +1923,7 @@ private void readCode(
}
} else if (Constants.RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(attributeName)) {
visibleTypeAnnotationOffsets =
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible = */ true);
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible= */ true);
// Here we do not extract the labels corresponding to the attribute content. This would
// require a full parsing of the attribute, which would need to be repeated when parsing
// the bytecode instructions (see below). Instead, the content of the attribute is read one
Expand All @@ -1935,7 +1932,7 @@ private void readCode(
// time. This assumes that type annotations are ordered by increasing bytecode offset.
} else if (Constants.RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(attributeName)) {
invisibleTypeAnnotationOffsets =
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible = */ false);
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible= */ false);
// Same comment as above for the RuntimeVisibleTypeAnnotations attribute.
} else if (Constants.STACK_MAP_TABLE.equals(attributeName)) {
if ((context.parsingOptions & SKIP_FRAMES) == 0) {
Expand Down Expand Up @@ -2517,9 +2514,9 @@ private void readCode(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
currentVisibleTypeAnnotationBytecodeOffset =
Expand All @@ -2545,9 +2542,9 @@ private void readCode(
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
currentInvisibleTypeAnnotationBytecodeOffset =
Expand Down Expand Up @@ -2618,9 +2615,9 @@ private void readCode(
context.currentLocalVariableAnnotationRangeEnds,
context.currentLocalVariableAnnotationRangeIndices,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand All @@ -2646,9 +2643,9 @@ private void readCode(
context.currentLocalVariableAnnotationRangeEnds,
context.currentLocalVariableAnnotationRangeIndices,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand Down Expand Up @@ -2821,7 +2818,7 @@ private int[] readTypeAnnotations(
methodVisitor.visitTryCatchAnnotation(
targetType & 0xFFFFFF00, path, annotationDescriptor, visible),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
} else {
// We don't want to visit the other target_type annotations, so we just skip them (which
Expand All @@ -2832,7 +2829,7 @@ private int[] readTypeAnnotations(
// with a null AnnotationVisitor).
currentOffset =
readElementValues(
/* annotationVisitor = */ null, currentOffset, /* named = */ true, charBuffer);
/* annotationVisitor= */ null, currentOffset, /* named= */ true, charBuffer);
}
}
return typeAnnotationsOffsets;
Expand Down Expand Up @@ -2972,7 +2969,7 @@ private void readParameterAnnotations(
readElementValues(
methodVisitor.visitParameterAnnotation(i, annotationDescriptor, visible),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
Expand Down Expand Up @@ -3042,9 +3039,9 @@ private int readElementValue(
case 'e': // enum_const_value
return currentOffset + 5;
case '@': // annotation_value
return readElementValues(null, currentOffset + 3, /* named = */ true, charBuffer);
return readElementValues(null, currentOffset + 3, /* named= */ true, charBuffer);
case '[': // array_value
return readElementValues(null, currentOffset + 1, /* named = */ false, charBuffer);
return readElementValues(null, currentOffset + 1, /* named= */ false, charBuffer);
default:
return currentOffset + 3;
}
Expand Down Expand Up @@ -3112,7 +3109,7 @@ private int readElementValue(
return readElementValues(
annotationVisitor.visitArray(elementName),
currentOffset - 2,
/* named = */ false,
/* named= */ false,
charBuffer);
}
switch (classFileBuffer[currentOffset] & 0xFF) {
Expand Down Expand Up @@ -3189,7 +3186,7 @@ private int readElementValue(
readElementValues(
annotationVisitor.visitArray(elementName),
currentOffset - 2,
/* named = */ false,
/* named= */ false,
charBuffer);
break;
}
Expand Down
Loading