Further advanced new API implementation.

raphw · Dec 31, 2015 · 0f15762 · 0f15762
1 parent 9d98ed0
commit 0f15762
Show file tree

Hide file tree

Showing 7 changed files with 723 additions and 136 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java
@@ -507,13 +507,13 @@ public DynamicType.Builder<? extends Enum<?>> makeEnumeration(Collection<? exten
         if (values.isEmpty()) {
             throw new IllegalArgumentException("Require at least one enumeration constant");
         }
-        TypeDescription.Generic enumType = new TypeDescription.Generic.OfNonGenericType.ForLoadedType(Enum.class);
+        TypeDescription.Generic enumType = TypeDescription.Generic.Builder.parameterizedType(Enum.class, TargetType.class).asType();
         return new SubclassDynamicTypeBuilder<Enum<?>>(classFileVersion,
                 namingStrategy.subclass(enumType.asErasure()),
                 auxiliaryTypeNamingStrategy,
                 implementationContextFactory,
                 interfaceTypes,
-                Visibility.PUBLIC.getMask() | TypeManifestation.FINAL.getMask() | EnumerationState.ENUMERATION.getMask(),
+                ModifierContributor.Resolver.of(Visibility.PUBLIC, TypeManifestation.FINAL, EnumerationState.ENUMERATION).resolve(),
                 typeAttributeAppender,
                 ignoredMethods,
                 classVisitorWrapper,

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
@@ -1342,6 +1342,14 @@ class Token implements ByteCodeElement.Token<Token> {
          */
         private final Object defaultValue;
 
+        public Token(int modifiers) {
+            this(MethodDescription.CONSTRUCTOR_INTERNAL_NAME, modifiers, TypeDescription.Generic.VOID);
+        }
+
+        public Token(String name, int modifiers, TypeDescription.Generic returnType) {
+            this(name, modifiers, returnType, Collections.<TypeDescription.Generic>emptyList());
+        }
+
         /**
          * Creates a new method token with simple values.
          *

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
@@ -968,6 +968,10 @@ public Token(TypeDescription.Generic typeDescription, List<? extends AnnotationD
             this(typeDescription, annotationDescriptions, NO_NAME, NO_MODIFIERS);
         }
 
+        public Token(TypeDescription.Generic typeDescription, String name, Integer modifiers) {
+            this(typeDescription, Collections.<AnnotationDescription>emptyList(), name, modifiers);
+        }
+
         /**
          * Creates a new parameter token.
          *