From 552244753211645336983012ade6578a347605e7 Mon Sep 17 00:00:00 2001 From: Julien Giovaresco Date: Thu, 16 Jan 2025 16:06:42 +0100 Subject: [PATCH] Revert "fix: do not append colon in endpoint name for EL resolution" This reverts commit c932923d08a14f30dc08082b7e78e07eb406ec74. --- .../core/v4/endpoint/DefaultEndpointManager.java | 4 ++-- .../core/v4/endpoint/DefaultEndpointManagerTest.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManager.java b/gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManager.java index 3a891644773..960525d985b 100644 --- a/gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManager.java +++ b/gravitee-apim-gateway/gravitee-apim-gateway-core/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/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManagerTest.java b/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManagerTest.java index 8fd29c9bd7a..f1c7a050610 100644 --- a/gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/DefaultEndpointManagerTest.java +++ b/gravitee-apim-gateway/gravitee-apim-gateway-core/src/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