moves validator to core package and makes it pkg private

Signed-off-by: Oleh Dokuka <[email protected]>

Author: OlegDokuka

rsocket-core/src/main/java/io/rsocket/fragmentation/FragmentationUtils.java renamed to rsocket-core/src/main/java/io/rsocket/core/PayloadValidationUtils.java

@@ -1,11 +1,11 @@
-package io.rsocket.fragmentation;
+package io.rsocket.core;
 
 import io.netty.buffer.ByteBuf;
 import io.rsocket.Payload;
 import io.rsocket.frame.FrameHeaderFlyweight;
 import io.rsocket.frame.FrameLengthFlyweight;
 
-public final class FragmentationUtils {
+final class PayloadValidationUtils {
   public static boolean isValid(int mtu, Payload payload) {
     return payload.hasMetadata()
         ? isValid(mtu, payload.data(), payload.metadata())

rsocket-core/src/main/java/io/rsocket/core/RSocketRequester.java

@@ -28,7 +28,6 @@
 import io.rsocket.RSocket;
 import io.rsocket.exceptions.ConnectionErrorException;
 import io.rsocket.exceptions.Exceptions;
-import io.rsocket.fragmentation.FragmentationUtils;
 import io.rsocket.frame.CancelFrameFlyweight;
 import io.rsocket.frame.ErrorFrameFlyweight;
 import io.rsocket.frame.FrameHeaderFlyweight;
@@ -190,7 +189,7 @@ private Mono<Void> handleFireAndForget(Payload payload) {
       return Mono.error(err);
     }
 
-    if (!FragmentationUtils.isValid(this.mtu, payload)) {
+    if (!PayloadValidationUtils.isValid(this.mtu, payload)) {
       payload.release();
       return Mono.error(
           new IllegalArgumentException(
@@ -221,7 +220,7 @@ private Mono<Payload> handleRequestResponse(final Payload payload) {
       return Mono.error(err);
     }
 
-    if (!FragmentationUtils.isValid(this.mtu, payload)) {
+    if (!PayloadValidationUtils.isValid(this.mtu, payload)) {
       payload.release();
       return Mono.error(
           new IllegalArgumentException(
@@ -273,7 +272,7 @@ private Flux<Payload> handleRequestStream(final Payload payload) {
       return Flux.error(err);
     }
 
-    if (!FragmentationUtils.isValid(this.mtu, payload)) {
+    if (!PayloadValidationUtils.isValid(this.mtu, payload)) {
       payload.release();
       return Flux.error(
           new IllegalArgumentException(
@@ -342,7 +341,7 @@ private Flux<Payload> handleChannel(Flux<Payload> request) {
         (s, flux) -> {
           Payload payload = s.get();
           if (payload != null) {
-            if (!FragmentationUtils.isValid(mtu, payload)) {
+            if (!PayloadValidationUtils.isValid(mtu, payload)) {
               payload.release();
               final IllegalArgumentException t =
                   new IllegalArgumentException(
@@ -374,7 +373,7 @@ protected void hookOnSubscribe(Subscription subscription) {
 
           @Override
           protected void hookOnNext(Payload payload) {
-            if (!FragmentationUtils.isValid(mtu, payload)) {
+            if (!PayloadValidationUtils.isValid(mtu, payload)) {
               payload.release();
               cancel();
               final IllegalArgumentException t =
@@ -472,7 +471,7 @@ private Mono<Void> handleMetadataPush(Payload payload) {
       return Mono.error(err);
     }
 
-    if (!FragmentationUtils.isValid(this.mtu, payload)) {
+    if (!PayloadValidationUtils.isValid(this.mtu, payload)) {
       payload.release();
       return Mono.error(
           new IllegalArgumentException(

rsocket-core/src/main/java/io/rsocket/core/RSocketResponder.java

@@ -25,7 +25,6 @@
 import io.rsocket.RSocket;
 import io.rsocket.ResponderRSocket;
 import io.rsocket.exceptions.ApplicationErrorException;
-import io.rsocket.fragmentation.FragmentationUtils;
 import io.rsocket.frame.*;
 import io.rsocket.frame.decoder.PayloadDecoder;
 import io.rsocket.internal.SynchronizedIntObjectHashMap;
@@ -376,7 +375,7 @@ protected void hookOnNext(Payload payload) {
               isEmpty = false;
             }
 
-            if (!FragmentationUtils.isValid(mtu, payload)) {
+            if (!PayloadValidationUtils.isValid(mtu, payload)) {
               payload.release();
               cancel();
               final IllegalArgumentException t =
@@ -432,7 +431,7 @@ protected void hookOnSubscribe(Subscription s) {
 
           @Override
           protected void hookOnNext(Payload payload) {
-            if (!FragmentationUtils.isValid(mtu, payload)) {
+            if (!PayloadValidationUtils.isValid(mtu, payload)) {
               payload.release();
               cancel();
               final IllegalArgumentException t =

rsocket-core/src/test/java/io/rsocket/fragmentation/FragmentationUtilsTest.java renamed to rsocket-core/src/test/java/io/rsocket/core/PayloadValidationUtilsTest.java

@@ -1,4 +1,4 @@
-package io.rsocket.fragmentation;
+package io.rsocket.core;
 
 import io.rsocket.Payload;
 import io.rsocket.frame.FrameHeaderFlyweight;
@@ -8,7 +8,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-class FragmentationUtilsTest {
+class PayloadValidationUtilsTest {
 
   @Test
   void shouldBeValidFrameWithNoFragmentation() {
@@ -20,7 +20,7 @@ void shouldBeValidFrameWithNoFragmentation() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data);
 
-    Assertions.assertThat(FragmentationUtils.isValid(0, payload)).isTrue();
+    Assertions.assertThat(PayloadValidationUtils.isValid(0, payload)).isTrue();
   }
 
   @Test
@@ -34,7 +34,7 @@ void shouldBeInValidFrameWithNoFragmentation() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data);
 
-    Assertions.assertThat(FragmentationUtils.isValid(0, payload)).isFalse();
+    Assertions.assertThat(PayloadValidationUtils.isValid(0, payload)).isFalse();
   }
 
   @Test
@@ -50,7 +50,7 @@ void shouldBeValidFrameWithNoFragmentation0() {
     ThreadLocalRandom.current().nextBytes(metadata);
     final Payload payload = DefaultPayload.create(data, metadata);
 
-    Assertions.assertThat(FragmentationUtils.isValid(0, payload)).isTrue();
+    Assertions.assertThat(PayloadValidationUtils.isValid(0, payload)).isTrue();
   }
 
   @Test
@@ -61,7 +61,7 @@ void shouldBeInValidFrameWithNoFragmentation1() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data, metadata);
 
-    Assertions.assertThat(FragmentationUtils.isValid(0, payload)).isFalse();
+    Assertions.assertThat(PayloadValidationUtils.isValid(0, payload)).isFalse();
   }
 
   @Test
@@ -72,7 +72,7 @@ void shouldBeValidFrameWithNoFragmentation2() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data, metadata);
 
-    Assertions.assertThat(FragmentationUtils.isValid(0, payload)).isTrue();
+    Assertions.assertThat(PayloadValidationUtils.isValid(0, payload)).isTrue();
   }
 
   @Test
@@ -83,7 +83,7 @@ void shouldBeValidFrameWithNoFragmentation3() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data, metadata);
 
-    Assertions.assertThat(FragmentationUtils.isValid(64, payload)).isTrue();
+    Assertions.assertThat(PayloadValidationUtils.isValid(64, payload)).isTrue();
   }
 
   @Test
@@ -94,6 +94,6 @@ void shouldBeValidFrameWithNoFragmentation4() {
     ThreadLocalRandom.current().nextBytes(data);
     final Payload payload = DefaultPayload.create(data, metadata);
 
-    Assertions.assertThat(FragmentationUtils.isValid(64, payload)).isTrue();
+    Assertions.assertThat(PayloadValidationUtils.isValid(64, payload)).isTrue();
   }
 }