Deprecate ErrorType

This change deprecates ErrorType as the same constants are already
declared in ErrorFrameFlyweight and there is hierarchy of exceptions
with one exception per error code.

Signed-off-by: Rossen Stoyanchev <[email protected]>

Author: rstoyanchev

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

@@ -28,6 +28,10 @@ public class RSocketErrorException extends RuntimeException {
 
   private static final long serialVersionUID = -1628781753426267554L;
 
+  private static final int MIN_ERROR_CODE = 0x00000001;
+
+  private static final int MAX_ERROR_CODE = 0xFFFFFFFE;
+
   private final int errorCode;
 
   /**
@@ -50,9 +54,7 @@ public RSocketErrorException(int errorCode, String message) {
   public RSocketErrorException(int errorCode, String message, @Nullable Throwable cause) {
     super(message, cause);
     this.errorCode = errorCode;
-
-    // Avoid dependency on frame package
-    if (errorCode > 0xFFFFFFFE && errorCode < 0x00000001) {
+    if (errorCode > MAX_ERROR_CODE && errorCode < MIN_ERROR_CODE) {
       throw new IllegalArgumentException(
           "Allowed errorCode value should be in range [0x00000001-0xFFFFFFFE]", this);
     }

rsocket-core/src/main/java/io/rsocket/exceptions/ApplicationErrorException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -45,6 +45,6 @@ public ApplicationErrorException(String message) {
    * @param cause the cause of this exception
    */
   public ApplicationErrorException(String message, @Nullable Throwable cause) {
-    super(ErrorType.APPLICATION_ERROR, message, cause);
+    super(ErrorFrameFlyweight.APPLICATION_ERROR, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/CanceledException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -46,6 +46,6 @@ public CanceledException(String message) {
    * @param cause the cause of this exception
    */
   public CanceledException(String message, @Nullable Throwable cause) {
-    super(ErrorType.CANCELED, message, cause);
+    super(ErrorFrameFlyweight.CANCELED, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/ConnectionCloseException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -46,6 +46,6 @@ public ConnectionCloseException(String message) {
    * @param cause the cause of this exception
    */
   public ConnectionCloseException(String message, @Nullable Throwable cause) {
-    super(ErrorType.CONNECTION_CLOSE, message, cause);
+    super(ErrorFrameFlyweight.CONNECTION_CLOSE, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/ConnectionErrorException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -46,6 +46,6 @@ public ConnectionErrorException(String message) {
    * @param cause the cause of this exception
    */
   public ConnectionErrorException(String message, @Nullable Throwable cause) {
-    super(ErrorType.CONNECTION_ERROR, message, cause);
+    super(ErrorFrameFlyweight.CONNECTION_ERROR, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/CustomRSocketException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 public class CustomRSocketException extends RSocketException {
@@ -43,8 +43,8 @@ public CustomRSocketException(int errorCode, String message) {
    */
   public CustomRSocketException(int errorCode, String message, @Nullable Throwable cause) {
     super(errorCode, message, cause);
-    if (errorCode > ErrorType.MAX_USER_ALLOWED_ERROR_CODE
-        && errorCode < ErrorType.MIN_USER_ALLOWED_ERROR_CODE) {
+    if (errorCode > ErrorFrameFlyweight.MAX_USER_ALLOWED_ERROR_CODE
+        && errorCode < ErrorFrameFlyweight.MIN_USER_ALLOWED_ERROR_CODE) {
       throw new IllegalArgumentException(
           "Allowed errorCode value should be in range [0x00000301-0xFFFFFFFE]", this);
     }

rsocket-core/src/main/java/io/rsocket/exceptions/InvalidException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -45,6 +45,6 @@ public InvalidException(String message) {
    * @param cause the cause of this exception
    */
   public InvalidException(String message, @Nullable Throwable cause) {
-    super(ErrorType.INVALID, message, cause);
+    super(ErrorFrameFlyweight.INVALID, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/InvalidSetupException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -46,6 +46,6 @@ public InvalidSetupException(String message) {
    * @param cause the cause of this exception
    */
   public InvalidSetupException(String message, @Nullable Throwable cause) {
-    super(ErrorType.INVALID_SETUP, message, cause);
+    super(ErrorFrameFlyweight.INVALID_SETUP, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/RSocketException.java

@@ -17,6 +17,7 @@
 package io.rsocket.exceptions;
 
 import io.rsocket.RSocketErrorException;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import reactor.util.annotation.Nullable;
 
 /**
@@ -46,7 +47,7 @@ public RSocketException(String message) {
    * @param cause the cause of this exception
    */
   public RSocketException(String message, @Nullable Throwable cause) {
-    super(0x00000201, message, cause);
+    super(ErrorFrameFlyweight.APPLICATION_ERROR, message, cause);
   }
 
   /**

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -47,6 +47,6 @@ public RejectedException(String message) {
    * @param cause the cause of this exception
    */
   public RejectedException(String message, @Nullable Throwable cause) {
-    super(ErrorType.REJECTED, message, cause);
+    super(ErrorFrameFlyweight.REJECTED, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedResumeException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -45,6 +45,6 @@ public RejectedResumeException(String message) {
    * @param cause the cause of this exception
    */
   public RejectedResumeException(String message, @Nullable Throwable cause) {
-    super(ErrorType.REJECTED_RESUME, message, cause);
+    super(ErrorFrameFlyweight.REJECTED_RESUME, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/RejectedSetupException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -45,6 +45,6 @@ public RejectedSetupException(String message) {
    * @param cause the cause of this exception
    */
   public RejectedSetupException(String message, @Nullable Throwable cause) {
-    super(ErrorType.REJECTED_SETUP, message, cause);
+    super(ErrorFrameFlyweight.REJECTED_SETUP, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/exceptions/SetupException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /** The root of the setup exception hierarchy. */
@@ -44,7 +44,7 @@ public SetupException(String message) {
    */
   @Deprecated
   public SetupException(String message, @Nullable Throwable cause) {
-    this(ErrorType.INVALID_SETUP, message, cause);
+    this(ErrorFrameFlyweight.INVALID_SETUP, message, cause);
   }
 
   /**

rsocket-core/src/main/java/io/rsocket/exceptions/UnsupportedSetupException.java

@@ -16,7 +16,7 @@
 
 package io.rsocket.exceptions;
 
-import io.rsocket.frame.ErrorType;
+import io.rsocket.frame.ErrorFrameFlyweight;
 import javax.annotation.Nullable;
 
 /**
@@ -45,6 +45,6 @@ public UnsupportedSetupException(String message) {
    * @param cause the cause of this exception
    */
   public UnsupportedSetupException(String message, @Nullable Throwable cause) {
-    super(ErrorType.UNSUPPORTED_SETUP, message, cause);
+    super(ErrorFrameFlyweight.UNSUPPORTED_SETUP, message, cause);
   }
 }

rsocket-core/src/main/java/io/rsocket/frame/ErrorType.java

@@ -5,7 +5,9 @@
  *
  * @see <a href="https://github.com/rsocket/rsocket/blob/master/Protocol.md#error-codes">Error
  *     Codes</a>
+ * @deprecated please use constants in {@link ErrorFrameFlyweight}.
  */
+@Deprecated
 public final class ErrorType {
 
   /**