This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new acab9be CAMEL-14916: Remove JAXB based dump model classes that are no
longer in use.
acab9be is described below
commit acab9bea52dcf7abb0040fef7fea9ff50165632d
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Apr 16 11:54:56 2020 +0200
CAMEL-14916: Remove JAXB based dump model classes that are no longer in use.
---
core/camel-base/pom.xml | 7 -
.../camel/support/dump/CamelContextStatDump.java | 314 --------------------
.../org/apache/camel/support/dump/MessageDump.java | 144 ---------
.../camel/support/dump/ProcessorStatDump.java | 284 ------------------
.../apache/camel/support/dump/RouteStatDump.java | 327 ---------------------
.../apache/camel/support/dump/StepStatDump.java | 273 -----------------
.../org/apache/camel/util/MessageHelperTest.java | 19 +-
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 7 +
8 files changed, 10 insertions(+), 1365 deletions(-)
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index e57ae4f..fa9a8e4 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -33,13 +33,6 @@
<name>Camel :: Base</name>
<description>The Base Camel Framework</description>
- <properties>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
- </properties>
-
<dependencies>
<!-- required dependencies by camel-base -->
diff --git
a/core/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
b/core/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
deleted file mode 100644
index e15d3ac..0000000
---
a/core/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support.dump;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A model of a CamelContext stat dump from {@link
org.apache.camel.api.management.mbean.ManagedCamelContextMBean#dumpRoutesStatsAsXml(boolean,
boolean)}.
- */
-@XmlRootElement(name = "camelContextStat")
-@XmlAccessorType(XmlAccessType.FIELD)
-public final class CamelContextStatDump {
-
- @XmlAttribute
- private String id;
-
- @XmlAttribute
- private String state;
-
- @XmlAttribute
- private Long exchangesCompleted;
-
- @XmlAttribute
- private Long exchangesFailed;
-
- @XmlAttribute
- private Long failuresHandled;
-
- @XmlAttribute
- private Long redeliveries;
-
- @XmlAttribute
- private Long minProcessingTime;
-
- @XmlAttribute
- private Long maxProcessingTime;
-
- @XmlAttribute
- private Long totalProcessingTime;
-
- @XmlAttribute
- private Long lastProcessingTime;
-
- @XmlAttribute
- private Long deltaProcessingTime;
-
- @XmlAttribute
- private Long meanProcessingTime;
-
- @XmlAttribute
- private Long exchangesInflight;
-
- @XmlAttribute
- private Long selfProcessingTime;
-
- @XmlAttribute
- private String startTimestamp;
-
- @XmlAttribute
- private String resetTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String firstExchangeFailureTimestamp;
-
- @XmlAttribute
- private String firstExchangeFailureExchangeId;
-
- @XmlAttribute
- private String lastExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String lastExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String lastExchangeFailureTimestamp;
-
- @XmlAttribute
- private String lastExchangeFailureExchangeId;
-
- @XmlElementWrapper(name = "routeStats")
- @XmlElements({
- @XmlElement(type = RouteStatDump.class, name = "routeStat")
- })
- private List<RouteStatDump> routeStats;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getExchangesCompleted() {
- return exchangesCompleted;
- }
-
- public void setExchangesCompleted(Long exchangesCompleted) {
- this.exchangesCompleted = exchangesCompleted;
- }
-
- public Long getExchangesFailed() {
- return exchangesFailed;
- }
-
- public void setExchangesFailed(Long exchangesFailed) {
- this.exchangesFailed = exchangesFailed;
- }
-
- public Long getFailuresHandled() {
- return failuresHandled;
- }
-
- public void setFailuresHandled(Long failuresHandled) {
- this.failuresHandled = failuresHandled;
- }
-
- public Long getRedeliveries() {
- return redeliveries;
- }
-
- public void setRedeliveries(Long redeliveries) {
- this.redeliveries = redeliveries;
- }
-
- public Long getMinProcessingTime() {
- return minProcessingTime;
- }
-
- public void setMinProcessingTime(Long minProcessingTime) {
- this.minProcessingTime = minProcessingTime;
- }
-
- public Long getMaxProcessingTime() {
- return maxProcessingTime;
- }
-
- public void setMaxProcessingTime(Long maxProcessingTime) {
- this.maxProcessingTime = maxProcessingTime;
- }
-
- public Long getTotalProcessingTime() {
- return totalProcessingTime;
- }
-
- public void setTotalProcessingTime(Long totalProcessingTime) {
- this.totalProcessingTime = totalProcessingTime;
- }
-
- public Long getLastProcessingTime() {
- return lastProcessingTime;
- }
-
- public void setLastProcessingTime(Long lastProcessingTime) {
- this.lastProcessingTime = lastProcessingTime;
- }
-
- public Long getDeltaProcessingTime() {
- return deltaProcessingTime;
- }
-
- public void setDeltaProcessingTime(Long deltaProcessingTime) {
- this.deltaProcessingTime = deltaProcessingTime;
- }
-
- public Long getMeanProcessingTime() {
- return meanProcessingTime;
- }
-
- public void setMeanProcessingTime(Long meanProcessingTime) {
- this.meanProcessingTime = meanProcessingTime;
- }
-
- public Long getSelfProcessingTime() {
- return selfProcessingTime;
- }
-
- public void setSelfProcessingTime(Long selfProcessingTime) {
- this.selfProcessingTime = selfProcessingTime;
- }
-
- public Long getExchangesInflight() {
- return exchangesInflight;
- }
-
- public void setExchangesInflight(Long exchangesInflight) {
- this.exchangesInflight = exchangesInflight;
- }
-
- public String getStartTimestamp() {
- return startTimestamp;
- }
-
- public void setStartTimestamp(String startTimestamp) {
- this.startTimestamp = startTimestamp;
- }
-
- public String getResetTimestamp() {
- return resetTimestamp;
- }
-
- public void setResetTimestamp(String resetTimestamp) {
- this.resetTimestamp = resetTimestamp;
- }
-
- public String getFirstExchangeCompletedTimestamp() {
- return firstExchangeCompletedTimestamp;
- }
-
- public void setFirstExchangeCompletedTimestamp(String
firstExchangeCompletedTimestamp) {
- this.firstExchangeCompletedTimestamp = firstExchangeCompletedTimestamp;
- }
-
- public String getFirstExchangeCompletedExchangeId() {
- return firstExchangeCompletedExchangeId;
- }
-
- public void setFirstExchangeCompletedExchangeId(String
firstExchangeCompletedExchangeId) {
- this.firstExchangeCompletedExchangeId =
firstExchangeCompletedExchangeId;
- }
-
- public String getFirstExchangeFailureTimestamp() {
- return firstExchangeFailureTimestamp;
- }
-
- public void setFirstExchangeFailureTimestamp(String
firstExchangeFailureTimestamp) {
- this.firstExchangeFailureTimestamp = firstExchangeFailureTimestamp;
- }
-
- public String getFirstExchangeFailureExchangeId() {
- return firstExchangeFailureExchangeId;
- }
-
- public void setFirstExchangeFailureExchangeId(String
firstExchangeFailureExchangeId) {
- this.firstExchangeFailureExchangeId = firstExchangeFailureExchangeId;
- }
-
- public String getLastExchangeCompletedTimestamp() {
- return lastExchangeCompletedTimestamp;
- }
-
- public void setLastExchangeCompletedTimestamp(String
lastExchangeCompletedTimestamp) {
- this.lastExchangeCompletedTimestamp = lastExchangeCompletedTimestamp;
- }
-
- public String getLastExchangeCompletedExchangeId() {
- return lastExchangeCompletedExchangeId;
- }
-
- public void setLastExchangeCompletedExchangeId(String
lastExchangeCompletedExchangeId) {
- this.lastExchangeCompletedExchangeId = lastExchangeCompletedExchangeId;
- }
-
- public String getLastExchangeFailureTimestamp() {
- return lastExchangeFailureTimestamp;
- }
-
- public void setLastExchangeFailureTimestamp(String
lastExchangeFailureTimestamp) {
- this.lastExchangeFailureTimestamp = lastExchangeFailureTimestamp;
- }
-
- public String getLastExchangeFailureExchangeId() {
- return lastExchangeFailureExchangeId;
- }
-
- public void setLastExchangeFailureExchangeId(String
lastExchangeFailureExchangeId) {
- this.lastExchangeFailureExchangeId = lastExchangeFailureExchangeId;
- }
-
- public List<RouteStatDump> getRouteStats() {
- return routeStats;
- }
-
- public void setRouteStats(List<RouteStatDump> routeStats) {
- this.routeStats = routeStats;
- }
-
-}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
b/core/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
deleted file mode 100644
index 3b1e596..0000000
---
a/core/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support.dump;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-/**
- * A model of a message dump from {@link
MessageHelper#dumpAsXml(org.apache.camel.Message)}.
- */
-@XmlRootElement(name = "message")
-@XmlAccessorType(XmlAccessType.FIELD)
-public final class MessageDump {
-
- /**
- * A model of a message dump header.
- */
- @XmlRootElement(name = "header")
- @XmlAccessorType(XmlAccessType.FIELD)
- public static class Header {
-
- @XmlAttribute
- private String key;
-
- @XmlAttribute
- private String type;
-
- @XmlValue
- private String value;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
- }
-
- /**
- * A model of a message dump body.
- */
- @XmlRootElement(name = "body")
- @XmlAccessorType(XmlAccessType.FIELD)
- public static class Body {
-
- @XmlAttribute
- private String type;
-
- @XmlValue
- private String value;
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
- }
-
- @XmlAttribute
- private String exchangeId;
-
- @XmlElementWrapper(name = "headers")
- @XmlElements({
- @XmlElement(type = Header.class, name = "header")
- })
- private List<Header> headers;
-
- @XmlElementRef
- private Body body;
-
- public String getExchangeId() {
- return exchangeId;
- }
-
- public void setExchangeId(String exchangeId) {
- this.exchangeId = exchangeId;
- }
-
- public List<Header> getHeaders() {
- return headers;
- }
-
- public void setHeaders(List<Header> headers) {
- this.headers = headers;
- }
-
- public Body getBody() {
- return body;
- }
-
- public void setBody(Body body) {
- this.body = body;
- }
-}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
b/core/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
deleted file mode 100644
index 80de7e0..0000000
---
a/core/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support.dump;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A model of a route stat dump from {@link
org.apache.camel.api.management.mbean.ManagedRouteMBean#dumpRouteStatsAsXml(boolean,
boolean)}.
- */
-@XmlRootElement(name = "processorStat")
-@XmlAccessorType(XmlAccessType.FIELD)
-public final class ProcessorStatDump {
-
- @XmlAttribute
- private String id;
-
- @XmlAttribute
- private Integer index;
-
- @XmlAttribute
- private String state;
-
- @XmlAttribute
- private Long exchangesCompleted;
-
- @XmlAttribute
- private Long exchangesFailed;
-
- @XmlAttribute
- private Long failuresHandled;
-
- @XmlAttribute
- private Long redeliveries;
-
- @XmlAttribute
- private Long minProcessingTime;
-
- @XmlAttribute
- private Long maxProcessingTime;
-
- @XmlAttribute
- private Long totalProcessingTime;
-
- @XmlAttribute
- private Long lastProcessingTime;
-
- @XmlAttribute
- private Long deltaProcessingTime;
-
- @XmlAttribute
- private Long meanProcessingTime;
-
- @XmlAttribute
- private Long accumulatedProcessingTime;
-
- @XmlAttribute
- private String resetTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String firstExchangeFailureTimestamp;
-
- @XmlAttribute
- private String firstExchangeFailureExchangeId;
-
- @XmlAttribute
- private String lastExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String lastExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String lastExchangeFailureTimestamp;
-
- @XmlAttribute
- private String lastExchangeFailureExchangeId;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Integer getIndex() {
- return index;
- }
-
- public void setIndex(Integer index) {
- this.index = index;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getExchangesCompleted() {
- return exchangesCompleted;
- }
-
- public void setExchangesCompleted(Long exchangesCompleted) {
- this.exchangesCompleted = exchangesCompleted;
- }
-
- public Long getExchangesFailed() {
- return exchangesFailed;
- }
-
- public void setExchangesFailed(Long exchangesFailed) {
- this.exchangesFailed = exchangesFailed;
- }
-
- public Long getFailuresHandled() {
- return failuresHandled;
- }
-
- public void setFailuresHandled(Long failuresHandled) {
- this.failuresHandled = failuresHandled;
- }
-
- public Long getRedeliveries() {
- return redeliveries;
- }
-
- public void setRedeliveries(Long redeliveries) {
- this.redeliveries = redeliveries;
- }
-
- public Long getMinProcessingTime() {
- return minProcessingTime;
- }
-
- public void setMinProcessingTime(Long minProcessingTime) {
- this.minProcessingTime = minProcessingTime;
- }
-
- public Long getMaxProcessingTime() {
- return maxProcessingTime;
- }
-
- public void setMaxProcessingTime(Long maxProcessingTime) {
- this.maxProcessingTime = maxProcessingTime;
- }
-
- public Long getTotalProcessingTime() {
- return totalProcessingTime;
- }
-
- public void setTotalProcessingTime(Long totalProcessingTime) {
- this.totalProcessingTime = totalProcessingTime;
- }
-
- public Long getLastProcessingTime() {
- return lastProcessingTime;
- }
-
- public void setLastProcessingTime(Long lastProcessingTime) {
- this.lastProcessingTime = lastProcessingTime;
- }
-
- public Long getDeltaProcessingTime() {
- return deltaProcessingTime;
- }
-
- public void setDeltaProcessingTime(Long deltaProcessingTime) {
- this.deltaProcessingTime = deltaProcessingTime;
- }
-
- public Long getMeanProcessingTime() {
- return meanProcessingTime;
- }
-
- public void setMeanProcessingTime(Long meanProcessingTime) {
- this.meanProcessingTime = meanProcessingTime;
- }
-
- public Long getAccumulatedProcessingTime() {
- return accumulatedProcessingTime;
- }
-
- public void setAccumulatedProcessingTime(Long accumulatedProcessingTime) {
- this.accumulatedProcessingTime = accumulatedProcessingTime;
- }
-
- public String getResetTimestamp() {
- return resetTimestamp;
- }
-
- public void setResetTimestamp(String resetTimestamp) {
- this.resetTimestamp = resetTimestamp;
- }
-
- public String getFirstExchangeCompletedTimestamp() {
- return firstExchangeCompletedTimestamp;
- }
-
- public void setFirstExchangeCompletedTimestamp(String
firstExchangeCompletedTimestamp) {
- this.firstExchangeCompletedTimestamp = firstExchangeCompletedTimestamp;
- }
-
- public String getFirstExchangeCompletedExchangeId() {
- return firstExchangeCompletedExchangeId;
- }
-
- public void setFirstExchangeCompletedExchangeId(String
firstExchangeCompletedExchangeId) {
- this.firstExchangeCompletedExchangeId =
firstExchangeCompletedExchangeId;
- }
-
- public String getFirstExchangeFailureTimestamp() {
- return firstExchangeFailureTimestamp;
- }
-
- public void setFirstExchangeFailureTimestamp(String
firstExchangeFailureTimestamp) {
- this.firstExchangeFailureTimestamp = firstExchangeFailureTimestamp;
- }
-
- public String getFirstExchangeFailureExchangeId() {
- return firstExchangeFailureExchangeId;
- }
-
- public void setFirstExchangeFailureExchangeId(String
firstExchangeFailureExchangeId) {
- this.firstExchangeFailureExchangeId = firstExchangeFailureExchangeId;
- }
-
- public String getLastExchangeCompletedTimestamp() {
- return lastExchangeCompletedTimestamp;
- }
-
- public void setLastExchangeCompletedTimestamp(String
lastExchangeCompletedTimestamp) {
- this.lastExchangeCompletedTimestamp = lastExchangeCompletedTimestamp;
- }
-
- public String getLastExchangeCompletedExchangeId() {
- return lastExchangeCompletedExchangeId;
- }
-
- public void setLastExchangeCompletedExchangeId(String
lastExchangeCompletedExchangeId) {
- this.lastExchangeCompletedExchangeId = lastExchangeCompletedExchangeId;
- }
-
- public String getLastExchangeFailureTimestamp() {
- return lastExchangeFailureTimestamp;
- }
-
- public void setLastExchangeFailureTimestamp(String
lastExchangeFailureTimestamp) {
- this.lastExchangeFailureTimestamp = lastExchangeFailureTimestamp;
- }
-
- public String getLastExchangeFailureExchangeId() {
- return lastExchangeFailureExchangeId;
- }
-
- public void setLastExchangeFailureExchangeId(String
lastExchangeFailureExchangeId) {
- this.lastExchangeFailureExchangeId = lastExchangeFailureExchangeId;
- }
-
-}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
b/core/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
deleted file mode 100644
index b8b87e3..0000000
---
a/core/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support.dump;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A model of a route stat dump from {@link
org.apache.camel.api.management.mbean.ManagedRouteMBean#dumpRouteStatsAsXml(boolean,
boolean)}.
- */
-@XmlRootElement(name = "routeStat")
-@XmlAccessorType(XmlAccessType.FIELD)
-public final class RouteStatDump {
-
- @XmlAttribute
- private String id;
-
- @XmlAttribute
- private String state;
-
- @XmlAttribute
- private Long exchangesCompleted;
-
- @XmlAttribute
- private Long exchangesFailed;
-
- @XmlAttribute
- private Long failuresHandled;
-
- @XmlAttribute
- private Long redeliveries;
-
- @XmlAttribute
- private Long minProcessingTime;
-
- @XmlAttribute
- private Long maxProcessingTime;
-
- @XmlAttribute
- private Long totalProcessingTime;
-
- @XmlAttribute
- private Long lastProcessingTime;
-
- @XmlAttribute
- private Long deltaProcessingTime;
-
- @XmlAttribute
- private Long meanProcessingTime;
-
- @XmlAttribute
- private Long exchangesInflight;
-
- @XmlAttribute
- private Long selfProcessingTime;
-
- @XmlAttribute
- private String startTimestamp;
-
- @XmlAttribute
- private String resetTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String firstExchangeFailureTimestamp;
-
- @XmlAttribute
- private String firstExchangeFailureExchangeId;
-
- @XmlAttribute
- private String lastExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String lastExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String lastExchangeFailureTimestamp;
-
- @XmlAttribute
- private String lastExchangeFailureExchangeId;
-
- @XmlElementWrapper(name = "processorStats")
- @XmlElements({
- @XmlElement(type = ProcessorStatDump.class, name = "processorStat")
- })
- private List<ProcessorStatDump> processorStats;
-
- @XmlElementWrapper(name = "stepStats")
- @XmlElements({
- @XmlElement(type = StepStatDump.class, name = "stepStat")
- })
- private List<StepStatDump> stepStats;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getExchangesCompleted() {
- return exchangesCompleted;
- }
-
- public void setExchangesCompleted(Long exchangesCompleted) {
- this.exchangesCompleted = exchangesCompleted;
- }
-
- public Long getExchangesFailed() {
- return exchangesFailed;
- }
-
- public void setExchangesFailed(Long exchangesFailed) {
- this.exchangesFailed = exchangesFailed;
- }
-
- public Long getFailuresHandled() {
- return failuresHandled;
- }
-
- public void setFailuresHandled(Long failuresHandled) {
- this.failuresHandled = failuresHandled;
- }
-
- public Long getRedeliveries() {
- return redeliveries;
- }
-
- public void setRedeliveries(Long redeliveries) {
- this.redeliveries = redeliveries;
- }
-
- public Long getMinProcessingTime() {
- return minProcessingTime;
- }
-
- public void setMinProcessingTime(Long minProcessingTime) {
- this.minProcessingTime = minProcessingTime;
- }
-
- public Long getMaxProcessingTime() {
- return maxProcessingTime;
- }
-
- public void setMaxProcessingTime(Long maxProcessingTime) {
- this.maxProcessingTime = maxProcessingTime;
- }
-
- public Long getTotalProcessingTime() {
- return totalProcessingTime;
- }
-
- public void setTotalProcessingTime(Long totalProcessingTime) {
- this.totalProcessingTime = totalProcessingTime;
- }
-
- public Long getLastProcessingTime() {
- return lastProcessingTime;
- }
-
- public void setLastProcessingTime(Long lastProcessingTime) {
- this.lastProcessingTime = lastProcessingTime;
- }
-
- public Long getDeltaProcessingTime() {
- return deltaProcessingTime;
- }
-
- public void setDeltaProcessingTime(Long deltaProcessingTime) {
- this.deltaProcessingTime = deltaProcessingTime;
- }
-
- public Long getMeanProcessingTime() {
- return meanProcessingTime;
- }
-
- public void setMeanProcessingTime(Long meanProcessingTime) {
- this.meanProcessingTime = meanProcessingTime;
- }
-
- public Long getSelfProcessingTime() {
- return selfProcessingTime;
- }
-
- public void setSelfProcessingTime(Long selfProcessingTime) {
- this.selfProcessingTime = selfProcessingTime;
- }
-
- public Long getExchangesInflight() {
- return exchangesInflight;
- }
-
- public void setExchangesInflight(Long exchangesInflight) {
- this.exchangesInflight = exchangesInflight;
- }
-
- public String getStartTimestamp() {
- return startTimestamp;
- }
-
- public void setStartTimestamp(String startTimestamp) {
- this.startTimestamp = startTimestamp;
- }
-
- public String getResetTimestamp() {
- return resetTimestamp;
- }
-
- public void setResetTimestamp(String resetTimestamp) {
- this.resetTimestamp = resetTimestamp;
- }
-
- public String getFirstExchangeCompletedTimestamp() {
- return firstExchangeCompletedTimestamp;
- }
-
- public void setFirstExchangeCompletedTimestamp(String
firstExchangeCompletedTimestamp) {
- this.firstExchangeCompletedTimestamp = firstExchangeCompletedTimestamp;
- }
-
- public String getFirstExchangeCompletedExchangeId() {
- return firstExchangeCompletedExchangeId;
- }
-
- public void setFirstExchangeCompletedExchangeId(String
firstExchangeCompletedExchangeId) {
- this.firstExchangeCompletedExchangeId =
firstExchangeCompletedExchangeId;
- }
-
- public String getFirstExchangeFailureTimestamp() {
- return firstExchangeFailureTimestamp;
- }
-
- public void setFirstExchangeFailureTimestamp(String
firstExchangeFailureTimestamp) {
- this.firstExchangeFailureTimestamp = firstExchangeFailureTimestamp;
- }
-
- public String getFirstExchangeFailureExchangeId() {
- return firstExchangeFailureExchangeId;
- }
-
- public void setFirstExchangeFailureExchangeId(String
firstExchangeFailureExchangeId) {
- this.firstExchangeFailureExchangeId = firstExchangeFailureExchangeId;
- }
-
- public String getLastExchangeCompletedTimestamp() {
- return lastExchangeCompletedTimestamp;
- }
-
- public void setLastExchangeCompletedTimestamp(String
lastExchangeCompletedTimestamp) {
- this.lastExchangeCompletedTimestamp = lastExchangeCompletedTimestamp;
- }
-
- public String getLastExchangeCompletedExchangeId() {
- return lastExchangeCompletedExchangeId;
- }
-
- public void setLastExchangeCompletedExchangeId(String
lastExchangeCompletedExchangeId) {
- this.lastExchangeCompletedExchangeId = lastExchangeCompletedExchangeId;
- }
-
- public String getLastExchangeFailureTimestamp() {
- return lastExchangeFailureTimestamp;
- }
-
- public void setLastExchangeFailureTimestamp(String
lastExchangeFailureTimestamp) {
- this.lastExchangeFailureTimestamp = lastExchangeFailureTimestamp;
- }
-
- public String getLastExchangeFailureExchangeId() {
- return lastExchangeFailureExchangeId;
- }
-
- public void setLastExchangeFailureExchangeId(String
lastExchangeFailureExchangeId) {
- this.lastExchangeFailureExchangeId = lastExchangeFailureExchangeId;
- }
-
- public List<ProcessorStatDump> getProcessorStats() {
- return processorStats;
- }
-
- public void setProcessorStats(List<ProcessorStatDump> processorStats) {
- this.processorStats = processorStats;
- }
-
- public List<StepStatDump> getStepStats() {
- return stepStats;
- }
-
- public void setStepStats(List<StepStatDump> stepStats) {
- this.stepStats = stepStats;
- }
-}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/support/dump/StepStatDump.java
b/core/camel-base/src/main/java/org/apache/camel/support/dump/StepStatDump.java
deleted file mode 100644
index c987add..0000000
---
a/core/camel-base/src/main/java/org/apache/camel/support/dump/StepStatDump.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support.dump;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A model of a step stat dump from {@link
org.apache.camel.api.management.mbean.ManagedRouteMBean#dumpStepStatsAsXml(boolean)}.
- */
-@XmlRootElement(name = "stepStat")
-@XmlAccessorType(XmlAccessType.FIELD)
-public final class StepStatDump {
-
- @XmlAttribute
- private String id;
-
- @XmlAttribute
- private Integer index;
-
- @XmlAttribute
- private String state;
-
- @XmlAttribute
- private Long exchangesCompleted;
-
- @XmlAttribute
- private Long exchangesFailed;
-
- @XmlAttribute
- private Long failuresHandled;
-
- @XmlAttribute
- private Long redeliveries;
-
- @XmlAttribute
- private Long minProcessingTime;
-
- @XmlAttribute
- private Long maxProcessingTime;
-
- @XmlAttribute
- private Long totalProcessingTime;
-
- @XmlAttribute
- private Long lastProcessingTime;
-
- @XmlAttribute
- private Long deltaProcessingTime;
-
- @XmlAttribute
- private Long meanProcessingTime;
-
- @XmlAttribute
- private String resetTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String firstExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String firstExchangeFailureTimestamp;
-
- @XmlAttribute
- private String firstExchangeFailureExchangeId;
-
- @XmlAttribute
- private String lastExchangeCompletedTimestamp;
-
- @XmlAttribute
- private String lastExchangeCompletedExchangeId;
-
- @XmlAttribute
- private String lastExchangeFailureTimestamp;
-
- @XmlAttribute
- private String lastExchangeFailureExchangeId;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Integer getIndex() {
- return index;
- }
-
- public void setIndex(Integer index) {
- this.index = index;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getExchangesCompleted() {
- return exchangesCompleted;
- }
-
- public void setExchangesCompleted(Long exchangesCompleted) {
- this.exchangesCompleted = exchangesCompleted;
- }
-
- public Long getExchangesFailed() {
- return exchangesFailed;
- }
-
- public void setExchangesFailed(Long exchangesFailed) {
- this.exchangesFailed = exchangesFailed;
- }
-
- public Long getFailuresHandled() {
- return failuresHandled;
- }
-
- public void setFailuresHandled(Long failuresHandled) {
- this.failuresHandled = failuresHandled;
- }
-
- public Long getRedeliveries() {
- return redeliveries;
- }
-
- public void setRedeliveries(Long redeliveries) {
- this.redeliveries = redeliveries;
- }
-
- public Long getMinProcessingTime() {
- return minProcessingTime;
- }
-
- public void setMinProcessingTime(Long minProcessingTime) {
- this.minProcessingTime = minProcessingTime;
- }
-
- public Long getMaxProcessingTime() {
- return maxProcessingTime;
- }
-
- public void setMaxProcessingTime(Long maxProcessingTime) {
- this.maxProcessingTime = maxProcessingTime;
- }
-
- public Long getTotalProcessingTime() {
- return totalProcessingTime;
- }
-
- public void setTotalProcessingTime(Long totalProcessingTime) {
- this.totalProcessingTime = totalProcessingTime;
- }
-
- public Long getLastProcessingTime() {
- return lastProcessingTime;
- }
-
- public void setLastProcessingTime(Long lastProcessingTime) {
- this.lastProcessingTime = lastProcessingTime;
- }
-
- public Long getDeltaProcessingTime() {
- return deltaProcessingTime;
- }
-
- public void setDeltaProcessingTime(Long deltaProcessingTime) {
- this.deltaProcessingTime = deltaProcessingTime;
- }
-
- public Long getMeanProcessingTime() {
- return meanProcessingTime;
- }
-
- public void setMeanProcessingTime(Long meanProcessingTime) {
- this.meanProcessingTime = meanProcessingTime;
- }
-
- public String getResetTimestamp() {
- return resetTimestamp;
- }
-
- public void setResetTimestamp(String resetTimestamp) {
- this.resetTimestamp = resetTimestamp;
- }
-
- public String getFirstExchangeCompletedTimestamp() {
- return firstExchangeCompletedTimestamp;
- }
-
- public void setFirstExchangeCompletedTimestamp(String
firstExchangeCompletedTimestamp) {
- this.firstExchangeCompletedTimestamp = firstExchangeCompletedTimestamp;
- }
-
- public String getFirstExchangeCompletedExchangeId() {
- return firstExchangeCompletedExchangeId;
- }
-
- public void setFirstExchangeCompletedExchangeId(String
firstExchangeCompletedExchangeId) {
- this.firstExchangeCompletedExchangeId =
firstExchangeCompletedExchangeId;
- }
-
- public String getFirstExchangeFailureTimestamp() {
- return firstExchangeFailureTimestamp;
- }
-
- public void setFirstExchangeFailureTimestamp(String
firstExchangeFailureTimestamp) {
- this.firstExchangeFailureTimestamp = firstExchangeFailureTimestamp;
- }
-
- public String getFirstExchangeFailureExchangeId() {
- return firstExchangeFailureExchangeId;
- }
-
- public void setFirstExchangeFailureExchangeId(String
firstExchangeFailureExchangeId) {
- this.firstExchangeFailureExchangeId = firstExchangeFailureExchangeId;
- }
-
- public String getLastExchangeCompletedTimestamp() {
- return lastExchangeCompletedTimestamp;
- }
-
- public void setLastExchangeCompletedTimestamp(String
lastExchangeCompletedTimestamp) {
- this.lastExchangeCompletedTimestamp = lastExchangeCompletedTimestamp;
- }
-
- public String getLastExchangeCompletedExchangeId() {
- return lastExchangeCompletedExchangeId;
- }
-
- public void setLastExchangeCompletedExchangeId(String
lastExchangeCompletedExchangeId) {
- this.lastExchangeCompletedExchangeId = lastExchangeCompletedExchangeId;
- }
-
- public String getLastExchangeFailureTimestamp() {
- return lastExchangeFailureTimestamp;
- }
-
- public void setLastExchangeFailureTimestamp(String
lastExchangeFailureTimestamp) {
- this.lastExchangeFailureTimestamp = lastExchangeFailureTimestamp;
- }
-
- public String getLastExchangeFailureExchangeId() {
- return lastExchangeFailureExchangeId;
- }
-
- public void setLastExchangeFailureExchangeId(String
lastExchangeFailureExchangeId) {
- this.lastExchangeFailureExchangeId = lastExchangeFailureExchangeId;
- }
-
-}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
index a146eee..34ed925 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.MessageHelper;
-import org.apache.camel.support.dump.MessageDump;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -228,10 +227,7 @@ public class MessageHelperTest extends Assert {
}
@Test
- public void testMessageDump() throws Exception {
- JAXBContext jaxb = JAXBContext.newInstance(MessageDump.class);
- Unmarshaller unmarshaller = jaxb.createUnmarshaller();
-
+ public void testMessageDumpBody() throws Exception {
CamelContext context = new DefaultCamelContext();
context.start();
@@ -242,17 +238,8 @@ public class MessageHelperTest extends Assert {
message.setHeader("foo", 123);
String out = MessageHelper.dumpAsXml(message, true);
-
- MessageDump dump = (MessageDump)unmarshaller.unmarshal(new
StringReader(out));
- assertNotNull(dump);
-
- assertEquals("java.lang.String", dump.getBody().getType());
- assertEquals("Hello World", dump.getBody().getValue());
-
- assertEquals(1, dump.getHeaders().size());
- assertEquals("foo", dump.getHeaders().get(0).getKey());
- assertEquals("java.lang.Integer", dump.getHeaders().get(0).getType());
- assertEquals("123", dump.getHeaders().get(0).getValue());
+ assertNotNull(out);
+ assertTrue(out.contains("Hello World"));
}
}
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index f16c74a..32a2676 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -1084,3 +1084,10 @@ JVM settings to be able to manage Camel remotely on
localhost, port 9913:
-Dcom.sun.management.jmxremote.ssl=false
-Djava.rmi.server.hostname=localhost
----
+
+== Upgrading Camel 3.2 to 3.3
+
+=== API changes
+
+The dump model classes in package `org.apache.camel.support.dump` has been
removed
+as they were not in use by Camel.
