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/07/20 10:25:19 UTC

[camel] branch main updated: CAMEL-19629: Remove camel-weka CAMEL-19630: Remove camel-hyperledge

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.git


The following commit(s) were added to refs/heads/main by this push:
     new a708a32528a CAMEL-19629: Remove camel-weka CAMEL-19630: Remove camel-hyperledge
a708a32528a is described below

commit a708a32528a02b1824b136d2b1cb322f79b9d48c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 20 12:19:22 2023 +0200

    CAMEL-19629: Remove camel-weka
    CAMEL-19630: Remove camel-hyperledge
---
 bom/camel-bom/pom.xml                              |   10 -
 catalog/camel-allcomponents/pom.xml                |   10 -
 .../org/apache/camel/catalog/components.properties |    2 -
 .../catalog/components/hyperledger-aries.json      |   37 -
 .../org/apache/camel/catalog/components/weka.json  |   41 -
 .../org/apache/camel/catalog/others.properties     |    2 -
 .../apache/camel/catalog/others/componentdsl.json  |   15 -
 .../apache/camel/catalog/others/endpointdsl.json   |   15 -
 .../camel-hyperledger-aries/docker-compose.yml     |  206 ----
 components/camel-hyperledger-aries/pom.xml         |   59 -
 .../aries/HyperledgerAriesComponentConfigurer.java |   61 -
 .../aries/HyperledgerAriesEndpointConfigurer.java  |   70 --
 .../aries/HyperledgerAriesEndpointUriFactory.java  |   73 --
 ...tionReceiveInvitationFilterConverterLoader.java |   56 -
 .../aries/ConnectionRecordConverterLoader.java     |   60 -
 .../CreateInvitationRequestConverterLoader.java    |   56 -
 .../aries/CreateWalletRequestConverterLoader.java  |   56 -
 .../CredentialDefinitionFilterConverterLoader.java |   56 -
 ...CredentialDefinitionRequestConverterLoader.java |   56 -
 ...ssueCredentialRecordsFilterConverterLoader.java |   56 -
 .../aries/PresentProofRequestConverterLoader.java  |   56 -
 .../aries/PresentationRequestConverterLoader.java  |   56 -
 .../ReceiveInvitationFilterConverterLoader.java    |   56 -
 .../ReceiveInvitationRequestConverterLoader.java   |   56 -
 .../aries/RevRegCreateRequestConverterLoader.java  |   56 -
 .../aries/RevokeRequestConverterLoader.java        |   56 -
 .../aries/SchemaSendRequestConverterLoader.java    |   56 -
 .../aries/SchemasCreatedFilterConverterLoader.java |   56 -
 .../aries/V1CredentialExchangeConverterLoader.java |   60 -
 ...1CredentialFreeOfferRequestConverterLoader.java |   56 -
 .../V1CredentialIssueRequestConverterLoader.java   |   56 -
 .../V1CredentialStoreRequestConverterLoader.java   |   56 -
 .../services/org/apache/camel/TypeConverterLoader  |   20 -
 .../services/org/apache/camel/component.properties |    7 -
 .../org/apache/camel/component/hyperledger-aries   |    2 -
 .../camel/configurer/hyperledger-aries-component   |    2 -
 .../camel/configurer/hyperledger-aries-endpoint    |    2 -
 .../camel/urifactory/hyperledger-aries-endpoint    |    2 -
 .../camel/component/aries/hyperledger-aries.json   |   37 -
 .../src/main/docs/hyperledger-aries-component.adoc |  460 -------
 .../apache/camel/component/aries/Constants.java    |   47 -
 .../component/aries/HyperledgerAriesComponent.java |  168 ---
 .../aries/HyperledgerAriesConfiguration.java       |   82 --
 .../component/aries/HyperledgerAriesEndpoint.java  |   79 --
 .../component/aries/HyperledgerAriesProducer.java  |  111 --
 .../aries/UnsupportedServiceException.java         |   26 -
 .../aries/handler/AbstractServiceHandler.java      |  126 --
 .../aries/handler/ConnectionsServiceHandler.java   |   98 --
 .../CredentialDefinitionsServiceHandler.java       |  139 ---
 .../aries/handler/CredentialsServiceHandler.java   |   45 -
 .../aries/handler/DidExchangeServiceHandler.java   |   79 --
 .../handler/IssueCredentialV1ServiceHandler.java   |   93 --
 .../aries/handler/MultitenancyServiceHandler.java  |  102 --
 .../aries/handler/OutOfBandServiceHandler.java     |   62 -
 .../aries/handler/PresentProofServiceHandler.java  |   99 --
 .../aries/handler/RevocationServiceHandler.java    |   50 -
 .../aries/handler/SchemasServiceHandler.java       |   49 -
 .../component/aries/handler/ServiceHandler.java    |   25 -
 .../aries/handler/WalletServiceHandler.java        |   49 -
 .../converter/aries/AbstractAriesConverter.java    |   79 --
 ...ConnectionReceiveInvitationFilterConverter.java |   42 -
 .../converter/aries/ConnectionRecordConverter.java |   54 -
 .../aries/CreateInvitationRequestConverter.java    |   42 -
 .../aries/CreateWalletRequestConverter.java        |   42 -
 .../aries/CredentialDefinitionFilterConverter.java |   42 -
 .../CredentialDefinitionRequestConverter.java      |   42 -
 .../IssueCredentialRecordsFilterConverter.java     |   42 -
 .../aries/PresentProofRequestConverter.java        |   42 -
 .../aries/PresentationRequestConverter.java        |   42 -
 .../aries/ReceiveInvitationFilterConverter.java    |   42 -
 .../aries/ReceiveInvitationRequestConverter.java   |   42 -
 .../aries/RevRegCreateRequestConverter.java        |   42 -
 .../converter/aries/RevokeRequestConverter.java    |   42 -
 .../aries/SchemaSendRequestConverter.java          |   42 -
 .../aries/SchemasCreatedFilterConverter.java       |   42 -
 .../aries/V1CredentialExchangeConverter.java       |   54 -
 .../V1CredentialFreeOfferRequestConverter.java     |   42 -
 .../aries/V1CredentialIssueRequestConverter.java   |   42 -
 .../aries/V1CredentialStoreRequestConverter.java   |   42 -
 .../component/aries/AbstractCamelAriesTest.java    |  120 --
 .../component/aries/CamelGettingStartedTest.java   | 1298 --------------------
 .../component/aries/ConnectionlessProofTest.java   |   94 --
 .../component/aries/CredentialDefinitionTest.java  |   69 --
 .../camel/component/aries/CredentialOfferTest.java |  103 --
 .../component/aries/PresentationExchangeTest.java  |   58 -
 .../apache/camel/component/aries/SchemaTest.java   |   73 --
 ...ectionReceiveInvitationFilterConverterTest.java |   56 -
 .../aries/SchemaSendRequestConverterTest.java      |   55 -
 .../V1CredentialFreeOfferRequestConverterTest.java |   68 -
 .../src/test/resources/log4j2.properties           |   36 -
 .../src/test/resources/transscripts.csv            |    6 -
 components/camel-weka/pom.xml                      |   78 --
 .../component/weka/WekaComponentConfigurer.java    |   55 -
 .../component/weka/WekaEndpointConfigurer.java     |   82 --
 .../component/weka/WekaEndpointUriFactory.java     |   78 --
 .../component/weka/WekaTypeConvertersLoader.java   |   64 -
 .../services/org/apache/camel/TypeConverterLoader  |    2 -
 .../services/org/apache/camel/component.properties |    7 -
 .../services/org/apache/camel/component/weka       |    2 -
 .../org/apache/camel/configurer/weka-component     |    2 -
 .../org/apache/camel/configurer/weka-endpoint      |    2 -
 .../org/apache/camel/urifactory/weka-endpoint      |    2 -
 .../org/apache/camel/component/weka/weka.json      |   41 -
 .../camel-weka/src/main/docs/weka-component.adoc   |  219 ----
 .../apache/camel/component/weka/WekaComponent.java |   41 -
 .../camel/component/weka/WekaConfiguration.java    |  146 ---
 .../apache/camel/component/weka/WekaEndpoint.java  |   65 -
 .../apache/camel/component/weka/WekaProducer.java  |  253 ----
 .../camel/component/weka/WekaTypeConverters.java   |   71 --
 .../camel/component/weka/DecisionTreeTest.java     |  143 ---
 .../apache/camel/component/weka/FilterTest.java    |  113 --
 .../camel/component/weka/PredictionTest.java       |  114 --
 .../apache/camel/component/weka/ReadWriteTest.java |  245 ----
 .../src/test/resources/data/sfny-j48.model         |  Bin 7824 -> 0 bytes
 .../src/test/resources/data/sfny-predicted.arff    |  111 --
 .../src/test/resources/data/sfny-test.arff         |  111 --
 .../src/test/resources/data/sfny-train.arff        |  405 ------
 .../camel-weka/src/test/resources/data/sfny.arff   |  504 --------
 .../camel-weka/src/test/resources/data/sfny.csv    |  501 --------
 .../src/test/resources/log4j2.properties           |   28 -
 components/pom.xml                                 |    2 -
 .../org/apache/camel/main/components.properties    |    2 -
 .../ROOT/examples/json/hyperledger-aries.json      |    1 -
 .../modules/ROOT/examples/json/weka.json           |    1 -
 docs/components/modules/ROOT/nav.adoc              |    2 -
 .../ROOT/pages/hyperledger-aries-component.adoc    |    1 -
 .../modules/ROOT/pages/weka-component.adoc         |    1 -
 .../ROOT/pages/camel-4-migration-guide.adoc        |    2 +
 .../component/ComponentsBuilderFactory.java        |   26 -
 .../HyperledgerAriesComponentBuilderFactory.java   |  138 ---
 .../component/dsl/WekaComponentBuilderFactory.java |  117 --
 .../src/generated/resources/metadata.json          |   44 -
 .../builder/endpoint/EndpointBuilderFactory.java   |    2 -
 .../camel/builder/endpoint/EndpointBuilders.java   |    2 -
 .../builder/endpoint/StaticEndpointBuilders.java   |   90 --
 .../HyperledgerAriesEndpointBuilderFactory.java    |  236 ----
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |  335 -----
 .../camel-component-known-dependencies.properties  |    2 -
 parent/pom.xml                                     |   12 -
 pom.xml                                            |   12 -
 140 files changed, 2 insertions(+), 11182 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index c8ee54d2f7d..7baff1e7680 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -967,11 +967,6 @@
         <artifactId>camel-huaweicloud-smn</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-hyperledger-aries</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-ical</artifactId>
@@ -2017,11 +2012,6 @@
         <artifactId>camel-webhook</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-weka</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-whatsapp</artifactId>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 95406d375d2..ba36b12626d 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -803,11 +803,6 @@
             <artifactId>camel-huaweicloud-smn</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-hyperledger-aries</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-ical</artifactId>
@@ -1758,11 +1753,6 @@
             <artifactId>camel-webhook</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-weka</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-whatsapp</artifactId>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 34bf2e3c9fe..adb6490da35 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -142,7 +142,6 @@ hwcloud-iam
 hwcloud-imagerecognition
 hwcloud-obs
 hwcloud-smn
-hyperledger-aries
 iec60870-client
 iec60870-server
 ignite-cache
@@ -311,7 +310,6 @@ vertx-websocket
 weather
 web3j
 webhook
-weka
 whatsapp
 wordpress
 workday
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
deleted file mode 100644
index 2c1a1a71606..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "hyperledger-aries",
-    "title": "Hyperledger Aries",
-    "description": "Camel support for Hyperledger Aries",
-    "deprecated": false,
-    "firstVersion": "3.19.0",
-    "label": "blockchain,security",
-    "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-hyperledger-aries",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "hyperledger-aries",
-    "extendsScheme": "",
-    "syntax": "hyperledger-aries:walletName",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "removeWalletsOnShutdown": { "index": 1, "kind": "property", "displayName": "Remove Wallets On Shutdown", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Remove wallets from the Agent on shutdown" },
-    "autowiredEnabled": { "index": 2, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
-  },
-  "properties": {
-    "walletName": { "index": 0, "kind": "path", "displayName": "Wallet Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "The wallet to connect to" },
-    "autoSchema": { "index": 1, "kind": "parameter", "displayName": "Auto Schema", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "Allow on-demand schema creation" },
-    "schemaName": { "index": 2, "kind": "parameter", "displayName": "Schema Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "A schema name" },
-    "schemaVersion": { "index": 3, "kind": "parameter", "displayName": "Schema Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "A schema version" },
-    "service": { "index": 4, "kind": "parameter", "displayName": "Service", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "An API path (e.g. \/issue-credential\/records)" },
-    "lazyStartProducer": { "index": 5, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...]
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
deleted file mode 100644
index b164686ff63..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "weka",
-    "title": "Weka",
-    "description": "Perform machine learning tasks using Weka.",
-    "deprecated": false,
-    "firstVersion": "3.1.0",
-    "label": "blockchain",
-    "javaType": "org.apache.camel.component.weka.WekaComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-weka",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "weka",
-    "extendsScheme": "",
-    "syntax": "weka:command",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "autowiredEnabled": { "index": 1, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
-  },
-  "properties": {
-    "command": { "index": 0, "kind": "path", "displayName": "Command", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.weka.WekaConfiguration.Command", "enum": [ "filter", "model", "read", "write", "push", "pop", "version" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "descript [...]
-    "lazyStartProducer": { "index": 1, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...]
-    "apply": { "index": 2, "kind": "parameter", "displayName": "Apply", "group": "filter", "label": "filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The filter spec (i.e. Name Options)" },
-    "build": { "index": 3, "kind": "parameter", "displayName": "Build", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The classifier spec (i.e. Name Options)" },
-    "dsname": { "index": 4, "kind": "parameter", "displayName": "Dsname", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The named dataset to train the classifier with" },
-    "folds": { "index": 5, "kind": "parameter", "displayName": "Folds", "group": "model", "label": "model", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Number of folds to use for cross-validation" },
-    "loadFrom": { "index": 6, "kind": "parameter", "displayName": "Load From", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Path to load the model from" },
-    "saveTo": { "index": 7, "kind": "parameter", "displayName": "Save To", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Path to save the model to" },
-    "seed": { "index": 8, "kind": "parameter", "displayName": "Seed", "group": "model", "label": "model", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "An optional seed for the randomizer" },
-    "xval": { "index": 9, "kind": "parameter", "displayName": "Xval", "group": "model", "label": "model", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Flag on whether to use cross-validation with the current dataset" },
-    "path": { "index": 10, "kind": "parameter", "displayName": "Path", "group": "write", "label": "read,write", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "An in\/out path for the read\/write commands" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 19f74621977..44a4cb357db 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -4,13 +4,11 @@ cli-connector
 cloud
 cloudevents
 cluster
-componentdsl
 console
 csimple-joor
 debug
 dsl-modeline
 elytron
-endpointdsl
 groovy-dsl
 headersmap
 health
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
deleted file mode 100644
index 3799e772735..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "componentdsl",
-    "title": "Java Component DSL",
-    "description": "The Camel Component DSL",
-    "deprecated": false,
-    "firstVersion": "3.1.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-componentdsl",
-    "version": "4.0.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
deleted file mode 100644
index cea1951ad69..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "endpointdsl",
-    "title": "Java Endpoint DSL",
-    "description": "The Camel Endpoint DSL",
-    "deprecated": false,
-    "firstVersion": "3.0.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-endpointdsl",
-    "version": "4.0.0-SNAPSHOT"
-  }
-}
diff --git a/components/camel-hyperledger-aries/docker-compose.yml b/components/camel-hyperledger-aries/docker-compose.yml
deleted file mode 100644
index d92d6c33a2a..00000000000
--- a/components/camel-hyperledger-aries/docker-compose.yml
+++ /dev/null
@@ -1,206 +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.
-#
-
-version: '3'
-
-networks:
-  von-network:
-
-services:
-
-  #
-  # Webserver
-  #
-  webserver:
-    image: nessusio/von-network:${VON_NETWORK_VERSION:-1.7.2}
-    container_name: indy-webserver
-    command: bash -c 'sleep 10 && ./scripts/start_webserver.sh'
-    environment:
-      - IP=${IP}
-      - IPS=${IPS}
-      - DOCKERHOST=${DOCKERHOST:-host.docker.internal}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - RUST_LOG=${RUST_LOG:-warn}
-      - GENESIS_URL=${GENESIS_URL}
-      - ANONYMOUS=${ANONYMOUS}
-      - LEDGER_SEED=${LEDGER_SEED}
-      - LEDGER_CACHE_PATH=${LEDGER_CACHE_PATH}
-      - MAX_FETCH=${MAX_FETCH:-50000}
-      - RESYNC_TIME=${RESYNC_TIME:-120}
-      - REGISTER_NEW_DIDS=${REGISTER_NEW_DIDS:-True}
-      - LEDGER_INSTANCE_NAME=${LEDGER_INSTANCE_NAME:-localhost}
-      - WEB_ANALYTICS_SCRIPT=${WEB_ANALYTICS_SCRIPT}
-      - INFO_SITE_TEXT=${INFO_SITE_TEXT}
-      - INFO_SITE_URL=${INFO_SITE_URL}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    networks:
-      - von-network
-    ports:
-      - ${WEB_SERVER_HOST_PORT:-9000}:8000
-    volumes:
-      - webserver-cli:/home/indy/.indy-cli
-      - webserver-ledger:/home/indy/ledger
-
-  #
-  # Nodes
-  #
-  node1:
-    image: nessusio/von-network:${VON_NETWORK_VERSION:-1.7.2}
-    container_name: indy-node1
-    command: ./scripts/start_node.sh 1
-    networks:
-      - von-network
-    ports:
-      - 9701:9701
-      - 9702:9702
-    environment:
-      - IP=${IP}
-      - IPS=${IPS}
-      - DOCKERHOST=${DOCKERHOST:-host.docker.internal}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - RUST_LOG=${RUST_LOG:-warn}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    volumes:
-      - node1-data:/home/indy/ledger
-
-  node2:
-    image: nessusio/von-network:${VON_NETWORK_VERSION:-1.7.2}
-    container_name: indy-node2
-    command: ./scripts/start_node.sh 2
-    networks:
-      - von-network
-    ports:
-      - 9703:9703
-      - 9704:9704
-    environment:
-      - IP=${IP}
-      - IPS=${IPS}
-      - DOCKERHOST=${DOCKERHOST:-host.docker.internal}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - RUST_LOG=${RUST_LOG:-warn}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    volumes:
-      - node2-data:/home/indy/ledger
-
-  node3:
-    image: nessusio/von-network:${VON_NETWORK_VERSION:-1.7.2}
-    container_name: indy-node3
-    command: ./scripts/start_node.sh 3
-    networks:
-      - von-network
-    ports:
-      - 9705:9705
-      - 9706:9706
-    environment:
-      - IP=${IP}
-      - IPS=${IPS}
-      - DOCKERHOST=${DOCKERHOST:-host.docker.internal}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - RUST_LOG=${RUST_LOG:-warn}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    volumes:
-      - node3-data:/home/indy/ledger
-
-  node4:
-    image: nessusio/von-network:${VON_NETWORK_VERSION:-1.7.2}
-    container_name: indy-node4
-    command: ./scripts/start_node.sh 4
-    networks:
-      - von-network
-    ports:
-      - 9707:9707
-      - 9708:9708
-    environment:
-      - IP=${IP}
-      - IPS=${IPS}
-      - DOCKERHOST=${DOCKERHOST:-host.docker.internal}
-      - LOG_LEVEL=${LOG_LEVEL:-info}
-      - RUST_LOG=${RUST_LOG:-warn}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    volumes:
-      - node4-data:/home/indy/ledger
-
-  tails-server:
-    image: nessusio/indy-tails-server:${TAILS_SERVER_VERSION:-1.0.0}
-    container_name: tails-server
-    ports:
-      - 6543:6543
-    networks:
-      - von-network
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    command: >
-      tails-server
-        --host 0.0.0.0
-        --port 6543
-        --storage-path ${STORAGE_PATH:-/tmp/tails-files}
-        --log-level ${LOG_LEVEL:-info}
-
-  acapy:
-    image: nessusio/aries-cloudagent-python:${ACAPY_VERSION:-0.7.5}
-    container_name: acapy
-    ports:
-      - ${ACAPY_USER_PORT:-8030}:${ACAPY_USER_PORT:-8030}
-      - ${ACAPY_ADMIN_PORT:-8031}:${ACAPY_ADMIN_PORT:-8031}
-    networks:
-      - von-network
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    command: >
-      start
-        --genesis-url http://${DOCKERHOST:-host.docker.internal}:9000/genesis
-        --endpoint http://${ACAPY_HOSTNAME:-localhost}:${ACAPY_USER_PORT:-8030}
-        --inbound-transport http 0.0.0.0 ${ACAPY_USER_PORT:-8030}
-        --outbound-transport http
-        --tails-server-base-url http://tails-server:6543
-        --admin 0.0.0.0 ${ACAPY_ADMIN_PORT:-8031}
-        --admin-api-key adminkey
-        --jwt-secret jwtsecret
-        --multitenant
-        --multitenant-admin
-        --seed 000000000000000000000000Trustee1
-        --wallet-storage-type default
-        --wallet-key trusteewkey
-        --wallet-name trustee
-        --wallet-type indy
-        --storage-type indy
-        --recreate-wallet
-        --auto-provision
-        --auto-ping-connection
-        --auto-accept-requests
-        --log-level info
-    depends_on:
-      - node1
-      - node2
-      - node3
-      - node4
-      - webserver
-      - tails-server
-
-volumes:
-  webserver-cli:
-  webserver-ledger:
-  node1-data:
-  node2-data:
-  node3-data:
-  node4-data:
-  nodes-data:
diff --git a/components/camel-hyperledger-aries/pom.xml b/components/camel-hyperledger-aries/pom.xml
deleted file mode 100644
index 4c24618c22a..00000000000
--- a/components/camel-hyperledger-aries/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <name>Camel :: Hyperledger Aries</name>
-
-    <description>Camel support for Hyperledger Aries</description>
-    <artifactId>camel-hyperledger-aries</artifactId>
-    <packaging>jar</packaging>
-
-	<dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.nessus.aries</groupId>
-            <artifactId>nessus-aries-common</artifactId>
-            <version>${nessus-hyperledger-aries-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-	</dependencies>
-	
-</project>
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesComponentConfigurer.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesComponentConfigurer.java
deleted file mode 100644
index 2d4f0ac2d3c..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesComponentConfigurer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aries;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class HyperledgerAriesComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        HyperledgerAriesComponent target = (HyperledgerAriesComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "removewalletsonshutdown":
-        case "removeWalletsOnShutdown": target.setRemoveWalletsOnShutdown(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "removewalletsonshutdown":
-        case "removeWalletsOnShutdown": return boolean.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        HyperledgerAriesComponent target = (HyperledgerAriesComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "removewalletsonshutdown":
-        case "removeWalletsOnShutdown": return target.isRemoveWalletsOnShutdown();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointConfigurer.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointConfigurer.java
deleted file mode 100644
index b83cc50f8cf..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointConfigurer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aries;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class HyperledgerAriesEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        HyperledgerAriesEndpoint target = (HyperledgerAriesEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autoschema":
-        case "autoSchema": target.getConfiguration().setAutoSchema(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "schemaname":
-        case "schemaName": target.getConfiguration().setSchemaName(property(camelContext, java.lang.String.class, value)); return true;
-        case "schemaversion":
-        case "schemaVersion": target.getConfiguration().setSchemaVersion(property(camelContext, java.lang.String.class, value)); return true;
-        case "service": target.getConfiguration().setService(property(camelContext, java.lang.String.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autoschema":
-        case "autoSchema": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "schemaname":
-        case "schemaName": return java.lang.String.class;
-        case "schemaversion":
-        case "schemaVersion": return java.lang.String.class;
-        case "service": return java.lang.String.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        HyperledgerAriesEndpoint target = (HyperledgerAriesEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autoschema":
-        case "autoSchema": return target.getConfiguration().isAutoSchema();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "schemaname":
-        case "schemaName": return target.getConfiguration().getSchemaName();
-        case "schemaversion":
-        case "schemaVersion": return target.getConfiguration().getSchemaVersion();
-        case "service": return target.getConfiguration().getService();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointUriFactory.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointUriFactory.java
deleted file mode 100644
index dbaa8182b02..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/component/aries/HyperledgerAriesEndpointUriFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aries;
-
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class HyperledgerAriesEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":walletName";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    private static final Set<String> MULTI_VALUE_PREFIXES;
-    static {
-        Set<String> props = new HashSet<>(6);
-        props.add("autoSchema");
-        props.add("lazyStartProducer");
-        props.add("schemaName");
-        props.add("schemaVersion");
-        props.add("service");
-        props.add("walletName");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        SECRET_PROPERTY_NAMES = Collections.emptySet();
-        MULTI_VALUE_PREFIXES = Collections.emptySet();
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "hyperledger-aries".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(properties);
-
-        uri = buildPathParameter(syntax, uri, "walletName", null, true, copy);
-        uri = buildQueryParameters(uri, copy, encode);
-        return uri;
-    }
-
-    @Override
-    public Set<String> propertyNames() {
-        return PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> secretPropertyNames() {
-        return SECRET_PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> multiValuePrefixes() {
-        return MULTI_VALUE_PREFIXES;
-    }
-
-    @Override
-    public boolean isLenientProperties() {
-        return false;
-    }
-}
-
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterLoader.java
deleted file mode 100644
index cfdf2e6d244..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class ConnectionReceiveInvitationFilterConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public ConnectionReceiveInvitationFilterConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionReceiveInvitationFilterConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionReceiveInvitationFilterConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionReceiveInvitationFilterConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionRecordConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionRecordConverterLoader.java
deleted file mode 100644
index 7b9ba2ff121..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ConnectionRecordConverterLoader.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class ConnectionRecordConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public ConnectionRecordConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, com.google.gson.JsonObject.class, org.hyperledger.aries.api.connection.ConnectionRecord.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionRecordConverter.toJsonObject((org.hyperledger.aries.api.connection.ConnectionRecord) value));
-        addTypeConverter(registry, java.util.Map.class, org.hyperledger.aries.api.connection.ConnectionRecord.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionRecordConverter.toMap((org.hyperledger.aries.api.connection.ConnectionRecord) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionRecord.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionRecordConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionRecord.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionRecordConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ConnectionRecord.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ConnectionRecordConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateInvitationRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateInvitationRequestConverterLoader.java
deleted file mode 100644
index 520b819fbac..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateInvitationRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class CreateInvitationRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public CreateInvitationRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.CreateInvitationRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateInvitationRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.CreateInvitationRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateInvitationRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.CreateInvitationRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateInvitationRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateWalletRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateWalletRequestConverterLoader.java
deleted file mode 100644
index 5b43b68288e..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CreateWalletRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class CreateWalletRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public CreateWalletRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.multitenancy.CreateWalletRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateWalletRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.multitenancy.CreateWalletRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateWalletRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.multitenancy.CreateWalletRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CreateWalletRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverterLoader.java
deleted file mode 100644
index 6be65d35a13..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class CredentialDefinitionFilterConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public CredentialDefinitionFilterConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinitionFilter.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionFilterConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinitionFilter.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionFilterConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinitionFilter.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionFilterConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverterLoader.java
deleted file mode 100644
index 31c75387045..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class CredentialDefinitionRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public CredentialDefinitionRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.CredentialDefinitionRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverterLoader.java
deleted file mode 100644
index b2694052d76..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class IssueCredentialRecordsFilterConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public IssueCredentialRecordsFilterConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.IssueCredentialRecordsFilterConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.IssueCredentialRecordsFilterConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.IssueCredentialRecordsFilterConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentProofRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentProofRequestConverterLoader.java
deleted file mode 100644
index 33bf6104e91..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentProofRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class PresentProofRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public PresentProofRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentProofRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentProofRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentProofRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentProofRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentProofRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentProofRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentationRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentationRequestConverterLoader.java
deleted file mode 100644
index f39f4760e6d..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/PresentationRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class PresentationRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public PresentationRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentationRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentationRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentationRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentationRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.present_proof.PresentationRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.PresentationRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverterLoader.java
deleted file mode 100644
index 9e9687cb0e8..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class ReceiveInvitationFilterConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public ReceiveInvitationFilterConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.out_of_band.ReceiveInvitationFilter.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationFilterConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.out_of_band.ReceiveInvitationFilter.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationFilterConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.out_of_band.ReceiveInvitationFilter.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationFilterConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverterLoader.java
deleted file mode 100644
index 7656d44dbfd..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class ReceiveInvitationRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public ReceiveInvitationRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ReceiveInvitationRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ReceiveInvitationRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.connection.ReceiveInvitationRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.ReceiveInvitationRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevRegCreateRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevRegCreateRequestConverterLoader.java
deleted file mode 100644
index f1413a6d06c..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevRegCreateRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class RevRegCreateRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public RevRegCreateRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevRegCreateRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevRegCreateRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevRegCreateRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevRegCreateRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevRegCreateRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevRegCreateRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevokeRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevokeRequestConverterLoader.java
deleted file mode 100644
index 0901f3e0506..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/RevokeRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class RevokeRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public RevokeRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevokeRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevokeRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevokeRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevokeRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.revocation.RevokeRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.RevokeRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemaSendRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemaSendRequestConverterLoader.java
deleted file mode 100644
index db6aec36a59..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemaSendRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class SchemaSendRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public SchemaSendRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemaSendRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemaSendRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemaSendRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemaSendRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemaSendRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemaSendRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverterLoader.java
deleted file mode 100644
index 57cdac68bbd..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class SchemasCreatedFilterConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public SchemasCreatedFilterConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemasCreatedFilter.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemasCreatedFilterConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemasCreatedFilter.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemasCreatedFilterConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.schema.SchemasCreatedFilter.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.SchemasCreatedFilterConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialExchangeConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialExchangeConverterLoader.java
deleted file mode 100644
index 152787a01c6..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialExchangeConverterLoader.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class V1CredentialExchangeConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public V1CredentialExchangeConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, com.google.gson.JsonObject.class, org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialExchangeConverter.toJsonObject((org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange) value));
-        addTypeConverter(registry, java.util.Map.class, org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialExchangeConverter.toMap((org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialExchangeConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialExchangeConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialExchangeConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterLoader.java
deleted file mode 100644
index dd0ae16eb26..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class V1CredentialFreeOfferRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public V1CredentialFreeOfferRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialFreeOfferRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialFreeOfferRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialFreeOfferRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverterLoader.java
deleted file mode 100644
index 893eb104378..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class V1CredentialIssueRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public V1CredentialIssueRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialIssueRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialIssueRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialIssueRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverterLoader.java b/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverterLoader.java
deleted file mode 100644
index 55c01aba42c..00000000000
--- a/components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverterLoader.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.converter.aries;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class V1CredentialStoreRequestConverterLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public V1CredentialStoreRequestConverterLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest.class, com.google.gson.JsonObject.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialStoreRequestConverter.toAries((com.google.gson.JsonObject) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialStoreRequestConverter.toAries((java.lang.String) value));
-        addTypeConverter(registry, org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest.class, java.util.Map.class, false,
-            (type, exchange, value) -> org.apache.camel.converter.aries.V1CredentialStoreRequestConverter.toAries((java.util.Map) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
deleted file mode 100644
index 53f2af79bc6..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-org.apache.camel.converter.aries.ConnectionReceiveInvitationFilterConverterLoader
-org.apache.camel.converter.aries.ConnectionRecordConverterLoader
-org.apache.camel.converter.aries.CreateInvitationRequestConverterLoader
-org.apache.camel.converter.aries.CreateWalletRequestConverterLoader
-org.apache.camel.converter.aries.CredentialDefinitionFilterConverterLoader
-org.apache.camel.converter.aries.CredentialDefinitionRequestConverterLoader
-org.apache.camel.converter.aries.IssueCredentialRecordsFilterConverterLoader
-org.apache.camel.converter.aries.PresentProofRequestConverterLoader
-org.apache.camel.converter.aries.PresentationRequestConverterLoader
-org.apache.camel.converter.aries.ReceiveInvitationFilterConverterLoader
-org.apache.camel.converter.aries.ReceiveInvitationRequestConverterLoader
-org.apache.camel.converter.aries.RevRegCreateRequestConverterLoader
-org.apache.camel.converter.aries.RevokeRequestConverterLoader
-org.apache.camel.converter.aries.SchemaSendRequestConverterLoader
-org.apache.camel.converter.aries.SchemasCreatedFilterConverterLoader
-org.apache.camel.converter.aries.V1CredentialExchangeConverterLoader
-org.apache.camel.converter.aries.V1CredentialFreeOfferRequestConverterLoader
-org.apache.camel.converter.aries.V1CredentialIssueRequestConverterLoader
-org.apache.camel.converter.aries.V1CredentialStoreRequestConverterLoader
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index 59e3a09d761..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=hyperledger-aries
-groupId=org.apache.camel
-artifactId=camel-hyperledger-aries
-version=4.0.0-SNAPSHOT
-projectName=Camel :: Hyperledger Aries
-projectDescription=Camel support for Hyperledger Aries
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component/hyperledger-aries b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component/hyperledger-aries
deleted file mode 100644
index a1b18515ac7..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/component/hyperledger-aries
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aries.HyperledgerAriesComponent
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-component b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-component
deleted file mode 100644
index 7b67aef94e1..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aries.HyperledgerAriesComponentConfigurer
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-endpoint b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-endpoint
deleted file mode 100644
index 427cb295098..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/configurer/hyperledger-aries-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aries.HyperledgerAriesEndpointConfigurer
diff --git a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hyperledger-aries-endpoint b/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hyperledger-aries-endpoint
deleted file mode 100644
index 8a9a77ddf32..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/META-INF/services/org/apache/camel/urifactory/hyperledger-aries-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.aries.HyperledgerAriesEndpointUriFactory
diff --git a/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json b/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json
deleted file mode 100644
index 2c1a1a71606..00000000000
--- a/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "hyperledger-aries",
-    "title": "Hyperledger Aries",
-    "description": "Camel support for Hyperledger Aries",
-    "deprecated": false,
-    "firstVersion": "3.19.0",
-    "label": "blockchain,security",
-    "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-hyperledger-aries",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "hyperledger-aries",
-    "extendsScheme": "",
-    "syntax": "hyperledger-aries:walletName",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "removeWalletsOnShutdown": { "index": 1, "kind": "property", "displayName": "Remove Wallets On Shutdown", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Remove wallets from the Agent on shutdown" },
-    "autowiredEnabled": { "index": 2, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
-  },
-  "properties": {
-    "walletName": { "index": 0, "kind": "path", "displayName": "Wallet Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "The wallet to connect to" },
-    "autoSchema": { "index": 1, "kind": "parameter", "displayName": "Auto Schema", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "Allow on-demand schema creation" },
-    "schemaName": { "index": 2, "kind": "parameter", "displayName": "Schema Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "A schema name" },
-    "schemaVersion": { "index": 3, "kind": "parameter", "displayName": "Schema Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "A schema version" },
-    "service": { "index": 4, "kind": "parameter", "displayName": "Service", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aries.HyperledgerAriesConfiguration", "configurationField": "configuration", "description": "An API path (e.g. \/issue-credential\/records)" },
-    "lazyStartProducer": { "index": 5, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...]
-  }
-}
diff --git a/components/camel-hyperledger-aries/src/main/docs/hyperledger-aries-component.adoc b/components/camel-hyperledger-aries/src/main/docs/hyperledger-aries-component.adoc
deleted file mode 100644
index 3a9d748cfb1..00000000000
--- a/components/camel-hyperledger-aries/src/main/docs/hyperledger-aries-component.adoc
+++ /dev/null
@@ -1,460 +0,0 @@
-= Hyperledger Aries Component
-:doctitle: Hyperledger Aries
-:shortname: hyperledger-aries
-:artifactid: camel-hyperledger-aries
-:description: Camel support for Hyperledger Aries
-:since: 3.19
-:supportlevel: Stable
-:tabs-sync-option:
-:component-header: Only producer is supported
-//Manually maintained attributes
-:camel-spring-boot-name: hyperledger-aries
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The Hyperledger Aries component uses https://github.com/tdiesler/nessus-aries[Nessus Aries] and transitively the https://github.com/tdiesler/acapy-java-client[Aries Cloud Agent Java Client] 
-to provide access to an ecosystems of Verifiable Credentials (VC). This is part of a larger effort to provide a digital https://github.com/tdiesler/nessus-aries/blob/main/docs/img/ssi-book.png[Self Sovereign Identity (SSI)], to people, institutions and things - in the end it is all about "Trust over IP".
-
-A good introduction video to this technology space is https://www.youtube.com/watch?v=RllH91rcFdE[The Story of Open SSI Standards].
-
-Maven users will need to add the following dependency to their `pom.xml` for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-hyperledger-aries</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-== URI format
-
----------------------------------
-hyperledger-aries://wallet?service&options
----------------------------------
-
-// component-configure options: START
-
-// component-configure options: END
-
-// component options: START
-include::partial$component-configure-options.adoc[]
-include::partial$component-endpoint-options.adoc[]
-// component options: END
-
-// endpoint options: START
-
-// endpoint options: END
-
-
-
-== Aries Cloud Agent Connection
-
-This component communicates with an instance of https://github.com/hyperledger/aries-cloudagent-python[Aries Cloud Agent Python] (a.k.a ACA-Py) via REST API, which in turn 
-requires a connection to a Distributed Ledger (e.g. https://github.com/bcgov/von-network[Hyperledger Indy]) and a https://github.com/bcgov/indy-tails-server[Indy Tails Server]
-for Credential Revocation support.
-
-The easiest way to get started is using the Docker Compose script provided by https://github.com/tdiesler/nessus-aries[Nessus Aries]
-
-----
-docker compose up --detach && docker compose logs -f acapy
-----
-
-The Camel component uses an `AgentConfiguration` object to make the connection to ACA-Py. The connection parameters can be configured through these environment variables...
-
-----
-ACAPY_HOSTNAME: localhost
-ACAPY_ADMIN_PORT: 8031
-ACAPY_USER_PORT: 8030
-ACAPY_API_KEY: adminkey
-----
-
-
-== Examples
-
-Once the connection with ACA-Py is established we can access various https://github.com/hyperledger/aries-rfcs/tree/main/features[SSI related protocols]. Here, we use the 
-classical Alice/Faber example walktrough. Alice, a former student of Faber College ("Knowledge is Good"), connects with the College, is issued a credential about her degree 
-and then uses this verifiable credential to apply for a job with Acme Corp. Acme uses "Trust over IP" to verifiy that Alice actually graduated from Faber and perhaps even more 
-imporantly that Faber is authorized to issue such credentials. Alice gets the job (of course ;-) and can now now use this employment credential to apply for a loan with Thrift Bank. 
-At some point in the future, Alice decides to leave Acme for to pursue other things in life, uppon which, Acme revokes the previously issued credential. The transcript credential from 
-Faber cannot be revoked - the associated cryptographic material remain immutably in the distributed ledger.
-
-The code snipets below are abridged for readability - for the fully working copy have a look at https://github.com/tdiesler/camel/blob/CAMEL-18156/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CamelGettingStartedTest.java[CamelGettingStartedTest].
-
-=== Working with Wallets
-
-A Wallet primarily holds Credentials and Connections to other peers. The Ledger does not store personal information - instead, it holds cryptographic material, Credential Schemas,
-public Digital Identities (DID) and so on. The component can work with Wallets that already exist in ACA-Py or alternatively it can create/remove such Wallets
-
-[source,java]
----------------------------------------------------------------------------------------------
-from("direct:admin")
-    .to("hyperledger-aries:admin?service=/multitenancy/wallet")
-    
-CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-        .walletDispatchType(WalletDispatchType.DEFAULT)
-        .walletType(WalletType.INDY)
-        .walletName(walletName)
-        .walletKey(walletName + "Key")
-        .build();
-
-template.requestBodyAndHeaders("direct:admin", walletRequest, Map.of(
-        HEADER_MULTITENANCY_TRUSTEE_WALLET, Government,
-        HEADER_MULTITENANCY_LEDGER_ROLE, ENDORSER),
-        WalletRecord.class);
----------------------------------------------------------------------------------------------
-
-=== Creating Credential Schemas
-
-Credential Schema is the base semantic structure that describes the list of attributes which one particular Credential can contain.
-
-It’s not possible to update an existing Schema. If the Schema needs to be evolved, a new Schema with a new version or name needs to be created.
-
-[source,java]
----------------------------------------------------------------------------------------------
-from("direct:faber")
-        .to("hyperledger-aries:faber");
-    
-SchemaSendRequest schemaRequest = SchemaSendRequest.builder()
-        .schemaVersion("1.2")
-        .schemaName("Transcript")
-        .attributes(Arrays.asList(
-                "first_name",
-                "last_name",
-                "ssn",
-                "degree",
-                "status",
-                "year",
-                "average"))
-        .build();
-
-SchemaSendResponse schemaResponse = template.requestBodyAndHeaders("direct:faber", schemaRequest, Map.of(
-        HEADER_SERVICE, "/schemas"),
-        SchemaSendResponse.class);
----------------------------------------------------------------------------------------------
-
-=== Creating Credential Definitions
-
-Credential Definition is similar in that the keys that the Issuer uses for
-the signing of Credentials also satisfies a specific Credential Schema.
-
-It references it's associated schema, announces who is going to be issuing
-credentials with that schema, what type of signature method they plan to use
-(“CL” = “Camenisch Lysyanskya”, the default method used for zero-knowledge
-proofs by indy), how they plan to handle revocation, and so forth.
-
-It’s not possible to update data in an existing Credential Definition. If a
-Credential Definition needs to be evolved (for example, a key needs to be rotated), 
-then a new Credential Definition needs to be created by a new Issuer DID.
-
-A Credential Definition can be created and saved in the Ledger by an Endorser.
-
-[source,java]
----------------------------------------------------------------------------------------------
-from("direct:faber")
-        .to("hyperledger-aries:faber");
-
-CredentialDefinitionRequest credDefRequest = CredentialDefinitionRequest.builder()
-        .schemaId(ctx.getAttachment(TranscriptSchemaId, String.class))
-        .supportRevocation(false)
-        .build();
-
-CredentialDefinitionResponse credDefResponse = template.requestBodyAndHeaders("direct:faber", credDefRequest, Map.of(
-        HEADER_SERVICE, "/credential-definitions"),
-        CredentialDefinitionResponse.class);
----------------------------------------------------------------------------------------------
-
-=== Create a Peer Connection
-
-When Alice connects to Faber, she doesn't use Faber's public DID. 
-Instead, both parties create new DIDs that they use for their Peer Connection.
-
-That A has a trusted connection with B, is of nobody's business except A and B.
-
-[source,java]
----------------------------------------------------------------------------------------------
-
-// Inviter creates an invitation (/connections/create-invitation)
-UnaryOperator<String> uri = wn -> "direct:" + wn.toLowerCase();
-CreateInvitationRequest createInvitationRequest = CreateInvitationRequest.builder().build();
-CreateInvitationResponse createInvitationResponse = template.requestBodyAndHeaders("direct:faber",
-        createInvitationRequest, Map.of(HEADER_SERVICE, "/connections/create-invitation"),
-        CreateInvitationResponse.class);
-
-// This invitation data finds its way to the Invitee somehow (i.e. out-of-band)
-ConnectionInvitation invitation = createInvitationResponse.getInvitation();
-
-// Invitee receives the invitation from the Inviter (/connections/receive-invitation)
-ReceiveInvitationRequest receiveInvitationRequest = ReceiveInvitationRequest.builder()
-        .recipientKeys(invitation.getRecipientKeys())
-        .serviceEndpoint(invitation.getServiceEndpoint())
-        .build();
-
-ConnectionReceiveInvitationFilter receiveParams = ConnectionReceiveInvitationFilter.builder()
-        .autoAccept(true)
-        .build();
-
-template.requestBodyAndHeaders("direct:alice", receiveInvitationRequest, Map.of(
-        HEADER_SERVICE, "/connections/receive-invitation",
-        ConnectionReceiveInvitationFilter.class.getName(), receiveParams),
-        ConnectionRecord.class);
-    
----------------------------------------------------------------------------------------------
-
-=== Get a Verifiable Credential
-
-A credential is a piece of information about an identity — a name, an age, a credit score... 
-It is information claimed to be true. 
-
-Credentials are offered by an Issuer and stored in the Wallet of the Holder.
-
-An issuer may be any identity owner known to the Ledger and any issuer may
-issue a credential about any identity owner it can identify.
-
-The usefulness and reliability of a credential are tied to the reputation of
-the issuer with respect to the credential at hand. For Alice to self-issue a
-credential that she likes chocolate ice cream may be perfectly reasonable,
-but for her to self-issue a credential that she graduated from Faber College
-should not impress anyone.
-
-[source,java]
----------------------------------------------------------------------------------------------
-/* 1. Faber sends the Transcript Credential Offer
- * 
- * The value of this Transcript Credential is that it is provably issued by Faber College
- */
-
-V1CredentialOfferRequest credentialOffer = V1CredentialOfferRequest.builder()
-        .connectionId(faberAliceConnectionId)
-        .credentialDefinitionId(transcriptCredDefId)
-        .credentialPreview(new CredentialPreview(
-                CredentialAttributes.from(Map.of(
-                        "first_name", "Alice",
-                        "last_name", "Garcia",
-                        "ssn", "123-45-6789",
-                        "degree", "Bachelor of Science, Marketing",
-                        "status", "graduated",
-                        "year", "2015",
-                        "average", "5"))))
-        .build();
-
-template.requestBodyAndHeaders("direct:faber", credentialOffer, Map.of(
-        HEADER_SERVICE, "/issue-credential/send-offer"),
-        V1CredentialExchange.class);
-
-/* 2. Alice inspects the the Transcript Credential Offer
- * 
- */
-
-CredentialProposal credentialProposal = holderExchange.getCredentialProposalDict().getCredentialProposal();
-CredentialProposalHelper credentialHelper = new CredentialProposalHelper(credentialProposal);
-Assertions.assertEquals("Alice", credentialHelper.getAttributeValue("first_name"));
-Assertions.assertEquals("Garcia", credentialHelper.getAttributeValue("last_name"));
-Assertions.assertEquals("graduated", credentialHelper.getAttributeValue("status"));
-Assertions.assertEquals("5", credentialHelper.getAttributeValue("average"));
-
-/* 3. Alice sends the Transcript Credential Request
- * 
- */
-
-template.requestBodyAndHeaders("direct:alice", null, Map.of(
-        HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/send-request"),
-        V1CredentialExchange.class);
-
-/* 4. Faber receives the Transcript Credential Request
- * 
- */
-
-V1CredentialExchange issuerExchange = issuerEvents.credentialEx()
-        .filter(cex -> cex.getState() == CredentialExchangeState.REQUEST_RECEIVED)
-        .blockFirst(Duration.ofSeconds(10));
-
-/* 5. Faber issues the Transcript Credential
- * 
- */
-
-V1CredentialIssueRequest credentialIssueRequest = V1CredentialIssueRequest.builder().build();
-
-template.requestBodyAndHeaders("direct:faber", credentialIssueRequest, Map.of(
-        HEADER_SERVICE, "/issue-credential/records/" + issuerCredentialExchangeId + "/issue"),
-        V1CredentialExchange.class);
-
-/* 6. Alice receives the Transcript Credential
- * 
- */
-
-holderExchange = holderEvents.credentialEx()
-        .filter(cex -> cex.getState() == CredentialExchangeState.CREDENTIAL_RECEIVED)
-        .blockFirst(Duration.ofSeconds(10));
-
-/* 7. Alice stores the Transcript Credential
- * 
- */
-
-V1CredentialStoreRequest credentialStoreRequest = V1CredentialStoreRequest.builder()
-        .credentialId(holderCredentialId)
-        .build();
-
-template.requestBodyAndHeaders("direct:alice", credentialStoreRequest, Map.of(
-        HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/store"),
-        V1CredentialExchange.class);
----------------------------------------------------------------------------------------------
-
-=== Verify a Credential
-
-Above we said, that Credentials are offered by an Issuer and stored in the Wallet of the Holder.
-
-During the Credential verification process, the Verifier may request Proof for some attribute claim
-from the Proover. In our case, Acme (the Verifier) requests proof from Alice (the Proover) that certain
-attribute claims in the Transcript Credential are infact true.
-
-[source,java]
----------------------------------------------------------------------------------------------
-/* 1. Acme creates a Job Application Proof Request
- * 
- * Notice that some attributes are verifiable and others are not.
- * 
- * The proof request says that degree, and graduation status, ssn and year must be formally asserted by an issuer and schema_key. 
- * Notice also that the first_name, last_name and phone_number are not required to be verifiable. 
- * 
- * By not tagging these credentials with a verifiable status, Acme’s credential request is saying it will accept 
- * Alice’s own credential about her names and phone number.
- */
-
-PresentProofRequest proofRequest = PresentProofRequest.builder()
-        .connectionId(acmeAliceConnectionId)
-        .proofRequest(ProofRequest.builder()
-                .name("Job-Application")
-                .nonce("1")
-                .requestedAttribute("attr1_referent", proofReqAttr.apply("first_name"))
-                .requestedAttribute("attr2_referent", proofReqAttr.apply("last_name"))
-                .requestedAttribute("attr3_referent", restrictedProofReqAttr.apply("ssn", transcriptCredDefId))
-                .requestedAttribute("attr4_referent", restrictedProofReqAttr.apply("degree", transcriptCredDefId))
-                .requestedAttribute("attr5_referent", restrictedProofReqAttr.apply("status", transcriptCredDefId))
-                .requestedAttribute("attr6_referent", restrictedProofReqAttr.apply("year", transcriptCredDefId))
-                .requestedPredicate("pred1_referent", restrictedProofReqPred.apply("average >= 4", transcriptCredDefId))
-                .build())
-        .build();
-
-template.requestBodyAndHeaders("direct:acme", proofRequest, Map.of(
-        HEADER_SERVICE, "/present-proof/send-request"),
-        PresentationExchangeRecord.class);
-
-// 2. Alice searches her Wallet for Credentials that she can use for the creating of Proof for the Job-Application Proof Request
-
-credentials.stream().forEach(cred -> {
-    List<String> presentationReferents = cred.getPresentationReferents();
-    CredentialInfo credInfo = cred.getCredentialInfo();
-    String credDefId = credInfo.getCredentialDefinitionId();
-    Map<String, String> attributes = credInfo.getAttrs();
-    String referent = credInfo.getReferent();
-    log.info("{}", cred);
-    log.info("+- CredDefId: {}", credDefId);
-    log.info("+- PresentationReferents: {}", presentationReferents);
-    log.info("+- Attributes: {}", attributes);
-    log.info("+- Referent: {}", referent);
-
-    // Map attribute referents to their respective credential referent
-    presentationReferents.stream().forEach(pr -> referentMapping.put(pr, referent));
-});
-
-/* 3. Alice provides Job Application Proof
- * 
- * Alice divides these attributes into the three groups:
- * 
- * - attributes values of which will be revealed
- * - attributes values of which will be unrevealed
- * - attributes for which creating of verifiable proof is not required
- */
-
-PresentationRequest presentationRequest = PresentationRequest.builder()
-        .selfAttestedAttributes(Map.of(
-                "attr1_referent", "Alice",
-                "attr2_referent", "Garcia"))
-        .requestedAttributes(Map.of(
-                "attr3_referent", indyRequestedAttr.apply("attr3_referent", true),
-                "attr4_referent", indyRequestedAttr.apply("attr4_referent", true),
-                "attr5_referent", indyRequestedAttr.apply("attr5_referent", true),
-                "attr6_referent", indyRequestedAttr.apply("attr6_referent", true)))
-        .requestedPredicates(Map.of(
-                "pred1_referent", indyRequestedPred.apply("pred1_referent")))
-        .build();
-
-template.requestBodyAndHeaders("direct:alice", presentationRequest, Map.of(
-        HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/send-presentation"),
-        PresentationExchangeRecord.class);
-
-/* 4. Acme verifies the Job Application Proof from Alice
- * 
- */
-
-template.requestBodyAndHeaders("direct:acme", null, Map.of(
-        HEADER_SERVICE, "/present-proof/records/" + verifierExchangeId + "/verify-presentation"),
-        PresentationExchangeRecord.class);
-
-verifierExchangeRecord = verifierEvents.presentationEx()
-        .filter(pex -> pex.getState() == PresentationExchangeState.VERIFIED)
-        .blockFirst(Duration.ofSeconds(10));
-
-Assertions.assertTrue(verifierExchangeRecord.isVerified(), "Not VERIFIED");
----------------------------------------------------------------------------------------------
-
-==== Connectionless proofs
-
-There is a possibility to request proof without securing the connection beforehand.
-It's similar to usual credential verification process with two changes:
-
-1. Verifier should use `/present-proof/create-request` instead of `send-request` service.
-
-2. Verifier should decorate proof presentation with `~service` decorator with their recipient key and endpoint.
-
-[source,java]
----------------------------------------------------------------------------------------------
-/* 1. Acme creates Job Application Proof Request.
- *
- * Notice no connectionId and new service endpoint.
- * Everything else is the same as for send-request process.
- */
-PresentProofRequest proofRequest = PresentProofRequest.builder()
-        .proofRequest(...)
-        .build();
-
-String exchangeId = template.requestBodyAndHeader("direct:acme", proofRequest,
-        HEADER_SERVICE, "/present-proof/create-request",
-        PresentationExchangeRecord.class).getPresentationExchangeId();
-
-/* 2. Acme generates presentation JSON.
- *
- * This is a new step. Acme needs to decorate the presentation request with their service details.
- */
-JsonObject presentation = template.requestBodyAndHeader("direct:acme", null,
-        HEADER_SERVICE, "/present-proof/records/" + exchangeId,
-        PresentationExchangeRecord.class).getPresentationRequestDict();
-
-DID did = template.requestBodyAndHeader("direct:acme", null,
-        HEADER_SERVICE, "/wallet/did/public",
-        DID.class);
-
-String endpoint = template.requestBodyAndHeaders("direct:acme", null,
-        Map.of(HEADER_SERVICE, "/wallet/get-did-endpoint", HEADER_DID, did.getDid()),
-        DIDEndpoint.class).getEndpoint();
-
-var decorator = new JsonObject();
-var recipients = new JsonArray();
-recipients.add(did.getVerkey());
-decorator.add("recipientKeys", recipients);
-decorator.addProperty("serviceEndpoint", endpoint);
-
-presentation.add("~service", decorator);
-
-/* 3. Acme shares presentation request with Alice.
- *
- * This step is not Camel-specific, thus there is no example.
- * The easiest way to share this JSON is to generate QR code using it
- * and let Alice scan this QR using her Aries mobile wallet.
- */
----------------------------------------------------------------------------------------------
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/Constants.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/Constants.java
deleted file mode 100644
index 09b18f98aa4..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/Constants.java
+++ /dev/null
@@ -1,47 +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.component.aries;
-
-public final class Constants {
-
-    // The ACA-Py API path
-    public static final String HEADER_SERVICE = "service";
-
-    public static final String HEADER_DID = "did";
-
-    public static final String HEADER_WALLET_NAME = "WalletName";
-    public static final String HEADER_WALLET_RECORD = "WalletRecord";
-
-    public static final String HEADER_SCHEMA_NAME = "SchemaName";
-    public static final String HEADER_SCHEMA_VERSION = "SchemaVersion";
-
-    // Properties on the Exchange
-    public static final String PROPERTY_HYPERLEDGER_ARIES_COMPONENT = HyperledgerAriesComponent.class.getSimpleName();
-
-    // The name of the TRUSTEE wallet that can onboard others to the ledger
-    public static final String HEADER_MULTITENANCY_TRUSTEE_WALLET = "multitenancy/trustee-wallet";
-
-    // The Indy ledger role for this wallet
-    public static final String HEADER_MULTITENANCY_LEDGER_ROLE = "multitenancy/ledger-role";
-
-    // Allow this wallet to self register with ledger. This is cheating and required access to the ledger's admin interface
-    public static final String HEADER_MULTITENANCY_SELF_REGISTER_NYM = "multitenancy/self-register-nym";
-
-    private Constants() {
-        // hide ctor
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
deleted file mode 100644
index ce255f966a8..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
+++ /dev/null
@@ -1,168 +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.component.aries;
-
-import java.util.List;
-import java.util.Map;
-
-import io.nessus.aries.AgentConfiguration;
-import io.nessus.aries.AriesClientFactory;
-import io.nessus.aries.util.AssertArg;
-import io.nessus.aries.util.AssertState;
-import io.nessus.aries.wallet.NessusWallet;
-import io.nessus.aries.wallet.WalletRegistry;
-import io.nessus.aries.websocket.WebSocketClient;
-import io.nessus.aries.websocket.WebSocketListener;
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-import org.hyperledger.aries.AriesClient;
-
-@Component("hyperledger-aries")
-public class HyperledgerAriesComponent extends DefaultComponent {
-
-    // private static final Logger LOG = LoggerFactory.getLogger(HyperledgerAriesComponent.class);
-
-    private final WalletRegistry walletRegistry = new WalletRegistry();
-    private AgentConfiguration agentConfig;
-
-    @Metadata(description = "Remove wallets from the Agent on shutdown")
-    private boolean removeWalletsOnShutdown;
-
-    private AriesClient adminClient;
-    private WebSocketClient adminWebSocketClient;
-    private WebSocketListener adminWebSocketListener;
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        HyperledgerAriesConfiguration configuration = new HyperledgerAriesConfiguration();
-        configuration.setWalletName(remaining);
-
-        HyperledgerAriesEndpoint endpoint = new HyperledgerAriesEndpoint(uri, this, configuration);
-        setProperties(endpoint, parameters);
-
-        return endpoint;
-    }
-
-    public boolean isRemoveWalletsOnShutdown() {
-        return removeWalletsOnShutdown;
-    }
-
-    public void setRemoveWalletsOnShutdown(boolean removeWalletsOnShutdown) {
-        this.removeWalletsOnShutdown = removeWalletsOnShutdown;
-    }
-
-    @Override
-    protected void doShutdown() throws Exception {
-
-        closeAdminWebSocketClient();
-
-        if (removeWalletsOnShutdown) {
-            for (NessusWallet wallet : walletRegistry.getWallets()) {
-                wallet.closeAndRemove();
-            }
-        }
-    }
-
-    public AgentConfiguration getAgentConfiguration() {
-        if (agentConfig == null) {
-            agentConfig = AgentConfiguration.defaultConfiguration();
-        }
-        return agentConfig;
-    }
-
-    public void setAgentConfiguration(AgentConfiguration agentConfig) {
-        this.agentConfig = agentConfig;
-    }
-
-    public WalletRegistry getWalletRegistry() {
-        return walletRegistry;
-    }
-
-    public List<String> getWalletNames() {
-        return walletRegistry.getWalletNames();
-    }
-
-    public void addWallet(NessusWallet wallet) {
-        walletRegistry.putWallet(wallet);
-    }
-
-    public NessusWallet getWallet(String walletName) {
-        return walletRegistry.getWalletByName(walletName);
-    }
-
-    public NessusWallet assertWallet(String walletName) {
-        NessusWallet wallet = getWallet(walletName);
-        AssertState.notNull(wallet, "Cannot obtain wallet for: " + walletName);
-        return wallet;
-    }
-
-    public AriesClient adminClient() {
-        if (adminClient == null) {
-            AgentConfiguration agentConfig = getAgentConfiguration();
-            adminClient = AriesClientFactory.adminClient(agentConfig);
-        }
-        return adminClient;
-    }
-
-    public AriesClient createClient(String walletName) {
-        NessusWallet wallet = assertWallet(walletName);
-        AgentConfiguration agentConfig = getAgentConfiguration();
-        return AriesClientFactory.createClient(agentConfig, wallet);
-    }
-
-    public WebSocketListener createAdminWebSocketListener() {
-        return new WebSocketListener("admin", null, null);
-    }
-
-    public WebSocketClient createAdminWebSocketClient() {
-        WebSocketListener wslistener = createAdminWebSocketListener();
-        return createAdminWebSocketClient(wslistener);
-    }
-
-    public WebSocketClient createAdminWebSocketClient(WebSocketListener wslistener) {
-        AssertArg.notNull(wslistener, "No wslistener");
-        AssertState.isNull(adminWebSocketClient, "WebSocket client already created");
-        AgentConfiguration agentConfig = getAgentConfiguration();
-        adminWebSocketClient = new WebSocketClient(agentConfig, null);
-        adminWebSocketClient.openWebSocket(wslistener);
-        adminWebSocketListener = wslistener;
-        return adminWebSocketClient;
-    }
-
-    public WebSocketClient getAdminWebSocketClient() {
-        return adminWebSocketClient;
-    }
-
-    public WebSocketListener getAdminWebSocketListener() {
-        return adminWebSocketListener;
-    }
-
-    public void closeAdminWebSocketClient() {
-        if (adminWebSocketClient != null) {
-            adminWebSocketClient.close();
-            adminWebSocketListener = null;
-            adminWebSocketClient = null;
-        }
-    }
-
-    public WebSocketClient createWebSocketClient(String walletName, WebSocketListener wslistener) {
-        NessusWallet wallet = assertWallet(walletName);
-        return wallet.createWebSocketClient(getAgentConfiguration(), wslistener);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesConfiguration.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesConfiguration.java
deleted file mode 100644
index f8bd3b23a4c..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesConfiguration.java
+++ /dev/null
@@ -1,82 +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.component.aries;
-
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
-
-@UriParams
-public class HyperledgerAriesConfiguration {
-
-    @UriPath(description = "The wallet to connect to")
-    @Metadata(required = true)
-    private String walletName;
-    @UriParam(description = "An API path (e.g. /issue-credential/records)")
-    @Metadata(required = false)
-    private String service;
-    @UriParam(description = "A schema name")
-    @Metadata(required = false)
-    private String schemaName;
-    @UriParam(description = "A schema version")
-    @Metadata(required = false)
-    private String schemaVersion;
-    @UriParam(description = "Allow on-demand schema creation")
-    @Metadata(required = false)
-    private boolean autoSchema;
-
-    public String getWalletName() {
-        return walletName;
-    }
-
-    public void setWalletName(String name) {
-        this.walletName = name;
-    }
-
-    public String getService() {
-        return service;
-    }
-
-    public void setService(String path) {
-        this.service = path;
-    }
-
-    public String getSchemaName() {
-        return schemaName;
-    }
-
-    public void setSchemaName(String schemaName) {
-        this.schemaName = schemaName;
-    }
-
-    public String getSchemaVersion() {
-        return schemaVersion;
-    }
-
-    public void setSchemaVersion(String schemaVersion) {
-        this.schemaVersion = schemaVersion;
-    }
-
-    public boolean isAutoSchema() {
-        return autoSchema;
-    }
-
-    public void setAutoSchema(boolean autoSchema) {
-        this.autoSchema = autoSchema;
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java
deleted file mode 100644
index 351a23a0c0e..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java
+++ /dev/null
@@ -1,79 +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.component.aries;
-
-import java.io.IOException;
-
-import io.nessus.aries.wallet.NessusWallet;
-import org.apache.camel.Category;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.support.DefaultEndpoint;
-import org.hyperledger.aries.AriesClient;
-
-@UriEndpoint(firstVersion = "3.19.0", scheme = "hyperledger-aries", title = "Hyperledger Aries", syntax = "aries:walletName",
-             producerOnly = true, category = { Category.BLOCKCHAIN, Category.SECURITY })
-public class HyperledgerAriesEndpoint extends DefaultEndpoint {
-
-    @UriParam
-    private HyperledgerAriesConfiguration configuration;
-
-    public HyperledgerAriesEndpoint(String uri, HyperledgerAriesComponent component,
-                                    HyperledgerAriesConfiguration configuration) {
-        super(uri, component);
-        this.configuration = configuration;
-    }
-
-    @Override
-    public HyperledgerAriesComponent getComponent() {
-        return (HyperledgerAriesComponent) super.getComponent();
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return new HyperledgerAriesProducer(this);
-    }
-
-    public HyperledgerAriesConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    public String getWalletName() {
-        return getConfiguration().getWalletName();
-    }
-
-    public NessusWallet getWallet() {
-        return getComponent().getWallet(getWalletName());
-    }
-
-    public AriesClient createClient() throws IOException {
-        String walletName = getWalletName();
-        if (getWallet() == null && "admin".equals(walletName)) {
-            return getComponent().adminClient();
-        } else {
-            return getComponent().createClient(walletName);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java
deleted file mode 100644
index 583cb8c0f90..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java
+++ /dev/null
@@ -1,111 +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.component.aries;
-
-import io.nessus.aries.util.AssertState;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.handler.AbstractServiceHandler;
-import org.apache.camel.component.aries.handler.ConnectionsServiceHandler;
-import org.apache.camel.component.aries.handler.CredentialDefinitionsServiceHandler;
-import org.apache.camel.component.aries.handler.CredentialsServiceHandler;
-import org.apache.camel.component.aries.handler.DidExchangeServiceHandler;
-import org.apache.camel.component.aries.handler.IssueCredentialV1ServiceHandler;
-import org.apache.camel.component.aries.handler.MultitenancyServiceHandler;
-import org.apache.camel.component.aries.handler.OutOfBandServiceHandler;
-import org.apache.camel.component.aries.handler.PresentProofServiceHandler;
-import org.apache.camel.component.aries.handler.RevocationServiceHandler;
-import org.apache.camel.component.aries.handler.SchemasServiceHandler;
-import org.apache.camel.component.aries.handler.WalletServiceHandler;
-import org.apache.camel.support.DefaultProducer;
-
-import static org.apache.camel.component.aries.Constants.HEADER_SERVICE;
-
-public class HyperledgerAriesProducer extends DefaultProducer {
-
-    public HyperledgerAriesProducer(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public HyperledgerAriesEndpoint getEndpoint() {
-        return (HyperledgerAriesEndpoint) super.getEndpoint();
-    }
-
-    @Override
-    public void process(Exchange exchange) throws Exception {
-
-        AbstractServiceHandler serviceHandler;
-
-        String service = getService(exchange);
-        if (service.startsWith("/connections")) {
-            serviceHandler = new ConnectionsServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/credential-definitions")) {
-            serviceHandler = new CredentialDefinitionsServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/credentials")) {
-            serviceHandler = new CredentialsServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/didexchange")) {
-            serviceHandler = new DidExchangeServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/issue-credential")) {
-            serviceHandler = new IssueCredentialV1ServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/multitenancy")) {
-            serviceHandler = new MultitenancyServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/out-of-band")) {
-            serviceHandler = new OutOfBandServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/present-proof")) {
-            serviceHandler = new PresentProofServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/revocation")) {
-            serviceHandler = new RevocationServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/schemas")) {
-            serviceHandler = new SchemasServiceHandler(getEndpoint());
-
-        } else if (service.startsWith("/wallet")) {
-            serviceHandler = new WalletServiceHandler(getEndpoint());
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-
-        serviceHandler.beforeProcess(exchange, service);
-        serviceHandler.process(exchange, service);
-        serviceHandler.afterProcess(exchange, service);
-    }
-
-    protected String getWalletName() {
-        return getEndpoint().getWalletName();
-    }
-
-    private String getService(Exchange exchange) {
-        String service = exchange.getIn().getHeader(HEADER_SERVICE, String.class);
-        if (service == null) {
-            service = getEndpoint().getConfiguration().getService();
-        }
-        AssertState.notNull(service, "Cannot obtain API service");
-        if (!service.startsWith("/")) {
-            service = "/" + service;
-        }
-        return service;
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/UnsupportedServiceException.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/UnsupportedServiceException.java
deleted file mode 100644
index e722efab7eb..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/UnsupportedServiceException.java
+++ /dev/null
@@ -1,26 +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.component.aries;
-
-public class UnsupportedServiceException extends RuntimeException {
-
-    private static final long serialVersionUID = 8827347527702393577L;
-
-    public UnsupportedServiceException(String service) {
-        super("Unsupported service: " + service);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/AbstractServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/AbstractServiceHandler.java
deleted file mode 100644
index 4f1e45abc5d..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/AbstractServiceHandler.java
+++ /dev/null
@@ -1,126 +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.component.aries.handler;
-
-import java.io.IOException;
-
-import io.nessus.aries.util.AssertState;
-import io.nessus.aries.websocket.WebSocketListener;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.component.aries.HyperledgerAriesComponent;
-import org.apache.camel.component.aries.HyperledgerAriesConfiguration;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.hyperledger.aries.AriesClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.component.aries.Constants.HEADER_WALLET_NAME;
-import static org.apache.camel.component.aries.Constants.HEADER_WALLET_RECORD;
-import static org.apache.camel.component.aries.Constants.PROPERTY_HYPERLEDGER_ARIES_COMPONENT;
-
-public abstract class AbstractServiceHandler implements ServiceHandler {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-
-    protected final HyperledgerAriesEndpoint endpoint;
-
-    protected AbstractServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public void beforeProcess(Exchange exchange, String service) {
-        String walletName = endpoint.getWalletName();
-        exchange.setProperty(PROPERTY_HYPERLEDGER_ARIES_COMPONENT, endpoint.getComponent());
-        Message message = exchange.getIn();
-        message.setHeader(HEADER_WALLET_NAME, walletName);
-        message.setHeader(HEADER_WALLET_RECORD, endpoint.getWallet());
-        log.debug("{}: Before [service={}, body={}, headers={}]", walletName, service, message.getBody(), message.getHeaders());
-    }
-
-    public void afterProcess(Exchange exchange, String service) {
-        Message message = exchange.getIn();
-        String walletName = endpoint.getWalletName();
-        log.debug("{}: After [service={}, body={}, headers={}]", walletName, service, message.getBody(), message.getHeaders());
-    }
-
-    protected String getServicePathToken(String service, int idx) {
-        return service.split("/")[idx + 1];
-    }
-
-    public <T> boolean hasBody(Exchange exchange, Class<T> type) {
-        return maybeBody(exchange, type) != null;
-    }
-
-    public <T> T maybeBody(Exchange exchange, Class<T> type) {
-        return exchange.getIn().getBody(type);
-    }
-
-    public <T> T assertBody(Exchange exchange, Class<T> type) {
-        T body = exchange.getIn().getBody(type);
-        AssertState.notNull(body, "Cannot obtain body of type: " + type.getName());
-        return body;
-    }
-
-    public boolean hasHeader(Exchange exchange, String key) {
-        return exchange.getIn().getHeader(key) != null;
-    }
-
-    public <T> T maybeHeader(Exchange exchange, Class<T> type) {
-        T value = maybeHeader(exchange, type.getSimpleName(), type);
-        if (value == null) {
-            value = maybeHeader(exchange, type.getName(), type);
-        }
-        return value;
-    }
-
-    public <T> T maybeHeader(Exchange exchange, String key, Class<T> type) {
-        return exchange.getIn().getHeader(key, type);
-    }
-
-    public <T> T assertHeader(Exchange exchange, Class<T> type) {
-        T value = maybeHeader(exchange, type);
-        AssertState.notNull(value, "Cannot obtain header of type: " + type.getName());
-        return value;
-    }
-
-    public <T> T assertHeader(Exchange exchange, String key, Class<T> type) {
-        T value = maybeHeader(exchange, key, type);
-        AssertState.notNull(value, "Cannot obtain header '" + key + "' of type: " + type.getName());
-        return value;
-    }
-
-    public HyperledgerAriesConfiguration getConfiguration() {
-        return endpoint.getConfiguration();
-    }
-
-    public HyperledgerAriesComponent getComponent() {
-        return endpoint.getComponent();
-    }
-
-    public AriesClient adminClient() {
-        return getComponent().adminClient();
-    }
-
-    public AriesClient createClient() throws IOException {
-        return endpoint.createClient();
-    }
-
-    public WebSocketListener getAdminWebSocketListener() {
-        return getComponent().getAdminWebSocketListener();
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ConnectionsServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ConnectionsServiceHandler.java
deleted file mode 100644
index 418c3e9b854..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ConnectionsServiceHandler.java
+++ /dev/null
@@ -1,98 +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.component.aries.handler;
-
-import java.util.List;
-
-import io.nessus.aries.util.AssertState;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.acy_py.generated.model.ConnectionInvitation;
-import org.hyperledger.aries.api.connection.ConnectionAcceptInvitationFilter;
-import org.hyperledger.aries.api.connection.ConnectionFilter;
-import org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-import org.hyperledger.aries.api.connection.CreateInvitationRequest;
-import org.hyperledger.aries.api.connection.CreateInvitationResponse;
-import org.hyperledger.aries.api.connection.ReceiveInvitationRequest;
-import org.hyperledger.aries.api.trustping.PingRequest;
-import org.hyperledger.aries.api.trustping.PingResponse;
-
-public class ConnectionsServiceHandler extends AbstractServiceHandler {
-
-    public ConnectionsServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/connections")) {
-            ConnectionFilter filter = maybeHeader(exchange, ConnectionFilter.class);
-            List<ConnectionRecord> resObj = createClient().connections(filter).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/connections/create-invitation")) {
-            CreateInvitationRequest reqObj = maybeBody(exchange, CreateInvitationRequest.class);
-            if (reqObj == null) {
-                reqObj = CreateInvitationRequest.builder().build();
-            }
-            CreateInvitationResponse resObj = createClient().connectionsCreateInvitation(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/connections/receive-invitation")) {
-            ReceiveInvitationRequest reqObj = maybeBody(exchange, ReceiveInvitationRequest.class);
-            if (reqObj == null) {
-                ConnectionInvitation invitation = assertBody(exchange, ConnectionInvitation.class);
-                reqObj = ReceiveInvitationRequest.builder()
-                        .recipientKeys(invitation.getRecipientKeys())
-                        .serviceEndpoint(invitation.getServiceEndpoint())
-                        .build();
-            }
-            ConnectionReceiveInvitationFilter filter = maybeHeader(exchange, ConnectionReceiveInvitationFilter.class);
-            ConnectionRecord resObj = createClient().connectionsReceiveInvitation(reqObj, filter).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.startsWith("/connections/")) {
-
-            String connectionId = getServicePathToken(service, 1);
-            AssertState.notNull(connectionId, "Null connectionId");
-
-            if (service.endsWith("/accept-invitation")) {
-                ConnectionAcceptInvitationFilter acceptFilter = maybeHeader(exchange, ConnectionAcceptInvitationFilter.class);
-                ConnectionRecord resObj = createClient().connectionsAcceptInvitation(connectionId, acceptFilter).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith("/send-ping")) {
-                PingRequest pingRequest = assertBody(exchange, PingRequest.class);
-                PingResponse resObj = createClient().connectionsSendPing(connectionId, pingRequest).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith(connectionId)) {
-                ConnectionRecord resObj = createClient().connectionsGetById(connectionId).orElse(null);
-                exchange.getIn().setBody(resObj);
-
-            } else {
-                throw new UnsupportedServiceException(service);
-            }
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialDefinitionsServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialDefinitionsServiceHandler.java
deleted file mode 100644
index 324fc42a0f0..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialDefinitionsServiceHandler.java
+++ /dev/null
@@ -1,139 +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.component.aries.handler;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
-import io.nessus.aries.util.AssertState;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionResponse;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionsCreated;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinitionFilter;
-import org.hyperledger.aries.api.schema.SchemaSendRequest;
-import org.hyperledger.aries.api.schema.SchemaSendResponse;
-import org.hyperledger.aries.api.schema.SchemasCreatedFilter;
-
-import static org.apache.camel.component.aries.Constants.HEADER_SCHEMA_NAME;
-import static org.apache.camel.component.aries.Constants.HEADER_SCHEMA_VERSION;
-
-public class CredentialDefinitionsServiceHandler extends AbstractServiceHandler {
-
-    public CredentialDefinitionsServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/credential-definitions/created")) {
-            CredentialDefinitionFilter filter = maybeBody(exchange, CredentialDefinitionFilter.class);
-            if (filter == null) {
-                String schemaName = maybeHeader(exchange, HEADER_SCHEMA_NAME, String.class);
-                if (schemaName == null) {
-                    schemaName = getConfiguration().getSchemaName();
-                }
-                String schemaVersion = maybeHeader(exchange, HEADER_SCHEMA_VERSION, String.class);
-                if (schemaVersion == null) {
-                    schemaVersion = getConfiguration().getSchemaVersion();
-                }
-                filter = CredentialDefinitionFilter.builder()
-                        .schemaName(schemaName)
-                        .schemaVersion(schemaVersion)
-                        .build();
-            }
-            CredentialDefinitionsCreated resObj = createClient().credentialDefinitionsCreated(filter).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/credential-definitions")) {
-            CredentialDefinitionRequest credDefReq = maybeBody(exchange, CredentialDefinitionRequest.class);
-            if (credDefReq == null) {
-
-                Map<String, Object> spec = assertBody(exchange, Map.class);
-
-                String schemaName = (String) spec.get("schemaName");
-                if (schemaName == null) {
-                    schemaName = endpoint.getConfiguration().getSchemaName();
-                }
-                AssertState.notNull(schemaName, "Cannot obtain schemaName");
-
-                String schemaVersion = (String) spec.get("schemaVersion");
-                if (schemaVersion == null) {
-                    schemaVersion = endpoint.getConfiguration().getSchemaVersion();
-                }
-                AssertState.notNull(schemaVersion, "Cannot obtain schemaVersion");
-
-                boolean autoSchema = toBoolean(spec.get("autoSchema"), () -> endpoint.getConfiguration().isAutoSchema());
-
-                // Search existing schemas
-                DID publicDid = createClient().walletDidPublic().get();
-                SchemasCreatedFilter filter = SchemasCreatedFilter.builder()
-                        .schemaIssuerDid(publicDid.getDid())
-                        .schemaName(schemaName)
-                        .schemaVersion(schemaVersion)
-                        .build();
-                List<String> schemaIds = createClient().schemasCreated(filter).get();
-
-                // Create schema on-demand
-                if (schemaIds.isEmpty() && autoSchema) {
-                    List<String> attributes = (List<String>) spec.get("attributes");
-                    SchemaSendRequest schemaReq = SchemaSendRequest.builder()
-                            .schemaName(schemaName)
-                            .schemaVersion(schemaVersion)
-                            .attributes(attributes)
-                            .build();
-                    SchemaSendResponse schemaRes = createClient().schemas(schemaReq).get();
-                    schemaIds = Arrays.asList(schemaRes.getSchemaId());
-                    log.info("Created Schema: {}", schemaRes);
-                }
-                AssertState.isFalse(schemaIds.isEmpty(), "Cannot obtain schema ids for: " + filter);
-                AssertState.isEqual(1, schemaIds.size(), "Unexpected number of schema ids for: " + filter);
-
-                boolean supportRevocation = toBoolean(spec.get("supportRevocation"), () -> false);
-
-                credDefReq = CredentialDefinitionRequest.builder()
-                        .supportRevocation(supportRevocation)
-                        .schemaId(schemaIds.get(0))
-                        .build();
-            }
-            CredentialDefinitionResponse resObj = createClient().credentialDefinitionsCreate(credDefReq).get();
-            String credentialDefinitionId = resObj.getCredentialDefinitionId();
-            log.info("CredentialDefinitionId: {}", credentialDefinitionId);
-            exchange.getIn().setBody(resObj);
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-
-    private static boolean toBoolean(Object object, Supplier<Boolean> provider) {
-        if (object instanceof Boolean) {
-            return (Boolean) object;
-        }
-        if (object instanceof String) {
-            return Boolean.valueOf((String) object);
-        }
-
-        return provider.get();
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialsServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialsServiceHandler.java
deleted file mode 100644
index 92423fe856a..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/CredentialsServiceHandler.java
+++ /dev/null
@@ -1,45 +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.component.aries.handler;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.credentials.Credential;
-
-import static java.util.Collections.emptyList;
-
-public class CredentialsServiceHandler extends AbstractServiceHandler {
-
-    public CredentialsServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/credentials")) {
-            List<Credential> credentials = adminClient().credentials().orElse(emptyList());
-            exchange.getIn().setBody(credentials);
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/DidExchangeServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/DidExchangeServiceHandler.java
deleted file mode 100644
index d69307bcdc6..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/DidExchangeServiceHandler.java
+++ /dev/null
@@ -1,79 +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.component.aries.handler;
-
-import java.util.concurrent.TimeUnit;
-
-import io.nessus.aries.util.AssertState;
-import io.nessus.aries.websocket.WebSocketListener;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-import org.hyperledger.aries.api.connection.ConnectionState;
-import org.hyperledger.aries.api.did_exchange.DidExchangeAcceptInvitationFilter;
-
-public class DidExchangeServiceHandler extends AbstractServiceHandler {
-
-    public DidExchangeServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.startsWith("/didexchange")) {
-
-            String connectionId = getServicePathToken(service, 1);
-            AssertState.notNull(connectionId, "Null connectionId");
-
-            if (service.endsWith("/accept-invitation")) {
-                DidExchangeAcceptInvitationFilter filter = maybeHeader(exchange, DidExchangeAcceptInvitationFilter.class);
-                ConnectionRecord conrec = adminClient().didExchangeAcceptInvitation(connectionId, filter).get();
-                WebSocketListener wsevents = getAdminWebSocketListener();
-                if (conrec == null && wsevents != null) {
-                    conrec = wsevents.awaitConnection(
-                            cr -> cr.getState() == ConnectionState.COMPLETED
-                                    && cr.getConnectionId().equals(connectionId),
-                            10, TimeUnit.SECONDS)
-                            .findFirst().orElse(null);
-                }
-                AssertState.notNull(conrec, String.format("No ConnectionRecord for %s", connectionId));
-                exchange.getIn().setBody(conrec);
-
-            } else if (service.endsWith(connectionId)) {
-                WebSocketListener wsevents = getAdminWebSocketListener();
-                ConnectionRecord conrec = createClient().connectionsGetById(connectionId).orElse(null);
-                if (conrec == null && wsevents != null) {
-                    conrec = wsevents.awaitConnection(
-                            cr -> cr.getState() == ConnectionState.COMPLETED
-                                    && cr.getConnectionId().equals(connectionId),
-                            10, TimeUnit.SECONDS)
-                            .findFirst().orElse(null);
-                }
-                AssertState.notNull(conrec, String.format("No ConnectionRecord for %s", connectionId));
-                exchange.getIn().setBody(conrec);
-
-            } else {
-                throw new UnsupportedServiceException(service);
-            }
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/IssueCredentialV1ServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/IssueCredentialV1ServiceHandler.java
deleted file mode 100644
index 7fa09c1b950..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/IssueCredentialV1ServiceHandler.java
+++ /dev/null
@@ -1,93 +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.component.aries.handler;
-
-import java.util.List;
-
-import io.nessus.aries.util.AssertState;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialOfferRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialProposalRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest;
-
-public class IssueCredentialV1ServiceHandler extends AbstractServiceHandler {
-
-    public IssueCredentialV1ServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/issue-credential/create-offer")) {
-            V1CredentialFreeOfferRequest reqObj = assertBody(exchange, V1CredentialFreeOfferRequest.class);
-            V1CredentialExchange resObj = createClient().issueCredentialCreateOffer(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/issue-credential/send-offer")) {
-            V1CredentialOfferRequest reqObj = assertBody(exchange, V1CredentialOfferRequest.class);
-            V1CredentialExchange resObj = createClient().issueCredentialSendOffer(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/issue-credential/send-proposal")) {
-            V1CredentialProposalRequest reqObj = assertBody(exchange, V1CredentialProposalRequest.class);
-            V1CredentialExchange resObj = createClient().issueCredentialSendProposal(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/issue-credential/records")) {
-            IssueCredentialRecordsFilter reqObj = assertBody(exchange, IssueCredentialRecordsFilter.class);
-            List<V1CredentialExchange> resObj = createClient().issueCredentialRecords(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.startsWith("/issue-credential/records/")) {
-
-            String credExchangeId = getServicePathToken(service, 2);
-            AssertState.notNull(credExchangeId, "Null cred_ex_id");
-
-            if (service.endsWith("/send-request")) {
-                V1CredentialExchange resObj = createClient().issueCredentialRecordsSendRequest(credExchangeId).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith("/issue")) {
-                V1CredentialIssueRequest reqObj = maybeHeader(exchange, V1CredentialIssueRequest.class);
-                V1CredentialExchange resObj = createClient().issueCredentialRecordsIssue(credExchangeId, reqObj).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith("/store")) {
-                V1CredentialStoreRequest reqObj = maybeBody(exchange, V1CredentialStoreRequest.class);
-                V1CredentialExchange resObj = createClient().issueCredentialRecordsStore(credExchangeId, reqObj).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith(credExchangeId)) {
-                // /issue-credential/records/{cred_ex_id}
-                V1CredentialExchange resObj = createClient().issueCredentialRecordsGetById(credExchangeId).orElse(null);
-                exchange.getIn().setBody(resObj);
-
-            } else {
-                throw new UnsupportedServiceException(service);
-            }
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/MultitenancyServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/MultitenancyServiceHandler.java
deleted file mode 100644
index 97b17549cd7..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/MultitenancyServiceHandler.java
+++ /dev/null
@@ -1,102 +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.component.aries.handler;
-
-import io.nessus.aries.util.AssertState;
-import io.nessus.aries.wallet.NessusWallet;
-import io.nessus.aries.wallet.WalletRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.hyperledger.acy_py.generated.model.DIDEndpoint;
-import org.hyperledger.acy_py.generated.model.TxnOrRegisterLedgerNymResponse;
-import org.hyperledger.aries.AriesClient;
-import org.hyperledger.aries.api.ledger.IndyLedgerRoles;
-import org.hyperledger.aries.api.ledger.RegisterNymFilter;
-import org.hyperledger.aries.api.multitenancy.CreateWalletRequest;
-import org.hyperledger.aries.api.multitenancy.WalletRecord;
-import org.hyperledger.aries.api.wallet.WalletDIDCreate;
-
-import static io.nessus.aries.wallet.WalletBuilder.selfRegisterWithDid;
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_LEDGER_ROLE;
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_SELF_REGISTER_NYM;
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_TRUSTEE_WALLET;
-
-public class MultitenancyServiceHandler extends AbstractServiceHandler {
-
-    public MultitenancyServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/multitenancy/wallet")) {
-            CreateWalletRequest walletRequest = assertBody(exchange, CreateWalletRequest.class);
-            String walletName = walletRequest.getWalletName();
-
-            boolean selfRegister = maybeHeader(exchange, HEADER_MULTITENANCY_SELF_REGISTER_NYM, boolean.class);
-            IndyLedgerRoles ledgerRole = maybeHeader(exchange, HEADER_MULTITENANCY_LEDGER_ROLE, IndyLedgerRoles.class);
-            String trusteeName = maybeHeader(exchange, HEADER_MULTITENANCY_TRUSTEE_WALLET, String.class);
-
-            WalletRegistry walletRegistry = getComponent().getWalletRegistry();
-            WalletRecord walletRecord = adminClient().multitenancyWalletCreate(walletRequest).get();
-            NessusWallet wallet = NessusWallet.build(walletRecord).withWalletRegistry(walletRegistry);
-            getComponent().addWallet(wallet);
-
-            String walletId = wallet.getWalletId();
-            log.info("{}: [{}] {}", walletName, walletId, wallet);
-
-            if (ledgerRole != null) {
-
-                AssertState.isTrue(selfRegister || trusteeName != null,
-                        "LedgerRole " + ledgerRole + " requires selfRegister or trusteeWallet");
-
-                // Create a local DID for the wallet
-                AriesClient client = getComponent().createClient(walletName);
-                DID did = client.walletDidCreate(WalletDIDCreate.builder().build()).get();
-                log.info("{}: {}", walletName, did);
-
-                if (trusteeName != null) {
-
-                    AriesClient trustee = getComponent().createClient(trusteeName);
-                    TxnOrRegisterLedgerNymResponse nymResponse = trustee.ledgerRegisterNym(RegisterNymFilter.builder()
-                            .did(did.getDid())
-                            .verkey(did.getVerkey())
-                            .role(ledgerRole)
-                            .build()).get();
-                    log.info("{} for {}: {}", trusteeName, walletName, nymResponse);
-                } else if (selfRegister) {
-                    // Register DID with the leder (out-of-band)
-                    selfRegisterWithDid(walletName, did.getDid(), did.getVerkey(), ledgerRole);
-                }
-
-                // Set the public DID for the wallet
-                client.walletDidPublic(did.getDid());
-                wallet.setPublicDid(did);
-
-                DIDEndpoint didEndpoint = client.walletGetDidEndpoint(did.getDid()).get();
-                log.info("{}: {}", walletName, didEndpoint);
-            }
-
-            exchange.getIn().setBody(wallet);
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/OutOfBandServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/OutOfBandServiceHandler.java
deleted file mode 100644
index b4f5fa34fdf..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/OutOfBandServiceHandler.java
+++ /dev/null
@@ -1,62 +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.component.aries.handler;
-
-import io.nessus.aries.util.AssertState;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-import org.hyperledger.aries.api.connection.ConnectionState;
-import org.hyperledger.aries.api.out_of_band.InvitationMessage;
-import org.hyperledger.aries.api.out_of_band.InvitationMessage.InvitationMessageService;
-import org.hyperledger.aries.api.out_of_band.ReceiveInvitationFilter;
-
-public class OutOfBandServiceHandler extends AbstractServiceHandler {
-
-    public OutOfBandServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/out-of-band/receive-invitation")) {
-            @SuppressWarnings("unchecked")
-            InvitationMessage<InvitationMessageService> reqObj = assertBody(exchange, InvitationMessage.class);
-            ReceiveInvitationFilter filter = maybeHeader(exchange, ReceiveInvitationFilter.class);
-            if (filter == null) {
-                filter = ReceiveInvitationFilter.builder()
-                        .useExistingConnection(false)
-                        .autoAccept(false)
-                        .build();
-            }
-            ConnectionRecord oobRecord = createClient().outOfBandReceiveInvitation(reqObj, filter).get();
-            String connectionId = oobRecord.getConnectionId();
-            AssertState.notNull(connectionId);
-            ConnectionRecord resObj = adminClient().connections().get().stream()
-                    .filter(cr -> cr.getState() == ConnectionState.INVITATION)
-                    .filter(cr -> cr.getConnectionId().equals(connectionId))
-                    .findFirst().orElse(null);
-            AssertState.notNull(resObj, String.format("No ConnectionRecord for %s", connectionId));
-            exchange.getMessage().setBody(resObj);
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/PresentProofServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/PresentProofServiceHandler.java
deleted file mode 100644
index 10ef5bcbf8c..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/PresentProofServiceHandler.java
+++ /dev/null
@@ -1,99 +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.component.aries.handler;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.present_proof.PresentProofProposal;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest;
-import org.hyperledger.aries.api.present_proof.PresentationExchangeRecord;
-import org.hyperledger.aries.api.present_proof.PresentationRequest;
-import org.hyperledger.aries.api.present_proof.PresentationRequestCredentials;
-import org.hyperledger.aries.api.present_proof.PresentationRequestCredentialsFilter;
-
-import static java.util.Collections.emptyList;
-
-public class PresentProofServiceHandler extends AbstractServiceHandler {
-
-    public PresentProofServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/present-proof/create-request")) {
-            PresentProofRequest reqObj = assertBody(exchange, PresentProofRequest.class);
-            PresentationExchangeRecord resObj = createClient().presentProofCreateRequest(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/present-proof/send-proposal")) {
-            PresentProofProposal reqObj = assertBody(exchange, PresentProofProposal.class);
-            PresentationExchangeRecord resObj = adminClient().presentProofSendProposal(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/present-proof/send-request")) {
-            PresentProofRequest reqObj = assertBody(exchange, PresentProofRequest.class);
-            PresentationExchangeRecord resObj = createClient().presentProofSendRequest(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/present-proof/records")) {
-            List<PresentationExchangeRecord> resObj = createClient().presentProofRecords().orElse(emptyList()).stream()
-                    .sorted(Collections.reverseOrder((a, b) -> a.getState().ordinal() - b.getState().ordinal()))
-                    .peek(pe -> log.info("{}", pe))
-                    .collect(Collectors.toList());
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.startsWith("/present-proof/records/")) {
-
-            String presExchangeId = getServicePathToken(service, 2);
-            if (service.endsWith("/credentials")) {
-                PresentationRequestCredentialsFilter reqObj = assertBody(exchange, PresentationRequestCredentialsFilter.class);
-                List<PresentationRequestCredentials> resObj
-                        = createClient().presentProofRecordsCredentials(presExchangeId, reqObj)
-                                .orElse(emptyList());
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith("/send-presentation")) {
-                PresentationRequest reqObj = assertBody(exchange, PresentationRequest.class);
-                PresentationExchangeRecord resObj
-                        = createClient().presentProofRecordsSendPresentation(presExchangeId, reqObj).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith("/verify-presentation")) {
-                PresentationExchangeRecord resObj = createClient().presentProofRecordsVerifyPresentation(presExchangeId).get();
-                exchange.getIn().setBody(resObj);
-
-            } else if (service.endsWith(presExchangeId)) {
-                // /present-proof/records/{pres_ex_id}
-                PresentationExchangeRecord resObj = createClient().presentProofRecordsGetById(presExchangeId).orElse(null);
-                exchange.getIn().setBody(resObj);
-
-            } else {
-                throw new UnsupportedServiceException(service);
-            }
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/RevocationServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/RevocationServiceHandler.java
deleted file mode 100644
index c0261e6ce03..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/RevocationServiceHandler.java
+++ /dev/null
@@ -1,50 +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.component.aries.handler;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.acy_py.generated.model.IssuerRevRegRecord;
-import org.hyperledger.aries.api.revocation.RevRegCreateRequest;
-import org.hyperledger.aries.api.revocation.RevRegCreateResponse.RevocationModuleResponse;
-import org.hyperledger.aries.api.revocation.RevokeRequest;
-
-public class RevocationServiceHandler extends AbstractServiceHandler {
-
-    public RevocationServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/revocation/create-registry")) {
-            RevRegCreateRequest reqObj = assertBody(exchange, RevRegCreateRequest.class);
-            IssuerRevRegRecord resObj = createClient().revocationCreateRegistry(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/revocation/revoke")) {
-            RevokeRequest reqObj = assertBody(exchange, RevokeRequest.class);
-            RevocationModuleResponse resObj = createClient().revocationRevoke(reqObj).get();
-            exchange.getIn().setBody(resObj);
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/SchemasServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/SchemasServiceHandler.java
deleted file mode 100644
index fed91cce710..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/SchemasServiceHandler.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.component.aries.handler;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.aries.api.schema.SchemaSendRequest;
-import org.hyperledger.aries.api.schema.SchemaSendResponse;
-
-public class SchemasServiceHandler extends AbstractServiceHandler {
-
-    public SchemasServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/schemas")) {
-            SchemaSendRequest schemaReq = assertBody(exchange, SchemaSendRequest.class);
-            if (schemaReq.getSchemaName() == null) {
-                schemaReq.setSchemaName(endpoint.getConfiguration().getSchemaName());
-            }
-            if (schemaReq.getSchemaVersion() == null) {
-                schemaReq.setSchemaVersion(endpoint.getConfiguration().getSchemaVersion());
-            }
-            SchemaSendResponse resObj = createClient().schemas(schemaReq).get();
-            exchange.getIn().setBody(resObj);
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ServiceHandler.java
deleted file mode 100644
index fc84934efb4..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/ServiceHandler.java
+++ /dev/null
@@ -1,25 +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.component.aries.handler;
-
-import org.apache.camel.Exchange;
-
-public interface ServiceHandler {
-
-    void process(Exchange exchange, String service) throws Exception;
-
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/WalletServiceHandler.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/WalletServiceHandler.java
deleted file mode 100644
index 0299816b7a2..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/WalletServiceHandler.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.component.aries.handler;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.aries.HyperledgerAriesEndpoint;
-import org.apache.camel.component.aries.UnsupportedServiceException;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.hyperledger.acy_py.generated.model.DIDEndpoint;
-
-import static org.apache.camel.component.aries.Constants.HEADER_DID;
-
-public class WalletServiceHandler extends AbstractServiceHandler {
-
-    public WalletServiceHandler(HyperledgerAriesEndpoint endpoint) {
-        super(endpoint);
-    }
-
-    @Override
-    public void process(Exchange exchange, String service) throws Exception {
-
-        if (service.equals("/wallet/did/public")) {
-            DID resObj = createClient().walletDidPublic().orElse(null);
-            exchange.getIn().setBody(resObj);
-
-        } else if (service.equals("/wallet/get-did-endpoint")) {
-            String did = assertHeader(exchange, HEADER_DID, String.class);
-            DIDEndpoint resObj = createClient().walletGetDidEndpoint(did).orElse(null);
-            exchange.getIn().setBody(resObj);
-
-        } else {
-            throw new UnsupportedServiceException(service);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/AbstractAriesConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/AbstractAriesConverter.java
deleted file mode 100644
index fcf4c2d11ae..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/AbstractAriesConverter.java
+++ /dev/null
@@ -1,79 +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.converter.aries;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import org.hyperledger.aries.config.GsonConfig;
-
-class AbstractAriesConverter {
-
-    static final Gson GSON = GsonConfig.defaultConfig();
-
-    protected AbstractAriesConverter() {
-    }
-
-    static <T> T toAries(JsonObject jsonObj, Class<T> type) {
-        T result = null;
-        if (filterFields(type, jsonObj)) {
-            result = GSON.fromJson(jsonObj, type);
-        }
-        return result;
-    }
-
-    static <T> T toAries(String json, Class<T> type) {
-        try {
-            JsonObject obj = GSON.fromJson(json, JsonObject.class);
-            return toAries(obj, type);
-        } catch (JsonSyntaxException e) {
-            return null;
-        }
-    }
-
-    static <T> T toAries(Map<String, Object> map, Class<T> type) {
-        String json = GSON.toJson(map);
-        return toAries(json, type);
-    }
-
-    static String toSnakeCase(String instr) {
-        return instr.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase();
-    }
-
-    static boolean filterFields(Class<?> type, JsonObject json) {
-
-        // Convert target object field names to snake case
-        List<String> acceptedFields = Arrays.asList(type.getDeclaredFields()).stream()
-                .map(f -> toSnakeCase(f.getName()))
-                .collect(Collectors.toList());
-
-        // Filter unexpected properties
-        new HashSet<>(json.keySet()).stream().forEach(k -> {
-            if (!acceptedFields.contains(k)) {
-                json.remove(k);
-            }
-        });
-
-        return !json.keySet().isEmpty();
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverter.java
deleted file mode 100644
index 2bfb55fd78e..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter;
-
-@Converter(generateLoader = true)
-public final class ConnectionReceiveInvitationFilterConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static ConnectionReceiveInvitationFilter toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, ConnectionReceiveInvitationFilter.class);
-    }
-
-    @Converter
-    public static ConnectionReceiveInvitationFilter toAries(String json) {
-        return toAries(json, ConnectionReceiveInvitationFilter.class);
-    }
-
-    @Converter
-    public static ConnectionReceiveInvitationFilter toAries(Map<String, Object> map) {
-        return toAries(map, ConnectionReceiveInvitationFilter.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionRecordConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionRecordConverter.java
deleted file mode 100644
index 9b4461e4e17..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ConnectionRecordConverter.java
+++ /dev/null
@@ -1,54 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-
-@Converter(generateLoader = true)
-public final class ConnectionRecordConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static ConnectionRecord toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, ConnectionRecord.class);
-    }
-
-    @Converter
-    public static ConnectionRecord toAries(String json) {
-        return toAries(json, ConnectionRecord.class);
-    }
-
-    @Converter
-    public static ConnectionRecord toAries(Map<String, Object> map) {
-        return toAries(map, ConnectionRecord.class);
-    }
-
-    @Converter
-    public static JsonObject toJsonObject(ConnectionRecord item) {
-        return (JsonObject) GSON.toJsonTree(item, ConnectionRecord.class);
-    }
-
-    @Converter
-    @SuppressWarnings("unchecked")
-    public static Map<String, Object> toMap(ConnectionRecord item) {
-        JsonObject json = toJsonObject(item);
-        return GSON.fromJson(json, Map.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateInvitationRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateInvitationRequestConverter.java
deleted file mode 100644
index 25af5c4baf8..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateInvitationRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.connection.CreateInvitationRequest;
-
-@Converter(generateLoader = true)
-public final class CreateInvitationRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static CreateInvitationRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, CreateInvitationRequest.class);
-    }
-
-    @Converter
-    public static CreateInvitationRequest toAries(String json) {
-        return toAries(json, CreateInvitationRequest.class);
-    }
-
-    @Converter
-    public static CreateInvitationRequest toAries(Map<String, Object> map) {
-        return toAries(map, CreateInvitationRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateWalletRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateWalletRequestConverter.java
deleted file mode 100644
index f5f3b53d9df..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CreateWalletRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.multitenancy.CreateWalletRequest;
-
-@Converter(generateLoader = true)
-public final class CreateWalletRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static CreateWalletRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, CreateWalletRequest.class);
-    }
-
-    @Converter
-    public static CreateWalletRequest toAries(String json) {
-        return toAries(json, CreateWalletRequest.class);
-    }
-
-    @Converter
-    public static CreateWalletRequest toAries(Map<String, Object> map) {
-        return toAries(map, CreateWalletRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverter.java
deleted file mode 100644
index feb2a13d009..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionFilterConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinitionFilter;
-
-@Converter(generateLoader = true)
-public final class CredentialDefinitionFilterConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static CredentialDefinitionFilter toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, CredentialDefinitionFilter.class);
-    }
-
-    @Converter
-    public static CredentialDefinitionFilter toAries(String json) {
-        return toAries(json, CredentialDefinitionFilter.class);
-    }
-
-    @Converter
-    public static CredentialDefinitionFilter toAries(Map<String, Object> map) {
-        return toAries(map, CredentialDefinitionFilter.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverter.java
deleted file mode 100644
index 39a90a076c1..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/CredentialDefinitionRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest;
-
-@Converter(generateLoader = true)
-public final class CredentialDefinitionRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static CredentialDefinitionRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, CredentialDefinitionRequest.class);
-    }
-
-    @Converter
-    public static CredentialDefinitionRequest toAries(String json) {
-        return toAries(json, CredentialDefinitionRequest.class);
-    }
-
-    @Converter
-    public static CredentialDefinitionRequest toAries(Map<String, Object> map) {
-        return toAries(map, CredentialDefinitionRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverter.java
deleted file mode 100644
index e3a60d8b4bd..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/IssueCredentialRecordsFilterConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter;
-
-@Converter(generateLoader = true)
-public final class IssueCredentialRecordsFilterConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static IssueCredentialRecordsFilter toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, IssueCredentialRecordsFilter.class);
-    }
-
-    @Converter
-    public static IssueCredentialRecordsFilter toAries(String json) {
-        return toAries(json, IssueCredentialRecordsFilter.class);
-    }
-
-    @Converter
-    public static IssueCredentialRecordsFilter toAries(Map<String, Object> map) {
-        return toAries(map, IssueCredentialRecordsFilter.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentProofRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentProofRequestConverter.java
deleted file mode 100644
index 1bc9ec5e517..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentProofRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest;
-
-@Converter(generateLoader = true)
-public final class PresentProofRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static PresentProofRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, PresentProofRequest.class);
-    }
-
-    @Converter
-    public static PresentProofRequest toAries(String json) {
-        return toAries(json, PresentProofRequest.class);
-    }
-
-    @Converter
-    public static PresentProofRequest toAries(Map<String, Object> map) {
-        return toAries(map, PresentProofRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentationRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentationRequestConverter.java
deleted file mode 100644
index c47c453ccf8..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/PresentationRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.present_proof.PresentationRequest;
-
-@Converter(generateLoader = true)
-public final class PresentationRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static PresentationRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, PresentationRequest.class);
-    }
-
-    @Converter
-    public static PresentationRequest toAries(String json) {
-        return toAries(json, PresentationRequest.class);
-    }
-
-    @Converter
-    public static PresentationRequest toAries(Map<String, Object> map) {
-        return toAries(map, PresentationRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverter.java
deleted file mode 100644
index 10852994a77..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.out_of_band.ReceiveInvitationFilter;
-
-@Converter(generateLoader = true)
-public final class ReceiveInvitationFilterConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static ReceiveInvitationFilter toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, ReceiveInvitationFilter.class);
-    }
-
-    @Converter
-    public static ReceiveInvitationFilter toAries(String json) {
-        return toAries(json, ReceiveInvitationFilter.class);
-    }
-
-    @Converter
-    public static ReceiveInvitationFilter toAries(Map<String, Object> map) {
-        return toAries(map, ReceiveInvitationFilter.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverter.java
deleted file mode 100644
index 857dfd9055b..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.connection.ReceiveInvitationRequest;
-
-@Converter(generateLoader = true)
-public final class ReceiveInvitationRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static ReceiveInvitationRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, ReceiveInvitationRequest.class);
-    }
-
-    @Converter
-    public static ReceiveInvitationRequest toAries(String json) {
-        return toAries(json, ReceiveInvitationRequest.class);
-    }
-
-    @Converter
-    public static ReceiveInvitationRequest toAries(Map<String, Object> map) {
-        return toAries(map, ReceiveInvitationRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevRegCreateRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevRegCreateRequestConverter.java
deleted file mode 100644
index a1a8e243b9a..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevRegCreateRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.revocation.RevRegCreateRequest;
-
-@Converter(generateLoader = true)
-public final class RevRegCreateRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static RevRegCreateRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, RevRegCreateRequest.class);
-    }
-
-    @Converter
-    public static RevRegCreateRequest toAries(String json) {
-        return toAries(json, RevRegCreateRequest.class);
-    }
-
-    @Converter
-    public static RevRegCreateRequest toAries(Map<String, Object> map) {
-        return toAries(map, RevRegCreateRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevokeRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevokeRequestConverter.java
deleted file mode 100644
index 74a47622373..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/RevokeRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.revocation.RevokeRequest;
-
-@Converter(generateLoader = true)
-public final class RevokeRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static RevokeRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, RevokeRequest.class);
-    }
-
-    @Converter
-    public static RevokeRequest toAries(String json) {
-        return toAries(json, RevokeRequest.class);
-    }
-
-    @Converter
-    public static RevokeRequest toAries(Map<String, Object> map) {
-        return toAries(map, RevokeRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemaSendRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemaSendRequestConverter.java
deleted file mode 100644
index a8227d257e6..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemaSendRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.schema.SchemaSendRequest;
-
-@Converter(generateLoader = true)
-public final class SchemaSendRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static SchemaSendRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, SchemaSendRequest.class);
-    }
-
-    @Converter
-    public static SchemaSendRequest toAries(String json) {
-        return toAries(json, SchemaSendRequest.class);
-    }
-
-    @Converter
-    public static SchemaSendRequest toAries(Map<String, Object> map) {
-        return toAries(map, SchemaSendRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverter.java
deleted file mode 100644
index 1058155f130..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/SchemasCreatedFilterConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.schema.SchemasCreatedFilter;
-
-@Converter(generateLoader = true)
-public final class SchemasCreatedFilterConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static SchemasCreatedFilter toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, SchemasCreatedFilter.class);
-    }
-
-    @Converter
-    public static SchemasCreatedFilter toAries(String json) {
-        return toAries(json, SchemasCreatedFilter.class);
-    }
-
-    @Converter
-    public static SchemasCreatedFilter toAries(Map<String, Object> map) {
-        return toAries(map, SchemasCreatedFilter.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialExchangeConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialExchangeConverter.java
deleted file mode 100644
index adc94256227..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialExchangeConverter.java
+++ /dev/null
@@ -1,54 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange;
-
-@Converter(generateLoader = true)
-public final class V1CredentialExchangeConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static V1CredentialExchange toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, V1CredentialExchange.class);
-    }
-
-    @Converter
-    public static V1CredentialExchange toAries(String json) {
-        return toAries(json, V1CredentialExchange.class);
-    }
-
-    @Converter
-    public static V1CredentialExchange toAries(Map<String, Object> map) {
-        return toAries(map, V1CredentialExchange.class);
-    }
-
-    @Converter
-    public static JsonObject toJsonObject(V1CredentialExchange item) {
-        return (JsonObject) GSON.toJsonTree(item, V1CredentialExchange.class);
-    }
-
-    @Converter
-    @SuppressWarnings("unchecked")
-    public static Map<String, Object> toMap(V1CredentialExchange item) {
-        JsonObject json = toJsonObject(item);
-        return GSON.fromJson(json, Map.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverter.java
deleted file mode 100644
index fde4ad021f8..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest;
-
-@Converter(generateLoader = true)
-public final class V1CredentialFreeOfferRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static V1CredentialFreeOfferRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, V1CredentialFreeOfferRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialFreeOfferRequest toAries(String json) {
-        return toAries(json, V1CredentialFreeOfferRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialFreeOfferRequest toAries(Map<String, Object> map) {
-        return toAries(map, V1CredentialFreeOfferRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverter.java
deleted file mode 100644
index 1d74e409ff4..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialIssueRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest;
-
-@Converter(generateLoader = true)
-public final class V1CredentialIssueRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static V1CredentialIssueRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, V1CredentialIssueRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialIssueRequest toAries(String json) {
-        return toAries(json, V1CredentialIssueRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialIssueRequest toAries(Map<String, Object> map) {
-        return toAries(map, V1CredentialIssueRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverter.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverter.java
deleted file mode 100644
index bc8b05bad2b..00000000000
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/V1CredentialStoreRequestConverter.java
+++ /dev/null
@@ -1,42 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import org.apache.camel.Converter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest;
-
-@Converter(generateLoader = true)
-public final class V1CredentialStoreRequestConverter extends AbstractAriesConverter {
-
-    @Converter
-    public static V1CredentialStoreRequest toAries(JsonObject jsonObj) {
-        return toAries(jsonObj, V1CredentialStoreRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialStoreRequest toAries(String json) {
-        return toAries(json, V1CredentialStoreRequest.class);
-    }
-
-    @Converter
-    public static V1CredentialStoreRequest toAries(Map<String, Object> map) {
-        return toAries(map, V1CredentialStoreRequest.class);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/AbstractCamelAriesTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/AbstractCamelAriesTest.java
deleted file mode 100644
index e60fdc27fd8..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/AbstractCamelAriesTest.java
+++ /dev/null
@@ -1,120 +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.component.aries;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import com.google.gson.Gson;
-import io.nessus.aries.AgentConfiguration;
-import io.nessus.aries.util.AttachmentKey;
-import io.nessus.aries.util.AttachmentSupport;
-import io.nessus.aries.wallet.NessusWallet;
-import io.nessus.aries.wallet.WalletBuilder;
-import io.nessus.aries.wallet.WalletRegistry;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-import org.hyperledger.aries.api.ledger.IndyLedgerRoles;
-import org.hyperledger.aries.config.GsonConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractCamelAriesTest extends CamelTestSupport {
-
-    static final String GOVERNMENT = "Government";
-    static final String FABER = "Faber";
-    static final String ACME = "Acme";
-    static final String THRIFT = "Thrift";
-    static final String ALICE = "Alice";
-
-    static final Gson GSON = GsonConfig.defaultConfig();
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-
-    private AttachmentContext attcontext = new AttachmentContext();
-
-    public HyperledgerAriesComponent getAriesComponent() {
-        return context.getComponent("hyperledger-aries", HyperledgerAriesComponent.class);
-    }
-
-    public AgentConfiguration getAgentConfiguration() {
-        return getAriesComponent().getAgentConfiguration();
-    }
-
-    public void setRemoveWalletsOnShutdown(boolean flag) {
-        getAriesComponent().setRemoveWalletsOnShutdown(flag);
-    }
-
-    public NessusWallet assertWallet(String walletName) {
-        return getAriesComponent().assertWallet(walletName);
-    }
-
-    public NessusWallet getWallet(String walletName) {
-        return getAriesComponent().getWallet(walletName);
-    }
-
-    public AttachmentContext getAttachmentContext() {
-        return attcontext;
-    }
-
-    public void logSection(String title) {
-        int len = 119 - title.length();
-        char[] tail = new char[len];
-        Arrays.fill(tail, '=');
-        log.info("{} {}", title, String.valueOf(tail));
-    }
-
-    public NessusWallet onboardWallet(String walletName) throws IOException {
-        return onboardWallet(walletName, null);
-    }
-
-    public NessusWallet onboardWallet(String walletName, IndyLedgerRoles role) throws IOException {
-
-        logSection("Onboard " + walletName);
-
-        WalletRegistry walletRegistry = getAriesComponent().getWalletRegistry();
-
-        NessusWallet walletRecord = new WalletBuilder(walletName)
-                .walletRegistry(walletRegistry)
-                .selfRegisterNym(role != null)
-                .ledgerRole(role)
-                .build();
-
-        return walletRecord;
-    }
-
-    // Attachment Support ===============================================================
-
-    public static class AttachmentContext extends AttachmentSupport {
-
-        public ConnectionRecord getConnection(String inviter, String invitee) {
-            return getAttachment(inviter + invitee + "Connection", ConnectionRecord.class);
-        }
-
-        public <T> T getAttachment(String name, Class<T> type) {
-            return getAttachment(new AttachmentKey<>(name, type));
-        }
-
-        public <T> T putAttachment(String name, Class<T> type, T obj) {
-            return putAttachment(new AttachmentKey<T>(name, type), obj);
-        }
-
-        public @SuppressWarnings("unchecked") <T> T putAttachment(String name, T obj) {
-            return putAttachment(new AttachmentKey<T>(name, (Class<T>) obj.getClass()), obj);
-        }
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CamelGettingStartedTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CamelGettingStartedTest.java
deleted file mode 100644
index 8da8ac75765..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CamelGettingStartedTest.java
+++ /dev/null
@@ -1,1298 +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.component.aries;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.UnaryOperator;
-
-import com.google.gson.JsonObject;
-import io.nessus.aries.wallet.CredentialProposalHelper;
-import io.nessus.aries.wallet.NessusWallet;
-import io.nessus.aries.websocket.WebSocketClient;
-import org.apache.camel.builder.RouteBuilder;
-import org.hyperledger.acy_py.generated.model.ConnectionInvitation;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.hyperledger.acy_py.generated.model.IndyProofReqPredSpec.PTypeEnum;
-import org.hyperledger.acy_py.generated.model.IssuerRevRegRecord;
-import org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter;
-import org.hyperledger.aries.api.connection.ConnectionRecord;
-import org.hyperledger.aries.api.connection.CreateInvitationRequest;
-import org.hyperledger.aries.api.connection.CreateInvitationResponse;
-import org.hyperledger.aries.api.connection.ReceiveInvitationRequest;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionRequest;
-import org.hyperledger.aries.api.credential_definition.CredentialDefinition.CredentialDefinitionResponse;
-import org.hyperledger.aries.api.credentials.CredentialAttributes;
-import org.hyperledger.aries.api.credentials.CredentialPreview;
-import org.hyperledger.aries.api.issue_credential_v1.CredentialExchangeState;
-import org.hyperledger.aries.api.issue_credential_v1.IssueCredentialRecordsFilter;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange.CredentialProposalDict.CredentialProposal;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialIssueRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialOfferRequest;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialStoreRequest;
-import org.hyperledger.aries.api.multitenancy.CreateWalletRequest;
-import org.hyperledger.aries.api.multitenancy.WalletDispatchType;
-import org.hyperledger.aries.api.multitenancy.WalletRecord;
-import org.hyperledger.aries.api.multitenancy.WalletType;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest.ProofNonRevoked;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest.ProofRequestedAttributes;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest.ProofRequestedPredicates;
-import org.hyperledger.aries.api.present_proof.PresentationExchangeRecord;
-import org.hyperledger.aries.api.present_proof.PresentationExchangeState;
-import org.hyperledger.aries.api.present_proof.PresentationRequest;
-import org.hyperledger.aries.api.present_proof.PresentationRequest.IndyRequestedCredsRequestedAttr;
-import org.hyperledger.aries.api.present_proof.PresentationRequest.IndyRequestedCredsRequestedPred;
-import org.hyperledger.aries.api.present_proof.PresentationRequestCredentials;
-import org.hyperledger.aries.api.present_proof.PresentationRequestCredentials.CredentialInfo;
-import org.hyperledger.aries.api.present_proof.PresentationRequestCredentialsFilter;
-import org.hyperledger.aries.api.revocation.RevRegCreateRequest;
-import org.hyperledger.aries.api.revocation.RevRegCreateResponse.RevocationModuleResponse;
-import org.hyperledger.aries.api.revocation.RevocationEvent.RevocationEventState;
-import org.hyperledger.aries.api.revocation.RevokeRequest;
-import org.hyperledger.aries.api.schema.SchemaSendRequest;
-import org.hyperledger.aries.api.schema.SchemaSendResponse;
-import org.hyperledger.aries.webhook.EventType;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_LEDGER_ROLE;
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_SELF_REGISTER_NYM;
-import static org.apache.camel.component.aries.Constants.HEADER_MULTITENANCY_TRUSTEE_WALLET;
-import static org.apache.camel.component.aries.Constants.HEADER_SERVICE;
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.ENDORSER;
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.TRUSTEE;
-
-/**
- * docker compose up --detach && docker compose logs -f acapy
- */
-@EnabledIfSystemProperty(named = "enable.hyperledger.aries.itests", matches = "true",
-                         disabledReason = "Requires distributed ledger (i.e. blockchain)")
-public class CamelGettingStartedTest extends AbstractCamelAriesTest {
-
-    static final String TRANSCRIPT_SCHEMA_ID = "TranscriptSchemaId";
-    static final String TRANSCRIPT_CREDEF_ID = "TranscriptCredDefId";
-    static final String JOB_CERTIFICATE_SCHEMA_ID = "JobCertificateSchemaId";
-    static final String JOB_CERTIFICATE_CREDEF_ID = "JobCertificateCredDefId";
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() {
-
-                from("direct:admin")
-                        .to("hyperledger-aries:admin?service=/multitenancy/wallet");
-
-                from("direct:government")
-                        .to("hyperledger-aries:government");
-
-                from("direct:faber")
-                        .to("hyperledger-aries:faber");
-
-                from("direct:acme")
-                        .to("hyperledger-aries:acme");
-
-                from("direct:thrift")
-                        .to("hyperledger-aries:thrift");
-
-                from("direct:alice")
-                        .to("hyperledger-aries:alice");
-            }
-        };
-    }
-
-    @Test
-    public void testWorkflow() throws Exception {
-
-        AttachmentContext ctx = getAttachmentContext();
-        setRemoveWalletsOnShutdown(true);
-
-        /*
-         * Onboard Government Wallet and DID
-         *
-         * Trustees operate nodes. Trustees govern the network. These are the highest
-         * privileged DIDs. Endorsers are able to write Schemas and Cred_Defs to the
-         * ledger, or sign such transactions so they can be written by non-privileged
-         * DIDs.
-         *
-         * We want to ensure a DID has the least amount of privilege it needs to
-         * operate, which in many cases is no privilege, provided the resources it needs
-         * are already written to the ledger, either by a privileged DID or by having
-         * the txn signed by a privileged DID (e.g. by an Endorser).
-         *
-         * An Endorser is a person or organization that the ledger already knows about,
-         * that is able to help bootstrap others.
-         */
-
-        onboardGovernment(ctx);
-
-        /*
-         * Onboarding Faber, Acme, Thrift
-         *
-         * Each connection is actually a pair of Pairwise-Unique Identifiers (DIDs). The
-         * one DID is owned by one party to the connection and the second by another.
-         *
-         * Both parties know both DIDs and understand what connection this pair
-         * describes.
-         *
-         * Publishing with a DID verification key allows a person, organization or
-         * thing, to verify that someone owns this DID as that person, organization or
-         * thing is the only one who knows the corresponding signing key and any
-         * DID-related operations requiring signing with this key.
-         *
-         * The relationship between them is not shareable with others; it is unique to
-         * those two parties in that each pairwise relationship uses different DIDs.
-         *
-         * We call the process of establish a connection Onboarding.
-         */
-
-        onboardFaberCollege(ctx);
-        onboardAcmeCorp(ctx);
-        onboardThriftBank(ctx);
-        onboardAlice(ctx);
-
-        /*
-         * Creating Credential Schemas
-         *
-         * Credential Schema is the base semantic structure that describes the list of
-         * attributes which one particular Credential can contain.
-         *
-         * It’s not possible to update an existing Schema. If the Schema needs to be
-         * evolved, a new Schema with a new version or name needs to be created.
-         *
-         * Schemas in indy are very simple JSON documents that specify their name and
-         * version, and that list attributes that will appear in a credential.
-         * Currently, they do not describe data type, recurrence rules, nesting, and
-         * other elaborate constructs.
-         */
-
-        createTranscriptSchema(ctx);
-        createJobCertificateSchema(ctx);
-
-        /*
-         * Creating Credential Definitions
-         *
-         * Credential Definition is similar in that the keys that the Issuer uses for
-         * the signing of Credentials also satisfies a specific Credential Schema.
-         *
-         * It references it's associated schema, announces who is going to be issuing
-         * credentials with that schema, what type of signature method they plan to use
-         * (“CL” = “Camenisch Lysyanskya”, the default method used for zero-knowledge
-         * proofs by indy), how they plan to handle revocation, and so forth.
-         *
-         * It’s not possible to update data in an existing Credential Definition. If a
-         * CredDef needs to be evolved (for example, a key needs to be rotated), then a
-         * new Credential Definition needs to be created by a new Issuer DID.
-         *
-         * A Credential Definition can be created and saved in the Ledger by an Endorser.
-         */
-
-        createTranscriptCredentialDefinition(ctx);
-        createJobCertificateCredentialDefinition(ctx);
-
-        /*
-         * Create a peer connection between Alice/Faber
-         *
-         * Alice does not connect to Faber's public DID, Alice does not even have a public DID
-         * Instead both parties create new DIDs that they use for their peer connection
-         */
-
-        connectPeers(ctx, FABER, ALICE);
-
-        /*
-         * Alice gets her Transcript from Faber College
-         *
-         * A credential is a piece of information about an identity — a name, an age, a
-         * credit score... It is information claimed to be true. In this case, the
-         * credential is named, “Transcript”.
-         *
-         * Credentials are offered by an issuer.
-         *
-         * An issuer may be any identity owner known to the Ledger and any issuer may
-         * issue a credential about any identity owner it can identify.
-         *
-         * The usefulness and reliability of a credential are tied to the reputation of
-         * the issuer with respect to the credential at hand. For Alice to self-issue a
-         * credential that she likes chocolate ice cream may be perfectly reasonable,
-         * but for her to self-issue a credential that she graduated from Faber College
-         * should not impress anyone.
-         */
-
-        getTranscriptFromFaber(ctx);
-
-        /*
-         * Create a peer connection between Alice/Acme
-         *
-         *  Alice does not connect to Faber's public DID, Alice does not even have a public DID
-         *  Instead both parties create new DIDs that they use for their peer connection
-         */
-
-        connectPeers(ctx, ACME, ALICE);
-
-        /*
-         * Alice applies for a job at Acme
-         *
-         * At some time in the future, Alice would like to work for Acme Corp. Normally
-         * she would browse to their website, where she would click on a hyperlink to
-         * apply for a job. Her browser would download a connection request in which her
-         * Indy app would open; this would trigger a prompt to Alice, asking her to
-         * accept the connection with Acme Corp.
-         *
-         * After Alice had established connection with Acme, she got the Job-Application
-         * Proof Request. A proof request is a request made by the party who needs
-         * verifiable proof of having certain attributes and the solving of predicates
-         * that can be provided by other verified credentials.
-         *
-         * Acme Corp is requesting that Alice provide a Job Application. The Job
-         * Application requires a name, degree, status, SSN and also the satisfaction of
-         * the condition about the average mark or grades.
-         */
-
-        applyForJobWithAcme(ctx);
-
-        /*
-         * Alice gets the job and hence receives a JobCertificate from Acme
-         *
-         * This is similar to the Transcript VC that she got from Faber, except that the
-         * JobCertificate credential can be revoked by Acme
-         */
-
-        getJobWithAcme(ctx);
-
-        /*
-         * Create a peer connection between Alice/Faber
-         *
-         * Alice does not connect to Faber's public DID, Alice does not even have a public DID
-         * Instead both parties create new DIDs that they use for their peer connection
-         */
-
-        connectPeers(ctx, THRIFT, ALICE);
-
-        /*
-         * Alice applies for a loan with Thrift Bank
-         *
-         * Now that Alice has a job, she’d like to apply for a loan. That will require a
-         * proof of employment. She can get this from the Job-Certificate credential
-         * offered by Acme.
-         */
-
-        applyForLoanWithThrift(ctx, true);
-
-        /*
-         * Thrift accepts the loan application and now requires KYC
-         *
-         * Thrift Bank sends the second Proof Request where Alice needs to share her
-         * personal information with the bank.
-         */
-
-        kycProcessWithThrift(ctx);
-
-        /*
-         * Alice decides to quit her job with Acme
-         */
-
-        acmeRevokesTheJobCertificate(ctx);
-
-        /*
-         * Alice applies for another loan with Thrift Bank - this time without having a Job
-         *
-         */
-
-        applyForLoanWithThrift(ctx, false);
-    }
-
-    public void onboardGovernment(AttachmentContext ctx) throws IOException {
-
-        String walletName = GOVERNMENT;
-        logSection("Onboard " + walletName);
-
-        CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-                .walletDispatchType(WalletDispatchType.DEFAULT)
-                .walletType(WalletType.INDY)
-                .walletName(walletName)
-                .walletKey(walletName + "Key")
-                .build();
-
-        template.requestBodyAndHeaders("direct:admin", walletRequest, Map.of(
-                HEADER_MULTITENANCY_LEDGER_ROLE, TRUSTEE,
-                HEADER_MULTITENANCY_SELF_REGISTER_NYM, true),
-                WalletRecord.class);
-
-        template.requestBodyAndHeaders("direct:government", null,
-                Map.of(HEADER_SERVICE, "/wallet/did/public"), DID.class);
-
-        NessusWallet wallet = assertWallet(walletName);
-        wallet.createWebSocketClient(getAgentConfiguration());
-        Assertions.assertNotNull(wallet.getPublicDid(), "Public DID not null");
-    }
-
-    public void onboardFaberCollege(AttachmentContext ctx) throws IOException {
-
-        String walletName = FABER;
-        logSection("Onboard " + walletName);
-
-        CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-                .walletDispatchType(WalletDispatchType.DEFAULT)
-                .walletType(WalletType.INDY)
-                .walletName(walletName)
-                .walletKey(walletName + "Key")
-                .build();
-
-        template.requestBodyAndHeaders("direct:admin", walletRequest, Map.of(
-                HEADER_MULTITENANCY_TRUSTEE_WALLET, GOVERNMENT,
-                HEADER_MULTITENANCY_LEDGER_ROLE, ENDORSER),
-                WalletRecord.class);
-
-        template.requestBodyAndHeaders("direct:faber", null,
-                Map.of(HEADER_SERVICE, "/wallet/did/public"), DID.class);
-
-        NessusWallet wallet = assertWallet(walletName);
-        wallet.createWebSocketClient(getAgentConfiguration());
-        Assertions.assertNotNull(wallet.getPublicDid(), "Public DID not null");
-    }
-
-    public void onboardAcmeCorp(AttachmentContext ctx) throws IOException {
-
-        String walletName = ACME;
-        logSection("Onboard " + walletName);
-
-        CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-                .walletDispatchType(WalletDispatchType.DEFAULT)
-                .walletType(WalletType.INDY)
-                .walletName(walletName)
-                .walletKey(walletName + "Key")
-                .build();
-
-        template.requestBodyAndHeaders("direct:admin", walletRequest, Map.of(
-                HEADER_MULTITENANCY_TRUSTEE_WALLET, GOVERNMENT,
-                HEADER_MULTITENANCY_LEDGER_ROLE, ENDORSER),
-                WalletRecord.class);
-
-        template.requestBodyAndHeaders("direct:acme", null,
-                Map.of(HEADER_SERVICE, "/wallet/did/public"), DID.class);
-
-        NessusWallet wallet = assertWallet(walletName);
-        wallet.createWebSocketClient(getAgentConfiguration());
-        Assertions.assertNotNull(wallet.getPublicDid(), "Public DID not null");
-    }
-
-    public void onboardThriftBank(AttachmentContext ctx) throws IOException {
-
-        String walletName = THRIFT;
-        logSection("Onboard " + walletName);
-
-        CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-                .walletDispatchType(WalletDispatchType.DEFAULT)
-                .walletType(WalletType.INDY)
-                .walletName(walletName)
-                .walletKey(walletName + "Key")
-                .build();
-
-        template.requestBodyAndHeaders("direct:admin", walletRequest, Map.of(
-                HEADER_MULTITENANCY_TRUSTEE_WALLET, GOVERNMENT,
-                HEADER_MULTITENANCY_LEDGER_ROLE, ENDORSER),
-                WalletRecord.class);
-
-        template.requestBodyAndHeaders("direct:thrift", null,
-                Map.of(HEADER_SERVICE, "/wallet/did/public"), DID.class);
-
-        NessusWallet wallet = assertWallet(walletName);
-        wallet.createWebSocketClient(getAgentConfiguration());
-        Assertions.assertNotNull(wallet.getPublicDid(), "Public DID not null");
-    }
-
-    public void onboardAlice(AttachmentContext ctx) throws IOException {
-
-        String walletName = ALICE;
-        logSection("Onboard " + walletName);
-
-        CreateWalletRequest walletRequest = CreateWalletRequest.builder()
-                .walletDispatchType(WalletDispatchType.DEFAULT)
-                .walletType(WalletType.INDY)
-                .walletName(walletName)
-                .walletKey(walletName + "Key")
-                .build();
-
-        template.requestBody("direct:admin", walletRequest, WalletRecord.class);
-
-        NessusWallet wallet = getWallet(walletName);
-        wallet.createWebSocketClient(getAgentConfiguration());
-    }
-
-    void connectPeers(AttachmentContext ctx, String inviter, String invitee) throws Exception {
-
-        logSection(String.format("Connect %s to %s", inviter, invitee));
-
-        NessusWallet inviterWallet = getAriesComponent().assertWallet(inviter);
-        NessusWallet inviteeWallet = getAriesComponent().assertWallet(invitee);
-
-        WebSocketClient inviterEvents = inviterWallet.getWebSocketClient().startRecording(EventType.CONNECTIONS);
-        WebSocketClient inviteeEvents = inviteeWallet.getWebSocketClient().startRecording(EventType.CONNECTIONS);
-
-        // Inviter creates an invitation (/connections/create-invitation)
-        UnaryOperator<String> uri = wn -> "direct:" + wn.toLowerCase();
-        CreateInvitationRequest createInvitationRequest = CreateInvitationRequest.builder().build();
-        CreateInvitationResponse createInvitationResponse = template.requestBodyAndHeaders(uri.apply(inviter),
-                createInvitationRequest, Map.of(HEADER_SERVICE, "/connections/create-invitation"),
-                CreateInvitationResponse.class);
-
-        // This invitation data finds its way to the Invitee somehow (i.e. out-of-band)
-        ConnectionInvitation invitation = createInvitationResponse.getInvitation();
-
-        // Invitee receives the invitation from the Inviter (/connections/receive-invitation)
-        ReceiveInvitationRequest receiveInvitationRequest = ReceiveInvitationRequest.builder()
-                .recipientKeys(invitation.getRecipientKeys())
-                .serviceEndpoint(invitation.getServiceEndpoint())
-                .build();
-
-        ConnectionReceiveInvitationFilter receiveParams = ConnectionReceiveInvitationFilter.builder()
-                .autoAccept(true)
-                .build();
-
-        template.requestBodyAndHeaders(uri.apply(invitee), receiveInvitationRequest, Map.of(
-                HEADER_SERVICE, "/connections/receive-invitation",
-                ConnectionReceiveInvitationFilter.class.getName(), receiveParams),
-                ConnectionRecord.class);
-
-        ConnectionRecord inviterConnectionRecord = inviterEvents
-                .awaitConnection(ConnectionRecord::stateIsActive, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        ConnectionRecord inviteeConnectionRecord = inviteeEvents
-                .awaitConnection(ConnectionRecord::stateIsActive, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        ctx.putAttachment(inviter + invitee + "Connection", inviterConnectionRecord);
-        ctx.putAttachment(invitee + inviter + "Connection", inviteeConnectionRecord);
-    }
-
-    void createTranscriptSchema(AttachmentContext ctx) {
-
-        logSection("Create Transcript Schema");
-
-        // Faber creates the Transcript Credential Schema and sends it to the Ledger
-        // It can do so with it's Endorser role
-
-        SchemaSendRequest schemaRequest = SchemaSendRequest.builder()
-                .schemaVersion("1.2")
-                .schemaName("Transcript")
-                .attributes(Arrays.asList(
-                        "first_name",
-                        "last_name",
-                        "ssn",
-                        "degree",
-                        "status",
-                        "year",
-                        "average"))
-                .build();
-
-        SchemaSendResponse schemaResponse = template.requestBodyAndHeaders("direct:faber", schemaRequest, Map.of(
-                HEADER_SERVICE, "/schemas"),
-                SchemaSendResponse.class);
-        log.info("{}", schemaResponse);
-
-        ctx.putAttachment(TRANSCRIPT_SCHEMA_ID, schemaResponse.getSchemaId());
-    }
-
-    void createJobCertificateSchema(AttachmentContext ctx) {
-
-        logSection("Create Job Certificate Schema");
-
-        // Acme creates the Job-Certificate Credential Schema and sends it to the Ledger
-        // It can do so with it's Trustee role
-
-        SchemaSendRequest schemaRequest = SchemaSendRequest.builder()
-                .schemaVersion("0.2")
-                .schemaName("Job-Certificate")
-                .attributes(Arrays.asList(
-                        "first_name",
-                        "last_name",
-                        "salary",
-                        "employee_status",
-                        "experience"))
-                .build();
-
-        SchemaSendResponse schemaResponse = template.requestBodyAndHeaders("direct:acme", schemaRequest, Map.of(
-                HEADER_SERVICE, "/schemas"),
-                SchemaSendResponse.class);
-        log.info("{}", schemaResponse);
-
-        ctx.putAttachment(JOB_CERTIFICATE_SCHEMA_ID, schemaResponse.getSchemaId());
-    }
-
-    void createTranscriptCredentialDefinition(AttachmentContext ctx) {
-
-        logSection("Create Transcript CredDef");
-
-        // 1. Faber creates the Transcript Credential Definition
-
-        CredentialDefinitionRequest credDefRequest = CredentialDefinitionRequest.builder()
-                .schemaId(ctx.getAttachment(TRANSCRIPT_SCHEMA_ID, String.class))
-                .supportRevocation(false)
-                .build();
-
-        CredentialDefinitionResponse credDefResponse = template.requestBodyAndHeaders("direct:faber", credDefRequest, Map.of(
-                HEADER_SERVICE, "/credential-definitions"),
-                CredentialDefinitionResponse.class);
-        log.info("{}", credDefResponse);
-
-        ctx.putAttachment(TRANSCRIPT_CREDEF_ID, credDefResponse.getCredentialDefinitionId());
-    }
-
-    void createJobCertificateCredentialDefinition(AttachmentContext ctx) {
-
-        logSection("Create Job Certificate CredDef");
-
-        // 1. Acme creates the Job-Certificate Credential Definition
-
-        CredentialDefinitionRequest credDefRequest = CredentialDefinitionRequest.builder()
-                .schemaId(ctx.getAttachment(JOB_CERTIFICATE_SCHEMA_ID, String.class))
-                .supportRevocation(true)
-                .build();
-
-        CredentialDefinitionResponse credDefResponse = template.requestBodyAndHeaders("direct:acme", credDefRequest, Map.of(
-                HEADER_SERVICE, "/credential-definitions"),
-                CredentialDefinitionResponse.class);
-        log.info("{}", credDefResponse);
-
-        String credentialDefinitionId = credDefResponse.getCredentialDefinitionId();
-        ctx.putAttachment(JOB_CERTIFICATE_CREDEF_ID, credentialDefinitionId);
-
-        /* 2. Acme creates a Revocation Registry for the given Credential Definition.
-         *
-         * The issuer anticipates revoking Job-Certificate credentials. It decides to create a revocation registry.
-         *
-         * One of Hyperledger Indy’s revocation registry types uses cryptographic accumulators for publishing revoked credentials.
-         * The use of those accumulators requires the publication of “validity tails” outside of the Ledger.
-         */
-
-        RevRegCreateRequest revocRegistryRequest = RevRegCreateRequest.builder()
-                .credentialDefinitionId(credentialDefinitionId)
-                .build();
-
-        IssuerRevRegRecord revocRegistryRecord = template.requestBodyAndHeaders("direct:acme", revocRegistryRequest, Map.of(
-                HEADER_SERVICE, "/revocation/create-registry"),
-                IssuerRevRegRecord.class);
-        log.info("{}", revocRegistryRecord);
-    }
-
-    void getTranscriptFromFaber(AttachmentContext ctx) throws Exception {
-
-        logSection("Alice gets Transcript from Faber");
-
-        String faberAliceConnectionId = ctx.getConnection(FABER, ALICE).getConnectionId();
-
-        WebSocketClient issuerEvents = getWallet(FABER).getWebSocketClient().startRecording(EventType.ISSUE_CREDENTIAL);
-        WebSocketClient holderEvents = getWallet(ALICE).getWebSocketClient().startRecording(EventType.ISSUE_CREDENTIAL);
-
-        /* 1. Faber sends the Transcript Credential Offer
-         *
-         * The value of this Transcript Credential is that it is provably issued by Faber College
-         */
-
-        String transcriptCredDefId = ctx.getAttachment(TRANSCRIPT_CREDEF_ID, String.class);
-        V1CredentialOfferRequest credentialOffer = V1CredentialOfferRequest.builder()
-                .connectionId(faberAliceConnectionId)
-                .credentialDefinitionId(transcriptCredDefId)
-                .credentialPreview(new CredentialPreview(
-                        CredentialAttributes.from(Map.of(
-                                "first_name", "Alice",
-                                "last_name", "Garcia",
-                                "ssn", "123-45-6789",
-                                "degree", "Bachelor of Science, Marketing",
-                                "status", "graduated",
-                                "year", "2015",
-                                "average", "5"))))
-                .build();
-
-        template.requestBodyAndHeaders("direct:faber", credentialOffer, Map.of(
-                HEADER_SERVICE, "/issue-credential/send-offer"),
-                V1CredentialExchange.class);
-
-        /* 2. Alice inspects the the Transcript Credential Offer
-         *
-         */
-
-        V1CredentialExchange holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(transcriptCredDefId) &&
-                        cex.getState() == CredentialExchangeState.OFFER_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        CredentialProposal credentialProposal = holderExchange.getCredentialProposalDict().getCredentialProposal();
-        CredentialProposalHelper credentialHelper = new CredentialProposalHelper(credentialProposal);
-        Assertions.assertEquals("Alice", credentialHelper.getAttributeValue("first_name"));
-        Assertions.assertEquals("Garcia", credentialHelper.getAttributeValue("last_name"));
-        Assertions.assertEquals("graduated", credentialHelper.getAttributeValue("status"));
-        Assertions.assertEquals("5", credentialHelper.getAttributeValue("average"));
-
-        /* 3. Alice sends the Transcript Credential Request
-         *
-         */
-
-        String holderCredentialExchangeId = holderExchange.getCredentialExchangeId();
-        template.requestBodyAndHeaders("direct:alice", null, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/send-request"),
-                V1CredentialExchange.class);
-
-        /* 4. Faber receives the Transcript Credential Request
-         *
-         */
-
-        V1CredentialExchange issuerExchange = issuerEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(transcriptCredDefId) &&
-                        cex.getState() == CredentialExchangeState.REQUEST_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 5. Faber issues the Transcript Credential
-         *
-         */
-
-        String issuerCredentialExchangeId = issuerExchange.getCredentialExchangeId();
-        V1CredentialIssueRequest credentialIssueRequest = V1CredentialIssueRequest.builder().build();
-
-        template.requestBodyAndHeaders("direct:faber", credentialIssueRequest, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + issuerCredentialExchangeId + "/issue"),
-                V1CredentialExchange.class);
-
-        /* 6. Alice receives the Transcript Credential
-         *
-         */
-
-        holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(transcriptCredDefId) &&
-                        cex.getState() == CredentialExchangeState.CREDENTIAL_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 7. Alice stores the Transcript Credential
-         *
-         */
-
-        String holderCredentialId = holderExchange.getCredentialId();
-        holderCredentialExchangeId = holderExchange.getCredentialExchangeId();
-        V1CredentialStoreRequest credentialStoreRequest = V1CredentialStoreRequest.builder()
-                .credentialId(holderCredentialId)
-                .build();
-
-        template.requestBodyAndHeaders("direct:alice", credentialStoreRequest, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/store"),
-                V1CredentialExchange.class);
-
-        holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(transcriptCredDefId) &&
-                        cex.getState() == CredentialExchangeState.CREDENTIAL_ACKED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-    }
-
-    void applyForJobWithAcme(AttachmentContext ctx) throws Exception {
-
-        logSection("Alice applies for a Job with Acme");
-
-        String acmeAliceConnectionId = ctx.getConnection(ACME, ALICE).getConnectionId();
-
-        WebSocketClient verifierEvents = getWallet(ACME).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-        WebSocketClient proverEvents = getWallet(ALICE).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-
-        /* 1. Acme creates a Job Application Proof Request
-         *
-         * Notice that some attributes are verifiable and others are not.
-         *
-         * The proof request says that degree, and graduation status, ssn and year must be formally asserted by an issuer and schema_key.
-         * Notice also that the first_name, last_name and phone_number are not required to be verifiable.
-         *
-         * By not tagging these credentials with a verifiable status, Acme’s credential request is saying it will accept
-         * Alice’s own credential about her names and phone number.
-         */
-
-        String transcriptCredDefId = ctx.getAttachment(TRANSCRIPT_CREDEF_ID, String.class);
-
-        Function<String, JsonObject> creddefRestriction
-                = cdid -> GSON.fromJson("{\"cred_def_id\"=\"" + cdid + "\"}", JsonObject.class);
-        Function<String, ProofRequestedAttributes> proofReqAttr = name -> ProofRequestedAttributes.builder().name(name).build();
-        BiFunction<String, String, ProofRequestedAttributes> restrictedProofReqAttr
-                = (name, cdid) -> ProofRequestedAttributes.builder()
-                        .name(name)
-                        .restriction(creddefRestriction.apply(cdid))
-                        .build();
-        BiFunction<String, String, ProofRequestedPredicates> restrictedProofReqPred
-                = (pred, cdid) -> ProofRequestedPredicates.builder()
-                        .name(pred.split(" ")[0])
-                        .pType(PTypeEnum.fromValue(pred.split(" ")[1]))
-                        .pValue(Integer.valueOf(pred.split(" ")[2]))
-                        .restriction(creddefRestriction.apply(cdid))
-                        .build();
-
-        PresentProofRequest proofRequest = PresentProofRequest.builder()
-                .connectionId(acmeAliceConnectionId)
-                .proofRequest(ProofRequest.builder()
-                        .name("Job-Application")
-                        .nonce("1")
-                        .requestedAttribute("attr1_referent", proofReqAttr.apply("first_name"))
-                        .requestedAttribute("attr2_referent", proofReqAttr.apply("last_name"))
-                        .requestedAttribute("attr3_referent", restrictedProofReqAttr.apply("ssn", transcriptCredDefId))
-                        .requestedAttribute("attr4_referent", restrictedProofReqAttr.apply("degree", transcriptCredDefId))
-                        .requestedAttribute("attr5_referent", restrictedProofReqAttr.apply("status", transcriptCredDefId))
-                        .requestedAttribute("attr6_referent", restrictedProofReqAttr.apply("year", transcriptCredDefId))
-                        .requestedPredicate("pred1_referent", restrictedProofReqPred.apply("average >= 4", transcriptCredDefId))
-                        .build())
-                .build();
-
-        PresentationExchangeRecord verifierExchangeRecord = template.requestBodyAndHeaders("direct:acme", proofRequest, Map.of(
-                HEADER_SERVICE, "/present-proof/send-request"),
-                PresentationExchangeRecord.class);
-
-        String threadId = verifierExchangeRecord.getThreadId();
-        PresentationExchangeRecord proverExchangeRecord = proverEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.REQUEST_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // 2. Alice searches her Wallet for Credentials that she can use for the creating of Proof for the Job-Application Proof Request
-
-        Map<String, String> referentMapping = new HashMap<>();
-        String proverExchangeId = proverExchangeRecord.getPresentationExchangeId();
-        PresentationRequestCredentialsFilter credentialsFilter = PresentationRequestCredentialsFilter.builder().build();
-
-        List<PresentationRequestCredentials> credentials = Arrays.asList(template.requestBodyAndHeaders("direct:alice",
-                credentialsFilter, Map.of(
-                        HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/credentials"),
-                PresentationRequestCredentials[].class));
-        Assertions.assertEquals(1, credentials.size(), "Expected single Credential");
-
-        credentials.stream().forEach(cred -> {
-            List<String> presentationReferents = cred.getPresentationReferents();
-            CredentialInfo credInfo = cred.getCredentialInfo();
-            String credDefId = credInfo.getCredentialDefinitionId();
-            Map<String, String> attributes = credInfo.getAttrs();
-            String referent = credInfo.getReferent();
-            log.info("{}", cred);
-            log.info("+- CredDefId: {}", credDefId);
-            log.info("+- PresentationReferents: {}", presentationReferents);
-            log.info("+- Attributes: {}", attributes);
-            log.info("+- Referent: {}", referent);
-
-            // Map attribute referents to their respective credential referent
-            presentationReferents.stream().forEach(pr -> referentMapping.put(pr, referent));
-        });
-
-        /* 3. Alice provides Job Application Proof
-         *
-         * Alice divides these attributes into the three groups:
-         *
-         * - attributes values of which will be revealed
-         * - attributes values of which will be unrevealed
-         * - attributes for which creating of verifiable proof is not required
-         */
-
-        BiFunction<String, Boolean, IndyRequestedCredsRequestedAttr> indyRequestedAttr
-                = (ref, reveal) -> IndyRequestedCredsRequestedAttr.builder()
-                        .credId(referentMapping.get(ref))
-                        .revealed(reveal)
-                        .build();
-        Function<String, IndyRequestedCredsRequestedPred> indyRequestedPred = ref -> IndyRequestedCredsRequestedPred.builder()
-                .credId(referentMapping.get(ref))
-                .build();
-
-        PresentationRequest presentationRequest = PresentationRequest.builder()
-                .selfAttestedAttributes(Map.of(
-                        "attr1_referent", "Alice",
-                        "attr2_referent", "Garcia"))
-                .requestedAttributes(Map.of(
-                        "attr3_referent", indyRequestedAttr.apply("attr3_referent", true),
-                        "attr4_referent", indyRequestedAttr.apply("attr4_referent", true),
-                        "attr5_referent", indyRequestedAttr.apply("attr5_referent", true),
-                        "attr6_referent", indyRequestedAttr.apply("attr6_referent", true)))
-                .requestedPredicates(Map.of(
-                        "pred1_referent", indyRequestedPred.apply("pred1_referent")))
-                .build();
-
-        template.requestBodyAndHeaders("direct:alice", presentationRequest, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/send-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 4. Acme verifies the Job Application Proof from Alice
-         *
-         */
-
-        String verifierExchangeId = verifierExchangeRecord.getPresentationExchangeId();
-
-        template.requestBodyAndHeaders("direct:acme", null, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + verifierExchangeId + "/verify-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.VERIFIED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        Assertions.assertTrue(verifierExchangeRecord.isVerified(), "Not VERIFIED");
-
-        proverEvents.awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_ACKED &&
-                pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // [#1754] Prover cannot know verification outcome from PRESENTATION_ACKED
-        // https://github.com/hyperledger/aries-cloudagent-python/issues/1754
-        //Assertions.assertTrue(proverExchangeRecord[0].isVerified(), "Not VERIFIED");
-    }
-
-    void getJobWithAcme(AttachmentContext ctx) throws Exception {
-
-        logSection("Alice gets JobCertificate from Acme");
-
-        String acmeAliceConnectionId = ctx.getConnection(ACME, ALICE).getConnectionId();
-
-        WebSocketClient issuerEvents = getWallet(ACME).getWebSocketClient().startRecording(EventType.ISSUE_CREDENTIAL);
-        WebSocketClient holderEvents = getWallet(ALICE).getWebSocketClient().startRecording(EventType.ISSUE_CREDENTIAL);
-
-        /* 1. Acme sends the JobCertificate Credential Offer
-         *
-         * The value of this JobCertificate Credential is that it
-         * is verifiably proves that the holder is employed by Acme
-         */
-
-        String jobCertificateCredDefId = ctx.getAttachment(JOB_CERTIFICATE_CREDEF_ID, String.class);
-        V1CredentialOfferRequest credentialOfferRequest = V1CredentialOfferRequest.builder()
-                .connectionId(acmeAliceConnectionId)
-                .credentialDefinitionId(jobCertificateCredDefId)
-                .credentialPreview(new CredentialPreview(
-                        CredentialAttributes.from(Map.of(
-                                "first_name", "Alice",
-                                "last_name", "Garcia",
-                                "employee_status", "Permanent",
-                                "experience", "10",
-                                "salary", "2400"))))
-                .build();
-
-        template.requestBodyAndHeaders("direct:acme", credentialOfferRequest, Map.of(
-                HEADER_SERVICE, "/issue-credential/send-offer"),
-                V1CredentialExchange.class);
-
-        /* 2. Alice inspects the the JobCertificate Credential Offer
-         *
-         */
-
-        V1CredentialExchange holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(jobCertificateCredDefId) &&
-                        cex.getState() == CredentialExchangeState.OFFER_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        CredentialProposal credentialProposal = holderExchange.getCredentialProposalDict().getCredentialProposal();
-        CredentialProposalHelper credentialHelper = new CredentialProposalHelper(credentialProposal);
-        Assertions.assertEquals("Alice", credentialHelper.getAttributeValue("first_name"));
-        Assertions.assertEquals("Garcia", credentialHelper.getAttributeValue("last_name"));
-        Assertions.assertEquals("Permanent", credentialHelper.getAttributeValue("employee_status"));
-        Assertions.assertEquals("2400", credentialHelper.getAttributeValue("salary"));
-
-        /* 3. Alice sends the JobCertificate Credential Request
-         *
-         */
-
-        String holderCredentialExchangeId = holderExchange.getCredentialExchangeId();
-        template.requestBodyAndHeaders("direct:alice", null, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/send-request"),
-                V1CredentialExchange.class);
-
-        /* 4. Acme receives the JobCertificate Credential Request
-         *
-         */
-
-        V1CredentialExchange issuerExchange = issuerEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(jobCertificateCredDefId) &&
-                        cex.getState() == CredentialExchangeState.REQUEST_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 5. Acme issues the JobCertificate Credential
-         *
-         */
-
-        String issuerCredentialExchangeId = issuerExchange.getCredentialExchangeId();
-        V1CredentialIssueRequest credentialIssueRequest = V1CredentialIssueRequest.builder().build();
-
-        template.requestBodyAndHeaders("direct:acme", credentialIssueRequest, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + issuerCredentialExchangeId + "/issue"),
-                V1CredentialExchange.class);
-
-        /* 6. Alice receives the Transcript Credential
-         *
-         */
-
-        holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(jobCertificateCredDefId) &&
-                        cex.getState() == CredentialExchangeState.CREDENTIAL_RECEIVED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 7. Alice stores the Transcript Credential
-         *
-         */
-
-        String holderCredentialId = holderExchange.getCredentialId();
-        holderCredentialExchangeId = holderExchange.getCredentialExchangeId();
-        V1CredentialStoreRequest credentialStoreRequest = V1CredentialStoreRequest.builder()
-                .credentialId(holderCredentialId)
-                .build();
-
-        template.requestBodyAndHeaders("direct:alice", credentialStoreRequest, Map.of(
-                HEADER_SERVICE, "/issue-credential/records/" + holderCredentialExchangeId + "/store"),
-                V1CredentialExchange.class);
-
-        holderExchange = holderEvents
-                .awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(jobCertificateCredDefId) &&
-                        cex.getState() == CredentialExchangeState.CREDENTIAL_ACKED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-    }
-
-    void applyForLoanWithThrift(AttachmentContext ctx, boolean expectedOutcome) throws Exception {
-
-        logSection("Alice applies for a Loan with Thrift");
-
-        String thriftAliceConnectionId = ctx.getConnection(THRIFT, ALICE).getConnectionId();
-
-        WebSocketClient verifierEvents = getWallet(THRIFT).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-        WebSocketClient proverEvents = getWallet(ALICE).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-
-        /* 1. Alice gets a Loan-Application Proof Request from Thrift Bank
-         *
-         * Note, that the Job-Certificate should not have been revoked at the time of application.
-         */
-
-        String jobCertificateCredDefId = ctx.getAttachment(JOB_CERTIFICATE_CREDEF_ID, String.class);
-
-        Function<String, JsonObject> credDefRestriction
-                = cdid -> GSON.fromJson("{\"cred_def_id\"=\"" + cdid + "\"}", JsonObject.class);
-        BiFunction<String, String, ProofRequestedAttributes> restrictedProofReqAttr
-                = (name, cdid) -> ProofRequestedAttributes.builder()
-                        .name(name)
-                        .restriction(credDefRestriction.apply(cdid))
-                        .build();
-        BiFunction<String, String, ProofRequestedPredicates> restrictedProofReqPred
-                = (pred, cdid) -> ProofRequestedPredicates.builder()
-                        .name(pred.split(" ")[0])
-                        .pType(PTypeEnum.fromValue(pred.split(" ")[1]))
-                        .pValue(Integer.valueOf(pred.split(" ")[2]))
-                        .restriction(credDefRestriction.apply(cdid))
-                        .build();
-
-        PresentProofRequest proofRequest = PresentProofRequest.builder()
-                .connectionId(thriftAliceConnectionId)
-                .proofRequest(ProofRequest.builder()
-                        .name("Loan-Application")
-                        .nonce("1")
-                        .requestedAttribute("attr1_referent",
-                                restrictedProofReqAttr.apply("employee_status", jobCertificateCredDefId))
-                        .requestedPredicate("pred1_referent",
-                                restrictedProofReqPred.apply("salary >= 2000", jobCertificateCredDefId))
-                        .requestedPredicate("pred2_referent",
-                                restrictedProofReqPred.apply("experience >= 1", jobCertificateCredDefId))
-                        .nonRevoked(ProofNonRevoked.builder()
-                                .from(Instant.now().getEpochSecond())
-                                .to(Instant.now().getEpochSecond())
-                                .build())
-                        .build())
-                .build();
-
-        PresentationExchangeRecord verifierExchangeRecord = template.requestBodyAndHeaders("direct:thrift", proofRequest,
-                Map.of(
-                        HEADER_SERVICE, "/present-proof/send-request"),
-                PresentationExchangeRecord.class);
-
-        String threadId = verifierExchangeRecord.getThreadId();
-        PresentationExchangeRecord proverExchangeRecord = proverEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.REQUEST_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // 2. Alice searches her Wallet for Credentials that she can use for the creating of Proof for the Loan-Application Proof Request
-
-        Map<String, String> referentMapping = new HashMap<>();
-        String proverExchangeId = proverExchangeRecord.getPresentationExchangeId();
-        PresentationRequestCredentialsFilter credentialsFilter = PresentationRequestCredentialsFilter.builder().build();
-
-        List<PresentationRequestCredentials> credentials = Arrays.asList(template.requestBodyAndHeaders("direct:alice",
-                credentialsFilter, Map.of(
-                        HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/credentials"),
-                PresentationRequestCredentials[].class));
-        Assertions.assertEquals(1, credentials.size(), "Expected single Credential");
-
-        credentials.stream().forEach(cred -> {
-            List<String> presentationReferents = cred.getPresentationReferents();
-            CredentialInfo credInfo = cred.getCredentialInfo();
-            String credDefId = credInfo.getCredentialDefinitionId();
-            Map<String, String> attributes = credInfo.getAttrs();
-            String referent = credInfo.getReferent();
-            log.info("{}", cred);
-            log.info("+- CredDefId: {}", credDefId);
-            log.info("+- PresentationReferents: {}", presentationReferents);
-            log.info("+- Attributes: {}", attributes);
-            log.info("+- Referent: {}", referent);
-
-            // Map attribute referents to their respective credential referent
-            presentationReferents.stream().forEach(pr -> referentMapping.put(pr, referent));
-        });
-
-        /* 3. Alice provides Loan-Application Proof
-         *
-         * Alice divides these attributes into the three groups:
-         *
-         * - attributes values of which will be revealed
-         * - attributes values of which will be unrevealed
-         * - attributes for which creating of verifiable proof is not required
-         */
-
-        BiFunction<String, Boolean, IndyRequestedCredsRequestedAttr> indyRequestedAttr
-                = (ref, reveal) -> IndyRequestedCredsRequestedAttr.builder()
-                        .credId(referentMapping.get(ref))
-                        .revealed(reveal)
-                        .build();
-        Function<String, IndyRequestedCredsRequestedPred> indyRequestedPred = ref -> IndyRequestedCredsRequestedPred.builder()
-                .credId(referentMapping.get(ref))
-                .build();
-
-        PresentationRequest presentationRequest = PresentationRequest.builder()
-                .requestedAttributes(Map.of(
-                        "attr1_referent", indyRequestedAttr.apply("attr1_referent", true)))
-                .requestedPredicates(Map.of(
-                        "pred1_referent", indyRequestedPred.apply("pred1_referent"),
-                        "pred2_referent", indyRequestedPred.apply("pred2_referent")))
-                .build();
-
-        template.requestBodyAndHeaders("direct:alice", presentationRequest, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/send-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 4. Thrift verifies the Loan-Application Proof from Alice
-         *
-         */
-
-        String verifierExchangeId = verifierExchangeRecord.getPresentationExchangeId();
-
-        template.requestBodyAndHeaders("direct:thrift", null, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + verifierExchangeId + "/verify-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.VERIFIED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        Assertions.assertEquals(expectedOutcome, verifierExchangeRecord.isVerified(), "Unexpected verification outcome");
-
-        proverEvents.awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_ACKED &&
-                pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // [#1754] Prover cannot know verification outcome from PRESENTATION_ACKED
-        // https://github.com/hyperledger/aries-cloudagent-python/issues/1754
-        //Assertions.assertTrue(proverExchangeRecord[0].isVerified(), "Not VERIFIED");
-    }
-
-    void kycProcessWithThrift(AttachmentContext ctx) throws Exception {
-
-        logSection("Alice goes through the KYC process with Thrift");
-
-        String thriftAliceConnectionId = ctx.getConnection(THRIFT, ALICE).getConnectionId();
-
-        WebSocketClient verifierEvents = getWallet(THRIFT).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-        WebSocketClient proverEvents = getWallet(ALICE).getWebSocketClient().startRecording(EventType.PRESENT_PROOF);
-
-        /* 1. Alice gets a second Proof Request from Thrift Bank
-         *
-         */
-
-        String transcriptCredDefId = ctx.getAttachment(TRANSCRIPT_CREDEF_ID, String.class);
-
-        Function<String, JsonObject> credDefRestriction
-                = cdid -> GSON.fromJson("{\"cred_def_id\"=\"" + cdid + "\"}", JsonObject.class);
-        BiFunction<String, String, ProofRequestedAttributes> restrictedProofReqAttr
-                = (name, cdid) -> ProofRequestedAttributes.builder()
-                        .name(name)
-                        .restriction(credDefRestriction.apply(cdid))
-                        .build();
-
-        PresentProofRequest proofRequest = PresentProofRequest.builder()
-                .connectionId(thriftAliceConnectionId)
-                .proofRequest(ProofRequest.builder()
-                        .name("KYC-Application")
-                        .nonce("1")
-                        .requestedAttribute("attr1_referent", restrictedProofReqAttr.apply("first_name", transcriptCredDefId))
-                        .requestedAttribute("attr2_referent", restrictedProofReqAttr.apply("last_name", transcriptCredDefId))
-                        .requestedAttribute("attr3_referent", restrictedProofReqAttr.apply("ssn", transcriptCredDefId))
-                        .build())
-                .build();
-
-        PresentationExchangeRecord verifierExchangeRecord = template.requestBodyAndHeaders("direct:thrift", proofRequest,
-                Map.of(
-                        HEADER_SERVICE, "/present-proof/send-request"),
-                PresentationExchangeRecord.class);
-
-        String threadId = verifierExchangeRecord.getThreadId();
-        PresentationExchangeRecord proverExchangeRecord = proverEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.REQUEST_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // 2. Alice searches her Wallet for Credentials that she can use for the creating of Proof for the KYC Proof Request
-
-        Map<String, String> referentMapping = new HashMap<>();
-        String proverExchangeId = proverExchangeRecord.getPresentationExchangeId();
-        PresentationRequestCredentialsFilter credentialsFilter = PresentationRequestCredentialsFilter.builder().build();
-
-        List<PresentationRequestCredentials> credentials = Arrays.asList(template.requestBodyAndHeaders("direct:alice",
-                credentialsFilter, Map.of(
-                        HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/credentials"),
-                PresentationRequestCredentials[].class));
-        Assertions.assertEquals(1, credentials.size(), "Expected single Credential");
-
-        credentials.stream().forEach(cred -> {
-            List<String> presentationReferents = cred.getPresentationReferents();
-            CredentialInfo credInfo = cred.getCredentialInfo();
-            String credDefId = credInfo.getCredentialDefinitionId();
-            Map<String, String> attributes = credInfo.getAttrs();
-            String referent = credInfo.getReferent();
-            log.info("{}", cred);
-            log.info("+- CredDefId: {}", credDefId);
-            log.info("+- PresentationReferents: {}", presentationReferents);
-            log.info("+- Attributes: {}", attributes);
-            log.info("+- Referent: {}", referent);
-
-            // Map attribute referents to their respective credential referent
-            presentationReferents.stream().forEach(pr -> referentMapping.put(pr, referent));
-        });
-
-        /* 3. Alice provides KYC-Application Proof
-         *
-         * Alice divides these attributes into the three groups:
-         *
-         * - attributes values of which will be revealed
-         * - attributes values of which will be unrevealed
-         * - attributes for which creating of verifiable proof is not required
-         */
-
-        BiFunction<String, Boolean, IndyRequestedCredsRequestedAttr> indyRequestedAttr
-                = (ref, reveal) -> IndyRequestedCredsRequestedAttr.builder()
-                        .credId(referentMapping.get(ref))
-                        .revealed(reveal)
-                        .build();
-
-        PresentationRequest presentationRequest = PresentationRequest.builder()
-                .requestedAttributes(Map.of(
-                        "attr1_referent", indyRequestedAttr.apply("attr1_referent", true),
-                        "attr2_referent", indyRequestedAttr.apply("attr2_referent", true),
-                        "attr3_referent", indyRequestedAttr.apply("attr3_referent", true)))
-                .build();
-
-        template.requestBodyAndHeaders("direct:alice", presentationRequest, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + proverExchangeId + "/send-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_RECEIVED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        /* 4. Thrift verifies the KYC-Application Proof from Alice
-         *
-         */
-
-        String verifierExchangeId = verifierExchangeRecord.getPresentationExchangeId();
-
-        template.requestBodyAndHeaders("direct:thrift", null, Map.of(
-                HEADER_SERVICE, "/present-proof/records/" + verifierExchangeId + "/verify-presentation"),
-                PresentationExchangeRecord.class);
-
-        verifierExchangeRecord = verifierEvents
-                .awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.VERIFIED &&
-                        pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-        Assertions.assertTrue(verifierExchangeRecord.isVerified(), "Not VERIFIED");
-
-        proverEvents.awaitPresentProofV1(pex -> pex.getState() == PresentationExchangeState.PRESENTATION_ACKED &&
-                pex.getThreadId().equals(threadId), 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        // [#1754] Prover cannot know verification outcome from PRESENTATION_ACKED
-        // https://github.com/hyperledger/aries-cloudagent-python/issues/1754
-        //Assertions.assertTrue(proverExchangeRecord[0].isVerified(), "Not VERIFIED");
-    }
-
-    void acmeRevokesTheJobCertificate(AttachmentContext ctx) throws Exception {
-
-        logSection("Acme revokes the Job-Certificate Credential");
-
-        String acmeAliceConnectionId = ctx.getConnection(ACME, ALICE).getConnectionId();
-
-        WebSocketClient issuerEvents
-                = getWallet(ACME).getWebSocketClient().startRecording(EventType.ISSUER_CRED_REV, EventType.ISSUE_CREDENTIAL);
-
-        // [TODO] There is currently no event that the Holder could listen to
-        // WebSocketClient holderEvents = assertWallet(Alice).getWebSocketClient();
-
-        // 1. Acme searches the Job-Certificate Credential
-
-        String jobCertificateCredDefId = ctx.getAttachment(JOB_CERTIFICATE_CREDEF_ID, String.class);
-        IssueCredentialRecordsFilter recordsFilter = IssueCredentialRecordsFilter.builder()
-                .connectionId(acmeAliceConnectionId)
-                .build();
-
-        V1CredentialExchange credex = Arrays.asList(template.requestBodyAndHeaders("direct:acme", recordsFilter, Map.of(
-                HEADER_SERVICE, "/issue-credential/records"),
-                V1CredentialExchange[].class)).stream()
-                .filter(cr -> jobCertificateCredDefId.equals(cr.getCredentialDefinitionId()))
-                .findFirst().get();
-
-        // 2. Acme revokes the Job-Certificate Credential
-
-        RevokeRequest revokeRequest = RevokeRequest.builder()
-                .credExId(credex.getCredentialExchangeId())
-                .connectionId(acmeAliceConnectionId)
-                .publish(true)
-                .notify(true)
-                .build();
-
-        template.requestBodyAndHeaders("direct:acme", revokeRequest, Map.of(
-                HEADER_SERVICE, "/revocation/revoke"),
-                RevocationModuleResponse.class);
-
-        issuerEvents.awaitIssuerRevocation(rev -> rev.getCredDefId().equals(jobCertificateCredDefId) &&
-                rev.getState() == RevocationEventState.REVOKED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-
-        issuerEvents.awaitIssueCredentialV1(cex -> cex.getCredentialDefinitionId().equals(jobCertificateCredDefId) &&
-                cex.getState() == CredentialExchangeState.CREDENTIAL_REVOKED, 10, TimeUnit.SECONDS)
-                .findAny().get();
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/ConnectionlessProofTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/ConnectionlessProofTest.java
deleted file mode 100644
index 78a91d80672..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/ConnectionlessProofTest.java
+++ /dev/null
@@ -1,94 +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.component.aries;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.hyperledger.acy_py.generated.model.DID;
-import org.hyperledger.acy_py.generated.model.DIDEndpoint;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest;
-import org.hyperledger.aries.api.present_proof.PresentProofRequest.ProofRequest.ProofRequestedAttributes;
-import org.hyperledger.aries.api.present_proof.PresentationExchangeRecord;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.ENDORSER;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeRole.VERIFIER;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.REQUEST_SENT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * docker compose up --detach && docker compose logs -f acapy
- */
-@EnabledIfSystemProperty(named = "enable.hyperledger.aries.itests", matches = "true",
-                         disabledReason = "Requires distributed ledger (i.e. blockchain)")
-public class ConnectionlessProofTest extends AbstractCamelAriesTest {
-
-    @BeforeEach
-    void beforeEach() throws IOException {
-        setRemoveWalletsOnShutdown(true);
-        onboardWallet(FABER, ENDORSER);
-    }
-
-    /**
-     * Creating proof request without connection ID.
-     */
-    @Test
-    void shouldCreateProofRequest() {
-        var request = new PresentProofRequest();
-        var proofRequest = new ProofRequest();
-        var attribute = new ProofRequestedAttributes();
-        attribute.setName("first_name");
-        proofRequest.setRequestedAttributes(Map.of("0_first_name_uuid", attribute));
-        proofRequest.setRequestedPredicates(Map.of());
-        request.setProofRequest(proofRequest);
-
-        var result = template.requestBody(
-                "hyperledger-aries:faber?service=/present-proof/create-request",
-                request,
-                PresentationExchangeRecord.class);
-
-        assertNotNull(result.getPresentationExchangeId());
-        assertEquals(REQUEST_SENT, result.getState());
-        assertEquals(VERIFIER, result.getRole());
-    }
-
-    /**
-     * This endpoint is required to add service decorator to connectionless proof presentation.
-     */
-    @Test
-    void shouldReturnPublicDidEndpoint() {
-        var did = template.requestBody(
-                "hyperledger-aries:faber?service=/wallet/did/public",
-                null,
-                DID.class);
-
-        var result = template.requestBodyAndHeader(
-                "hyperledger-aries:faber?service=/wallet/get-did-endpoint",
-                null,
-                "did",
-                did.getDid(),
-                DIDEndpoint.class);
-
-        assertNotNull(result.getEndpoint());
-        assertEquals(did.getDid(), result.getDid());
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialDefinitionTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialDefinitionTest.java
deleted file mode 100644
index 324463d05dd..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialDefinitionTest.java
+++ /dev/null
@@ -1,69 +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.component.aries;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import io.nessus.aries.wallet.NessusWallet;
-import org.apache.camel.builder.RouteBuilder;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.ENDORSER;
-
-/**
- * docker compose up --detach && docker compose logs -f acapy
- */
-@EnabledIfSystemProperty(named = "enable.hyperledger.aries.itests", matches = "true",
-                         disabledReason = "Requires distributed ledger (i.e. blockchain)")
-public class CredentialDefinitionTest extends AbstractCamelAriesTest {
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() {
-
-                // Faber creates a Transscript Credential Definition
-                // Note, the Schema is created on-demand
-                from("direct:transscript-credential-definition")
-                        .to("hyperledger-aries:faber?service=/credential-definitions&schemaName=Transscript&autoSchema=true")
-                        .transform(simple("${body.credentialDefinitionId}"));
-            }
-        };
-    }
-
-    @Test
-    public void testWorkflow() throws Exception {
-
-        setRemoveWalletsOnShutdown(true);
-
-        NessusWallet faberWallet = onboardWallet(FABER, ENDORSER);
-        DID publicDid = faberWallet.getPublicDid();
-
-        Map<String, Object> reqBody = Map.of(
-                "schemaVersion", "1.2",
-                "attributes", Arrays.asList("first_name", "last_name", "ssn", "degree", "status", "year", "average"),
-                "supportRevocation", "false");
-
-        String credDefId = template.requestBody("direct:transscript-credential-definition", reqBody, String.class);
-        Assertions.assertTrue(credDefId.startsWith(publicDid.getDid()));
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialOfferTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialOfferTest.java
deleted file mode 100644
index 582d403710d..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/CredentialOfferTest.java
+++ /dev/null
@@ -1,103 +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.component.aries;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.ValueBuilder;
-import org.hyperledger.aries.api.credentials.CredentialAttributes;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialExchange;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import static org.hyperledger.aries.api.issue_credential_v1.CredentialExchangeRole.ISSUER;
-import static org.hyperledger.aries.api.issue_credential_v1.CredentialExchangeState.OFFER_SENT;
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.ENDORSER;
-
-/**
- * docker compose up --detach && docker compose logs -f acapy
- */
-@EnabledIfSystemProperty(named = "enable.hyperledger.aries.itests", matches = "true",
-                         disabledReason = "Requires distributed ledger (i.e. blockchain)")
-public class CredentialOfferTest extends AbstractCamelAriesTest {
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() {
-
-                BiFunction<Exchange, String, Object> simple
-                        = (ex, exp) -> new ValueBuilder(simple(exp)).evaluate(ex, Object.class);
-
-                @SuppressWarnings("unchecked")
-                BiFunction<Exchange, String, List<CredentialAttributes>> attributes
-                        = (ex, exp) -> CredentialAttributes.from(new ValueBuilder(simple(exp)).evaluate(ex, Map.class));
-
-                // Faber creates a Transscript Credential Definition
-                // Note, the Schema is created on-demand
-                // Then, Faber creates Transcript Credential Offer
-                from("direct:start")
-                        .setHeader("Payload", simple("${body}"))
-                        .setBody(simple("${header.payload[schema]}"))
-                        .to("hyperledger-aries:faber?service=/credential-definitions&schemaName=Transscript&autoSchema=true")
-                        .setHeader("CredentialDefinitionId", simple("${body.credentialDefinitionId}"))
-                        .to("direct:transscript-credential-offer");
-
-                // Faber creates Transcript Credential Offer
-                from("direct:transscript-credential-offer")
-                        .setBody(ex -> Map.of(
-                                "cred_def_id", simple.apply(ex, "${header.credentialDefinitionId}"),
-                                "credential_preview", Map.of("attributes", attributes.apply(ex, "${header.payload[offer]}"))))
-                        .to("hyperledger-aries:faber?service=/issue-credential/create-offer");
-            }
-        };
-    }
-
-    @Test
-    public void testWorkflow() throws Exception {
-
-        setRemoveWalletsOnShutdown(true);
-
-        onboardWallet(FABER, ENDORSER);
-
-        Map<String, Object> reqBody = Map.of(
-                "schema", Map.of(
-                        "schemaVersion", "1.2",
-                        "attributes", Arrays.asList("first_name", "last_name", "ssn", "degree", "status", "year", "average"),
-                        "supportRevocation", "false"),
-                "offer", Map.of(
-                        "first_name", "Alice",
-                        "last_name", "Garcia",
-                        "ssn", "123-45-6789",
-                        "degree", "Bachelor of Science, Marketing",
-                        "status", "graduated",
-                        "year", "2015",
-                        "average", "5"));
-
-        V1CredentialExchange resObj = template.requestBody("direct:start", reqBody, V1CredentialExchange.class);
-        Assertions.assertEquals(ISSUER, resObj.getRole());
-        Assertions.assertEquals(OFFER_SENT, resObj.getState());
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/PresentationExchangeTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/PresentationExchangeTest.java
deleted file mode 100644
index 4f11f5c2429..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/PresentationExchangeTest.java
+++ /dev/null
@@ -1,58 +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.component.aries;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.hyperledger.aries.api.present_proof.PresentationExchangeState;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.PRESENTATIONS_SENT;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.PRESENTATION_ACKED;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.PRESENTATION_RECEIVED;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.PROPOSAL_RECEIVED;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.PROPOSAL_SENT;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.REQUEST_RECEIVED;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.REQUEST_SENT;
-import static org.hyperledger.aries.api.present_proof.PresentationExchangeState.VERIFIED;
-
-public class PresentationExchangeTest extends AbstractCamelAriesTest {
-
-    @Test
-    public void testWorkflow() throws Exception {
-
-        List<PresentationExchangeState> states = Arrays.asList(
-                PROPOSAL_SENT,
-                PROPOSAL_RECEIVED,
-                REQUEST_SENT,
-                REQUEST_RECEIVED,
-                PRESENTATIONS_SENT,
-                PRESENTATION_RECEIVED,
-                VERIFIED,
-                PRESENTATION_ACKED);
-
-        PresentationExchangeState first = states.stream()
-                .peek(ps -> log.info("{}", ps))
-                .sorted(Collections.reverseOrder((a, b) -> a.ordinal() - b.ordinal()))
-                .findFirst().get();
-
-        Assertions.assertEquals(PRESENTATION_ACKED, first);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/SchemaTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/SchemaTest.java
deleted file mode 100644
index c675b311bfb..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/component/aries/SchemaTest.java
+++ /dev/null
@@ -1,73 +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.component.aries;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import io.nessus.aries.wallet.NessusWallet;
-import org.apache.camel.builder.RouteBuilder;
-import org.hyperledger.acy_py.generated.model.DID;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import static org.hyperledger.aries.api.ledger.IndyLedgerRoles.ENDORSER;
-
-/**
- * docker compose up --detach && docker compose logs -f acapy
- */
-@EnabledIfSystemProperty(named = "enable.hyperledger.aries.itests", matches = "true",
-                         disabledReason = "Requires distributed ledger (i.e. blockchain)")
-public class SchemaTest extends AbstractCamelAriesTest {
-
-    @Override
-    protected RouteBuilder createRouteBuilder() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() {
-
-                from("direct:transscript-schema")
-                        .to("hyperledger-aries:faber?service=/schemas&schemaName=Transscript")
-                        .transform(simple("${body.schemaId}"));
-            }
-        };
-    }
-
-    @Test
-    public void testWorkflow() throws Exception {
-
-        setRemoveWalletsOnShutdown(true);
-
-        NessusWallet faberWallet = onboardWallet(FABER, ENDORSER);
-        DID publicDid = faberWallet.getPublicDid();
-        Assertions.assertNotNull(publicDid, "No public DID");
-
-        // Faber creates the Transcript Schema and sends it to the Ledger
-        // It can do so with it's Endorser role
-
-        Map<String, Object> reqBody = Map.of(
-                "attributes", Arrays.asList("first_name", "last_name", "ssn", "degree", "status", "year", "average"),
-                "schema_version", "1.2");
-
-        String schemaId = template.requestBody("direct:transscript-schema", reqBody, String.class);
-        log.info("{}", schemaId);
-
-        Assertions.assertTrue(schemaId.startsWith(publicDid.getDid()));
-        Assertions.assertTrue(schemaId.endsWith(":Transscript:1.2"));
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterTest.java
deleted file mode 100644
index 692f2d1c212..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/ConnectionReceiveInvitationFilterConverterTest.java
+++ /dev/null
@@ -1,56 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.Gson;
-import org.hyperledger.aries.api.connection.ConnectionReceiveInvitationFilter;
-import org.hyperledger.aries.config.GsonConfig;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class ConnectionReceiveInvitationFilterConverterTest {
-
-    static final Gson GSON = GsonConfig.defaultConfig();
-
-    @Test
-    public void testTypeConcertion() throws Exception {
-
-        ConnectionReceiveInvitationFilter obj = ConnectionReceiveInvitationFilterConverter.toAries(Map.of("auto_accept", true));
-        Assertions.assertTrue(obj.getAutoAccept());
-
-        obj = ConnectionReceiveInvitationFilterConverter.toAries(Map.of("auto_accept", "true", "foo", "bar"));
-        Assertions.assertTrue(obj.getAutoAccept());
-
-        obj = ConnectionReceiveInvitationFilterConverter.toAries(Map.of("foo", "bar"));
-        Assertions.assertNull(obj);
-
-        obj = ConnectionReceiveInvitationFilterConverter.toAries("{}");
-        Assertions.assertNull(obj);
-
-        obj = ConnectionReceiveInvitationFilterConverter.toAries("invalid");
-        Assertions.assertNull(obj);
-    }
-
-    @Test
-    public void testSnakeCase() throws Exception {
-
-        String res = ConnectionReceiveInvitationFilterConverter.toSnakeCase("credentialDefinitionId");
-        Assertions.assertEquals("credential_definition_id", res);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/SchemaSendRequestConverterTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/SchemaSendRequestConverterTest.java
deleted file mode 100644
index 577b9e60111..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/SchemaSendRequestConverterTest.java
+++ /dev/null
@@ -1,55 +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.converter.aries;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import com.google.gson.Gson;
-import org.hyperledger.aries.api.schema.SchemaSendRequest;
-import org.hyperledger.aries.config.GsonConfig;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class SchemaSendRequestConverterTest {
-
-    static final Gson GSON = GsonConfig.defaultConfig();
-
-    @Test
-    public void testTypeConcertion() throws Exception {
-
-        SchemaSendRequest reqObj = SchemaSendRequest.builder()
-                .schemaName("Transscript")
-                .schemaVersion("1.2")
-                .attributes(Arrays.asList("first_name", "last_name", "ssn", "degree", "status", "year", "average"))
-                .build();
-
-        String json = GSON.toJson(reqObj);
-
-        SchemaSendRequest resObj = SchemaSendRequestConverter.toAries(json);
-        Assertions.assertEquals(reqObj, resObj);
-
-        Map<String, Object> reqMap = Map.of(
-                "attributes", Arrays.asList("first_name", "last_name", "ssn", "degree", "status", "year", "average"),
-                "schema_version", "1.2");
-
-        resObj = SchemaSendRequestConverter.toAries(reqMap);
-        Assertions.assertEquals(reqObj.getSchemaVersion(), resObj.getSchemaVersion());
-        Assertions.assertEquals(reqObj.getAttributes(), resObj.getAttributes());
-        Assertions.assertNull(resObj.getSchemaName());
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterTest.java b/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterTest.java
deleted file mode 100644
index b4d54844fae..00000000000
--- a/components/camel-hyperledger-aries/src/test/java/org/apache/camel/converter/aries/V1CredentialFreeOfferRequestConverterTest.java
+++ /dev/null
@@ -1,68 +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.converter.aries;
-
-import java.util.Map;
-
-import com.google.gson.Gson;
-import org.hyperledger.aries.api.credentials.CredentialAttributes;
-import org.hyperledger.aries.api.credentials.CredentialPreview;
-import org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferRequest;
-import org.hyperledger.aries.config.GsonConfig;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class V1CredentialFreeOfferRequestConverterTest {
-
-    static final Gson GSON = GsonConfig.defaultConfig();
-
-    @Test
-    public void testTypeConcertion() throws Exception {
-
-        V1CredentialFreeOfferRequest reqObj = V1CredentialFreeOfferRequest.builder()
-                .credDefId("ZELMbHHhBTEp2FQjDYr25:3:CL:4395:default")
-                .credentialPreview(new CredentialPreview(
-                        CredentialAttributes.from(Map.of(
-                                "first_name", "Alice",
-                                "last_name", "Garcia",
-                                "ssn", "123-45-6789",
-                                "degree", "Bachelor of Science, Marketing",
-                                "status", "graduated",
-                                "year", "2015",
-                                "average", "5"))))
-                .build();
-
-        String json = GSON.toJson(reqObj);
-
-        V1CredentialFreeOfferRequest resObj = V1CredentialFreeOfferRequestConverter.toAries(json);
-        Assertions.assertEquals(reqObj, resObj);
-
-        Map<String, Object> reqMap = Map.of(
-                "cred_def_id", "ZELMbHHhBTEp2FQjDYr25:3:CL:4395:default",
-                "credential_preview", Map.of("attributes", CredentialAttributes.from(Map.of(
-                        "first_name", "Alice",
-                        "last_name", "Garcia",
-                        "ssn", "123-45-6789",
-                        "degree", "Bachelor of Science, Marketing",
-                        "status", "graduated",
-                        "year", "2015",
-                        "average", "5"))));
-
-        resObj = V1CredentialFreeOfferRequestConverter.toAries(reqMap);
-        Assertions.assertEquals(reqObj, resObj);
-    }
-}
diff --git a/components/camel-hyperledger-aries/src/test/resources/log4j2.properties b/components/camel-hyperledger-aries/src/test/resources/log4j2.properties
deleted file mode 100644
index 99e5aa74c3f..00000000000
--- a/components/camel-hyperledger-aries/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,36 +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.
-## ---------------------------------------------------------------------------
-
-rootLogger.level = TRACE
-rootLogger.appenderRefs = console, file
-rootLogger.appenderRef.console.ref = console
-rootLogger.appenderRef.file.ref = file
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/test.log
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p [%c] (%t) - %m%n
-appender.file.filter.threshold.type = ThresholdFilter
-appender.file.filter.threshold.level = DEBUG
-
-appender.stdout.type = Console
-appender.stdout.name = console
-appender.stdout.layout.type = PatternLayout
-appender.stdout.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p [%c] (%t) - %m%n
-appender.stdout.filter.threshold.type = ThresholdFilter
-appender.stdout.filter.threshold.level = INFO
\ No newline at end of file
diff --git a/components/camel-hyperledger-aries/src/test/resources/transscripts.csv b/components/camel-hyperledger-aries/src/test/resources/transscripts.csv
deleted file mode 100644
index 6bfa62864f5..00000000000
--- a/components/camel-hyperledger-aries/src/test/resources/transscripts.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-first_name,last_name,ssn,degree,status,year,average,offer
-Alice,Garcia,123-45-0001,Bachelor of Science Marketing,graduated,2015,4,1
-Berta,Garcia,123-45-0002,Bachelor of Science Marketing,graduated,2015,5,1
-Clara,Garcia,123-45-0003,Bachelor of Science Marketing,graduated,2015,6,1
-Dora,Garcia,123-45-0004,Bachelor of Science Marketing,graduated,2015,6,0
-Freja,Garcia,123-45-0005,Bachelor of Science Marketing,graduated,2015,6,0
\ No newline at end of file
diff --git a/components/camel-weka/pom.xml b/components/camel-weka/pom.xml
deleted file mode 100644
index a5aa423f571..00000000000
--- a/components/camel-weka/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>components</artifactId>
-        <groupId>org.apache.camel</groupId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-weka</artifactId>
-
-    <name>Camel :: Weka</name>
-    <description>Camel Weka support</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-file</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.nessus.weka</groupId>
-            <artifactId>nessus-weka-api</artifactId>
-            <version>${nessus-weka-version}</version>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <configuration>
-                    <pomElements combine.children="append">
-                        <repositories>keep</repositories>
-                    </pomElements>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaComponentConfigurer.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaComponentConfigurer.java
deleted file mode 100644
index b88e6f5c3fe..00000000000
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaComponentConfigurer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.weka;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class WekaComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        WekaComponent target = (WekaComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return boolean.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        WekaComponent target = (WekaComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "autowiredenabled":
-        case "autowiredEnabled": return target.isAutowiredEnabled();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointConfigurer.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointConfigurer.java
deleted file mode 100644
index be2c11b3765..00000000000
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointConfigurer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.weka;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class WekaEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        WekaEndpoint target = (WekaEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "apply": target.getConfiguration().setApply(property(camelContext, java.lang.String.class, value)); return true;
-        case "build": target.getConfiguration().setBuild(property(camelContext, java.lang.String.class, value)); return true;
-        case "dsname": target.getConfiguration().setDsname(property(camelContext, java.lang.String.class, value)); return true;
-        case "folds": target.getConfiguration().setFolds(property(camelContext, int.class, value)); return true;
-        case "lazystartproducer":
-        case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
-        case "loadfrom":
-        case "loadFrom": target.getConfiguration().setLoadFrom(property(camelContext, java.lang.String.class, value)); return true;
-        case "path": target.getConfiguration().setPath(property(camelContext, java.lang.String.class, value)); return true;
-        case "saveto":
-        case "saveTo": target.getConfiguration().setSaveTo(property(camelContext, java.lang.String.class, value)); return true;
-        case "seed": target.getConfiguration().setSeed(property(camelContext, int.class, value)); return true;
-        case "xval": target.getConfiguration().setXval(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Class<?> getOptionType(String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "apply": return java.lang.String.class;
-        case "build": return java.lang.String.class;
-        case "dsname": return java.lang.String.class;
-        case "folds": return int.class;
-        case "lazystartproducer":
-        case "lazyStartProducer": return boolean.class;
-        case "loadfrom":
-        case "loadFrom": return java.lang.String.class;
-        case "path": return java.lang.String.class;
-        case "saveto":
-        case "saveTo": return java.lang.String.class;
-        case "seed": return int.class;
-        case "xval": return boolean.class;
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        WekaEndpoint target = (WekaEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "apply": return target.getConfiguration().getApply();
-        case "build": return target.getConfiguration().getBuild();
-        case "dsname": return target.getConfiguration().getDsname();
-        case "folds": return target.getConfiguration().getFolds();
-        case "lazystartproducer":
-        case "lazyStartProducer": return target.isLazyStartProducer();
-        case "loadfrom":
-        case "loadFrom": return target.getConfiguration().getLoadFrom();
-        case "path": return target.getConfiguration().getPath();
-        case "saveto":
-        case "saveTo": return target.getConfiguration().getSaveTo();
-        case "seed": return target.getConfiguration().getSeed();
-        case "xval": return target.getConfiguration().isXval();
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java
deleted file mode 100644
index 1485d829ce6..00000000000
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.weka;
-
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.spi.EndpointUriFactory;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class WekaEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
-
-    private static final String BASE = ":command";
-
-    private static final Set<String> PROPERTY_NAMES;
-    private static final Set<String> SECRET_PROPERTY_NAMES;
-    private static final Set<String> MULTI_VALUE_PREFIXES;
-    static {
-        Set<String> props = new HashSet<>(11);
-        props.add("apply");
-        props.add("build");
-        props.add("command");
-        props.add("dsname");
-        props.add("folds");
-        props.add("lazyStartProducer");
-        props.add("loadFrom");
-        props.add("path");
-        props.add("saveTo");
-        props.add("seed");
-        props.add("xval");
-        PROPERTY_NAMES = Collections.unmodifiableSet(props);
-        SECRET_PROPERTY_NAMES = Collections.emptySet();
-        MULTI_VALUE_PREFIXES = Collections.emptySet();
-    }
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "weka".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(properties);
-
-        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
-        uri = buildQueryParameters(uri, copy, encode);
-        return uri;
-    }
-
-    @Override
-    public Set<String> propertyNames() {
-        return PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> secretPropertyNames() {
-        return SECRET_PROPERTY_NAMES;
-    }
-
-    @Override
-    public Set<String> multiValuePrefixes() {
-        return MULTI_VALUE_PREFIXES;
-    }
-
-    @Override
-    public boolean isLenientProperties() {
-        return false;
-    }
-}
-
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaTypeConvertersLoader.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaTypeConvertersLoader.java
deleted file mode 100644
index 9e527240b17..00000000000
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaTypeConvertersLoader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.weka;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.DeferredContextBinding;
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-@DeferredContextBinding
-public final class WekaTypeConvertersLoader implements TypeConverterLoader, CamelContextAware {
-
-    private CamelContext camelContext;
-
-    public WekaTypeConvertersLoader() {
-    }
-
-    @Override
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
-    @Override
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, io.nessus.weka.Dataset.class, java.io.File.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toDataset((java.io.File) value));
-        addTypeConverter(registry, io.nessus.weka.Dataset.class, java.io.InputStream.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toDataset((java.io.InputStream) value));
-        addTypeConverter(registry, io.nessus.weka.Dataset.class, java.net.URL.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toDataset((java.net.URL) value));
-        addTypeConverter(registry, io.nessus.weka.Dataset.class, java.nio.file.Path.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toDataset((java.nio.file.Path) value));
-        addTypeConverter(registry, io.nessus.weka.Dataset.class, weka.core.Instances.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toDataset((weka.core.Instances) value));
-        addTypeConverter(registry, java.io.InputStream.class, io.nessus.weka.Dataset.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toInputStream((io.nessus.weka.Dataset) value));
-        addTypeConverter(registry, java.io.InputStream.class, weka.core.Instances.class, false,
-            (type, exchange, value) -> org.apache.camel.component.weka.WekaTypeConverters.toInputStream((weka.core.Instances) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
deleted file mode 100644
index c917a252d11..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-org.apache.camel.component.weka.WekaTypeConvertersLoader
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component.properties
deleted file mode 100644
index a5f7ff52356..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-components=weka
-groupId=org.apache.camel
-artifactId=camel-weka
-version=4.0.0-SNAPSHOT
-projectName=Camel :: Weka
-projectDescription=Camel Weka support
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component/weka b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component/weka
deleted file mode 100644
index ed0e92b83ed..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/component/weka
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.weka.WekaComponent
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-component b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-component
deleted file mode 100644
index c3b2dcee805..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-component
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.weka.WekaComponentConfigurer
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-endpoint b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-endpoint
deleted file mode 100644
index fd01e2df029..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/configurer/weka-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.weka.WekaEndpointConfigurer
diff --git a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/urifactory/weka-endpoint b/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/urifactory/weka-endpoint
deleted file mode 100644
index 3e23a77a4d7..00000000000
--- a/components/camel-weka/src/generated/resources/META-INF/services/org/apache/camel/urifactory/weka-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.weka.WekaEndpointUriFactory
diff --git a/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json b/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json
deleted file mode 100644
index b164686ff63..00000000000
--- a/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "weka",
-    "title": "Weka",
-    "description": "Perform machine learning tasks using Weka.",
-    "deprecated": false,
-    "firstVersion": "3.1.0",
-    "label": "blockchain",
-    "javaType": "org.apache.camel.component.weka.WekaComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-weka",
-    "version": "4.0.0-SNAPSHOT",
-    "scheme": "weka",
-    "extendsScheme": "",
-    "syntax": "weka:command",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": true,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "autowiredEnabled": { "index": 1, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
-  },
-  "properties": {
-    "command": { "index": 0, "kind": "path", "displayName": "Command", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.weka.WekaConfiguration.Command", "enum": [ "filter", "model", "read", "write", "push", "pop", "version" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "descript [...]
-    "lazyStartProducer": { "index": 1, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...]
-    "apply": { "index": 2, "kind": "parameter", "displayName": "Apply", "group": "filter", "label": "filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The filter spec (i.e. Name Options)" },
-    "build": { "index": 3, "kind": "parameter", "displayName": "Build", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The classifier spec (i.e. Name Options)" },
-    "dsname": { "index": 4, "kind": "parameter", "displayName": "Dsname", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "The named dataset to train the classifier with" },
-    "folds": { "index": 5, "kind": "parameter", "displayName": "Folds", "group": "model", "label": "model", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Number of folds to use for cross-validation" },
-    "loadFrom": { "index": 6, "kind": "parameter", "displayName": "Load From", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Path to load the model from" },
-    "saveTo": { "index": 7, "kind": "parameter", "displayName": "Save To", "group": "model", "label": "model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Path to save the model to" },
-    "seed": { "index": 8, "kind": "parameter", "displayName": "Seed", "group": "model", "label": "model", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "An optional seed for the randomizer" },
-    "xval": { "index": 9, "kind": "parameter", "displayName": "Xval", "group": "model", "label": "model", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "Flag on whether to use cross-validation with the current dataset" },
-    "path": { "index": 10, "kind": "parameter", "displayName": "Path", "group": "write", "label": "read,write", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.weka.WekaConfiguration", "configurationField": "configuration", "description": "An in\/out path for the read\/write commands" }
-  }
-}
diff --git a/components/camel-weka/src/main/docs/weka-component.adoc b/components/camel-weka/src/main/docs/weka-component.adoc
deleted file mode 100644
index 3c13334938c..00000000000
--- a/components/camel-weka/src/main/docs/weka-component.adoc
+++ /dev/null
@@ -1,219 +0,0 @@
-= Weka Component
-:doctitle: Weka
-:shortname: weka
-:artifactid: camel-weka
-:description: Perform machine learning tasks using Weka.
-:since: 3.1
-:supportlevel: Stable
-:tabs-sync-option:
-:component-header: Only producer is supported
-//Manually maintained attributes
-:camel-spring-boot-name: weka
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The Weka component provides access to the https://www.cs.waikato.ac.nz/ml/weka[(Weka Data Mining)] toolset.
-
-Weka is tried and tested open source machine learning software that can be accessed through a graphical user interface, standard terminal applications, or a Java API. It is widely used for teaching, research, and industrial applications, contains a plethora of built-in tools for standard machine learning tasks, and additionally gives transparent access to well-known toolboxes such as scikit-learn, R, and Deeplearning4j. 
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-weka</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-== URI format
-
----------------------------------
-weka://cmd
----------------------------------
-
-
-
-// component-configure options: START
-
-// component-configure options: END
-
-// component options: START
-include::partial$component-configure-options.adoc[]
-include::partial$component-endpoint-options.adoc[]
-// component options: END
-
-// endpoint options: START
-
-// endpoint options: END
-
-
-== Samples
-
-=== Read + Filter + Write
-
-This first example shows how to read a CSV file with the file component and then pass it on to Weka. In Weka we apply a few filters to the data set and then pass it on to the file component for writing. 
-
-[source,java]
-----
-    @Override
-    public void configure() throws Exception {
-        
-        // Use the file component to read the CSV file
-        from("file:src/test/resources/data?fileName=sfny.csv")
-        
-        // Convert the 'in_sf' attribute to nominal
-        .to("weka:filter?apply=NumericToNominal -R first")
-        
-        // Move the 'in_sf' attribute to the end
-        .to("weka:filter?apply=Reorder -R 2-last,1")
-        
-        // Rename the relation
-        .to("weka:filter?apply=RenameRelation -modify sfny")
-        
-        // Use the file component to write the Arff file
-        .to("file:target/data?fileName=sfny.arff")
-    }
-----
-
-Here we do the same as above without use of the file component.
-
-[source,java]
-----
-    @Override
-    public void configure() throws Exception {
-        
-        // Initiate the route from somewhere
-        .from("...")
-        
-        // Use Weka to read the CSV file
-        .to("weka:read?path=src/test/resources/data/sfny.csv")
-        
-        // Convert the 'in_sf' attribute to nominal
-        .to("weka:filter?apply=NumericToNominal -R first")
-        
-        // Move the 'in_sf' attribute to the end
-        .to("weka:filter?apply=Reorder -R 2-last,1")
-        
-        // Rename the relation
-        .to("weka:filter?apply=RenameRelation -modify sfny")
-        
-        // Use Weka to write the Arff file
-        .to("weka:write?path=target/data/sfny.arff");
-    }
-----
-
-In this example, would the client provide the input path or some other supported type.
-Have a look at the  `WekaTypeConverters` for the set of supported input types.
-
-[source,java]
-----
-    @Override
-    public void configure() throws Exception {
-        
-        // Initiate the route from somewhere
-        .from("...")
-        
-        // Convert the 'in_sf' attribute to nominal
-        .to("weka:filter?apply=NumericToNominal -R first")
-        
-        // Move the 'in_sf' attribute to the end
-        .to("weka:filter?apply=Reorder -R 2-last,1")
-        
-        // Rename the relation
-        .to("weka:filter?apply=RenameRelation -modify sfny")
-        
-        // Use Weka to write the Arff file
-        .to("weka:write?path=target/data/sfny.arff");
-    }
-----
-
-=== Building a Model
-
-When building a model, we first choose the classification algorithm to use and then train it with some data. The result is the trained model that we can later use to classify unseen data.
-
-Here we train J48 with 10 fold cross-validation.  
-
-[source,java]
-----
-try (CamelContext camelctx = new DefaultCamelContext()) {
-    
-    camelctx.addRoutes(new RouteBuilder() {
-        
-        @Override
-        public void configure() throws Exception {
-            
-            // Use the file component to read the training data
-            from("file:src/test/resources/data?fileName=sfny-train.arff")
-            
-            // Build a J48 classifier using cross-validation with 10 folds
-            .to("weka:model?build=J48&xval=true&folds=10&seed=1")
-                    
-            // Persist the J48 model
-            .to("weka:model?saveTo=src/test/resources/data/sfny-j48.model")
-        }
-    });
-    camelctx.start();
-}
-----
-
-=== Predicting a Class
-
-Here we use a `Processor` to access functionality that is not directly available from endpoint URIs.
-
-In case you come here directly and this syntax looks a bit overwhelming, you might want to have a brief look at the section about https://tdiesler.github.io/nessus-weka/#_nessus_api_concepts[Nessus API Concepts].  
-
-[source,java]
-----
-try (CamelContext camelctx = new DefaultCamelContext()) {
-    
-    camelctx.addRoutes(new RouteBuilder() {
-        
-        @Override
-        public void configure() throws Exception {
-            
-            // Use the file component to read the test data
-            from("file:src/test/resources/data?fileName=sfny-test.arff")
-            
-            // Remove the class attribute 
-            .to("weka:filter?apply=Remove -R last")
-            
-            // Add the 'prediction' placeholder attribute 
-            .to("weka:filter?apply=Add -N predicted -T NOM -L 0,1")
-            
-            // Rename the relation 
-            .to("weka:filter?apply=RenameRelation -modify sfny-predicted")
-            
-            // Load an already existing model
-            .to("weka:model?loadFrom=src/test/resources/data/sfny-j48.model")
-            
-            // Use a processor to do the prediction
-            .process(new Processor() {
-                public void process(Exchange exchange) throws Exception {
-                    Dataset dataset = exchange.getMessage().getBody(Dataset.class);
-                    dataset.applyToInstances(new NominalPredictor());
-                }
-            })
-                    
-            // Write the data file
-            .to("weka:write?path=src/test/resources/data/sfny-predicted.arff")
-        }
-    });
-    camelctx.start();
-}
-----
-
-== Resources
-
-* https://www.cs.waikato.ac.nz/ml/weka/book.html[Practical Machine Learning Tools and Techniques,window=_blank]
-* https://www.cs.waikato.ac.nz/ml/weka/courses.html[Machine Learning Courses,window=_blank]
-* https://waikato.github.io/weka-wiki/documentation/[Weka Documentation,window=_blank]
-* https://tdiesler.github.io/nessus-weka[Nessus-Weka,window=_blank]
-
-
-include::spring-boot:partial$starter.adoc[]
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaComponent.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaComponent.java
deleted file mode 100644
index acdecc706b7..00000000000
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaComponent.java
+++ /dev/null
@@ -1,41 +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.component.weka;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.weka.WekaConfiguration.Command;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-
-@Component("weka")
-public class WekaComponent extends DefaultComponent {
-
-    @Override
-    protected Endpoint createEndpoint(String urispec, String remaining, Map<String, Object> params) throws Exception {
-
-        WekaConfiguration config = new WekaConfiguration();
-        WekaEndpoint endpoint = new WekaEndpoint(urispec, this, config);
-        setProperties(endpoint, params);
-
-        Command command = Command.valueOf(remaining);
-        config.setCommand(command);
-
-        return endpoint;
-    }
-}
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaConfiguration.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaConfiguration.java
deleted file mode 100644
index d125e4f976b..00000000000
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaConfiguration.java
+++ /dev/null
@@ -1,146 +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.component.weka;
-
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
-
-@UriParams
-public class WekaConfiguration {
-
-    // Available commands
-    public enum Command {
-        filter,
-        model,
-        read,
-        write,
-        push,
-        pop,
-        version
-    }
-
-    @UriPath(description = "The command to use.", enums = "filter,model,read,write,push,pop,version")
-    @Metadata(required = true)
-    private Command command;
-
-    // Read/Write parameters
-    @UriParam(description = "An in/out path for the read/write commands", label = "read,write")
-    private String path;
-
-    // Filter parameters
-    @UriParam(description = "The filter spec (i.e. Name [Options])", label = "filter")
-    private String apply;
-
-    // Model parameters
-    @UriParam(description = "The classifier spec (i.e. Name [Options])", label = "model")
-    private String build;
-    @UriParam(description = "Flag on whether to use cross-validation with the current dataset", label = "model")
-    private boolean xval;
-    @UriParam(description = "The named dataset to train the classifier with", label = "model")
-    private String dsname;
-    @UriParam(description = "Number of folds to use for cross-validation", label = "model", defaultValue = "10")
-    private int folds = 10;
-    @UriParam(description = "An optional seed for the randomizer", label = "model", defaultValue = "1")
-    private int seed = 1;
-    @UriParam(description = "Path to save the model to", label = "model")
-    private String saveTo;
-    @UriParam(description = "Path to load the model from", label = "model")
-    private String loadFrom;
-
-    Command getCommand() {
-        return command;
-    }
-
-    void setCommand(Command command) {
-        this.command = command;
-    }
-
-    String getApply() {
-        return apply;
-    }
-
-    void setApply(String apply) {
-        this.apply = apply;
-    }
-
-    String getBuild() {
-        return build;
-    }
-
-    void setBuild(String build) {
-        this.build = build;
-    }
-
-    String getPath() {
-        return path;
-    }
-
-    void setPath(String path) {
-        this.path = path;
-    }
-
-    boolean isXval() {
-        return xval;
-    }
-
-    void setXval(boolean xval) {
-        this.xval = xval;
-    }
-
-    int getFolds() {
-        return folds;
-    }
-
-    void setFolds(int folds) {
-        this.folds = folds;
-    }
-
-    int getSeed() {
-        return seed;
-    }
-
-    void setSeed(int seed) {
-        this.seed = seed;
-    }
-
-    String getSaveTo() {
-        return saveTo;
-    }
-
-    void setSaveTo(String saveTo) {
-        this.saveTo = saveTo;
-    }
-
-    String getLoadFrom() {
-        return loadFrom;
-    }
-
-    void setLoadFrom(String loadFrom) {
-        this.loadFrom = loadFrom;
-    }
-
-    String getDsname() {
-        return dsname;
-    }
-
-    void setDsname(String dsname) {
-        this.dsname = dsname;
-    }
-
-}
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java
deleted file mode 100644
index 6c20fe4a070..00000000000
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java
+++ /dev/null
@@ -1,65 +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.component.weka;
-
-import org.apache.camel.Category;
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.support.DefaultEndpoint;
-import weka.core.Version;
-
-/**
- * Perform machine learning tasks using Weka.
- */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "weka", title = "Weka", syntax = "weka:command", producerOnly = true,
-             category = { Category.BLOCKCHAIN })
-public class WekaEndpoint extends DefaultEndpoint {
-
-    @UriParam
-    private final WekaConfiguration configuration;
-
-    public WekaEndpoint(String uri, WekaComponent component, WekaConfiguration config) {
-        super(uri, component);
-        this.configuration = config;
-    }
-
-    public WekaConfiguration getConfiguration() {
-        return configuration;
-    }
-
-    @Override
-    public WekaComponent getComponent() {
-        return (WekaComponent) super.getComponent();
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return new WekaProducer(this);
-    }
-
-    String wekaVersion() {
-        return Version.VERSION;
-    }
-}
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
deleted file mode 100644
index 26a7f510973..00000000000
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
+++ /dev/null
@@ -1,253 +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.component.weka;
-
-import java.io.ByteArrayInputStream;
-import java.nio.file.Paths;
-
-import io.nessus.weka.AssertState;
-import io.nessus.weka.Dataset;
-import io.nessus.weka.ModelLoader;
-import io.nessus.weka.ModelPersister;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.component.weka.WekaConfiguration.Command;
-import org.apache.camel.support.DefaultProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import weka.classifiers.Classifier;
-import weka.classifiers.Evaluation;
-import weka.core.Instances;
-
-public class WekaProducer extends DefaultProducer {
-
-    static final Logger LOG = LoggerFactory.getLogger(WekaProducer.class);
-
-    public WekaProducer(WekaEndpoint endpoint) {
-        super(endpoint);
-
-        // All commands are supported on the producer
-        Command cmd = getConfiguration().getCommand();
-        AssertState.notNull(cmd, "Null command");
-    }
-
-    @Override
-    public WekaEndpoint getEndpoint() {
-        return (WekaEndpoint) super.getEndpoint();
-    }
-
-    public WekaConfiguration getConfiguration() {
-        return getEndpoint().getConfiguration();
-    }
-
-    @Override
-    public void process(Exchange exchange) throws Exception {
-
-        WekaEndpoint endpoint = getEndpoint();
-        Command cmd = getConfiguration().getCommand();
-
-        if (Command.version == cmd) {
-
-            Message msg = exchange.getMessage();
-            msg.setBody(endpoint.wekaVersion());
-
-        } else if (Command.read == cmd) {
-
-            Dataset dataset = handleReadCmd(exchange);
-            exchange.getMessage().setBody(dataset);
-
-        } else if (Command.write == cmd) {
-
-            Object result = handleWriteCmd(exchange);
-            exchange.getMessage().setBody(result);
-
-        } else if (Command.filter == cmd) {
-
-            Dataset dataset = handleFilterCmd(exchange);
-            exchange.getMessage().setBody(dataset);
-
-        } else if (Command.model == cmd) {
-
-            Dataset dataset = handleModelCmd(exchange);
-            exchange.getMessage().setBody(dataset);
-
-        } else if (Command.push == cmd) {
-
-            Dataset dataset = handlePushCmd(exchange);
-            exchange.getMessage().setBody(dataset);
-
-        } else if (Command.pop == cmd) {
-
-            Dataset dataset = handlePopCmd(exchange);
-            exchange.getMessage().setBody(dataset);
-
-        } else {
-
-            // Not really needed here, because all commands are supported
-            throw new UnsupportedOperationException("Unsupported on Producer: " + cmd);
-        }
-    }
-
-    Dataset handlePushCmd(Exchange exchange) {
-
-        String dsname = getConfiguration().getDsname();
-
-        Dataset dataset = assertDatasetBody(exchange);
-        if (dsname != null) {
-            dataset.push(dsname);
-        } else {
-            dataset.push();
-        }
-
-        return dataset;
-    }
-
-    Dataset handlePopCmd(Exchange exchange) {
-
-        String dsname = getConfiguration().getDsname();
-
-        Dataset dataset = assertDatasetBody(exchange);
-        if (dsname != null) {
-            dataset.pop(dsname);
-        } else {
-            dataset.pop();
-        }
-
-        return dataset;
-    }
-
-    Dataset handleReadCmd(Exchange exchange) {
-
-        String fpath = getConfiguration().getPath();
-
-        if (fpath != null) {
-            return Dataset.create(fpath);
-        }
-
-        return assertDatasetBody(exchange);
-    }
-
-    Object handleWriteCmd(Exchange exchange) {
-
-        Dataset dataset = assertDatasetBody(exchange);
-        String fpath = getConfiguration().getPath();
-
-        if (fpath != null) {
-
-            dataset.write(Paths.get(fpath));
-            return dataset;
-
-        } else {
-
-            // The internal implementation of DataSink does this..
-            // Instances.toString().getBytes()
-            //
-            // Therefore, we avoid creating yet another copy of the
-            // instance data and call Instances.toString() as well
-
-            Instances instances = dataset.getInstances();
-            byte[] bytes = instances.toString().getBytes();
-            return new ByteArrayInputStream(bytes);
-        }
-    }
-
-    Dataset handleFilterCmd(Exchange exchange) {
-
-        String applyValue = getConfiguration().getApply();
-
-        Dataset dataset = assertDatasetBody(exchange);
-        dataset = dataset.apply(applyValue);
-
-        return dataset;
-    }
-
-    Dataset handleModelCmd(Exchange exchange) {
-
-        Dataset dataset = assertDatasetBody(exchange);
-
-        String dsname = getConfiguration().getDsname();
-        boolean crossValidate = getConfiguration().isXval();
-        String buildSpec = getConfiguration().getBuild();
-        String loadFrom = getConfiguration().getLoadFrom();
-        String saveTo = getConfiguration().getSaveTo();
-
-        // Load the Model
-
-        if (loadFrom != null) {
-
-            Classifier cl = dataset
-                    .loadClassifier(new ModelLoader(loadFrom))
-                    .getClassifier();
-
-            AssertState.notNull(cl, "Cannot load the classifier from: " + loadFrom);
-            LOG.debug("{}", cl);
-        }
-
-        // Build a classifier
-
-        else if (buildSpec != null) {
-
-            dataset.buildClassifier(buildSpec);
-
-            // Cross Validate the Model
-
-            if (crossValidate) {
-                int seed = getConfiguration().getSeed();
-                int folds = getConfiguration().getFolds();
-                dataset.crossValidateModel(folds, seed);
-            }
-
-            // Validate the Model using explicit/current instances
-
-            else {
-
-                // Use the named data set training
-                if (dsname != null) {
-                    dataset.pop(dsname);
-                }
-
-                // Train with current instances
-                dataset.evaluateModel();
-            }
-
-            Classifier cl = dataset.getClassifier();
-            AssertState.notNull(cl, "Model command requires 'load' or 'apply'");
-            LOG.debug("{}", cl);
-
-            Evaluation ev = dataset.getEvaluation();
-            LOG.debug("{}", ev.toSummaryString());
-        }
-
-        // Save the Model
-
-        if (saveTo != null) {
-            dataset.consumeClassifier(new ModelPersister(saveTo));
-        }
-
-        return dataset;
-    }
-
-    private Dataset assertDatasetBody(Exchange exchange) {
-
-        Message msg = exchange.getMessage();
-        Dataset dataset = msg.getBody(Dataset.class);
-
-        AssertState.notNull(dataset, "Cannot obtain dataset from body: " + msg.getBody());
-
-        return dataset;
-    }
-}
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java
deleted file mode 100644
index 12503656f51..00000000000
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java
+++ /dev/null
@@ -1,71 +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.component.weka;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Path;
-
-import io.nessus.weka.Dataset;
-import org.apache.camel.Converter;
-import weka.core.Instances;
-
-@Converter(generateLoader = true)
-public final class WekaTypeConverters {
-
-    private WekaTypeConverters() {
-    }
-
-    @Converter
-    public static InputStream toInputStream(Dataset dataset) {
-        Instances instances = dataset.getInstances();
-        return toInputStream(instances);
-    }
-
-    @Converter
-    public static InputStream toInputStream(Instances instances) {
-        byte[] bytes = instances.toString().getBytes();
-        return new ByteArrayInputStream(bytes);
-    }
-
-    @Converter
-    public static Dataset toDataset(Instances instances) {
-        return Dataset.create(instances);
-    }
-
-    @Converter
-    public static Dataset toDataset(InputStream input) {
-        return Dataset.create(input);
-    }
-
-    @Converter
-    public static Dataset toDataset(File infile) {
-        return Dataset.create(infile.toPath());
-    }
-
-    @Converter
-    public static Dataset toDataset(Path inpath) {
-        return Dataset.create(inpath);
-    }
-
-    @Converter
-    public static Dataset toDataset(URL url) {
-        return Dataset.create(url);
-    }
-}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
deleted file mode 100644
index 133922fe999..00000000000
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
+++ /dev/null
@@ -1,143 +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.component.weka;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import io.nessus.weka.Dataset;
-import io.nessus.weka.testing.AbstractWekaTest;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-import weka.classifiers.Classifier;
-import weka.classifiers.Evaluation;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class DecisionTreeTest extends AbstractWekaTest {
-
-    @Test
-    public void testJ48WithCrossValidation() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use the weka to read the model training data
-                    from("direct:start")
-
-                            // Build a J48 classifier using cross-validation with 10 folds
-                            .to("weka:model?build=J48&xval=true&folds=10&seed=1")
-
-                            // Persist the J48 model
-                            .to("weka:model?saveTo=src/test/resources/data/sfny-j48.model");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny-train.arff");
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
-
-            Classifier classifier = dataset.getClassifier();
-            assertNotNull(classifier);
-            logInfo("{}", classifier);
-
-            Evaluation evaluation = dataset.getEvaluation();
-            assertNotNull(evaluation);
-            logInfo("{}", evaluation);
-        }
-    }
-
-    @Test
-    public void testJ48WithTrainingData() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use the weka to read the model training data
-                    from("direct:start")
-
-                            // Push the current instances to the stack
-                            .to("weka:push?dsname=sfny-train")
-
-                            // Build a J48 classifier with a set of named instances
-                            .to("weka:model?build=J48&dsname=sfny-train");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny-train.arff");
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
-
-            Classifier classifier = dataset.getClassifier();
-            assertNotNull(classifier);
-            logInfo("{}", classifier);
-
-            Evaluation evaluation = dataset.getEvaluation();
-            assertNotNull(evaluation);
-            logInfo("{}", evaluation);
-        }
-    }
-
-    @Test
-    public void testJ48WithCurrentInstances() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use the weka to read the model training data
-                    from("direct:start")
-
-                            // Build a J48 classifier using the current dataset
-                            .to("weka:model?build=J48");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny-train.arff");
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
-
-            Classifier classifier = dataset.getClassifier();
-            assertNotNull(classifier);
-            logInfo("{}", classifier);
-
-            Evaluation evaluation = dataset.getEvaluation();
-            assertNotNull(evaluation);
-            logInfo("{}", evaluation);
-        }
-    }
-}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
deleted file mode 100644
index 3d214220eef..00000000000
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
+++ /dev/null
@@ -1,113 +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.component.weka;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import io.nessus.weka.Dataset;
-import io.nessus.weka.utils.DatasetUtils;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ConsumerTemplate;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-import weka.core.Instances;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class FilterTest {
-
-    @Test
-    public void readFromFileFilterAndWrite() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use the file component to read the CSV file
-                    from("file:src/test/resources/data?fileName=sfny.csv&noop=true")
-
-                            // Convert the 'in_sf' attribute to nominal
-                            .to("weka:filter?apply=NumericToNominal -R first")
-
-                            // Move the 'in_sf' attribute to the end
-                            .to("weka:filter?apply=Reorder -R 2-last,1")
-
-                            // Rename the relation
-                            .to("weka:filter?apply=RenameRelation -modify sfny")
-
-                            // Use the file component to write the Arff file
-                            .to("file:target/data?fileName=sfny.arff")
-
-                            .to("direct:end");
-                }
-            });
-            camelctx.start();
-
-            ConsumerTemplate consumer = camelctx.createConsumerTemplate();
-            Dataset dataset = consumer.receiveBody("direct:end", Dataset.class);
-            assertEquals("sfny", dataset.getInstances().relationName());
-
-            Instances instances = DatasetUtils.read("target/data/sfny.arff");
-            assertEquals("sfny", instances.relationName());
-        }
-    }
-
-    @Test
-    public void readWithWekaFilterAndWrite() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use weka to read the CSV file
-                    from("direct:start")
-
-                            // Convert the 'in_sf' attribute to nominal
-                            .to("weka:filter?apply=NumericToNominal -R first")
-
-                            // Move the 'in_sf' attribute to the end
-                            .to("weka:filter?apply=Reorder -R 2-last,1")
-
-                            // Rename the relation
-                            .to("weka:filter?apply=RenameRelation -modify sfny")
-
-                            // Use weka to write the Arff file
-                            .to("weka:write?path=target/data/sfny.arff");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny.csv");
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
-            assertEquals("sfny", dataset.getInstances().relationName());
-
-            Instances instances = DatasetUtils.read("target/data/sfny.arff");
-            assertEquals("sfny", instances.relationName());
-        }
-    }
-}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
deleted file mode 100644
index 959b43178d6..00000000000
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
+++ /dev/null
@@ -1,114 +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.component.weka;
-
-import java.util.Locale;
-
-import io.nessus.weka.AssertArg;
-import io.nessus.weka.Dataset;
-import io.nessus.weka.NominalPredictor;
-import io.nessus.weka.testing.AbstractWekaTest;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ConsumerTemplate;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-import weka.core.Instances;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class PredictionTest extends AbstractWekaTest {
-
-    @Test
-    public void testJ48() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-
-                @Override
-                public void configure() {
-
-                    // Use the file component to read the CSV file
-                    from("file:src/test/resources/data?fileName=sfny-test.arff&noop=true")
-
-                            // Push these instances for later use
-                            .to("weka:push?dsname=sfny-test")
-
-                            // Remove the class attribute
-                            .to("weka:filter?apply=Remove -R last")
-
-                            // Add the 'prediction' placeholder attribute
-                            .to("weka:filter?apply=Add -N predicted -T NOM -L 0,1")
-
-                            // Rename the relation
-                            .to("weka:filter?apply=RenameRelation -modify sfny-predicted")
-
-                            // Load an already existing model
-                            .to("weka:model?loadFrom=src/test/resources/data/sfny-j48.model")
-
-                            // Use a processor to do the prediction
-                            .process(new Processor() {
-                                public void process(Exchange exchange) {
-                                    Dataset dataset = exchange.getMessage().getBody(Dataset.class);
-                                    dataset.applyToInstances(new NominalPredictor());
-                                }
-                            })
-
-                            // Write the data file
-                            .to("weka:write?path=src/test/resources/data/sfny-predicted.arff")
-
-                            .to("direct:end");
-                }
-            });
-            camelctx.start();
-
-            ConsumerTemplate consumer = camelctx.createConsumerTemplate();
-            Dataset dataset = consumer.receiveBody("direct:end", Dataset.class);
-
-            Instances wasdata = dataset.getInstances();
-            Instances expdata = dataset.pop("sfny-test").getInstances();
-            int numInstances = expdata.numInstances();
-
-            int correct = numCorrectlyClassified(expdata, wasdata);
-
-            double accuracy = 100.0 * correct / numInstances;
-            int incorrect = numInstances - correct;
-
-            logInfo(String.format("Correctly Classified Instances   %d %.4f %%", correct, accuracy));
-            logInfo(String.format("Incorrectly Classified Instances %d %.4f %%", incorrect, 100 - accuracy));
-
-            assertEquals("88.8889", String.format(Locale.ENGLISH, "%.4f", accuracy));
-        }
-    }
-
-    private int numCorrectlyClassified(Instances expdata, Instances wasdata) {
-        AssertArg.isEqual(expdata.classIndex(), wasdata.classIndex());
-        AssertArg.isEqual(expdata.size(), wasdata.size());
-        int numInstances = expdata.numInstances();
-        int clidx = expdata.classIndex();
-        int correct = 0;
-        for (int i = 0; i < numInstances; i++) {
-            double expval = expdata.instance(i).value(clidx);
-            double wasval = wasdata.instance(i).value(clidx);
-            correct += expval == wasval ? 1 : 0;
-        }
-        return correct;
-    }
-}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
deleted file mode 100644
index 4a9b1e2e60c..00000000000
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
+++ /dev/null
@@ -1,245 +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.component.weka;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import io.nessus.weka.Dataset;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ConsumerTemplate;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class ReadWriteTest {
-
-    @Test
-    public void wekaVersion() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:version");
-                }
-            });
-            camelctx.start();
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            String res = producer.requestBody("direct:start", null, String.class);
-            assertTrue(res.startsWith("3.8"));
-        }
-    }
-
-    @Test
-    public void readCsvFile() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("file:src/test/resources/data?fileName=sfny.csv&noop=true")
-                            .to("weka:read")
-                            .to("direct:end");
-                }
-            });
-            camelctx.start();
-
-            ConsumerTemplate consumer = camelctx.createConsumerTemplate();
-            Dataset dataset = consumer.receiveBody("direct:end", Dataset.class);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void readCsvUrl() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:read");
-                }
-            });
-            camelctx.start();
-
-            Path absPath = Paths.get("src/test/resources/data/sfny.csv").toAbsolutePath();
-            URL sourceUrl = absPath.toUri().toURL();
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", sourceUrl, Dataset.class);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void readCsvInputStream() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:read");
-                }
-            });
-            camelctx.start();
-
-            Path absPath = Paths.get("src/test/resources/data/sfny.csv").toAbsolutePath();
-            InputStream input = absPath.toUri().toURL().openStream();
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", input, Dataset.class);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void readArffWithPath() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:read?path=src/test/resources/data/sfny.arff");
-                }
-            });
-            camelctx.start();
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", null, Dataset.class);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void readArffInputStream() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:read");
-                }
-            });
-            camelctx.start();
-
-            Path absPath = Paths.get("src/test/resources/data/sfny.arff").toAbsolutePath();
-            InputStream input = absPath.toUri().toURL().openStream();
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            Dataset dataset = producer.requestBody("direct:start", input, Dataset.class);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void writeDatasetWithConversion() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("file:target/data?fileName=sfny.arff");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny.arff");
-            Dataset dataset = Dataset.create(inpath);
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            producer.sendBody("direct:start", dataset);
-
-            Path outpath = Paths.get("target/data/sfny.arff");
-            dataset = Dataset.create(outpath);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void writeDatasetWithoutPath() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:write")
-                            .to("file:target/data?fileName=sfny.arff");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny.arff");
-            Dataset dataset = Dataset.create(inpath);
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            producer.sendBody("direct:start", dataset);
-
-            Path outpath = Paths.get("target/data/sfny.arff");
-            dataset = Dataset.create(outpath);
-            assertNotNull(dataset);
-        }
-    }
-
-    @Test
-    public void writeDatasetWithPath() throws Exception {
-
-        try (CamelContext camelctx = new DefaultCamelContext()) {
-
-            camelctx.addRoutes(new RouteBuilder() {
-                @Override
-                public void configure() {
-                    from("direct:start")
-                            .to("weka:write?path=target/data/sfny.arff");
-                }
-            });
-            camelctx.start();
-
-            Path inpath = Paths.get("src/test/resources/data/sfny.arff");
-            Dataset dataset = Dataset.create(inpath);
-
-            ProducerTemplate producer = camelctx.createProducerTemplate();
-            producer.sendBody("direct:start", dataset);
-
-            Path outpath = Paths.get("target/data/sfny.arff");
-            dataset = Dataset.create(outpath);
-            assertNotNull(dataset);
-        }
-    }
-}
diff --git a/components/camel-weka/src/test/resources/data/sfny-j48.model b/components/camel-weka/src/test/resources/data/sfny-j48.model
deleted file mode 100644
index 3af41f554c3..00000000000
Binary files a/components/camel-weka/src/test/resources/data/sfny-j48.model and /dev/null differ
diff --git a/components/camel-weka/src/test/resources/data/sfny-predicted.arff b/components/camel-weka/src/test/resources/data/sfny-predicted.arff
deleted file mode 100644
index b5ced0438f3..00000000000
--- a/components/camel-weka/src/test/resources/data/sfny-predicted.arff
+++ /dev/null
@@ -1,111 +0,0 @@
-@relation sfny-predicted
-
-@attribute beds numeric
-@attribute bath numeric
-@attribute price numeric
-@attribute year_built numeric
-@attribute sqft numeric
-@attribute price_per_sqft numeric
-@attribute elevation numeric
-@attribute predicted {0,1}
-
-@data
-2,1,999000,1960,1000,999,10,0
-0,1,439000,1930,500,878,10,0
-3,3,2095000,1926,2200,952,4,0
-2,2,2059500,2008,1373,1500,5,0
-2,2,3450000,1900,1850,1865,9,0
-1,1,1195000,1900,1093,1093,6,0
-2,2,3159990,2012,1420,2225,8,0
-2,2,6525000,2016,2018,3233,11,0
-1,1,1595000,2015,714,2234,7,0
-2,2,4995000,1900,2024,2468,8,0
-3,3,9900000,2015,2950,3356,4,0
-2,1,899000,1990,820,1096,7,1
-0,1,699999,1988,500,1400,9,0
-0,1,775000,2009,546,1419,10,0
-1,1,1150000,2014,645,1783,18,0
-2,2,799000,1928,850,940,19,0
-2,3,2999000,1925,3200,937,12,0
-2,2,1725000,2005,976,1767,10,0
-1,1,869000,1988,670,1297,16,1
-1,1,1145000,2005,700,1636,19,0
-2,2,3500000,1986,1463,2392,23,0
-0,1,299000,1930,400,748,12,1
-0,1,539000,1957,485,1111,10,0
-2,2,4285000,2016,1747,2453,10,0
-5,5,19000000,2016,4972,3821,10,0
-1,1,588000,1970,600,980,14,0
-2,2,4285000,2016,1747,2453,15,0
-4,4,13150000,2016,3338,3939,15,0
-1,1,1000000,1912,612,1634,18,0
-2,2,3600000,1960,1340,2687,24,0
-4,4,5500000,1923,3200,1719,21,0
-1,1,779000,1902,700,1113,10,0
-0,1,725000,1960,600,1208,26,0
-2,1,385000,1999,820,470,8,1
-1,1,600000,1899,1060,566,10,0
-2,2,1599000,1973,1400,1142,14,0
-1,1,499999,2011,669,747,35,1
-2,1,545000,1939,1049,520,39,1
-0,1,835000,2013,501,1667,8,0
-1,1,1550000,2004,794,1952,11,0
-2,2,1995000,1996,1044,1911,10,0
-1,1,1695000,1927,680,2493,17,0
-3,2,1950000,1956,1600,1219,10,0
-2,2,1995000,1986,1406,1419,14,0
-1,1,529000,1986,650,814,0,1
-2,2,849000,1982,1030,824,24,0
-1,2,1088000,1998,1086,1002,6,1
-1,1,699000,2008,756,925,12,1
-3,3,1245000,1907,1503,828,23,0
-2,3,4995000,2009,2230,2240,0,1
-1,1,949000,2010,824,1152,8,1
-2,2.5,1050000,2000,1640,640,2,1
-2,2,1395000,2001,1334,1046,4,1
-2,2,1600000,2002,1173,1364,7,0
-1,1,699000,1907,932,750,59,1
-2,2,5950000,1989,3700,1608,83,1
-2,2,958000,2005,915,1047,54,1
-1,1,699000,1984,880,794,73,1
-1,1.5,378551,2000,1000,379,9,1
-2,2,1095000,2010,1135,965,30,1
-3,2,1389000,1908,1546,898,55,1
-3,2.5,1300000,1975,1642,792,4,0
-3,2,699000,1964,1250,559,48,1
-4,3,900000,2003,1870,481,54,1
-2,2,649000,1924,1320,492,72,1
-3,2,535000,1967,1824,293,102,1
-3,2.5,879000,1981,2111,416,139,1
-1,1,697000,1922,694,1004,50,1
-1,1,825000,1955,600,1375,74,1
-3,1,1095000,1895,1465,747,68,1
-1,1,1199000,1906,1139,1053,91,1
-3,2,899000,1948,1665,540,52,1
-5,5,2990000,2014,5000,598,108,1
-6,6,6895000,1902,7800,884,67,1
-1,1,599000,1900,624,960,91,1
-3,2,1099000,1905,1457,754,67,1
-5,3.5,6495000,1906,4609,1409,89,1
-4,1,1050000,1932,1767,594,55,1
-4,2.5,995000,1915,2180,456,62,1
-2,1,749000,1936,1450,517,110,1
-2,2.5,2495000,1940,1809,1379,48,1
-3,2.5,929000,2015,1391,668,5,1
-4,2,689000,1951,1473,468,21,1
-2,1,995000,1908,600,1658,36,1
-3,2,1650000,1922,2025,815,106,1
-2,2,599000,1990,862,695,181,1
-4,4,3760000,1900,3085,1219,49,1
-3,2,1799000,1926,1800,999,66,1
-4,3.5,1995000,1992,3312,602,108,1
-3,2,1159000,1977,1731,670,143,1
-3,2.5,1095000,1968,1868,586,187,1
-3,2.5,1588000,2015,2001,794,43,1
-3,2,849900,1958,1310,649,118,1
-3,2.5,1611000,2015,2001,805,153,1
-2,1,699000,1949,1050,666,64,1
-2,2,1698000,2008,1620,1048,1,1
-1,1,788000,2004,903,873,4,1
-4,4,3760000,1894,3085,1219,49,1
-1,1,649000,1983,850,764,163,1
diff --git a/components/camel-weka/src/test/resources/data/sfny-test.arff b/components/camel-weka/src/test/resources/data/sfny-test.arff
deleted file mode 100644
index b7ee347b479..00000000000
--- a/components/camel-weka/src/test/resources/data/sfny-test.arff
+++ /dev/null
@@ -1,111 +0,0 @@
-@relation sfny-test
-
-@attribute beds numeric
-@attribute bath numeric
-@attribute price numeric
-@attribute year_built numeric
-@attribute sqft numeric
-@attribute price_per_sqft numeric
-@attribute elevation numeric
-@attribute in_sf {0,1}
-
-@data
-2,1,999000,1960,1000,999,10,0
-0,1,439000,1930,500,878,10,0
-3,3,2095000,1926,2200,952,4,0
-2,2,2059500,2008,1373,1500,5,0
-2,2,3450000,1900,1850,1865,9,0
-1,1,1195000,1900,1093,1093,6,0
-2,2,3159990,2012,1420,2225,8,0
-2,2,6525000,2016,2018,3233,11,0
-1,1,1595000,2015,714,2234,7,0
-2,2,4995000,1900,2024,2468,8,0
-3,3,9900000,2015,2950,3356,4,0
-2,1,899000,1990,820,1096,7,0
-0,1,699999,1988,500,1400,9,0
-0,1,775000,2009,546,1419,10,0
-1,1,1150000,2014,645,1783,18,0
-2,2,799000,1928,850,940,19,0
-2,3,2999000,1925,3200,937,12,0
-2,2,1725000,2005,976,1767,10,0
-1,1,869000,1988,670,1297,16,0
-1,1,1145000,2005,700,1636,19,0
-2,2,3500000,1986,1463,2392,23,0
-0,1,299000,1930,400,748,12,0
-0,1,539000,1957,485,1111,10,0
-2,2,4285000,2016,1747,2453,10,0
-5,5,19000000,2016,4972,3821,10,0
-1,1,588000,1970,600,980,14,0
-2,2,4285000,2016,1747,2453,15,0
-4,4,13150000,2016,3338,3939,15,0
-1,1,1000000,1912,612,1634,18,0
-2,2,3600000,1960,1340,2687,24,0
-4,4,5500000,1923,3200,1719,21,0
-1,1,779000,1902,700,1113,10,0
-0,1,725000,1960,600,1208,26,0
-2,1,385000,1999,820,470,8,0
-1,1,600000,1899,1060,566,10,0
-2,2,1599000,1973,1400,1142,14,0
-1,1,499999,2011,669,747,35,0
-2,1,545000,1939,1049,520,39,0
-0,1,835000,2013,501,1667,8,0
-1,1,1550000,2004,794,1952,11,0
-2,2,1995000,1996,1044,1911,10,0
-1,1,1695000,1927,680,2493,17,0
-3,2,1950000,1956,1600,1219,10,0
-2,2,1995000,1986,1406,1419,14,0
-1,1,529000,1986,650,814,0,0
-2,2,849000,1982,1030,824,24,1
-1,2,1088000,1998,1086,1002,6,1
-1,1,699000,2008,756,925,12,1
-3,3,1245000,1907,1503,828,23,1
-2,3,4995000,2009,2230,2240,0,1
-1,1,949000,2010,824,1152,8,1
-2,2.5,1050000,2000,1640,640,2,1
-2,2,1395000,2001,1334,1046,4,1
-2,2,1600000,2002,1173,1364,7,1
-1,1,699000,1907,932,750,59,1
-2,2,5950000,1989,3700,1608,83,1
-2,2,958000,2005,915,1047,54,1
-1,1,699000,1984,880,794,73,1
-1,1.5,378551,2000,1000,379,9,1
-2,2,1095000,2010,1135,965,30,1
-3,2,1389000,1908,1546,898,55,1
-3,2.5,1300000,1975,1642,792,4,1
-3,2,699000,1964,1250,559,48,1
-4,3,900000,2003,1870,481,54,1
-2,2,649000,1924,1320,492,72,1
-3,2,535000,1967,1824,293,102,1
-3,2.5,879000,1981,2111,416,139,1
-1,1,697000,1922,694,1004,50,1
-1,1,825000,1955,600,1375,74,1
-3,1,1095000,1895,1465,747,68,1
-1,1,1199000,1906,1139,1053,91,1
-3,2,899000,1948,1665,540,52,1
-5,5,2990000,2014,5000,598,108,1
-6,6,6895000,1902,7800,884,67,1
-1,1,599000,1900,624,960,91,1
-3,2,1099000,1905,1457,754,67,1
-5,3.5,6495000,1906,4609,1409,89,1
-4,1,1050000,1932,1767,594,55,1
-4,2.5,995000,1915,2180,456,62,1
-2,1,749000,1936,1450,517,110,1
-2,2.5,2495000,1940,1809,1379,48,1
-3,2.5,929000,2015,1391,668,5,1
-4,2,689000,1951,1473,468,21,1
-2,1,995000,1908,600,1658,36,1
-3,2,1650000,1922,2025,815,106,1
-2,2,599000,1990,862,695,181,1
-4,4,3760000,1900,3085,1219,49,1
-3,2,1799000,1926,1800,999,66,1
-4,3.5,1995000,1992,3312,602,108,1
-3,2,1159000,1977,1731,670,143,1
-3,2.5,1095000,1968,1868,586,187,1
-3,2.5,1588000,2015,2001,794,43,1
-3,2,849900,1958,1310,649,118,1
-3,2.5,1611000,2015,2001,805,153,1
-2,1,699000,1949,1050,666,64,1
-2,2,1698000,2008,1620,1048,1,1
-1,1,788000,2004,903,873,4,1
-4,4,3760000,1894,3085,1219,49,1
-1,1,649000,1983,850,764,163,1
diff --git a/components/camel-weka/src/test/resources/data/sfny-train.arff b/components/camel-weka/src/test/resources/data/sfny-train.arff
deleted file mode 100644
index 89a475c0432..00000000000
--- a/components/camel-weka/src/test/resources/data/sfny-train.arff
+++ /dev/null
@@ -1,405 +0,0 @@
-@relation sfny-train
-
-@attribute beds numeric
-@attribute bath numeric
-@attribute price numeric
-@attribute year_built numeric
-@attribute sqft numeric
-@attribute price_per_sqft numeric
-@attribute elevation numeric
-@attribute in_sf {0,1}
-
-@data
-2,2,2750000,2006,1418,1939,0,0
-1,1,475000,1920,500,950,10,0
-1,1,999000,1982,784,1274,5,0
-2,2,2000000,1928,1200,1667,10,0
-1,1,3105000,2016,1108,2802,10,0
-1,1,450000,1920,500,900,10,0
-2,2,2200000,1920,2050,1073,10,0
-2,2,1675000,2006,1225,1367,12,0
-2,2,3995000,1906,2400,1665,9,0
-3,2,3580000,1880,3000,1193,10,0
-1,1,1849000,1920,1400,1321,5,0
-1,2,1950000,1900,1300,1500,7,0
-1,1,649000,1965,750,865,10,0
-1,1,649000,1965,750,865,10,0
-2,2,2650000,2014,1240,2137,18,0
-2,2,879000,1928,800,1099,22,0
-1,1,399000,1910,475,840,10,0
-2,2,2750000,2007,1384,1987,10,0
-1,1,1760000,1969,950,1853,17,0
-2,2,1725000,2005,976,1767,19,0
-0,1,925000,1978,585,1581,24,0
-1,1,695000,1961,720,965,16,0
-0,1,779000,1975,512,1521,10,0
-3,3,4875000,2016,2017,2417,10,0
-0,1,539000,1957,485,1111,11,0
-2,2,8690000,2002,2178,3990,15,0
-3,3,4875000,2016,2017,2417,15,0
-4,4,13400000,2016,3331,4023,15,0
-0,1,485000,1902,310,1565,23,0
-2,2,3600000,1960,1340,2687,24,0
-4,5,12000000,1939,3700,3243,22,0
-2,1,1475000,1973,971,1519,10,0
-2,1,925000,1941,790,1171,27,0
-2,2,1695000,2012,1051,1613,16,0
-2,1,910000,1899,1060,858,10,0
-2,2,1965000,2005,1330,1477,16,0
-1,1,749000,2011,762,983,35,0
-2,1,365000,1925,700,521,73,0
-1,1,935000,1910,1102,848,10,0
-1,1,1780000,2007,988,1802,14,0
-2,2,2235000,1999,1548,1444,14,0
-1,1,1495000,1962,1125,1329,19,0
-0,1,307000,1910,330,930,15,0
-2,2,2900000,1987,1600,1813,24,0
-3,3,2695000,2006,1991,1354,1,0
-3,2,1750000,1900,2950,593,26,1
-1,1,798000,1926,769,1038,10,1
-2,2,334905,2000,1047,320,12,1
-1,1,649000,1983,850,764,163,1
-2,2,1298000,2008,1159,1120,0,1
-1,1,187518,2000,670,280,12,1
-2,2,895000,2006,1113,804,3,1
-2,2,1299000,2004,1453,894,5,1
-3,2,1275000,2001,1502,849,13,1
-1,1,985000,1978,884,1114,11,1
-4,4,1800000,1948,2475,727,10,1
-2,2,1200000,1909,1302,922,56,1
-3,2,1295000,1926,1675,773,77,1
-4,2.3,1398000,1904,2492,561,13,1
-1,2,795000,2014,616,1291,31,1
-4,2,1099000,1962,1267,867,69,1
-1,1,539000,2000,709,760,5,1
-2,1,750000,1924,980,765,48,1
-3,2,748000,1930,1522,491,54,1
-2,1,798888,1929,1025,779,74,1
-2,1,699000,1913,900,777,108,1
-4,2.5,699900,1982,1752,399,140,1
-5,3.5,3995000,1905,3350,1193,59,1
-2,1,699000,1907,915,764,89,1
-1,1,725000,1900,811,894,70,1
-3,2.5,799000,1947,1400,571,35,1
-3,2,899000,1948,1665,540,52,1
-4,3,1338800,1940,2330,575,119,1
-2,2,1725000,1922,1415,1219,86,1
-1,1,599000,1900,624,960,91,1
-5,5.5,3495000,1921,4310,811,73,1
-4,3,1698000,1890,1789,949,102,1
-1,1,739900,1941,875,846,70,1
-2,1,829000,1925,1145,724,71,1
-6,6.5,9500000,1937,5420,1753,3,1
-2,2,2000000,1925,1518,1318,50,1
-4,4,850000,1928,2470,344,8,1
-2,2,669000,1986,1317,508,23,1
-2,1,759900,1941,1175,647,43,1
-3,3.5,2250000,1928,3258,691,127,1
-5,3.5,2995000,1947,3890,770,181,1
-3,2,1050000,1922,1266,829,52,1
-2,1,600000,1908,1350,444,92,1
-3,2,1495000,1937,1635,914,112,1
-3,2.5,995000,1976,1959,508,163,1
-2,1,599000,1972,990,605,189,1
-2,1,795000,1941,1256,633,63,1
-2,1,599000,1941,1254,478,123,1
-2,2,1495000,1913,1174,1273,35,1
-3,3,888000,1975,1555,571,79,1
-1,1,849000,2012,886,958,2,1
-2,2,1950000,1995,1930,1010,4,1
-3,2,1799000,1926,1800,999,66,1
-3,2,995000,1956,1305,762,216,1
-2,2,1350000,1900,2150,628,9,0
-1,1,975000,1930,900,1083,10,0
-1,1,999000,1982,784,1274,5,0
-1,1,715000,1903,557,1284,3,0
-4,5,13750000,2016,3699,3717,10,0
-1,1,1195000,1900,1093,1093,10,0
-2,2,4895000,2016,1520,3220,10,0
-2,2,1675000,2006,1225,1367,12,0
-1,1,1285000,2012,749,1716,10,0
-3,3,6350000,2015,2500,2540,3,0
-2,2,3500000,1915,2000,1750,5,0
-1,1,1750000,1963,1000,1750,5,0
-2,2,1200000,1964,1200,1000,10,0
-2,2,1849000,2009,1135,1629,10,0
-0,1,469000,1932,500,938,18,0
-2,3,2999000,1925,3200,937,10,0
-1,1,1135000,2005,715,1587,10,0
-2,2,2750000,2007,1384,1987,13,0
-3,3,1249000,1962,1500,833,18,0
-2,2,3500000,1925,1550,2258,20,0
-2,2,1700000,1982,1007,1688,25,0
-1,1,695000,1961,720,965,16,0
-1,1,925000,1985,745,1242,10,0
-3,3,14950000,1931,4435,3371,10,0
-1,1,835000,1963,700,1193,12,0
-2,2,4195000,2016,1750,2397,15,0
-3,3,5750000,2016,2196,2618,15,0
-5,5,19000000,2016,4972,3821,15,0
-3,2,7350000,1999,2075,3542,23,0
-1,1,525000,1924,700,750,24,0
-1,2,1850000,2007,839,2205,23,0
-2,2,1385000,1971,962,1440,10,0
-1,1,965000,1961,787,1226,27,0
-1,1,600000,1899,1060,566,8,0
-2,2,1599000,1973,1400,1142,10,0
-1,1,735000,1928,800,919,22,0
-2,2,904000,1920,1503,601,10,0
-2,1,365000,1925,700,521,73,0
-1,1,1420000,2004,768,1849,10,0
-2,2,2800000,2007,1308,2141,14,0
-4,4,8800000,1941,3382,2602,15,0
-2,2,2200000,2000,1044,2107,2,0
-2,2,1735000,1980,1585,1095,18,0
-2,2,2499000,2004,1658,1507,24,0
-3,3,2695000,2006,1991,1354,1,0
-1,1,799000,2008,847,943,29,1
-1,1,798000,1926,769,1038,10,1
-1,1.5,849000,1996,1127,753,13,1
-2,2,1700000,1987,1250,1360,11,1
-2,2,2149000,2008,1317,1632,0,1
-3,2.5,1995000,2008,2354,847,23,1
-1,1,998000,2006,872,1144,3,1
-2,2.5,850000,2000,1136,748,5,1
-1,1.5,775000,2009,835,928,14,1
-1,1,725000,1978,1063,682,60,1
-2,2.5,2350000,2008,1314,1788,19,1
-3,3,1575000,1993,2233,705,62,1
-4,4,1800000,1948,2347,767,87,1
-2,1.3,1097000,1904,1493,735,14,1
-3,2,979000,1900,1440,680,33,1
-3,3.5,1799000,1900,2449,735,75,1
-1,1,735000,1983,779,944,12,1
-3,2,549000,1915,1972,278,51,1
-2,1.5,749000,1949,1348,556,56,1
-5,2,899000,1972,1940,463,81,1
-2,1,699000,1913,900,777,108,1
-2,1,688000,1950,1145,601,143,1
-1,1,650000,1955,600,1083,74,1
-3,2,1495000,1927,1520,984,105,1
-1,1,725000,1900,811,894,70,1
-3,2,795000,1954,1350,589,36,1
-6,4,1198000,1937,1965,610,79,1
-3,2.5,1388000,1928,1905,729,160,1
-3,3,1995000,1922,1915,1042,88,1
-3,2,1200000,1929,1284,935,121,1
-3,2,2395000,1929,2323,1031,73,1
-5,2,6298000,1914,3585,1757,26,1
-4,4,1595000,1925,2750,580,81,1
-2,1,875000,1908,1158,756,84,1
-4,3,3595000,1931,3017,1192,9,1
-4,3.5,9895000,2008,6024,1643,62,1
-2,1,648000,1921,1125,576,11,1
-2,1.5,729000,1942,1012,720,27,1
-6,3.5,995000,2001,3080,323,55,1
-3,1,1319000,1925,1752,753,141,1
-3,2,995000,1956,1305,762,216,1
-2,2,1895000,1907,1756,1079,54,1
-2,1,1495000,1908,1700,879,98,1
-3,3.5,2195000,1922,2168,1012,125,1
-4,3,1388000,1968,2275,610,163,1
-2,1,915000,1954,1251,731,24,1
-2,1,795000,1941,1256,633,63,1
-3,2.5,1539514,2014,2024,761,136,1
-1,1,699000,1908,750,932,36,1
-1,1,599000,1945,631,949,84,1
-2,2,1675000,2012,1562,1072,2,1
-0,1,539000,2000,709,760,5,1
-5,2.5,1800000,1890,3073,586,76,1
-1,1,629000,1903,500,1258,9,0
-1,1,975000,1930,900,1083,12,0
-1,1,1249000,1987,826,1512,3,0
-2,2,2498000,2005,1260,1983,2,0
-2,2,1185000,1900,1000,1185,4,0
-2,2,1185000,1900,1000,1185,10,0
-2,2,6525000,2016,2018,3233,10,0
-2,1,999000,1985,799,1250,5,0
-1,1,1595000,2015,714,2234,10,0
-3,3,6550000,2015,2500,2620,3,0
-2,2,3500000,1910,1887,1855,5,0
-0,1,775000,2009,546,1419,6,0
-0,1,319000,1941,500,638,10,0
-1,1,615000,1960,750,820,11,0
-0,1,569000,1962,543,1048,8,0
-2,3,2999000,1925,3200,937,10,0
-1,1,1145000,2005,700,1636,10,0
-1,1,399000,1910,475,840,14,0
-3,3,1500000,1962,1600,938,18,0
-0,1,525000,1940,525,1000,21,0
-2,2,1700000,1982,1007,1688,25,0
-4,5,17750000,2012,4476,3966,20,0
-1,1,1319000,1958,1000,1319,10,0
-3,3,10225000,2016,3007,3400,10,0
-10,10,7995000,1910,6400,1249,12,0
-2,2,4195000,2016,1742,2408,15,0
-3,3,9350000,2016,3054,3062,15,0
-0,1,850000,1924,546,1557,10,0
-1,1,1200000,1969,600,2000,23,0
-0,1,545000,1900,387,1408,10,0
-1,1,535000,1900,450,1189,27,0
-1,1,779000,1902,700,1113,13,0
-2,1,1250000,1922,1145,1092,30,0
-2,1,910000,1899,1060,858,8,0
-2,2,4625000,1987,1695,2729,10,0
-2,2,4625000,1987,1695,2729,29,0
-2,2,904000,1920,1503,601,10,0
-1,1,935000,1910,1102,848,8,0
-1,1,1550000,2004,794,1952,10,0
-1,1,411500,1921,586,702,6,0
-2,2,1850000,1996,1044,1772,17,0
-0.5,1,384900,1962,540,713,10,0
-3,3,1850000,2005,1353,1367,8,0
-2,2,1575000,1930,1324,1190,33,0
-4,3,3895000,2001,2277,1711,0,0
-1,1.5,899000,1997,1453,619,3,1
-1,1,1495000,1927,2275,657,10,1
-1,1.5,1365000,1996,1607,849,13,1
-2,2,1980000,2009,1469,1348,0,1
-3,2,1995000,2006,1362,1465,3,1
-3,2.5,1995000,2008,2354,847,23,1
-2,2,1659000,2000,1165,1424,4,1
-3,2.5,2850000,2013,2075,1373,5,1
-3,2,1399000,1892,1809,773,41,1
-2,2,849000,1911,1100,772,66,1
-1,1,740200,1920,989,748,41,1
-2,2,1199000,1964,1100,1090,68,1
-1,1,795000,2000,990,803,7,1
-1,1,670000,2014,507,1321,20,1
-3,3,1488888,1977,2100,709,38,1
-3,2,1250000,1924,1450,862,83,1
-3,2,688000,1942,1441,477,34,1
-6,3,1600000,1926,2567,623,52,1
-2,1,599000,1942,707,847,61,1
-3,1.5,699000,1910,1625,430,94,1
-2,1,500000,1958,1166,429,136,1
-3,2,1195000,1907,1396,856,33,1
-1,1,650000,1955,600,1083,74,1
-4,4.5,5200000,1952,4813,1080,238,1
-4,4,2650000,1900,3816,694,75,1
-2,1,699000,1944,995,703,41,1
-3,3,1100000,1925,2633,418,91,1
-3,2,989000,1940,1603,617,227,1
-0,1,499000,1900,510,978,91,1
-3,2,1395000,1909,1877,743,57,1
-4,2.5,2549000,1907,2746,928,75,1
-3,3,1139000,2008,1532,743,44,1
-2,1,699000,1907,1200,583,14,1
-5,3,950000,1939,1846,515,97,1
-2,1.5,1425000,1925,1360,1048,14,1
-3,2,358000,1989,1325,270,5,1
-2,1,480000,1915,680,706,13,1
-2,2,767000,1916,1380,556,31,1
-2,1,725000,1945,1040,697,60,1
-5,3.5,1698000,1966,2769,613,176,1
-1,1,350000,1908,600,583,43,1
-1,1,599000,1961,680,881,56,1
-3,2,1595000,1961,1515,1053,103,1
-4,2,1798000,1951,2050,877,131,1
-5,3.5,2250000,1962,3729,603,174,1
-2,1,915000,1954,1251,731,24,1
-4,2,848000,1949,1646,515,69,1
-3,2.5,1339000,2015,2133,628,143,1
-2,2.5,3495000,1900,1968,1776,76,1
-3,3,758000,1989,2157,351,90,1
-2,2,1695000,2007,1610,1053,2,1
-2,2,849000,1982,1030,824,24,1
-2,1,695000,1923,1045,665,106,1
-0,1,439000,1930,500,878,10,0
-2,1,1895000,1921,1000,1895,12,0
-0,1,1110000,2008,698,1590,5,0
-2,1.5,2650000,1915,2500,1060,5,0
-1,2,1699000,1900,1500,1133,5,0
-0,1,625000,1964,800,781,8,0
-2,2,4895000,2016,1520,3220,11,0
-1,1,1550000,1926,1000,1550,6,0
-2,2,3995000,1906,2400,1665,10,0
-3,3,5985000,1909,3300,1814,3,0
-1,1,1250000,2007,720,1736,6,0
-0,1,390000,1955,550,709,6,0
-0,1,699999,1988,500,1400,10,0
-1,1,1590000,2008,785,2025,12,0
-1,1,549000,1924,750,732,10,0
-2,3,2999000,1925,3200,937,12,0
-1,1,1760000,1969,950,1853,10,0
-2,2,1725000,2005,1144,1508,16,0
-1,1,1135000,2005,715,1587,19,0
-2,2,2025000,1940,1433,1413,21,0
-0,1,449000,1962,550,816,10,0
-5,5,27500000,1930,7500,3667,21,0
-2,2,4240000,2016,1741,2435,10,0
-4,4,13400000,2016,3331,4023,10,0
-0,1,349000,1960,400,873,13,0
-2,2,4240000,2016,1741,2435,15,0
-3,3,10225000,2016,3007,3400,15,0
-7,7,19500000,1994,4238,4601,10,0
-2,2,4250000,2011,1504,2826,23,0
-1,1,535000,1900,450,1189,10,0
-2,2,1350000,1931,1300,1038,36,0
-1,1,649000,1929,800,811,25,0
-1,1,650000,1907,720,903,32,0
-8,7,2300000,1910,4180,550,9,0
-0,1,325000,1910,375,867,11,0
-1,1,749000,2011,762,983,10,0
-2,1,559900,1925,1200,467,51,0
-0,1,820000,2013,533,1538,8,0
-2,2,1635000,2004,957,1708,10,0
-2,2,2175000,1999,1569,1386,10,0
-2,2,1995000,1996,1044,1911,17,0
-1,1,515000,1962,725,710,10,0
-3,3,1850000,2005,1353,1367,10,0
-3,3,1495000,1990,1360,1099,0,0
-1,1,550000,1982,724,760,24,1
-1,1,598000,2005,534,1120,5,1
-4,4,4300000,2006,3321,1295,10,1
-1,1,649000,2011,674,963,14,1
-2,2,3600000,2009,1652,2179,0,1
-2,2,1650000,1937,1640,1006,7,1
-2,2,2799000,2008,1328,2108,35,1
-1,1,788000,2004,903,873,4,1
-2,2,950000,2000,1258,755,6,1
-2,2,879000,1912,950,925,53,1
-1,1,618000,1973,705,877,72,1
-1,1,699000,1982,780,896,51,1
-1,1,529000,1966,791,669,69,1
-2,2,779000,2007,808,964,7,1
-2,2,1199000,2014,943,1271,20,1
-3,2,1389000,1908,1546,898,55,1
-3,2,998000,1907,1464,682,84,1
-2,1,859000,1890,1100,781,44,1
-2,2,875000,1909,1700,515,54,1
-3,1,648800,1940,1325,490,66,1
-3,2,749000,1907,1513,495,95,1
-3,2.5,879000,1981,2111,416,139,1
-3,2,1195000,1907,1396,856,33,1
-1,1,775000,1955,600,1292,74,1
-2,2,989000,1984,988,1001,46,1
-2,2,1680000,1962,1850,908,89,1
-3,2,848000,1940,1500,565,42,1
-6,3.5,949000,1918,2473,384,97,1
-3,1,1295000,1890,1772,731,65,1
-0,1,499000,1900,510,978,91,1
... 2376 lines suppressed ...