You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/02/02 13:17:07 UTC

[camel-spring-boot] 01/02: Remove xstream

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit dda9a7238dcbe9d7cbb57db7168460452afef38c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 2 14:16:48 2023 +0100

    Remove xstream
---
 .../springboot/catalog/dataformats/xstream.json    | 28 -------------
 .../catalog/dataformats/xstreamJson.json           | 23 ----------
 .../camel/itest/springboot/CamelXstreamTest.java   | 49 ----------------------
 3 files changed, 100 deletions(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json
deleted file mode 100644
index 14bfb1352c2..00000000000
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstream.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dataformat": {
-    "kind": "dataformat",
-    "name": "xstream",
-    "title": "XStream",
-    "description": "Marshal and unmarshal POJOs to\/from XML using XStream library.",
-    "deprecated": true,
-    "firstVersion": "1.3.0",
-    "label": "dataformat,transformation,xml,json",
-    "javaType": "org.apache.camel.dataformat.xstream.XStreamDataFormat",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel.springboot",
-    "artifactId": "camel-xstream-starter",
-    "version": "4.0.0-SNAPSHOT",
-    "modelName": "xstream",
-    "modelJavaType": "org.apache.camel.model.dataformat.XStreamDataFormat"
-  },
-  "properties": {
-    "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus [...]
-    "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the encoding to use" },
-    "mode": { "kind": "attribute", "displayName": "Mode", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ], "deprecated": false, "autowired": false, "secret": false, "description": "Mode for dealing with duplicate references The possible values are: NO_REFERENCES ID_R [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
-    "converters": { "kind": "element", "displayName": "Converters", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter" },
-    "aliases": { "kind": "element", "displayName": "Aliases", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Alias a Class to a shorter name to be used in XML elements." },
-    "omitFields": { "kind": "element", "displayName": "Omit Fields", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma." },
-    "implicitCollections": { "kind": "element", "displayName": "Implicit Collections", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma." }
-  }
-}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json
deleted file mode 100644
index 06ccc2b55be..00000000000
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "dataformat": {
-    "kind": "dataformat",
-    "name": "xstreamJson",
-    "title": "JSON XStream",
-    "description": "Marshal POJOs to JSON and back using XStream",
-    "deprecated": false,
-    "firstVersion": "2.0.0",
-    "label": "dataformat,transformation,json",
-    "javaType": "org.apache.camel.dataformat.xstream.JsonDataFormat",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel.springboot",
-    "artifactId": "camel-xstream-starter",
-    "version": "4.0.0-SNAPSHOT",
-    "modelName": "json",
-    "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
-  },
-  "properties": {
-    "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
-    "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the  [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" }
-  }
-}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXstreamTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXstreamTest.java
deleted file mode 100644
index 6cf7745d7ad..00000000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXstreamTest.java
+++ /dev/null
@@ -1,49 +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.itest.springboot;
-
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit5.ArquillianExtension;
-import org.jboss.shrinkwrap.api.Archive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-
-@ExtendWith(ArquillianExtension.class)
-public class CamelXstreamTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelXstreamTest.class))
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        this.runDataformatTest(config, "xstreamJson");
-        this.runDataformatTest(config, "xstream");
-
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-}