4.x: Make HttpRouting an interface (#8523)

* 4.x: Make HttpRouting an interface --------- Co-authored-by: Kay Werndli <kay@spinque.com>
helidon-io · Apr 3, 2024 · ee86250 · ee86250
1 parent 8372bbc
commit ee86250
Show file tree

Hide file tree

Showing 7 changed files with 431 additions and 353 deletions.
diff --git a/microprofile/websocket/src/main/java/io/helidon/microprofile/tyrus/TyrusRouting.java b/microprofile/websocket/src/main/java/io/helidon/microprofile/tyrus/TyrusRouting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,11 @@ private TyrusRouting(Builder builder) {
         this.extensions = builder.extensions;
     }
 
+    @Override
+    public Class<? extends Routing> routingType() {
+        return TyrusRouting.class;
+    }
+
     /**
      * Builder for WebSocket routing.
      *

diff --git a/webserver/grpc/src/main/java/io/helidon/webserver/grpc/GrpcRouting.java b/webserver/grpc/src/main/java/io/helidon/webserver/grpc/GrpcRouting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,11 @@ private GrpcRouting(Builder builder) {
         this.routes = new ArrayList<>(builder.routes);
     }
 
+    @Override
+    public Class<? extends Routing> routingType() {
+        return GrpcRouting.class;
+    }
+
     /**
      * New routing builder.
      *

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/RouterImpl.java b/webserver/webserver/src/main/java/io/helidon/webserver/RouterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ private RouterImpl(Builder builder) {
         builder.routings.values()
                 .forEach(it -> {
                     Routing routing = it.build();
-                    routings.put(routing.getClass(), routing);
+                    routings.put(routing.routingType(), routing);
                 });
     }
 

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/Routing.java b/webserver/webserver/src/main/java/io/helidon/webserver/Routing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,4 +20,14 @@
  * Routing abstraction.
  */
 public interface Routing extends ServerLifecycle {
+
+    /**
+     * The class used by a {@link Router} to identify this {@link Routing} type and associate a connection with it.
+     *
+     * @return this routing type
+     */
+    default Class<? extends Routing> routingType() {
+        return getClass();
+    }
+
 }