Moves RoutingType to stand alone class

Author: spencergibb

rsocket-routing-client/src/test/java/io/rsocket/routing/client/RoutingRSocketClientTests.java

@@ -23,6 +23,7 @@
 import io.rsocket.routing.common.MimeTypes;
 import io.rsocket.routing.frames.Address;
 import io.rsocket.routing.frames.AddressFlyweight;
+import io.rsocket.routing.frames.RoutingType;
 import io.rsocket.transport.local.LocalClientTransport;
 import org.junit.jupiter.api.Test;
 
@@ -66,7 +67,7 @@ private Address assertAddress(CompositeByteBuf composite) {
 		assertThat(address).isNotNull();
 		assertThat(address.getOriginRouteId()).isEqualTo(ORIGIN_ID);
 		assertThat(address.getTags().get(SERVICE_NAME)).isEqualTo("remoteservice");
-		assertThat(address.getRoutingType()).isEqualTo(Address.RoutingType.MULTICAST);
+		assertThat(address.getRoutingType()).isEqualTo(RoutingType.MULTICAST);
 		return address;
 	}
 

rsocket-routing-frames/src/main/java/io/rsocket/routing/frames/Address.java

@@ -16,8 +16,6 @@
 
 package io.rsocket.routing.frames;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
 
@@ -89,36 +87,6 @@ public static Address from(ByteBuf byteBuf, int flags) {
 				.with(tags(byteBuf)).flags(flags).build();
 	}
 
-	public enum RoutingType {
-		UNICAST(AddressFlyweight.FLAGS_U),
-		MULTICAST(AddressFlyweight.FLAGS_M),
-		SHARD(AddressFlyweight.FLAGS_S);
-
-		private static Map<Integer, RoutingType> routingTypesByFlag;
-
-		static {
-			routingTypesByFlag = new HashMap<>();
-
-			for (RoutingType routingType : values()) {
-				routingTypesByFlag.put(routingType.getFlag(), routingType);
-			}
-		}
-
-		private int flag;
-
-		RoutingType(int flag) {
-			this.flag = flag;
-		}
-
-		public int getFlag() {
-			return this.flag;
-		}
-
-		public static RoutingType from(int flag) {
-			return routingTypesByFlag.get(flag);
-		}
-	}
-
 	public static final class Builder extends Tags.Builder<Builder> {
 		private final Id originRouteId;
 

rsocket-routing-frames/src/main/java/io/rsocket/routing/frames/RoutingType.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.routing.frames;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum RoutingType {
+	UNICAST(AddressFlyweight.FLAGS_U),
+	MULTICAST(AddressFlyweight.FLAGS_M),
+	SHARD(AddressFlyweight.FLAGS_S);
+
+	private static Map<Integer, RoutingType> routingTypesByFlag;
+
+	static {
+		routingTypesByFlag = new HashMap<>();
+
+		for (RoutingType routingType : values()) {
+			routingTypesByFlag.put(routingType.getFlag(), routingType);
+		}
+	}
+
+	private int flag;
+
+	RoutingType(int flag) {
+		this.flag = flag;
+	}
+
+	public int getFlag() {
+		return this.flag;
+	}
+
+	public static RoutingType from(int flag) {
+		return routingTypesByFlag.get(flag);
+	}
+}

rsocket-routing-frames/src/test/java/io/rsocket/routing/frames/AddressTests.java

@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static io.rsocket.routing.frames.Address.RoutingType.MULTICAST;
+import static io.rsocket.routing.frames.RoutingType.MULTICAST;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class AddressTests {