FISH-161 HK2 Annotation Parser improvements

[jGauravGupta]

This PR includes improvements in HK2 ClassModel Parser as listed below:

• Generic types parser for Method Parameters and return type
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java

  Line 33 in eb4663e

  public class MethodSignatureVisitorImpl extends SignatureVisitor {

• Added the Parameter list to MethodModel interface which returns the list of AnnotationModel:
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java

  Line 55 in 4a314c1

  List<Parameter> getParameters();

• Introduced EnumModel to return enum type:
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/EnumModel.java

  Lines 23 to 29 in b8fb554

  	public interface EnumModel {
  	Type getType();
  	String getValue();
  	}

  
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java

  Lines 487 to 496 in b8fb554

  	public void visitEnum(String name, String desc, String value) {
  	if (context.annotation == null) {
  	return;
  	}
  	final Type type = (Type) typeBuilder.getType(Opcodes.ACC_ENUM, unwrap(desc), null);
  	final EnumModel enumModel = new EnumModelImpl(type, value);
  	context.annotation.addValue(name, enumModel);
  	}

  
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/EnumType.java

  Line 23 in f83b921

  public interface EnumType extends ExtensibleType<EnumType> {

• Repeatable and Nested Annotation parser:
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java

  Lines 499 to 515 in b8fb554

  	public AnnotationVisitor visitAnnotation(String name, String desc) {
  	desc = unwrap(desc);
  	final AnnotationTypeImpl at = (AnnotationTypeImpl) typeBuilder.getType(Opcodes.ACC_ANNOTATION, desc, null);
  	final AnnotationModelImpl am = new AnnotationModelImpl(null, at);
  	context.annotation.addValue(name, am);
  	context.parentAnnotations.add(context.annotation);
  	context.annotation = am;
  	return annotationVisitor;
  	}
  	@Override
  	public void visitEnd() {
  	if (!context.parentAnnotations.isEmpty()) {
  	context.annotation = context.parentAnnotations.pollLast();
  	}

• Array element in Annotation
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java

  Lines 477 to 484 in b8fb554

  	public AnnotationVisitor visitArray(String name) {
  	if (context.annotation == null) {
  	return null;
  	}
  	ArrayVisitor arrayVisitor = new ArrayVisitor(annotationVisitor, context.annotation);
  	context.annotation.addValue(name, arrayVisitor.getValues());
  	return arrayVisitor;
  	}

  
  

  patched-src-hk2/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java

  Lines 519 to 544 in b8fb554

  	private class ArrayVisitor extends AnnotationVisitor {
  	AnnotationModelImpl annotation;
  	protected List values = new ArrayList();
  	public ArrayVisitor(AnnotationVisitor av, AnnotationModelImpl annotation) {
  	super(Opcodes.ASM7, av);
  	this.annotation = annotation;
  	}
  	@Override
  	public void visit(String name, Object value) {
  	values.add(unwrap(value));
  	}
  	private Object unwrap(Object value) {
  	if (org.objectweb.asm.Type.class.isInstance(value)) {
  	return org.objectweb.asm.Type.class.cast(value).getClassName();
  	}
  	return value;
  	}
  	public List getValues() {
  	return values;
  	}
  	}

UnitTest:

patched-src-hk2/class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java

Lines 25 to 45 in eb4663e

	@SomeAnnotation(
	aLong = 10,
	aClass = Void.class,
	aClassArr = {Integer.class, String.class},
	aEnum = SomeEnum.ENUM1,
	childAnnotation = @ChildAnnotation("child_value")
	)
	@Color(name = "red")
	@Color(name = "green")
	@GradientColor({
	@Color(name = "white"),
	@Color(name = "black")
	})
	@GradientColor({
	@Color(name = "yellow"),
	@Color(name = "orange")
	})
	public SampleType<Integer, Character, Boolean> setFoo(
	@Color(name = "brown") String foo,
	List<String> input,
	SampleType<Double, String, SampleType<Short, Float, Long>> abc) {

[MattGill98]

Clever - I like it