Adjust typing.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/description/modifier/RequiredPhase.java

@@ -5,9 +5,7 @@
 /**
  * Describes when another module is considered as a requirement.
  */
-public enum RequiredPhase implements ModifierContributor.ForModule.OfRequire,
-        ModifierContributor.ForModule.OfExport,
-        ModifierContributor.ForModule.OfOpen {
+public enum RequiredPhase implements ModifierContributor.ForModule.OfRequire {
 
     /**
      * Modifier for requiring another module during all phases. (This is the default modifier.)

byte-buddy-dep/src/main/java/net/bytebuddy/description/modifier/Transitivity.java

@@ -5,9 +5,7 @@
 /**
  * Defines if a module requires another module also for its users.
  */
-public enum Transitivity implements ModifierContributor.ForModule.OfRequire,
-        ModifierContributor.ForModule.OfExport,
-        ModifierContributor.ForModule.OfOpen {
+public enum Transitivity implements ModifierContributor.ForModule.OfRequire {
 
     /**
      * Modifier for not marking a type member as synthetic. (This is the default modifier.)

byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/DynamicType.java

@@ -1627,11 +1627,11 @@ interface ModuleDefinition<S> extends Builder<S> {
 
             ModuleDefinition<S> requires(Collection<String> modules);
 
-            ModuleDefinition<S> require(String module, ModifierContributor.ForModule.OfRequire... modifierContributor);
+            RequiresDefinition<S> require(String module, ModifierContributor.ForModule.OfRequire... modifierContributor);
 
-            ModuleDefinition<S> require(String module, Collection<? extends ModifierContributor.ForModule.OfRequire> modifierContributors);
+            RequiresDefinition<S> require(String module, Collection<? extends ModifierContributor.ForModule.OfRequire> modifierContributors);
 
-            ModuleDefinition<S> require(String module, int modifiers);
+            RequiresDefinition<S> require(String module, int modifiers);
 
             ModuleDefinition<S> exports(String... aPackage);
 
@@ -1673,18 +1673,62 @@ interface ModuleDefinition<S> extends Builder<S> {
 
             ModuleDefinition<S> provides(String service, Collection<String> implementations);
 
-            interface ExportsDefinition<S> extends ModuleDefinition<S> {
+            interface RequiresDefinition<U> extends ModuleDefinition<U> {
 
-                ModuleDefinition<S> to(String... module);
+                RequiresDefinition<U> version(@MaybeNull String version);
 
-                ModuleDefinition<S> to(Collection<String> modules);
+                /**
+                 * An abstract base implementation of a {@link RequiresDefinition}.
+                 *
+                 * @param <V> A loaded type that the built type is guaranteed to be a subclass of.
+                 */
+                abstract class AbstractBase<V> extends ModuleDefinition.AbstractBase<V> implements RequiresDefinition<V> {
+                    /* empty */
+                }
+            }
+
+            interface ExportsDefinition<U> extends ModuleDefinition<U> {
+
+                ExportsDefinition<U> to(String... module);
+
+                ExportsDefinition<U> to(Collection<String> modules);
+
+                /**
+                 * An abstract base implementation of a {@link OpensDefinition}.
+                 *
+                 * @param <V> A loaded type that the built type is guaranteed to be a subclass of.
+                 */
+                abstract class AbstractBase<V> extends ModuleDefinition.AbstractBase<V> implements ExportsDefinition<V> {
+
+                    /**
+                     * {@inheritDoc}ModuleDefinition
+                     */
+                    public ExportsDefinition<V> to(String... module) {
+                        return to(Arrays.asList(module));
+                    }
+                }
             }
 
             interface OpensDefinition<S> extends ModuleDefinition<S> {
 
-                ModuleDefinition<S> to(String... module);
+                OpensDefinition<S> to(String... module);
 
-                ModuleDefinition<S> to(Collection<String> modules);
+                OpensDefinition<S> to(Collection<String> modules);
+
+                /**
+                 * An abstract base implementation of a {@link OpensDefinition}.
+                 *
+                 * @param <V> A loaded type that the built type is guaranteed to be a subclass of.
+                 */
+                abstract class AbstractBase<V> extends ModuleDefinition.AbstractBase<V> implements OpensDefinition<V> {
+
+                    /**
+                     * {@inheritDoc}
+                     */
+                    public OpensDefinition<V> to(String... module) {
+                        return to(Arrays.asList(module));
+                    }
+                }
             }
 
             /**
@@ -1739,14 +1783,14 @@ public ModuleDefinition<U> requires(Collection<String> modules) {
                 /**
                  * {@inheritDoc}
                  */
-                public ModuleDefinition<U> require(String module, ModifierContributor.ForModule.OfRequire... modifierContributor) {
+                public RequiresDefinition<U> require(String module, ModifierContributor.ForModule.OfRequire... modifierContributor) {
                     return require(module, Arrays.asList(modifierContributor));
                 }
 
                 /**
                  * {@inheritDoc}
                  */
-                public ModuleDefinition<U> require(String module, Collection<? extends ModifierContributor.ForModule.OfRequire> modifierContributors) {
+                public RequiresDefinition<U> require(String module, Collection<? extends ModifierContributor.ForModule.OfRequire> modifierContributors) {
                     return require(module, ModifierContributor.Resolver.of(modifierContributors).resolve());
                 }
 
@@ -5316,7 +5360,7 @@ public ModuleDefinition<U> packages(Collection<String> packages) {
                     /**
                      * {@inheritDoc}
                      */
-                    public ModuleDefinition<U> require(String module, int modifiers) {
+                    public RequiresDefinition<U> require(String module, int modifiers) {
                         return null;
                     }