Skip to content

Bump version.camel from 4.16.0 to 4.18.1 #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dependabot wants to merge 2 commits into from
Closed

Bump version.camel from 4.16.0 to 4.18.1 #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7710b4d
Bump version.camel from 4.16.0 to 4.18.1
dependabot[bot] Apr 13, 2026
500fa06
fixed BacklogTracerEventMessage interface changes
lhein Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<sonar.organization>camel-tooling</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<version.camel>4.16.0</version.camel>
<version.camel>4.18.1</version.camel>
<!-- must be aligned with the one from Camel -->
<version.jaxb>4.0.0</version.jaxb>
<version.junit.pioneer>2.3.0</version.junit.pioneer>
Expand Down
291 changes: 226 additions & 65 deletions src/main/java/com/github/cameltooling/dap/internal/types/EventMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,60 @@
*/
package com.github.cameltooling.dap.internal.types;

import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Locale;
import java.util.Map;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

import org.apache.camel.spi.BacklogTracerEventMessage;


@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement(name = "backlogTracerEventMessage")
public class EventMessage implements BacklogTracerEventMessage {

private static final long serialVersionUID = 2559418843237642923L;
private static final DateTimeFormatter TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern(TIMESTAMP_FORMAT, Locale.ROOT);

private long uid;
//TODO: use a real date for the timestamp
//@XmlJavaTypeAdapter(DateAdapter.class)
private long timestamp;
private boolean first;
private boolean last;
private boolean rest;
private boolean template;
@XmlElement(name = "timestamp")
@XmlJavaTypeAdapter(TimestampAdapter.class)
private Long timestamp;
private long elapsed;
private boolean done;
private boolean failed;
private String location;
private String processingThreadName;
private String routeId;
private String fromRouteId;
private String toNode;
private String toNodeParentId;
private String toNodeParentWhenId;
private String toNodeParentWhenLabel;
private String toNodeShortName;
private String toNodeLabel;
private int toNodeLevel;
private String exchangeId;
private String correlationExchangeId;
private Message message;
private String endpointUri;
private boolean remoteEndpoint;
private String endpointServiceUrl;
private String endpointServiceProtocol;
private Map<String, String> endpointServiceMetadata;
private Throwable exception;

@XmlElement(name = "uid")
public long getUid() {
Expand All @@ -46,14 +79,86 @@ public void setUid(long uid) {
this.uid = uid;
}

@XmlElement(name = "timestamp")
@XmlElement(name = "first")
public boolean isFirst() {
return first;
}
public void setFirst(boolean first) {
this.first = first;
}

@XmlElement(name = "last")
public boolean isLast() {
return last;
}
public void setLast(boolean last) {
this.last = last;
}

@XmlElement(name = "rest")
public boolean isRest() {
return rest;
}
public void setRest(boolean rest) {
this.rest = rest;
}

@XmlElement(name = "template")
public boolean isTemplate() {
return template;
}
public void setTemplate(boolean template) {
this.template = template;
}

@XmlTransient
public long getTimestamp() {
return timestamp;
return timestamp != null ? timestamp.longValue() : 0L;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}

@XmlElement(name = "elapsed")
public long getElapsed() {
return elapsed;
}
public void setElapsed(long elapsed) {
this.elapsed = elapsed;
}

@XmlElement(name = "done")
public boolean isDone() {
return done;
}
public void setDone(boolean done) {
this.done = done;
}

@XmlElement(name = "failed")
public boolean isFailed() {
return failed;
}
public void setFailed(boolean failed) {
this.failed = failed;
}

@XmlElement(name = "location")
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}

@XmlElement(name = "threadName")
public String getProcessingThreadName() {
return processingThreadName;
}
public void setProcessingThreadName(String processingThreadName) {
this.processingThreadName = processingThreadName;
}

@XmlElement(name = "routeId")
public String getRouteId() {
return routeId;
Expand All @@ -62,6 +167,14 @@ public void setRouteId(String routeId) {
this.routeId = routeId;
}

@XmlElement(name = "fromRouteId")
public String getFromRouteId() {
return fromRouteId;
}
public void setFromRouteId(String fromRouteId) {
this.fromRouteId = fromRouteId;
}

@XmlElement(name = "toNode")
public String getToNode() {
return toNode;
Expand All @@ -70,6 +183,54 @@ public void setToNode(String toNode) {
this.toNode = toNode;
}

@XmlElement(name = "toNodeParentId")
public String getToNodeParentId() {
return toNodeParentId;
}
public void setToNodeParentId(String toNodeParentId) {
this.toNodeParentId = toNodeParentId;
}

@XmlElement(name = "toNodeParentWhenId")
public String getToNodeParentWhenId() {
return toNodeParentWhenId;
}
public void setToNodeParentWhenId(String toNodeParentWhenId) {
this.toNodeParentWhenId = toNodeParentWhenId;
}

@XmlElement(name = "toNodeParentWhenLabel")
public String getToNodeParentWhenLabel() {
return toNodeParentWhenLabel;
}
public void setToNodeParentWhenLabel(String toNodeParentWhenLabel) {
this.toNodeParentWhenLabel = toNodeParentWhenLabel;
}

@XmlElement(name = "toNodeShortName")
public String getToNodeShortName() {
return toNodeShortName;
}
public void setToNodeShortName(String toNodeShortName) {
this.toNodeShortName = toNodeShortName;
}

@XmlElement(name = "toNodeLabel")
public String getToNodeLabel() {
return toNodeLabel;
}
public void setToNodeLabel(String toNodeLabel) {
this.toNodeLabel = toNodeLabel;
}

@XmlElement(name = "toNodeLevel")
public int getToNodeLevel() {
return toNodeLevel;
}
public void setToNodeLevel(int toNodeLevel) {
this.toNodeLevel = toNodeLevel;
}

@XmlElement(name = "exchangeId")
public String getExchangeId() {
return exchangeId;
Expand All @@ -78,6 +239,14 @@ public void setExchangeId(String exchangeId) {
this.exchangeId = exchangeId;
}

@XmlElement(name = "correlationExchangeId")
public String getCorrelationExchangeId() {
return correlationExchangeId;
}
public void setCorrelationExchangeId(String correlationExchangeId) {
this.correlationExchangeId = correlationExchangeId;
}

@XmlElement(name = "message")
public Message getMessage() {
return message;
Expand All @@ -86,98 +255,90 @@ public void setMessage(Message message) {
this.message = message;
}

@Override
public String getMessageAsXml() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String toXml(int indent) {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isRest() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isTemplate() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String getMessageAsJSon() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String toJSon(int indent) {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public Map<String, Object> asJSon() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isFirst() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isLast() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String getLocation() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String getProcessingThreadName() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public long getElapsed() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isDone() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isFailed() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean hasException() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return exception != null;
}
@Override
public String getExceptionAsXml() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return null;
}
@Override
public String getExceptionAsJSon() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return null;
}
@Override
public String getEndpointUri() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return endpointUri;
}
public void setEndpointUri(String endpointUri) {
this.endpointUri = endpointUri;
}

@Override
public boolean isRemoteEndpoint() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return remoteEndpoint;
}
public void setRemoteEndpoint(boolean remoteEndpoint) {
this.remoteEndpoint = remoteEndpoint;
}
@Override
public String getEndpointServiceUrl() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return endpointServiceUrl;
}
public void setEndpointServiceUrl(String endpointServiceUrl) {
this.endpointServiceUrl = endpointServiceUrl;
}
@Override
public String getEndpointServiceProtocol() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return endpointServiceProtocol;
}
public void setEndpointServiceProtocol(String endpointServiceProtocol) {
this.endpointServiceProtocol = endpointServiceProtocol;
}
@Override
public Map<String, String> getEndpointServiceMetadata() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
return endpointServiceMetadata;
}
public void setEndpointServiceMetadata(Map<String, String> endpointServiceMetadata) {
this.endpointServiceMetadata = endpointServiceMetadata;
}
@Override
public void setException(Throwable cause) {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
this.exception = cause;
}

private static final class TimestampAdapter extends XmlAdapter<String, Long> {

@Override
public Long unmarshal(String value) {
if (value == null || value.isBlank()) {
return 0L;
}
try {
return Long.valueOf(value);
} catch (NumberFormatException ex) {
try {
return OffsetDateTime.parse(value, TIMESTAMP_FORMATTER).toInstant().toEpochMilli();
} catch (DateTimeParseException e) {
throw new IllegalArgumentException("Cannot parse backlog tracer timestamp: " + value, e);
}
}
}

@Override
public String marshal(Long value) {
if (value == null) {
return null;
}
return TIMESTAMP_FORMATTER.format(OffsetDateTime.ofInstant(java.time.Instant.ofEpochMilli(value), java.time.ZoneOffset.UTC));
}
}

}
Loading