Revert "fix: do not append colon in endpoint name for EL resolution"

This reverts commit c932923.
gravitee-io · Jan 16, 2025 · 5522447 · 5522447
1 parent f4056a2
commit 5522447
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...e/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManager.java b/...e/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManager.java
@@ -250,8 +250,8 @@ private void createAndStartEndpoint(final ManagedEndpointGroup managedEndpointGr
             final ManagedEndpoint managedEndpoint = new DefaultManagedEndpoint(endpoint, managedEndpointGroup, connector);
             managedEndpointGroup.addManagedEndpoint(managedEndpoint);
             endpointsByName.put(endpoint.getName(), managedEndpoint);
-            endpointVariables.put(endpoint.getName(), endpoint.getName());
-            endpointVariables.put(managedEndpointGroup.getDefinition().getName(), managedEndpointGroup.getDefinition().getName());
+            endpointVariables.put(endpoint.getName(), endpoint.getName() + ":");
+            endpointVariables.put(managedEndpointGroup.getDefinition().getName(), managedEndpointGroup.getDefinition().getName() + ":");
 
             listeners.values().forEach(l -> l.accept(Event.ADD, managedEndpoint));
         } catch (Exception e) {

diff --git a/...c/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManagerTest.java b/...c/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManagerTest.java
@@ -175,12 +175,12 @@ void should_provide_endpoints_template_variable() throws Exception {
             verify(templateContext).setVariable(eq("endpoints"), endpointsCaptor.capture());
 
             assertThat(endpointsCaptor.getValue())
-                .containsEntry("group1", "group1")
-                .containsEntry("endpoint1", "endpoint1")
-                .containsEntry("endpoint2", "endpoint2")
-                .containsEntry("group2", "group2")
-                .containsEntry("endpoint3", "endpoint3")
-                .containsEntry("endpoint4", "endpoint4");
+                .containsEntry("group1", "group1:")
+                .containsEntry("endpoint1", "endpoint1:")
+                .containsEntry("endpoint2", "endpoint2:")
+                .containsEntry("group2", "group2:")
+                .containsEntry("endpoint3", "endpoint3:")
+                .containsEntry("endpoint4", "endpoint4:");
         }
 
         @Test