purged EnumEntry and replaced by EnumerationDescription

Author: pfichtner

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/vaadoo/Parameters.java

@@ -41,24 +41,6 @@
 
 public class Parameters implements Iterable<Parameter> {
 
-	static class EnumEntry {
-		private final Type type;
-		private final String value;
-
-		private EnumEntry(Type type, String value) {
-			this.type = type;
-			this.value = value;
-		}
-
-		Type type() {
-			return type;
-		}
-
-		String value() {
-			return value;
-		}
-	}
-
 	public static Parameters of(ParameterList<InDefinedShape> parameterList) {
 		return new Parameters(parameterList);
 	}

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/vaadoo/ValidationCodeInjector.java

@@ -201,11 +201,10 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
 						if (isFirstParamLoad) {
 							Type returnType = getReturnType(descriptor);
 							if (isArray(returnType)) {
-								@SuppressWarnings("unchecked")
-								List<EnumEntry> annotationValues = (List<EnumEntry>) targetParam
+								EnumerationDescription[] annotationValues = (EnumerationDescription[]) targetParam
 										.annotationValue(currentAnnotationType, name);
 								writeArray(returnType.getElementType(),
-										annotationValues == null ? emptyList() : annotationValues);
+										annotationValues == null ? emptyList() : Arrays.asList(annotationValues));
 							} else {
 								visitLdcInsn(annotationsLdcInsnValue(targetParam, owner, name, returnType));
 							}
@@ -216,18 +215,18 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
 						}
 					}
 
-					private void writeArray(Type arrayElementType, List<EnumEntry> annotationValues) {
+					private void writeArray(Type arrayElementType, List<EnumerationDescription> annotationValues) {
 						int intInsn = annotationValues.size() <= 127 ? BIPUSH : SIPUSH;
 						mv.visitIntInsn(intInsn, annotationValues.size());
 						// TODO this only works for objects but not primitive arrays
 						mv.visitTypeInsn(ANEWARRAY, arrayElementType.getInternalName());
 
 						int idx = 0;
-						for (EnumEntry entry : annotationValues) {
+						for (EnumerationDescription entry : annotationValues) {
 							mv.visitInsn(DUP);
 							mv.visitIntInsn(intInsn, idx++);
-							mv.visitFieldInsn(GETSTATIC, entry.type().getInternalName(), entry.value(),
-									entry.type().getDescriptor());
+							mv.visitFieldInsn(GETSTATIC, entry.getEnumerationType().getInternalName(), entry.getValue(),
+									entry.getEnumerationType().getDescriptor());
 							mv.visitInsn(AASTORE);
 						}
 					}