Cleanup the operator classes package layout

UniSerializedSubscriber is tied to AbstractUni#subscribing so it can't be moved right now.

Also RevApi doesn't seem to honor package exclusion, so it complains that classes have been removed.

implementation/revapi.json

@@ -9,8 +9,8 @@
     "filter" : {
       "packages" : {
         "regex" : true,
-        "include" : [ "io\\.smallrye\\.mutiny\\..*", "io\\.smallrye\\.mutiny\\.*" ],
-        "exclude" : [ "io\\.smallrye\\.mutiny\\.operators\\.*", "io\\.smallrye\\.mutiny\\.operators\\..*" ]
+        "include" : [ "io\\.smallrye\\.mutiny(\\..+)?" ],
+        "exclude" : [ "io\\.smallrye\\.mutiny\\.operators(\\..+)?" ]
       }
     }
   }

implementation/src/main/java/io/smallrye/mutiny/groups/MultiBroadcast.java

@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiBroadcaster;
+import io.smallrye.mutiny.operators.multi.MultiBroadcaster;
 
 /**
  * Makes the upstream {@link Multi} be able to broadcast its events ({@code items}, {@code failure}, and

implementation/src/main/java/io/smallrye/mutiny/groups/MultiIfEmpty.java

@@ -14,7 +14,7 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiSwitchOnEmpty;
+import io.smallrye.mutiny.operators.multi.MultiSwitchOnEmpty;
 import io.smallrye.mutiny.subscription.MultiEmitter;
 
 public class MultiIfEmpty<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombination.java

@@ -7,7 +7,6 @@
 import org.reactivestreams.Publisher;
 
 import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.operators.*;
 
 public class MultiItemCombination {
 

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine2.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine2.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine3.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine3.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine4.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine4.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine5.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine5.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine6.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine6.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine7.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine7.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine8.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine8.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine9.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine9.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombineIterable.java → implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombineIterable.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 

implementation/src/main/java/io/smallrye/mutiny/groups/MultiMerge.java

@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.operators.MultiCombine;
+import io.smallrye.mutiny.operators.multi.MultiCombine;
 
 /**
  * Creates new {@link Multi} by merging several {@link Multi} or {@link Publisher}.

implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnCompletion.java

@@ -13,9 +13,9 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiSwitchOnCompletion;
 import io.smallrye.mutiny.operators.multi.MultiOnCompletionCall;
 import io.smallrye.mutiny.operators.multi.MultiOnCompletionInvoke;
+import io.smallrye.mutiny.operators.multi.MultiSwitchOnCompletion;
 import io.smallrye.mutiny.subscription.MultiEmitter;
 
 public class MultiOnCompletion<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnFailure.java

@@ -12,9 +12,9 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiFlatMapOnFailure;
-import io.smallrye.mutiny.operators.MultiOnFailureTransform;
+import io.smallrye.mutiny.operators.multi.MultiFlatMapOnFailure;
 import io.smallrye.mutiny.operators.multi.MultiOnFailureInvoke;
+import io.smallrye.mutiny.operators.multi.MultiOnFailureTransform;
 import io.smallrye.mutiny.subscription.Cancellable;
 
 /**

implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java

@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniAndCombination;
+import io.smallrye.mutiny.operators.uni.UniAndCombination;
 
 public class UniAndGroupIterable<T1> {
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniAny.java

@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOrCombination;
+import io.smallrye.mutiny.operators.uni.UniOrCombination;
 
 public class UniAny {
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniAwait.java

@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.operators.UniBlockingAwait;
+import io.smallrye.mutiny.operators.uni.UniBlockingAwait;
 
 /**
  * Waits and returns the item emitted by the {@link Uni}. If the {@link Uni} receives a failure, the failure is thrown.

implementation/src/main/java/io/smallrye/mutiny/groups/UniAwaitOptional.java

@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.operators.UniBlockingAwait;
+import io.smallrye.mutiny.operators.uni.UniBlockingAwait;
 
 /**
  * Likes {@link UniAwait} but wrapping the item event into an {@link Optional}. This optional is empty if the

implementation/src/main/java/io/smallrye/mutiny/groups/UniCreate.java

@@ -17,7 +17,7 @@
 import io.smallrye.mutiny.converters.UniConverter;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.*;
+import io.smallrye.mutiny.operators.uni.UniNever;
 import io.smallrye.mutiny.operators.uni.builders.*;
 import io.smallrye.mutiny.subscription.UniEmitter;
 import io.smallrye.mutiny.subscription.UniSubscriber;

implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java

@@ -10,7 +10,7 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
 import io.smallrye.mutiny.operators.AbstractUni;
-import io.smallrye.mutiny.operators.UniMemoizeOp;
+import io.smallrye.mutiny.operators.uni.UniMemoizeOp;
 
 @Experimental("Memoization is an experimental feature at this stage")
 public class UniMemoize<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnCancel.java

@@ -7,8 +7,8 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnCancellation;
-import io.smallrye.mutiny.operators.UniOnCancellationCall;
+import io.smallrye.mutiny.operators.uni.UniOnCancellation;
+import io.smallrye.mutiny.operators.uni.UniOnCancellationCall;
 
 public class UniOnCancel<T> {
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnFailure.java

@@ -11,9 +11,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnFailureFlatMap;
-import io.smallrye.mutiny.operators.UniOnFailureTransform;
-import io.smallrye.mutiny.operators.UniOnItemConsume;
+import io.smallrye.mutiny.operators.uni.UniOnFailureFlatMap;
+import io.smallrye.mutiny.operators.uni.UniOnFailureTransform;
+import io.smallrye.mutiny.operators.uni.UniOnItemConsume;
 
 /**
  * Configures the failure handler.

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItem.java

@@ -14,10 +14,10 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnItemConsume;
-import io.smallrye.mutiny.operators.UniOnItemTransform;
-import io.smallrye.mutiny.operators.UniOnItemTransformToMulti;
-import io.smallrye.mutiny.operators.UniOnItemTransformToUni;
+import io.smallrye.mutiny.operators.uni.UniOnItemConsume;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransform;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransformToMulti;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransformToUni;
 import io.smallrye.mutiny.subscription.UniEmitter;
 
 public class UniOnItem<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemDelay.java

@@ -8,8 +8,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniDelayOnItem;
-import io.smallrye.mutiny.operators.UniDelayUntil;
+import io.smallrye.mutiny.operators.uni.UniDelayOnItem;
+import io.smallrye.mutiny.operators.uni.UniDelayUntil;
 
 /**
  * Configures the delay applied to the item emission.

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemOrFailure.java

@@ -9,9 +9,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureConsume;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureFlatMap;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureMap;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureConsume;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureFlatMap;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureMap;
 import io.smallrye.mutiny.subscription.UniEmitter;
 import io.smallrye.mutiny.tuples.Functions;
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnSubscribe.java

@@ -8,8 +8,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnSubscribeCall;
-import io.smallrye.mutiny.operators.UniOnSubscribeInvoke;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeCall;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeInvoke;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
 /**

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTerminate.java

@@ -6,8 +6,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnTermination;
-import io.smallrye.mutiny.operators.UniOnTerminationCall;
+import io.smallrye.mutiny.operators.uni.UniOnTermination;
+import io.smallrye.mutiny.operators.uni.UniOnTerminationCall;
 import io.smallrye.mutiny.tuples.Functions;
 
 public class UniOnTerminate<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTimeout.java

@@ -10,7 +10,7 @@
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniFailOnTimeout;
+import io.smallrye.mutiny.operators.uni.UniFailOnTimeout;
 
 public class UniOnTimeout<T> {
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniOr.java

@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOrCombination;
+import io.smallrye.mutiny.operators.uni.UniOrCombination;
 
 public class UniOr<T> {
 

implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java

@@ -14,7 +14,7 @@
 import io.smallrye.mutiny.helpers.ExponentialBackoff;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniRetryAtMost;
+import io.smallrye.mutiny.operators.uni.UniRetryAtMost;
 
 // TODO This method should be renamed to UniOnFailureRetry, however it's a breaking change.
 public class UniRetry<T> {

implementation/src/main/java/io/smallrye/mutiny/groups/UniSubscribe.java

@@ -9,7 +9,7 @@
 import io.smallrye.mutiny.infrastructure.Infrastructure;
 import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.operators.UniSerializedSubscriber;
-import io.smallrye.mutiny.operators.UniSubscribeToCompletionStage;
+import io.smallrye.mutiny.operators.uni.UniSubscribeToCompletionStage;
 import io.smallrye.mutiny.subscription.Cancellable;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;

implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java

@@ -9,6 +9,9 @@
 import io.smallrye.mutiny.groups.*;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.uni.UniEmitOn;
+import io.smallrye.mutiny.operators.uni.UniMemoizeOp;
+import io.smallrye.mutiny.operators.uni.UniRunSubscribeOn;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.tuples.Tuple2;
 

implementation/src/main/java/io/smallrye/mutiny/operators/MultiBroadcaster.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBroadcaster.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import java.time.Duration;
 

implementation/src/main/java/io/smallrye/mutiny/operators/MultiCombine.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiCombine.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import java.util.List;
 import java.util.function.Function;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiFlatMapOnFailure.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiFlatMapOnFailure.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -11,7 +11,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiOnFailureResumeOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiFlatMapOnFailure<T> extends MultiOperator<T, T> {
     private final Predicate<? super Throwable> predicate;

implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiGroupByOp.java

@@ -261,7 +261,7 @@ boolean isDoneOrCancelled(boolean d, boolean empty, Queue<?> q) {
         }
     }
 
-    static final class GroupedUnicast<K, T> extends AbstractMulti<T> implements GroupedMulti<K, T> {
+    public static final class GroupedUnicast<K, T> extends AbstractMulti<T> implements GroupedMulti<K, T> {
 
         private final State<T, K> downstream;
         private final K key;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiOnFailureTransform.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiOnFailureTransform.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -11,7 +11,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiOnFailureResumeOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiOnFailureTransform<T> extends MultiOperator<T, T> {
     private final Predicate<? super Throwable> predicate;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnCompletion.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnCompletion.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.SUPPLIER_PRODUCED_NULL;
 
@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiConcatOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiSwitchOnCompletion<T> extends MultiOperator<T, T> {
     private final Supplier<Publisher<? extends T>> supplier;

implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnEmpty.java → implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnEmpty.java

@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.SUPPLIER_PRODUCED_NULL;
 
@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiSwitchOnEmptyOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 import io.smallrye.mutiny.operators.multi.builders.FailedMulti;
 
 public class MultiSwitchOnEmpty<T> extends MultiOperator<T, T> {