From 31292a90830ffe97aefe160012113b8a7d3fd35e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:09:27 +0000 Subject: [PATCH] Bump version.camel from 4.6.0 to 4.7.0 Bumps `version.camel` from 4.6.0 to 4.7.0. Updates `org.apache.camel:camel-management-api` from 4.6.0 to 4.7.0 Updates `org.apache.camel:camel-core` from 4.6.0 to 4.7.0 Updates `org.apache.camel:camel-management` from 4.6.0 to 4.7.0 Updates `org.apache.camel:camel-debug` from 4.6.0 to 4.7.0 Updates `org.apache.camel:camel-yaml-dsl` from 4.6.0 to 4.7.0 Updates `org.apache.camel:camel-xml-io-dsl` from 4.6.0 to 4.7.0 --- updated-dependencies: - dependency-name: org.apache.camel:camel-management-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-management dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-debug dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-yaml-dsl dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-xml-io-dsl dependency-type: direct:development update-type: version-update:semver-minor ... Updated EventMessage to match new methods in interface and adjust test, there is one more parent exchange property variable by default Signed-off-by: dependabot[bot] --- pom.xml | 2 +- .../dap/internal/types/EventMessage.java | 16 ++++++++++++++++ .../cameltooling/dap/internal/BaseTest.java | 2 +- .../UpdateDebuggerVariableValueTest.java | 5 ++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 066bb53..5a0cdb5 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ camel-tooling https://sonarcloud.io - 4.6.0 + 4.7.0 4.0.0 2.2.0 diff --git a/src/main/java/com/github/cameltooling/dap/internal/types/EventMessage.java b/src/main/java/com/github/cameltooling/dap/internal/types/EventMessage.java index 49557b3..ede7c38 100644 --- a/src/main/java/com/github/cameltooling/dap/internal/types/EventMessage.java +++ b/src/main/java/com/github/cameltooling/dap/internal/types/EventMessage.java @@ -167,5 +167,21 @@ public void setExceptionAsXml(String exceptionAsXml) { public void setExceptionAsJSon(String exceptionAsJSon) { throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX"); } + @Override + public boolean isRemoteEndpoint() { + throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX"); + } + @Override + public String getEndpointServiceUrl() { + throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX"); + } + @Override + public String getEndpointServiceProtocol() { + throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX"); + } + @Override + public Map getEndpointServiceMetadata() { + throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX"); + } } diff --git a/src/test/java/com/github/cameltooling/dap/internal/BaseTest.java b/src/test/java/com/github/cameltooling/dap/internal/BaseTest.java index 97f8503..18f910d 100644 --- a/src/test/java/com/github/cameltooling/dap/internal/BaseTest.java +++ b/src/test/java/com/github/cameltooling/dap/internal/BaseTest.java @@ -45,7 +45,7 @@ //@SetSystemProperty(key = "camel.debug.enabled", value = "true") public abstract class BaseTest { - protected static final int DEFAULT_VARIABLES_NUMBER = 17; + protected static final int DEFAULT_VARIABLES_NUMBER = 18; protected CamelDebugAdapterServer server; protected DummyCamelDebugClient clientProxy; protected CamelContext context; diff --git a/src/test/java/com/github/cameltooling/dap/internal/UpdateDebuggerVariableValueTest.java b/src/test/java/com/github/cameltooling/dap/internal/UpdateDebuggerVariableValueTest.java index f8cc1d2..456c871 100644 --- a/src/test/java/com/github/cameltooling/dap/internal/UpdateDebuggerVariableValueTest.java +++ b/src/test/java/com/github/cameltooling/dap/internal/UpdateDebuggerVariableValueTest.java @@ -60,7 +60,6 @@ class UpdateDebuggerVariableValueTest extends BaseTest { protected static final String SECOND_LOG_ID = "second-log-id"; private static final int NUMBER_OF_HEADER = 1; private static final int NUMBER_OF_EXCHANGE_PROPERTY = 1; - private static final int NUMBER_OF_EXCHANGE_PROPERTY_PARENT = 1; private static final int NUMBER_OF_EXCHANGE_VARIABLE = 1; private Scope debuggerScope; private CompletableFuture asyncSendBody; @@ -100,7 +99,7 @@ public void configure() throws Exception { assertThat(stoppedEventArgument.getThreadId()).isEqualTo(1); assertThat(stoppedEventArgument.getReason()).isEqualTo(StoppedEventArgumentsReason.BREAKPOINT); assertThat(asyncSendBody.isDone()).isFalse(); - awaitAllVariablesFilled(0, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_PROPERTY_PARENT + NUMBER_OF_EXCHANGE_VARIABLE); + awaitAllVariablesFilled(0, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_VARIABLE); debuggerScope = clientProxy.getAllStacksAndVars().get(0).getScopes().stream().filter(scope -> CamelDebuggerScope.NAME.equals(scope.getName())).findAny().get(); } @@ -282,7 +281,7 @@ private EventMessage getMessageStateOnNextStep() { server.next(nextArgs); waitBreakpointNotification(2); - awaitAllVariablesFilled(1, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_PROPERTY_PARENT + NUMBER_OF_EXCHANGE_VARIABLE); + awaitAllVariablesFilled(1, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_VARIABLE); // Keep using deprecated method to have it still working with 4.1- String messagesAsXml = server.getConnectionManager().getBacklogDebugger().dumpTracedMessagesAsXml(SECOND_LOG_ID, true);