diff --git a/distribution/entaxy-docker/ReadMe.md b/distribution/entaxy-docker/ReadMe.md deleted file mode 100644 index 1c7c1c3..0000000 --- a/distribution/entaxy-docker/ReadMe.md +++ /dev/null @@ -1,141 +0,0 @@ -## Docker compose для сборки и запуска Entaxy. - -Запуск локального окружения с несколькими docker контейнерами: -* Караф -* Брокер -* СУБД -* Менеджер артефактов - -Для начала клонируем репозиторий и переходим в корень проекта: -```bash -git clone -cd entaxy-framework -``` -Далее у нас есть разные варианты хранения необходимых для установки Entaxy артефактов. -### 1. Самый простой способ: локальный репозиторий артефактов включаеться в образ карафа. -В корневом POM находится профиль для деплоя артефактов в образ карафа: -```xml - - docker.file.repo - - - entaxy-maven-repo-file - file:./distribution/entaxy-docker/karaf/repo - - - -``` -Запускаем мевен деплой из корня проекта с этим профилем: -```bash -mvn deploy -P docker.file.repo -``` -И после успешной сборки запускаем контейнеры из директории проекта, в которой находится docker-compose.yml: -```bash -cd ./distribution/entaxy-docker -docker-compose up -``` -Или `docker compose up` для новых версий docker. -После запуска комманды мы будем видеть прогресс сборки образов, запуска контейнеров и логи запущенных приложений. Для остановки контейнеров достаточно нажать сочетание клавиш Ctrl+C или через команды запущенные из другого окна/вкладки терминала. -```bash -docker-compose stop -docker-compose start -``` -После запуска контейнеров открываем новый терминал и заходим в караф: -```bash -docker-compose exec karaf /opt/apache-karaf/bin/client -``` -или ssh клиент с дальнейшим вводом пароля (karaf) -```bash -ssh -p 8101 karaf@localhost -``` - -И в консоли карафа запускаем скрипт с установкой необходимых фич: -```bash -shell:source ./install.karaf -``` -Ждём окончания деплоя в караф. -(Не всегда полная установка проходит с первой попытки и тогда помогает повторный запуск `source install.karaf`) - -### 2. Reposilite: легковесный http репозиторий артефактов запускается в отдельном контейнере. -Комментируем в файле install.karaf строку начинающуюся с: -```bash -config:property-set -p org.ops4j.pax.url.mvn org.ops4j.pax.url.mvn.repositories file:/opt/apache-karaf/repo -``` -И убираем комментарий в строке начинающейся: -```bash -#config:property-set -p org.ops4j.pax.url.mvn org.ops4j.pax.url.mvn.repositories http://maven-repo/snapshots -``` - -Запускаем контейнеры из директории проекта, в которой находится docker-compose.yml: -```bash -cd ./distribution/entaxy-docker -docker-compose up -``` -Или `docker compose up` для новых версий docker. -После запуска комманды мы будем видеть прогресс сборки образов, запуска контейнеров и логи запущенных приложений. Для остановки контейнеров достаточно нажать сочетание клавиш Ctrl+C или через команды запущенные из другого окна/вкладки терминала. -```bash -docker-compose stop -docker-compose start -``` - -Для деплоя в reposilite добавляем учётные данные в конфигурацию мавена (`~/.m2/settings.xml`): -```xml - - - - entaxy-maven-repo - admin - aW7frfS9NPGrOnuNBMf9gyO0eXNRaCoOGtXHTcLU5akDFJ9ACiUJhgmZxlOKnLC5 - - - -``` -В корневом POM находится профиль для деплоя артефактов на сервер reposilite: -```xml - - docker.reposilite - - - entaxy-maven-repo - http://127.0.0.1:8081/snapshots - - - -``` -Запускаем мевен деплой из корня проекта с этим профилем: -```bash -mvn deploy -P docker.reposilite -``` -После успешной сборки открываем новый терминал и заходим в караф: -```bash -docker-compose exec karaf /opt/apache-karaf/bin/client -``` -или ssh клиент с дальнейшим вводом пароля (karaf) -```bash -ssh -p 8101 karaf@localhost -``` - -И в консоли карафа запускаем скрипт с установкой необходимых фич: -```bash -shell:source ./install.karaf -``` -Ждём окончания деплоя в караф. -(Не всегда полная установка проходит с первой попытки и тогда помогает повторный запуск `source install.karaf`) - - - -Также есть вариант с nexus -После старта получаем пароль для admin через команду: -`docker-compose exec nexus cat /nexus-data/admin.password`. -Через админку нужно разрешить анонимный деплой или настроить доступы. -Урл для install.karaf -`http://nexus:8081/repository/maven-snapshots/@id=local-nexus@snapshots@noreleases` - - - -Остановить все контейнеры -`docker-compose down` -Остановить и удалить хранилища с БД и репой -`docker-compose down -v` diff --git a/distribution/entaxy-docker/docker-compose.yml b/distribution/entaxy-docker/docker-compose.yml deleted file mode 100644 index 1837cf3..0000000 --- a/distribution/entaxy-docker/docker-compose.yml +++ /dev/null @@ -1,78 +0,0 @@ -version: '3' -services: - broker: - container_name: broker - image: vromero/activemq-artemis - restart: unless-stopped - environment: - - ARTEMIS_USERNAME=entaxy - - ARTEMIS_PASSWORD=entaxy - ports: - - 8161:8161 - - 61616:61616 - - db-postgres: - container_name: db-postgres -# image: postgres - build: ./postgres - restart: unless-stopped - volumes: - - db-vol:/var/lib/postgresql/data - # - /etc/localtime:/etc/localtime:ro - environment: - - POSTGRES_USER=entaxy - - POSTGRES_PASSWORD=entaxy - - POSTGRES_DB=cache - ports: - - 5432:5432 - - # db-mssql: - # container_name: db-mssql - # image: mcr.microsoft.com/mssql/server:2017-CU8-ubuntu - # restart: unless-stopped - # environment: - # - SA_PASSWORD=123mssql - # - ACCEPT_EULA=Y - # - POSTGRES_DB=cache - # ports: - # - 1433:1433 - -# nexus: -# container_name: nexus -# image: sonatype/nexus3 -# restart: unless-stopped -# volumes: -# - nexus-data:/nexus-data -# environment: -# - INSTALL4J_ADD_VM_PARAMS=-Xms2g -Xmx2g -XX:MaxDirectMemorySize=3g -# ports: -# - 8081:8081 - maven-repo: - container_name: maven-repo - build: ./reposilite -# image: dzikoysk/reposilite - restart: unless-stopped - volumes: - - nexus-data:/app/data - ports: - - 8081:80 - - karaf: -# image: apache/karaf:4.2.9 - build: - context: karaf/ - container_name: karaf -# environment: -# - ESB_ENTAXY_VERSION=1.8.0 -# - ESB_ENTAXY_MAVEN_REPO=http://nexus:8081/repository/maven-snapshots/@id=local-nexus@snapshots@noreleases - restart: unless-stopped - ports: - - 8101:8101 - - 8181:8181 - - 8080:8080 - -volumes: - db-vol: - driver: local - nexus-data: - driver: local \ No newline at end of file diff --git a/distribution/entaxy-docker/karaf/Dockerfile b/distribution/entaxy-docker/karaf/Dockerfile deleted file mode 100644 index 9f880b4..0000000 --- a/distribution/entaxy-docker/karaf/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM apache/karaf:4.2.9 - -COPY repo /opt/apache-karaf/repo -COPY init /opt/apache-karaf/etc/init - -COPY jre.properties /opt/apache-karaf/etc/ -COPY org.apache.karaf.cellar.groups.cfg /opt/apache-karaf/etc/ -COPY org.ops4j.datasource-entaxy.esb.cache.cfg /opt/apache-karaf/etc/ -COPY org.ops4j.datasource-entaxy.esb.db_connector.cfg /opt/apache-karaf/etc/ -COPY org.ops4j.datasource-entaxy.esb.storage.cfg /opt/apache-karaf/etc/ -COPY ru.entaxy.esb.cfg /opt/apache-karaf/etc/ -COPY ru.entaxy.esb.system.bridge.cfg /opt/apache-karaf/etc/ -COPY install.karaf /opt/apache-karaf/ diff --git a/distribution/entaxy-docker/karaf/init/entaxy-platform-connections.json b/distribution/entaxy-docker/karaf/init/entaxy-platform-connections.json deleted file mode 100644 index 25a8055..0000000 --- a/distribution/entaxy-docker/karaf/init/entaxy-platform-connections.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "connections": [ - { - "nodeType": "connection", - "uuid": "connection-uuid-1", - "name": "entaxy-file", - "adapterName": "fileAdapter", - "platform": true, - "pathParameter": "data/shared", - "properties": {}, - "options": { - "noop": true, - "fileName": "default.txt", - "allowNullBody": "true" - } - }, - { - "nodeType": "connection", - "uuid": "connection-uuid-2", - "name": "entaxy-broker", - "adapterName": "artemisAdapter", - "platform": true, - "pathParameter": "queue:entaxy.default", - "properties": { - "url": "(tcp://broker:61616)", - "username": "entaxy", - "password": "entaxy", - "maxConnections": "20", - "maxSessionsPerConnection": "100" - }, - "options": {} - }, - { - "nodeType": "connection", - "uuid": "connection-uuid-3", - "name": "entaxy-db-storage", - "adapterName": "postgresqlAdapter", - "platform": true, - "pathParameter": "entaxy.esb.storage", - "properties": {}, - "options": {} - }, - { - "nodeType": "connection", - "uuid": "connection-uuid-4", - "name": "entaxy-db-cache", - "adapterName": "postgresqlAdapter", - "platform": true, - "pathParameter": "entaxy.esb.cache", - "properties": {}, - "options": {} - } - ] -} diff --git a/distribution/entaxy-docker/karaf/install.karaf b/distribution/entaxy-docker/karaf/install.karaf deleted file mode 100644 index ca2d47a..0000000 --- a/distribution/entaxy-docker/karaf/install.karaf +++ /dev/null @@ -1,21 +0,0 @@ -ESB_ENTAXY_VERSION=1.8.0 - -echo "Maven repo=$ESB_ENTAXY_MAVEN_REPO, Version=$ESB_ENTAXY_VERSION" - -# docker.file.repo -config:property-set -p org.ops4j.pax.url.mvn org.ops4j.pax.url.mvn.repositories file:/opt/apache-karaf/repo@id=local-repo@snapshots@noreleases,https://repo1.maven.org/maven2@id=central,https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases,https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases -# docker.reposilite -#config:property-set -p org.ops4j.pax.url.mvn org.ops4j.pax.url.mvn.repositories http://maven-repo/releases@id=local-releases@update=always,http://maven-repo/snapshots@id=local-snapshots@snapshots@noreleases@update=always,https://repo1.maven.org/maven2@id=central,https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases,https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases - -feature:repo-add mvn:ru.entaxy.esb/karaf-features/$ESB_ENTAXY_VERSION/xml/features -echo "feature:install entaxy-all" -feature:install entaxy-all -feature:repo-add mvn:ru.entaxy.esb.platform.runtime/base/$ESB_ENTAXY_VERSION/xml/features -echo "feature:install base" -feature:install base -feature:repo-add mvn:ru.entaxy.esb.platform.runtime/core/$ESB_ENTAXY_VERSION/xml/features -echo "feature:install core" -feature:install core -feature:repo-add mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/$ESB_ENTAXY_VERSION/xml/features -echo "feature:install entaxy-uniform-service" -feature:install entaxy-uniform-service \ No newline at end of file diff --git a/distribution/entaxy-docker/karaf/jre.properties b/distribution/entaxy-docker/karaf/jre.properties deleted file mode 100644 index 3d884c7..0000000 --- a/distribution/entaxy-docker/karaf/jre.properties +++ /dev/null @@ -1,725 +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. -# -################################################################################ -# -# Java platform package export properties. -# -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.6=\ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.7=\ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - com.sun.nio.sctp -jre-1.8=\ - javax.accessibility, \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.8", \ - javax.xml.bind.annotation;version="2.2.8", \ - javax.xml.bind.annotation.adapters;version="2.2.8", \ - javax.xml.bind.attachment;version="2.2.8", \ - javax.xml.bind.helpers;version="2.2.8", \ - javax.xml.bind.util;version="2.2.8", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - javafx.animation, \ - javafx.application, \ - javafx.beans, \ - javafx.beans.binding, \ - javafx.beans.property, \ - javafx.beans.property.adapter, \ - javafx.beans.value, \ - javafx.collections, \ - javafx.collections.transform, \ - javafx.concurrent, \ - javafx.css, \ - javafx.embed.swing, \ - javafx.embed.swt, \ - javafx.event, \ - javafx.fxml, \ - javafx.geometry, \ - javafx.print, \ - javafx.scene, \ - javafx.scene.canvas, \ - javafx.scene.chart, \ - javafx.scene.control, \ - javafx.scene.control.cell, \ - javafx.scene.effect, \ - javafx.scene.image, \ - javafx.scene.input, \ - javafx.scene.layout, \ - javafx.scene.media, \ - javafx.scene.paint, \ - javafx.scene.shape, \ - javafx.scene.text, \ - javafx.scene.transform, \ - javafx.scene.web, \ - javafx.stage, \ - javafx.util, \ - javafx.util.converter, \ - netscape.javascript, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - com.sun.nio.sctp, \ - sun.nio.ch, \ - com.sun.management -jre-9=\ - javax.accessibility, \ - javax.activation;version="1.2", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.0", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.3.0", \ - javax.xml.bind.annotation;version="2.3.0", \ - javax.xml.bind.annotation.adapters;version="2.3.0", \ - javax.xml.bind.attachment;version="2.3.0", \ - javax.xml.bind.helpers;version="2.3.0", \ - javax.xml.bind.util;version="2.3.0", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.xpath, \ - javafx.animation, \ - javafx.application, \ - javafx.beans, \ - javafx.beans.binding, \ - javafx.beans.property, \ - javafx.beans.property.adapter, \ - javafx.beans.value, \ - javafx.collections, \ - javafx.collections.transformation, \ - javafx.concurrent, \ - javafx.css, \ - javafx.embed.swing, \ - javafx.embed.swt, \ - javafx.event, \ - javafx.fxml, \ - javafx.geometry, \ - javafx.print, \ - javafx.scene, \ - javafx.scene.canvas, \ - javafx.scene.chart, \ - javafx.scene.control, \ - javafx.scene.control.cell, \ - javafx.scene.effect, \ - javafx.scene.image, \ - javafx.scene.input, \ - javafx.scene.layout, \ - javafx.scene.media, \ - javafx.scene.paint, \ - javafx.scene.shape, \ - javafx.scene.text, \ - javafx.scene.transform, \ - javafx.scene.web, \ - javafx.stage, \ - javafx.util, \ - javafx.util.converter, \ - netscape.javascript, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - com.sun.nio.sctp, \ - sun.nio.ch, \ - com.sun.management -jre-10=${jre-9} -jre-11=${jre-10} \ No newline at end of file diff --git a/distribution/entaxy-docker/karaf/org.apache.karaf.cellar.groups.cfg b/distribution/entaxy-docker/karaf/org.apache.karaf.cellar.groups.cfg deleted file mode 100644 index 8fc03b5..0000000 --- a/distribution/entaxy-docker/karaf/org.apache.karaf.cellar.groups.cfg +++ /dev/null @@ -1,68 +0,0 @@ -# -# This property stores the cluster groups for which the local node is member -# -groups = default - -# -# Filtering of the bundles in the default cluster group -# -default.bundle.whitelist.inbound=* -default.bundle.whitelist.outbound=* -default.bundle.blacklist.inbound=none -default.bundle.blacklist.outbound=none - -# -# Filtering of the configurations in the default cluster group -# -default.config.whitelist.inbound=* -default.config.whitelist.outbound=* -default.config.blacklist.inbound=org.apache.felix.fileinstall*, \ - org.apache.karaf.management, \ - org.apache.karaf.shell, \ - org.ops4j.pax.web, \ - org.apache.aries.transaction, \ - org.ops4j.pax.logging, \ - org.apache.karaf.cellar.node, \ - org.apache.karaf.cellar.groups.cfg -default.config.blacklist.outbound=org.apache.felix.fileinstall*, \ - org.apache.karaf.management, \ - org.apache.karaf.shell, \ - org.ops4j.pax.web, \ - org.apache.aries.transaction, \ - org.ops4j.pax.logging, \ - org.apache.karaf.cellar.node, \ - org.apache.karaf.cellar.groups.cfg - - -# -# Filtering of the features in the default cluster group -# -default.feature.whitelist.inbound=* -default.feature.whitelist.outbound=* -default.feature.blacklist.inbound=none -default.feature.blacklist.outbound=none - -# -# The following properties define the behavior to use when the node joins the cluster (the usage of the bootstrap -# synchronizer), per cluster group and per resource. -# The following values are accepted: -# disabled: means that the synchronizer doesn't sync cluster group and node states -# cluster: the synchronizer retrieves the state from the cluster group first (pull first), and push the node the state -# to the cluster group after (push after) -# node: the synchronizer push the node state to the cluster group (push first), and pull the state from the cluster group -# after (pull after) -# clusterOnly: the cluster is the "master", the node only retrieves and applies the cluster group state, nothing is -# pushed to the cluster group -# nodeOnly: the node is the "master", the node pushes his state to the cluster group, nothing is pulled from the -# cluster group -# -default.bundle.sync = disabled -default.config.sync = disabled -default.feature.sync = disabled -default.obr.urls.sync = disabled -default.balanced.servlet.sync = disabled - -default.event.blacklist.inbound = none -default.event.blacklist.outbound = none -default.event.whitelist.inbound = subscription -default.event.whitelist.outbound = subscription diff --git a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.cache.cfg b/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.cache.cfg deleted file mode 100644 index f14cd19..0000000 --- a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.cache.cfg +++ /dev/null @@ -1,10 +0,0 @@ -dataSourceName=entaxy.esb.cache -osgi.jdbc.driver.name=PostgreSQL JDBC Driver -serverName=db-postgres -portNumber=5432 -databaseName=cache -user=entaxy -password=entaxy -pool=dbcp2 -xa=true -jdbc.pool.maxTotal=100 diff --git a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.db_connector.cfg b/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.db_connector.cfg deleted file mode 100644 index cb8f85b..0000000 --- a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.db_connector.cfg +++ /dev/null @@ -1,10 +0,0 @@ -dataSourceName=entaxy.esb.db_connector -osgi.jdbc.driver.name=PostgreSQL JDBC Driver -serverName=db-postgres -portNumber=5432 -databaseName=db_connector_test -user=entaxy -password=entaxy -pool=dbcp2 -xa=true -jdbc.pool.maxTotal=100 diff --git a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.storage.cfg b/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.storage.cfg deleted file mode 100644 index 8d921eb..0000000 --- a/distribution/entaxy-docker/karaf/org.ops4j.datasource-entaxy.esb.storage.cfg +++ /dev/null @@ -1,10 +0,0 @@ -dataSourceName=entaxy.esb.storage -osgi.jdbc.driver.name=PostgreSQL JDBC Driver -serverName=db-postgres -portNumber=5432 -databaseName=esb_entaxy -user=entaxy -password=entaxy -pool=dbcp2 -xa=true -jdbc.pool.maxTotal=100 diff --git a/distribution/entaxy-docker/karaf/ru.entaxy.esb.cfg b/distribution/entaxy-docker/karaf/ru.entaxy.esb.cfg deleted file mode 100644 index 66b84cc..0000000 --- a/distribution/entaxy-docker/karaf/ru.entaxy.esb.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# адреса кластера брокеров сообщений, задаются: -# если tcp в скобках и через запятую: (tcp://192.168.122.81:61616,tcp://192.168.122.82:61616) -# если amqp с failover и в скобках через запятую: failover:(amqp://192.168.122.81:5672,amqp://192.168.122.82:5672) -common.jms.url=(tcp://broker:61616) -# логин для аутентификации в брокере сообщений -common.jms.username=entaxy -# пароль для аутентификации в брокере сообщений -common.jms.password=entaxy -# максимальное количество соединений -# подробнее можно почитать здесь: https://github.com/messaginghub/pooled-jms/blob/master/pooled-jms-docs/Configuration.md -common.jms.maxConnections=20 -# максимальное количество сессий для каждого соединения -# подробнее можно почитать здесь: https://github.com/messaginghub/pooled-jms/blob/master/pooled-jms-docs/Configuration.md -common.jms.maxSessionsPerConnection=100 - -# наименование драйвера для инициализации фабрики планировщика quartz -org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate - -# название очереди, через которую ходят большие пакеты и файлы -common.bridge.file.queue.name=file.queue \ No newline at end of file diff --git a/distribution/entaxy-docker/karaf/ru.entaxy.esb.system.bridge.cfg b/distribution/entaxy-docker/karaf/ru.entaxy.esb.system.bridge.cfg deleted file mode 100644 index eea4183..0000000 --- a/distribution/entaxy-docker/karaf/ru.entaxy.esb.system.bridge.cfg +++ /dev/null @@ -1,58 +0,0 @@ -# имя локальной шины() -jms.local=test1 -# значение true - мост текущего узла работает в пассивном режиме, -# т.е. сообщения для соответствующего удалённого узла складываются в очередь на локальном брокере, -# из которой уже читает подключаемый узел (локальный брокер должен быть доступен для соединения) -# По умолчанию false - активный режим, запись сообщения идёт сразу в очередь на удалённом брокере, -# подключаемого узла (брокеры по обе стороны моста должны быть доступны) -jms.local.master=false -# имена удаленных шин, задается через запятую(,) -jms.remote.list=test2 - -# адреса брокера, задаются чеерез запятую(jms.url.) -jms.url.test1=broker:61616 -# логин для подключения к брокеру(jms.username.) -jms.username.test1=entaxy -# пароль для подключения к брокеру(jms.password.) -jms.password.test1=entaxy -# протокол для передачи сообщений внутри шины(jms.protocol.inner.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра в мосту и в самой шине(ru.entaxy.esb.cfg) -# возможные значения tcp, amqp -jms.protocol.inner.esb.test1=tcp -# протокол для передачи сообщений между шинами(jms.protocol.bridge.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра во всех подключенных шинах -# возможные значения tcp, amqp -jms.protocol.bridge.test1=amqp - -# адреса брокера, задаются чеерез запятую(jms.url.) -jms.url.test2=broker:61616 -# логин для подключения к брокеру(jms.username.) -jms.username.test2=entaxy -# пароль для подключения к брокеру(jms.password.) -jms.password.test2=entaxy -# jms.master. - выставляем в true, когда соответствующий узел настроен в пассивный режим, -# т.е. для него jms.local.master = true (брокер должен быть доступен для соединения) -jms.master.test2=true -# протокол для передачи сообщений внутри шины(jms.protocol.inner.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра в мосту и в самой шине(ru.entaxy.esb.cfg) -# возможные значения tcp, amqp -jms.protocol.inner.esb.test2=tcp -# протокол для передачи сообщений между шинами(jms.protocol.bridge.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра во всех подключенных шинах -# возможные значения tcp, amqp -jms.protocol.bridge.test2=amqp - -# максимальное колчичество попыток отправить сообщение в очередь -# почитать подробнее можно в https://camel.apache.org/components/latest/eips/dead-letter-channel.html#deadLetterChannel-Redelivery -redelivery.maximumRedeliveries=-1 -# время между попытками отправить сообщение в очередь -redelivery.redeliveryDelay=5000 -# экспоненциальный рост времени между попытками отпрвки сообщений в очередь -redelivery.useExponentialBackOff=true - -queue.sender.concurrentConsumers=1 -queue.receiver.concurrentConsumers=1 \ No newline at end of file diff --git a/distribution/entaxy-docker/postgres/Dockerfile b/distribution/entaxy-docker/postgres/Dockerfile deleted file mode 100644 index 040f2d8..0000000 --- a/distribution/entaxy-docker/postgres/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM postgres - -COPY create-db.sql /docker-entrypoint-initdb.d/ diff --git a/distribution/entaxy-docker/postgres/create-db.sql b/distribution/entaxy-docker/postgres/create-db.sql deleted file mode 100644 index cb4890c..0000000 --- a/distribution/entaxy-docker/postgres/create-db.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE DATABASE esb_entaxy; -GRANT ALL PRIVILEGES ON DATABASE esb_entaxy TO entaxy; -CREATE DATABASE db_connector_test; -GRANT ALL PRIVILEGES ON DATABASE db_connector_test TO entaxy; diff --git a/distribution/entaxy-docker/reposilite/Dockerfile b/distribution/entaxy-docker/reposilite/Dockerfile deleted file mode 100644 index 1fe5312..0000000 --- a/distribution/entaxy-docker/reposilite/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM dzikoysk/reposilite:2.9.23 - -COPY tokens.dat /app/data diff --git a/distribution/entaxy-docker/reposilite/tokens.dat b/distribution/entaxy-docker/reposilite/tokens.dat deleted file mode 100644 index 0ae3e57..0000000 --- a/distribution/entaxy-docker/reposilite/tokens.dat +++ /dev/null @@ -1,6 +0,0 @@ -!!org.panda_lang.reposilite.auth.TokenCollection -"tokens": -- "alias": "admin" - "path": "/" - "permissions": "m" - "token": "$2a$10$Xrurah6y4IOijq9EtFlAIe2wlhlUScggEBS88DriZDM9MCrAGwqdS" diff --git a/documentation/Entaxy.png b/documentation/Entaxy.png deleted file mode 100644 index bc9a433..0000000 Binary files a/documentation/Entaxy.png and /dev/null differ diff --git a/documentation/Management layer.postman_collection.json b/documentation/Management layer.postman_collection.json deleted file mode 100644 index 3dafc22..0000000 --- a/documentation/Management layer.postman_collection.json +++ /dev/null @@ -1,3606 +0,0 @@ -{ - "info": { - "_postman_id": "5f1e5b20-f1dd-46d2-a01c-36ed09cee573", - "name": "Management layer", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "Руководство по управлению коннекторами и профилями в шине.", - "item": [ - { - "name": "Создание профиля системы", - "event": [ - { - "listen": "test", - "script": { - "id": "ddae46ff-75a9-443b-8d11-a04edba74dbc", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n {{system_id}}\n \n default system\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для создания профиля системы нужно вызвать метод createProfile, где вместо “system_uuid” нужно подставить uuid системы, вместо “system_name” - имя системы, “description” описание системы:\n" - }, - "response": [] - }, - { - "name": "Получить профиль системы", - "event": [ - { - "listen": "test", - "script": { - "id": "231fc234-06f3-4758-9b33-61a3f1426d58", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var systemId = pm.environment.get(\"system1_id\");", - "", - "pm.test(\"Body matches \" + systemId, function () {", - " pm.expect(pm.response.text()).to.include(systemId);", - "});", - "", - "var connectorName = pm.globals.get(\"template_name\") + \"-\" + systemId;", - "", - "pm.test(\"Body matches \" + connectorName, function () {", - " pm.expect(pm.response.text()).to.include(connectorName);", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Проверить созданный профиль можно с помощью метода getProfile, где вместо “system_uuid” нужно подставить uuid системы\n" - }, - "response": [] - }, - { - "name": "Получить весь список профилей систем", - "event": [ - { - "listen": "test", - "script": { - "id": "86d87f3a-2067-4d17-becf-b52428bc67e7", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "var systemId = pm.environment.get(\"system1_id\");", - "var esbName = pm.environment.get(\"esb_name\");", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "if (response.hasOwnProperty('fullBridgeProfileType')) {", - " ", - " pm.test(\"Body matches \" + esbName, function () {", - " pm.expect(pm.response.text()).to.include(esbName);", - " });", - " ", - " pm.test(\"Body matches \" + systemId, function () {", - " pm.expect(pm.response.text()).to.include(systemId);", - " });", - "}" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Получить список профилей, зарегистрированных в шине, можно с помощью метода getProfiles" - }, - "response": [] - }, - { - "name": "Остановить работу профиля системы в шине ", - "event": [ - { - "listen": "test", - "script": { - "id": "e9016f40-0fb8-4d44-a58a-7ea98c883aa9", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Остановить профиль и все его зависимости можно с помощью метода stopProfile, где вместо “system_uuid” нужно подставить uuid системы\n" - }, - "response": [] - }, - { - "name": "Запустить работу профиля систем в шине", - "event": [ - { - "listen": "test", - "script": { - "id": "6fccc710-0a84-4843-a1bb-73c643e8c53d", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Запустить профиль и все его зависимости можно с помощью метода startProfile, где вместо “system_uuid” нужно подставить uuid системы\n" - }, - "response": [] - }, - { - "name": "Удалить профиль системы из шины", - "event": [ - { - "listen": "test", - "script": { - "id": "791636da-cb95-40d9-a709-17da9f769ff9", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Удалить профиль и все его зависимости можно с помощью метода removeProfile, где вместо “system_uuid” нужно подставить uuid системы(ВНИМАНИЕ! При удалении профиля также удаляются все связанные с ним коннекторы)" - }, - "response": [] - }, - { - "name": "Получить список шаблонов коннекторов", - "event": [ - { - "listen": "test", - "script": { - "id": "6c1b7bb5-e787-4bfc-9291-73648162dec9", - "exec": [ - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "pm.test(\"Has Messages\", function () {", - " pm.expect(response).to.have.property('listTemplate');", - "});", - "", - "if (response.hasOwnProperty('listTemplate')) {", - " var list_template = response['listTemplate'];", - "", - " pm.test(\"Body matches uniform-service-in-connector\", function () {", - " pm.expect(pm.response.text()).to.include(\"uniform-service-in-connector\");", - " });", - " ", - " // if (response.some(item => item.templateName === 'uniform-service-in-connector')) {", - " pm.globals.set(\"template_name\", \"uniform-service-in-connector\");", - " // }", - " ", - " pm.test(\"Body matches uniform-service-in-connector\", function () {", - " pm.expect(pm.response.text()).to.include(\"uniform-service-in-connector\");", - " });", - " ", - " pm.test(\"Body matches uniform-service-out-connector\", function () {", - " pm.expect(pm.response.text()).to.include(\"uniform-service-out-connector\");", - " });", - "}" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для создания коннектора в шине нужно получить список шаблонов(требуются для создания коннекторов) методом getTemplates\n" - }, - "response": [] - }, - { - "name": "Получить информацию о шаблоне коннектора", - "event": [ - { - "listen": "test", - "script": { - "id": "781451d6-5194-40f5-9b34-d9de14fa9b8e", - "exec": [ - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "pm.test(\"Has Messages template\", function () {", - " pm.expect(response).to.have.property('template');", - "});", - "", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{template_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для создания коннектора в шине нужно получить список шаблонов(требуются для создания коннекторов) методом getTemplate, где “template_name” имя шаблона по которому будет сделан коннектор\n" - }, - "response": [] - }, - { - "name": "Создание коннектора", - "event": [ - { - "listen": "test", - "script": { - "id": "7d9c9a60-8a4b-4b3d-b905-f5d7e40f9bd0", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{template_name}}\n {{system_id}}\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для создания коннектора в шине нужно вызвать метод createConnector, где templateName - это имя шаблона, полученное из метода getTemplates, system_uuid - это uuid профиля, зарегистрированного в системе ранее, также нужно заполнить список параметров необходимый для создания коннектора(ВНИМАНИЕ! если не заполнить список параметров, то установятся значения по умолчанию)\n" - }, - "response": [] - }, - { - "name": "Получить список коннекторов", - "event": [ - { - "listen": "test", - "script": { - "id": "39a21540-e292-418d-9d28-69627de99100", - "exec": [ - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "pm.test(\"Has Messages\", function () {", - " pm.expect(response).to.have.property('listConnector');", - "});", - "", - "if (response.hasOwnProperty('listConnector')) {", - " var list_template = response['listConnector'];", - "", - " pm.test(\"Body matches uniform-service-in-connector\", function () {", - " pm.expect(pm.response.text()).to.include(\"uniform-service-in-connector\");", - " });", - "}" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Можно просматривать список подключенных коннекторов в шине методом getConnectors" - }, - "response": [] - }, - { - "name": "Запустить работу коннектора в шине", - "event": [ - { - "listen": "test", - "script": { - "id": "5d1fab2f-51ae-4726-a2ea-c836cf80c8b2", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{template_name}}\n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Запустить коннектор можно с помощью метода startConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона" - }, - "response": [] - }, - { - "name": "Остановить работу коннектора в шине", - "event": [ - { - "listen": "test", - "script": { - "id": "7dd28510-2b75-439d-9bf9-a277dd1ad5cf", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{template_name}}\n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Остановить коннектор можно с помощью метода stopConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона" - }, - "response": [] - }, - { - "name": "Удалить коннектор", - "event": [ - { - "listen": "test", - "script": { - "id": "859d5f55-4da4-45a3-9553-fa3b2743044c", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{template_name}}\n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Удалить коннектор можно с помощью метода removeConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона" - }, - "response": [] - }, - { - "name": "Получить список подключенных шин", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "e676f268-7463-46a7-83f1-852c32cdb570", - "exec": [ - "" - ], - "type": "text/javascript" - } - }, - { - "listen": "test", - "script": { - "id": "b03708a1-b1f5-4185-b8d0-8c4e00fe0af9", - "exec": [ - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "pm.test(\"Has Messages listEsb\", function () {", - " pm.expect(response).to.have.property('listEsb');", - "});", - "", - "if (response.hasOwnProperty('listEsb')) {", - " var list_esb = response['listEsb'];", - " var esbName = list_esb[\"esbName\"];", - " ", - " if(Array.isArray(esbName)) {", - " esbName = esbName[0];", - " }", - " ", - " pm.test(\"Body matches \" + esbName, function () {", - " pm.globals.set(\"esb_name\", esbName);", - " });", - "}" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для получения списка подключенных шин можно с помощью метода getListEsb" - }, - "response": [] - }, - { - "name": "Создание мостового профиля", - "event": [ - { - "listen": "test", - "script": { - "id": "29d4a58d-62c0-468b-9783-4f6e35ca147a", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system_id}}\n {{system_id}}\n {{esb_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Создать профиль, ведущий на мост, можно с помощью метода createBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины" - }, - "response": [] - }, - { - "name": "Остановить мостовой профиль", - "event": [ - { - "listen": "test", - "script": { - "id": "7943398a-5511-4a6e-858f-1c4afdb16cc5", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n {{system_id}}\n {{esb_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Остановить профиль, ведущий на мост, можно с помощью метода stopBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины\n" - }, - "response": [] - }, - { - "name": "Запустить мостовой профиль", - "event": [ - { - "listen": "test", - "script": { - "id": "a8544cbe-0d41-490f-8507-8841359d00fd", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n {{system_id}}\n {{esb_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Запустить профиль, ведущий на мост, можно с помощью метода startBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины\n\n" - }, - "response": [] - }, - { - "name": "Получить мостовой профиль", - "event": [ - { - "listen": "test", - "script": { - "id": "7dadab09-b3c9-477f-a503-d5307f8fa958", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n {{system_id}}\n {{esb_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Получить профиль, ведущий на мост, можно с помощью метода getBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины\n\n" - }, - "response": [] - }, - { - "name": "Получить список мостовых профилей", - "event": [ - { - "listen": "test", - "script": { - "id": "954c6f50-e564-476c-b0d3-186af84509e2", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Для получения списка профилей, ведущих на мост, можно использовать метод getBridgeProfiles:(ВНИМАНИЕ! запрос покажет список проброшенных профилей на ТЕКУЩЕЙ шине)\n" - }, - "response": [] - }, - { - "name": "Удалить мостовой профиль", - "event": [ - { - "listen": "test", - "script": { - "id": "bbb77d98-0c2c-4de7-95c7-ae2b79ec887d", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system1_id}}\n {{system1_id}}\n {{esb_name}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Удалить профиль, ведущий на мост, можно с помощью метода removeBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины\n\n\n" - }, - "response": [] - }, - { - "name": "Создать доступ", - "event": [ - { - "listen": "test", - "script": { - "id": "e8022e10-0979-4ae3-98e7-40930fa57727", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system1_id}}\n {{system1_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Создать доступ одной системы к другой, можно с помощью метода createPermission, где “objectUuid” uuid системы, которой нужно дать доступ, “subjectUuid” - uuid системы, к которой нужно дать доступ" - }, - "response": [] - }, - { - "name": "Удалить доступ", - "event": [ - { - "listen": "test", - "script": { - "id": "ab8fdbbf-b4d4-4756-ae75-aba9c117c538", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Удалить доступ одной системы к другой, можно с помощью метода removePermission, где “objectUuid” uuid системы, которой нужно дать доступ, “subjectUuid” - uuid системы, к которой нужно дать доступ" - }, - "response": [] - }, - { - "name": "Получить список систем, доступ к которым от данной системы разрешен", - "event": [ - { - "listen": "test", - "script": { - "id": "f05fc1db-913c-4a91-810a-dd777cefc048", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Получить список систем, доступ к которым от данной системы разрешен, можно с помощью метода getPermissionByObject, где “objectUuid” uuid системы\n" - }, - "response": [] - }, - { - "name": "Получить список систем, доступ которым разрешен к данной системе", - "event": [ - { - "listen": "test", - "script": { - "id": "454c7cde-48bb-49c7-aa11-5e63e298555e", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{system_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Получить список систем, доступ которым разрешен к данной системе, можно с помощью метода getPermissionBySubject, где “subjectUuid” uuid системы:\n" - }, - "response": [] - }, - { - "name": "Создать сразу несколько доступов, которым разрешено отправлять сообщения от данной системы", - "event": [ - { - "listen": "test", - "script": { - "id": "9f59cfd2-0abb-4aaa-8e42-273fcb9927c5", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{objectUuid}}\n \n {{subjectUuid1}}\n {{subjectUuid2}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Создать сразу несколько доступов, которым разрешено отправлять сообщения от данной системы, можно с помощью метода createPermissionForObjectRequest, где “objectUuid” это uuid системы, от которой буду исходить сообщения, ‘“subjectUuid1”, “subjectUuid2” и т д, это uuid систем, которым будут отправлять сообщения\n" - }, - "response": [] - }, - { - "name": "Создать сразу несколько доступов, которым разрешено отправлять сообщения в данную систему", - "event": [ - { - "listen": "test", - "script": { - "id": "cacd85e7-bced-4116-bccb-ec87620bd0a4", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{objectUuid}}\n \n {{subjectUuid1}}\n {{subjectUuid2}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Создать сразу несколько доступов, которым разрешено отправлять сообщения в данную систему, можно с помощью метода createPermissionForSubjectRequest, где “objectUuid1”, “objectUuid2” и т д - это uuid систем, от которых буду исходить сообщения, ‘“subjectUuid” - это uuid системы, которой будут отправлять сообщения\n" - }, - "response": [] - } - ], - "description": "Профиль(profile) - это описание внешней системы в шине.(Например s1).\n\nМостовой профиль(bridge-profile) - это профиль на другой стороне шины, ведущий через мост в профиль.\n(Например s1)\n\nКоннектор(connector) - это связь между интерфейсом, через который может работать система, и профилем.(Например uniform-service, nsi)\n\nДоступ(permission) - это разрешение на взаимодействие двух систем.(Например для того чтобы система s1 смогла отправить сообщение s2)(/permission-management)\n\nУчетная запись(account) - это учетная запись системы для взаимодействия с шиной.\n\nДля каждой системы должна быть учетная запись для возможности отправления сообщений в шину.\n\nТакже есть учетные записи для возможности взаимодействия с управленческим слоем(т. е. для того чтобы управлять коннекторами/профилями/учетными записями/топиками нужна учетная запись с соответствующими правами)(/basic-auth-management)\nКоннекторы делятся на входящие и исходящие(in, out), которые отвечают за отправку сообщения в определенный интерфейс и на получение ответа из определенного интерфейса соответственно.\nНапример, для того чтобы иметь возможность отправить сообщение в soap нужно создать коннектор uniform-service-in-connector, а для того чтобы получить сообщение из soap нужно создать коннектор soap-out-connector.\nПо адресу /system-management-service находится сам сервис управления коннекторами и профилями в шине.\nДля работы внешней системы в шине нужно сначала создать профиль данной системы в шине, потом добавлять к нему необходимые коннекторы и пробрасывать его в необходимые шины.\n", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "94c3de71-9085-4751-8f4f-81aa7068b382", - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "id": "6fc701b1-cfdf-464e-b80c-fe7cd100d358", - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ], - "protocolProfileBehavior": {} - }, - { - "name": "Rest сервис Topic-management", - "item": [ - { - "name": "Создать топик", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\",\n \"possibleSubscribers\" : [\"systemUuid1\", \"systemUuid2\"],\n \"possiblePublishers\" : [\"systemUuid3\", \"systemUuid4\"]\n}\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9090/topic-management/create", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-management", - "create" - ] - }, - "description": "При создании и изменении топика, есть возможность передать списки систем, которым доступна подписка или публикация в данном топике.\n" - }, - "response": [] - }, - { - "name": "Обновить топик", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\",\n \"possibleSubscribers\" : [\"systemUuid1\", \"systemUuid2\"],\n \"possiblePublishers\" : [\"systemUuid3\", \"systemUuid4\"]\n}" - }, - "url": { - "raw": "{{host}}:9090/topic-management/update", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-management", - "update" - ] - }, - "description": "изменить топик (название не меняется, так как на него завязана сама очередь в брокере)\n" - }, - "response": [] - }, - { - "name": "Удалить топик", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\"\n}" - }, - "url": { - "raw": "{{host}}:9090/topic-management/delete", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-management", - "delete" - ] - }, - "description": "delete - топик помечается как удалённый\n\n" - }, - "response": [] - }, - { - "name": "Очистка хранилища топиков", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "" - }, - "url": { - "raw": "{{host}}:9090/topic-management/clean", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-management", - "clean" - ] - }, - "description": "Окончательное удаление топиков, помеченных как удалённые." - }, - "response": [] - }, - { - "name": "Подписаться на топик", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\",\n \"subscriptionType\": \"PUSH\"\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9090/topic-subscription/subscribe", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-subscription", - "subscribe" - ] - } - }, - "response": [] - }, - { - "name": "Отписаться от топика", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\"\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9090/topic-subscription/unsubscribe", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-subscription", - "unsubscribe" - ] - } - }, - "response": [] - }, - { - "name": "Массовая обработка при наличии права manage для данного сервиса", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\",\n \"systemUuids\": [\n {\n \"systemUuid\": \"NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN\",\n \"subscriptionType\": \"PUSH\"\n },\n {\n \"systemUuid\": \"XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX\",\n \"subscriptionType\": \"PULL\"\n },\n {\n \"systemUuid\": \"YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY\",\n \"subscriptionType\": \"PULL\"\n }\n ]\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9092/topic-subscription/subscribe", - "host": [ - "{{host}}" - ], - "port": "9092", - "path": [ - "topic-subscription", - "subscribe" - ] - } - }, - "response": [] - }, - { - "name": "Массовая обработка при наличии права manage для данного сервиса", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\",\n \"systemUuids\": [\n {\n \"systemUuid\":\"NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN\",\n \"subscriptionType\": \"PUSH\"\n },\n {\n \"systemUuid\": \"XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX\",\n \"subscriptionType\": \"PULL\"\n },\n {\n \"systemUuid\": \"YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY\",\n \"subscriptionType\": \"PULL\"\n }\n ]\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9092/topic-subscription/unsubscribe", - "host": [ - "{{host}}" - ], - "port": "9092", - "path": [ - "topic-subscription", - "unsubscribe" - ] - } - }, - "response": [] - }, - { - "name": "Опубликовать событие", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"topicName\": \"boomNews\", \"message\": \"messageText2\"\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{host}}:9090/topic-subscription/publish", - "host": [ - "{{host}}" - ], - "port": "9090", - "path": [ - "topic-subscription", - "publish" - ] - } - }, - "response": [] - } - ], - "description": "\nСервис состоит из 2-х контекстов:\n\n- _topic-management_ - управление топиками (создание/изменение/удаление)\n- _topic-subscription_ - клиентский сервис подписки и публикации сообщения\n\nПри смене контекста в конфигурационных файлах требуется перераздать права на данный сервис.\n", - "protocolProfileBehavior": {} - }, - { - "name": "Authentication", - "item": [ - { - "name": "Добавление аккаунтов", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n system1login\n system1pass\n \n system1uuid\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - }, - "description": "Метод для добавления учетных записей (addAccount) разработан для добавления новых пользователей в систему.\n" - }, - "response": [] - }, - { - "name": "Обновление аккаунтов", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n system1login\n system1pass\n \n system1uuid\n \n \n system2login\n system2pass\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - }, - "description": "Метод для обновления учетной записи (updateAccount)разработан для обновления следующей информации:\n" - }, - "response": [] - }, - { - "name": "Удаление аккаунтов", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n system1login\n system2login\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - }, - "description": "Метод для удаления аккаунта (removeAccount) служит для удаления аккаунта из системы.\n" - }, - "response": [] - }, - { - "name": "Выдача прав аккаунту", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n dog\n topic-management\n service\n \n \n \n \n dog\n system-management\n service\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - }, - "description": "Метод выдачи прав аккаунту (addAccountPermission) служит для создания permission связанных с переданным аккаунтом.\n" - }, - "response": [] - }, - { - "name": " Удаление прав аккаунта", - "request": { - "method": "POST", - "header": [ - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n dog\n topic-management\n service\n \n \n \n \n dog\n system-management\n service\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - }, - "description": "Метод удаления прав аккаунта (removeAccountPermission) служит для удаления permission связанных с переданным аккаунтом.\n" - }, - "response": [] - } - ], - "description": "Метод для добавления учетных записей (addAccount) разработан для добавления новых пользователей в систему.\n", - "event": [ - { - "listen": "prerequest", - "script": { - "id": "90b3a65b-d7c1-41ec-b5b3-9008ac46660b", - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "id": "9832eddc-fe66-4f0d-a736-86ef1f84aafc", - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ], - "protocolProfileBehavior": {} - }, - { - "name": "Сервис загрузки ресурсов", - "item": [ - { - "name": "Загрузка ресурса", - "event": [ - { - "listen": "test", - "script": { - "id": "4ef80c70-993e-45eb-86dd-c203491acabf", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n lama\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для загрузки ресурса в шину нужно использовать метод loadResource.\n- resourceValue - сам ресурс, в формате base64\n\n\n" - }, - "response": [] - }, - { - "name": "Получить ресурс", - "event": [ - { - "listen": "test", - "script": { - "id": "4f63face-528b-4d07-a0fe-ebea026cf416", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для выгрузки заранее загруженного ресурса в шину нужно использовать метод getResource.\n\n\n\n" - }, - "response": [] - }, - { - "name": "Перезагрузить ресурс", - "event": [ - { - "listen": "test", - "script": { - "id": "3eb62411-f82e-427f-899b-a5a4dbd699bb", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для перезагрузки ресурса в шину есть метод reloadResource.\n\n\n\n" - }, - "response": [] - }, - { - "name": "Удалить ресурс", - "event": [ - { - "listen": "test", - "script": { - "id": "9b839a39-a338-4005-80a9-68fb861d8cb2", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для удаления ресурса в шине есть метод removeResource.\n\n\n\n" - }, - "response": [] - }, - { - "name": "Загрузить информацию о ресурсе", - "event": [ - { - "listen": "test", - "script": { - "id": "15ac2ab2-7170-45ec-9eee-0966aa9d834b", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n lama.xsd\n 1\n 1.0\n lama test\n false\n http:lama.xsd\n l\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для загрузки мета информации ресурса в шине есть метод loadResourceInfo.\n\n\n\n" - }, - "response": [] - }, - { - "name": "Получить информацию о ресурсе", - "event": [ - { - "listen": "test", - "script": { - "id": "1987b97e-2f15-4cd7-842e-680acb4a8edd", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для получения мета информации ресурса в шине есть метод getResourceInfo.\n\n\n\n" - }, - "response": [] - }, - { - "name": "Изменить информацию о ресурсе", - "event": [ - { - "listen": "test", - "script": { - "id": "6eb7d443-c65e-4dc0-9f26-417998710ec5", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n lama.xsd\n 1\n 1.0\n lama test\n false\n http:lama.xsd\n l\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для корректирования мета информации ресурса в шине есть метод editResourceInfo.\n\n\n\n\n" - }, - "response": [] - }, - { - "name": "Удалить информацию о ресурсе", - "event": [ - { - "listen": "test", - "script": { - "id": "2c30f524-db2e-4a4b-b384-bedfbc3b6841", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n 1\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для удаления мета информации ресурса в шине есть метод removeResourceInfo.\n\n\n\n\n\n" - }, - "response": [] - }, - { - "name": "Получить список информации о ресурсах", - "event": [ - { - "listen": "test", - "script": { - "id": "cd6ea560-2b66-4e75-8fa2-479c1ee660ae", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для получения списка мета информации ресурсов в шине есть метод getResourceInfoList.\n\n\n\n\n\n" - }, - "response": [] - }, - { - "name": "Получить список информации о ресурсах по имени ресурса", - "event": [ - { - "listen": "test", - "script": { - "id": "b4a24cf7-bfe8-4456-9cfb-395de3961f90", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n .xsd\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для получения списка мета информации ресурсов по имени ресурса в шине есть метод getResourceInfoListByName.\n\n\n\n\n\n" - }, - "response": [] - }, - { - "name": "Получить список информации о ресурсах по namespace ресурса", - "event": [ - { - "listen": "test", - "script": { - "id": "15458871-e3b5-4f5c-a16f-917b3a57ea2e", - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "type": "text", - "value": "{{adminLogin}}" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n lama\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/schema", - "host": [ - "{{base_url}}" - ], - "path": [ - "schema" - ] - }, - "description": "Для получения списка мета информации ресурсов по namespace ресурса в шине есть метод getResourceInfoListByNamespace.\n\n\n\n\n\n" - }, - "response": [] - } - ], - "protocolProfileBehavior": {} - }, - { - "name": "Работа с файлами", - "item": [ - { - "name": "Загрузка мета информации о файле", - "event": [ - { - "listen": "test", - "script": { - "id": "0348e084-47aa-4b4b-8839-79241f336ca2", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{messageUUID}}\n 1\n 228377149\n 1\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - }, - "description": "Для начала загрузки необходимо прислать в шину служебную информацию о файле(количество кусков, id, checksum)" - }, - "response": [] - }, - { - "name": "Загрузка части файла", - "event": [ - { - "listen": "test", - "script": { - "id": "d283f30d-eaa7-4fa4-897c-33380f724e12", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{messageUUID}}\n 1\n bGFtYQ==\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - } - }, - "response": [] - }, - { - "name": "Подтверждение загрузки файла", - "event": [ - { - "listen": "test", - "script": { - "id": "ff868b95-e667-4c29-b7d0-c0cac5b51432", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "protocolProfileBehavior": { - "disabledSystemHeaders": { - "content-type": true - } - }, - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "type": "text", - "value": "application/soap+xml;charset=UTF-8;action=\"http://www.entaxy/connector/bigPackets/esb/1.0#Integration:ConfirmTransfer\"" - }, - { - "key": "", - "type": "text", - "value": "", - "disabled": true - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{messageUUID}}\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - }, - "description": "При загрузки в шину всех кусков файла необходимо послать запрос об окончании загрузки, для проверки целостности файла." - }, - "response": [] - }, - { - "name": "Запрос на скачивание файла", - "event": [ - { - "listen": "test", - "script": { - "id": "c2006b22-00c3-4cef-a432-3eaf66023850", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "protocolProfileBehavior": { - "disabledSystemHeaders": { - "content-type": true - } - }, - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "type": "text", - "value": "Content-Type: application/soap+xml;charset=UTF-8;action=\"http://www.entaxy/connector/bigPackets/esb/1.0#Integration:DownloadRequest\"" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{messageUUID}}\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - } - }, - "response": [] - }, - { - "name": "Получение куска файла", - "event": [ - { - "listen": "test", - "script": { - "id": "76950610-16ae-4088-a559-36bf8b0d4f33", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{messageUUID}}\n 1\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - } - }, - "response": [] - }, - { - "name": "Подтверждение получения файла", - "event": [ - { - "listen": "test", - "script": { - "id": "de8415be-fb49-455f-85e5-6a04e784d710", - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});" - ], - "type": "text/javascript" - } - } - ], - "protocolProfileBehavior": { - "disabledSystemHeaders": { - "content-type": true - } - }, - "request": { - "method": "POST", - "header": [ - { - "key": "Content-Type", - "value": "Content-Type: application/soap+xml;charset=UTF-8;action=\"http://www.entaxy/connector/bigPackets/esb/1.0#Integration:ConfirmDownload\"", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n {{messageUUID}}\n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/bigPackets", - "host": [ - "{{base_url}}" - ], - "path": [ - "bigPackets" - ] - }, - "description": "Необходим для удаления из шины уже выкачанного файла." - }, - "response": [] - } - ], - "protocolProfileBehavior": {} - } - ], - "event": [ - { - "listen": "prerequest", - "script": { - "id": "8dad468e-a846-4dcb-af3b-22959aa33b7d", - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "id": "75322b50-d081-49b3-b833-1d02a88c2136", - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ], - "variable": [ - { - "id": "74a38652-a338-49e7-941d-40f6a4c91e24", - "key": "X-ForwardedUser", - "value": "" - } - ], - "protocolProfileBehavior": {} -} \ No newline at end of file diff --git a/documentation/_styles/entaxy.css b/documentation/_styles/entaxy.css deleted file mode 100644 index 83d2e5c..0000000 --- a/documentation/_styles/entaxy.css +++ /dev/null @@ -1,429 +0,0 @@ -/* Entaxy documentation stylesheet */ -article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block} -audio,video{display:inline-block} -audio:not([controls]){display:none;height:0} -html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%} -a{background:none} -a:focus{outline:thin dotted} -a:active,a:hover{outline:0} -h1{font-size:2em;margin:.67em 0} -abbr[title]{border-bottom:1px dotted} -b,strong{font-weight:bold} -dfn{font-style:italic} -hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0} -mark{background:#ff0;color:#000} -code,kbd,pre,samp{font-family:monospace;font-size:1em} -pre{white-space:pre-wrap} -q{quotes:"\201C" "\201D" "\2018" "\2019"} -small{font-size:80%} -sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} -sup{top:-.5em} -sub{bottom:-.25em} -img{border:0} -svg:not(:root){overflow:hidden} -figure{margin:0} -fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} -legend{border:0;padding:0} -button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} -button,input{line-height:normal} -button,select{text-transform:none} -button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer} -button[disabled],html input[disabled]{cursor:default} -input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0} -button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} -textarea{overflow:auto;vertical-align:top} -table{border-collapse:collapse;border-spacing:0} -*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box} -html,body{font-size:100%} -body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} -a:hover{cursor:pointer} -img,object,embed{max-width:100%;height:auto} -object,embed{height:100%} -img{-ms-interpolation-mode:bicubic} -.left{float:left!important} -.right{float:right!important} -.text-left{text-align:left!important} -.text-right{text-align:right!important} -.text-center{text-align:center!important} -.text-justify{text-align:justify!important} -.hide{display:none} -img,object,svg{display:inline-block;vertical-align:middle} -textarea{height:auto;min-height:50px} -select{width:100%} -.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em} -div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0} -a{color:#2156a5;text-decoration:underline;line-height:inherit} -a:hover,a:focus{color:#1d4b8f} -a img{border:0} -p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} -p aside{font-size:.875em;line-height:1.35;font-style:italic} -h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em} -h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0} -h1{font-size:2.125em} -h2{font-size:1.6875em} -h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em} -h4,h5{font-size:1.125em} -h6{font-size:1em} -hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0} -em,i{font-style:italic;line-height:inherit} -strong,b{font-weight:bold;line-height:inherit} -small{font-size:60%;line-height:inherit} -code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)} -ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} -ul,ol{margin-left:1.5em} -ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em} -ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit} -ul.square{list-style-type:square} -ul.circle{list-style-type:circle} -ul.disc{list-style-type:disc} -ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} -dl dt{margin-bottom:.3125em;font-weight:bold} -dl dd{margin-bottom:1.25em} -abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help} -abbr{text-transform:none} -blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd} -blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)} -@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2} -h1{font-size:2.75em} -h2{font-size:2.3125em} -h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em} -h4{font-size:1.4375em}} -table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal} -table thead,table tfoot{background:#f7f8f7} -table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left} -table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)} -table tr.even,table tr.alt{background:#f8f8f7} -table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6} -h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em} -h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400} -.center{margin-left:auto;margin-right:auto} -.stretch{width:100%} -.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table} -.clearfix::after,.float-group::after{clear:both} -:not(pre).nobreak{word-wrap:normal} -:not(pre).nowrap{white-space:nowrap} -:not(pre).pre-wrap{white-space:pre-wrap} -:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed} -pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} -pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} -pre>code{display:block} -pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} -em em{font-style:normal} -strong strong{font-weight:400} -.keyseq{color:rgba(51,51,51,.8)} -kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap} -.keyseq kbd:first-child{margin-left:0} -.keyseq kbd:last-child{margin-right:0} -.menuseq,.menuref{color:#000} -.menuseq b:not(.caret),.menuref{font-weight:inherit} -.menuseq{word-spacing:-.02em} -.menuseq b.caret{font-size:1.25em;line-height:.8} -.menuseq i.caret{font-weight:bold;text-align:center;width:.45em} -b.button::before,b.button::after{position:relative;top:-1px;font-weight:400} -b.button::before{content:"[";padding:0 3px 0 2px} -b.button::after{content:"]";padding:0 2px 0 3px} -p a>code:hover{color:rgba(0,0,0,.9)} -#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em} -#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table} -#header::after,#content::after,#footnotes::after,#footer::after{clear:both} -#content{margin-top:1.25em} -#content::before{content:none} -#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0} -#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf} -#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} -#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap} -#header .details span:first-child{margin-left:-.125em} -#header .details span.email a{color:rgba(0,0,0,.85)} -#header .details br{display:none} -#header .details br+span::before{content:"\00a0\2013\00a0"} -#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)} -#header .details br+span#revremark::before{content:"\00a0|\00a0"} -#header #revnumber{text-transform:capitalize} -#header #revnumber::after{content:"\00a0"} -#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem} -#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em} -#toc>ul{margin-left:.125em} -#toc ul.sectlevel0>li>a{font-style:italic} -#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0} -#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none} -#toc li{line-height:1.3334;margin-top:.3334em} -#toc a{text-decoration:none} -#toc a:active{text-decoration:underline} -#toctitle{color:#7a2518;font-size:1.2em} -@media screen and (min-width:768px){#toctitle{font-size:1.375em} -body.toc2{padding-left:15em;padding-right:0} -#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto} -#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} -#toc.toc2>ul{font-size:.9em;margin-bottom:0} -#toc.toc2 ul ul{margin-left:0;padding-left:1em} -#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} -body.toc2.toc-right{padding-left:0;padding-right:15em} -body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} -@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} -#toc.toc2{width:20em} -#toc.toc2 #toctitle{font-size:1.375em} -#toc.toc2>ul{font-size:.95em} -#toc.toc2 ul ul{padding-left:1.25em} -body.toc2.toc-right{padding-left:0;padding-right:20em}} -#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px} -#content #toc>:first-child{margin-top:0} -#content #toc>:last-child{margin-bottom:0} -#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} -#footer-text{color:rgba(255,255,255,.8);line-height:1.44} -#content{margin-bottom:.625em} -.sect1{padding-bottom:.625em} -@media screen and (min-width:768px){#content{margin-bottom:1.25em} -.sect1{padding-bottom:1.25em}} -.sect1:last-child{padding-bottom:0} -.sect1+.sect1{border-top:1px solid #e7e7e9} -#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400} -#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em} -#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible} -#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none} -#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221} -details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} -details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em} -.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic} -table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} -.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)} -table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit} -.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} -.admonitionblock>table td.icon{text-align:center;width:80px} -.admonitionblock>table td.icon img{max-width:none} -.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} -.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere} -.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} -.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px} -.exampleblock>.content>:first-child{margin-top:0} -.exampleblock>.content>:last-child{margin-bottom:0} -.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px} -.sidebarblock>:first-child{margin-top:0} -.sidebarblock>:last-child{margin-bottom:0} -.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} -.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0} -.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} -@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} -@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} -.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} -.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} -.listingblock>.content{position:relative} -.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5} -.listingblock:hover code[data-lang]::before{display:block} -.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} -.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} -.listingblock pre.highlightjs{padding:0} -.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px} -.listingblock pre.prettyprint{border-width:0} -.prettyprint{background:#f7f7f8} -pre.prettyprint .linenums{line-height:1.45;margin-left:2em} -pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} -pre.prettyprint li code[data-lang]::before{opacity:1} -pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} -table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} -table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} -table.linenotable td.code{padding-left:.75em} -table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em} -pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em} -pre.pygments .lineno::before{content:"";margin-right:-.125em} -.quoteblock{margin:0 1em 1.25em 1.5em;display:table} -.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} -.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify} -.quoteblock blockquote{margin:0;padding:0;border:0} -.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)} -.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} -.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} -.verseblock{margin:0 1em 1.25em} -.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility} -.verseblock pre strong{font-weight:400} -.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} -.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} -.quoteblock .attribution br,.verseblock .attribution br{display:none} -.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} -.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} -.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0} -.quoteblock.abstract{margin:0 1em 1.25em;display:block} -.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} -.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} -.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} -.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} -.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} -p.tableblock:last-child{margin-bottom:0} -td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} -td.tableblock>.content>:last-child{margin-bottom:-1.25em} -table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} -table.grid-all>*>tr>*{border-width:1px} -table.grid-cols>*>tr>*{border-width:0 1px} -table.grid-rows>*>tr>*{border-width:1px 0} -table.frame-all{border-width:1px} -table.frame-ends{border-width:1px 0} -table.frame-sides{border-width:0 1px} -table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} -table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} -table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} -table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} -table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7} -th.halign-left,td.halign-left{text-align:left} -th.halign-right,td.halign-right{text-align:right} -th.halign-center,td.halign-center{text-align:center} -th.valign-top,td.valign-top{vertical-align:top} -th.valign-bottom,td.valign-bottom{vertical-align:bottom} -th.valign-middle,td.valign-middle{vertical-align:middle} -table thead th,table tfoot th{font-weight:bold} -tbody tr th{background:#f7f8f7} -tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} -p.tableblock>code:only-child{background:none;padding:0} -p.tableblock{font-size:1em} -ol{margin-left:1.75em} -ul li ol{margin-left:1.5em} -dl dd{margin-left:1.125em} -dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} -ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} -ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} -ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} -ul.unstyled,ol.unstyled{margin-left:0} -ul.checklist{margin-left:.625em} -ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em} -ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em} -ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} -ul.inline>li{margin-left:1.25em} -.unstyled dl dt{font-weight:400;font-style:normal} -ol.arabic{list-style-type:decimal} -ol.decimal{list-style-type:decimal-leading-zero} -ol.loweralpha{list-style-type:lower-alpha} -ol.upperalpha{list-style-type:upper-alpha} -ol.lowerroman{list-style-type:lower-roman} -ol.upperroman{list-style-type:upper-roman} -ol.lowergreek{list-style-type:lower-greek} -.hdlist>table,.colist>table{border:0;background:none} -.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} -td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} -td.hdlist1{font-weight:bold;padding-bottom:1.25em} -td.hdlist2{word-wrap:anywhere} -.literalblock+.colist,.listingblock+.colist{margin-top:-.5em} -.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} -.colist td:not([class]):first-child img{max-width:none} -.colist td:not([class]):last-child{padding:.25em 0} -.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd} -.imageblock.left{margin:.25em .625em 1.25em 0} -.imageblock.right{margin:.25em 0 1.25em .625em} -.imageblock>.title{margin-bottom:0} -.imageblock.thumb,.imageblock.th{border-width:6px} -.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} -.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} -.image.left{margin-right:.625em} -.image.right{margin-left:.625em} -a.image{text-decoration:none;display:inline-block} -a.image object{pointer-events:none} -sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} -sup.footnote a,sup.footnoteref a{text-decoration:none} -sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline} -#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} -#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} -#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} -#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} -#footnotes .footnote:last-of-type{margin-bottom:0} -#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} -.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0} -.gist .file-data>table td.line-data{width:99%} -div.unbreakable{page-break-inside:avoid} -.big{font-size:larger} -.small{font-size:smaller} -.underline{text-decoration:underline} -.overline{text-decoration:overline} -.line-through{text-decoration:line-through} -.aqua{color:#00bfbf} -.aqua-background{background:#00fafa} -.black{color:#000} -.black-background{background:#000} -.blue{color:#0000bf} -.blue-background{background:#0000fa} -.fuchsia{color:#bf00bf} -.fuchsia-background{background:#fa00fa} -.gray{color:#606060} -.gray-background{background:#7d7d7d} -.green{color:#006000} -.green-background{background:#007d00} -.lime{color:#00bf00} -.lime-background{background:#00fa00} -.maroon{color:#600000} -.maroon-background{background:#7d0000} -.navy{color:#000060} -.navy-background{background:#00007d} -.olive{color:#606000} -.olive-background{background:#7d7d00} -.purple{color:#600060} -.purple-background{background:#7d007d} -.red{color:#bf0000} -.red-background{background:#fa0000} -.silver{color:#909090} -.silver-background{background:#bcbcbc} -.teal{color:#006060} -.teal-background{background:#007d7d} -.white{color:#bfbfbf} -.white-background{background:#fafafa} -.yellow{color:#bfbf00} -.yellow-background{background:#fafa00} -span.icon>.fa{cursor:default} -a span.icon>.fa{cursor:inherit} -.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} -.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} -.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} -.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} -.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} -.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} -.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold} -.conum[data-value] *{color:#fff!important} -.conum[data-value]+b{display:none} -.conum[data-value]::after{content:attr(data-value)} -pre .conum[data-value]{position:relative;top:-.125em} -b.conum *{color:inherit!important} -.conum:not([data-value]):empty{display:none} -dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} -h1,h2,p,td.content,span.alt{letter-spacing:-.01em} -p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} -p,blockquote,dt,td.content,span.alt{font-size:1.0625rem} -p{margin-bottom:1.25rem} -.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} -.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc} -.print-only{display:none!important} -@page{margin:1.25cm .75cm} -@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important} -html{font-size:80%} -a{color:inherit!important;text-decoration:underline!important} -a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} -a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} -abbr[title]::after{content:" (" attr(title) ")"} -pre,blockquote,tr,img,object,svg{page-break-inside:avoid} -thead{display:table-header-group} -svg{max-width:100%} -p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} -h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} -#header,#content,#footnotes,#footer{max-width:none} -#toc,.sidebarblock,.exampleblock>.content{background:none!important} -#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} -body.book #header{text-align:center} -body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} -body.book #header .details{border:0!important;display:block;padding:0!important} -body.book #header .details span:first-child{margin-left:0!important} -body.book #header .details br{display:block} -body.book #header .details br+span::before{content:none!important} -body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} -body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} -.listingblock code[data-lang]::before{display:block} -#footer{padding:0 .9375em} -.hide-on-print{display:none!important} -.print-only{display:block!important} -.hide-for-print{display:none!important} -.show-for-print{display:inherit!important}} -@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem} -.sect1{padding:0!important} -.sect1+.sect1{border:0} -#footer{background:none} -#footer-text{color:rgba(0,0,0,.6);font-size:.9em}} -@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} - -/*! - * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - @font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/documentation/_styles/font-awesome.min.css b/documentation/_styles/font-awesome.min.css deleted file mode 100644 index 8646486..0000000 --- a/documentation/_styles/font-awesome.min.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! - * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - @font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/documentation/connectors/Message.png b/documentation/connectors/Message.png deleted file mode 100644 index b89636d..0000000 Binary files a/documentation/connectors/Message.png and /dev/null differ diff --git a/documentation/connectors/create_new_connectors.adoc b/documentation/connectors/create_new_connectors.adoc deleted file mode 100644 index 8385da8..0000000 --- a/documentation/connectors/create_new_connectors.adoc +++ /dev/null @@ -1,203 +0,0 @@ -= План создания коннектора - -Для создания полноценного коннектора необходимо создать bundle с такой структурой: - -. _src/main/resource/template/<название endpoint>-in-connector.ftl_ -. _src/main/resource/template/<название endpoint>-out-connector.ftl_ -. _src/main/resource/OSGI-INF/blueprint/camel-context.xml_ -. _pom.xml_ - -== Создание шаблона входного коннектора(in-connector) - -_Входной коннектор_ - это коннектор, который получает сообщения из вне Entaxy. - -_Шаблон входного коннектора_ - ftl файл, на основе которого шина будет создавать индивидуальные входные коннекторы для каждой системы, с помощью подстановки параметров, полученных от пользователя. - -Пример созданного шаблона, где название endpoint - _example_: -_src/main/resource/template/example-in-connector.ftl_ -[source,xml] ----- - - - - - - - - - - - - - - - - - - - example - - - - - - ----- - -Создание и публикация бина: для связи коннектора с профилем, возможности получить весь список коннекторов определенного типа. -[source, xml] ----- - - - - - - - - - - ----- - -Маршрут коннектора, который полученные сообщения отправляет на выходную точку профиля, к которой прикрепляется сгенерированный пользователем route. -[source, xml] ----- - - - - example - - - ----- - -Начало маршрута входного коннектора может начинаться не с _"direct-vm:example-in-connector-[=systemName]"_, а получать сообщения, например, через определенную папку на диске. - -Для того чтобы отправить сообщение в коннектор необходимо, получить все коннекторы определенного типа (example): -[source,xml] ----- - - - - - ----- - -И отправлять сообщения с помощью: -[source,xml] ----- - ----- - -== Создание шаблона выходного коннектора(out-connector) - -_Выходной коннектор_ - это коннектор, который отправляет сообщения из Entaxy в систему (вне Entaxy). - -_Шаблон выходного коннектора_ - ftl файл, на основе которого шина будет создавать индивидуальные выходные коннекторы для каждой системы, с помощью подстановки параметров, полученных от пользователя. - -Пример созданного шаблона, где название endpoint - _example_: -_src/main/resource/template/example-out-connector.ftl_ -[source,xml] ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ----- - -Создание и публикация бина: для связи коннектора с профилем, возможности получить весь список коннекторов определенного типа. -[source, xml] ----- - - - - - - - - - - ----- - -Маршрут выходного коннектора *должен* стартовать с: -[source,xml] ----- - ----- - -== Публикация созданных шаблонов - -Необходимо опубликовать osgi сервис с информацией об созданных шаблонах для того, чтобы механизм создания коннекторов увидел их. - -_src/main/resource/OSGI-INF/blueprint/camel-context.xml_ -[source,xml] ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - ----- - -xref:../core/system-managment/Users-manual-System-management.adoc[Информация о создании коннекторов со стороны пользователя] diff --git a/documentation/connectors/db-connector/deployment_schema.png b/documentation/connectors/db-connector/deployment_schema.png deleted file mode 100644 index 33203b0..0000000 Binary files a/documentation/connectors/db-connector/deployment_schema.png and /dev/null differ diff --git a/documentation/connectors/naming_service_headers.adoc b/documentation/connectors/naming_service_headers.adoc deleted file mode 100644 index 431bf09..0000000 --- a/documentation/connectors/naming_service_headers.adoc +++ /dev/null @@ -1,86 +0,0 @@ -= Используемые служебные заголовки Entaxy - -ENTAXY_ - глобальный формат заголовков, который используется не только в рамках коннектора. Используется во всём процессе прохождения пакета, так же может быть принят извне. - -NTX_ - внутренний формат заголовков в конкретном коннекторе, носит служебный характер. -Например _NTX_Origin_ - служит для идентификации имени контура шины при прохождении пакета через мост. - -|=== -|Имя заголовка |Описание |Возможные значения |Обязательность - -|X-ForwardedUser -|логин аккаунта, проставляется с помощью _nginx_ -| -|true - -|X-ForwardedUserId -|внутренний id аккаунта, проставляется с помощью _ru.entaxy.esb.system.auth.basic.interceptor.SystemInterceptor_ -| -|true - -|X-SystemName -|имя системы, полученное при авторизации с помощью _ru.entaxy.esb.system.auth.basic.interceptor.SystemInterceptor_ -| -|true - -|X-SystemUuid -|uuid системы, полученное при авторизации с помощью _ru.entaxy.esb.system.auth.basic.interceptor.SystemInterceptor_ -| -|true - -|X-SystemId -|внутренний id системы, полученное при авторизации с помощью _ru.entaxy.esb.system.auth.basic.interceptor.SystemInterceptor_ -| -|true - -|ENTAXY_EndpointName -|Имя коннектора, через который было получено сообщение -|US-SOAP, US-File, US-JMS, .... -|true - -|ENTAXY_ConnectorType -|Тип коннектора, через который было получено сообщение -|uniform-service -|true - -|ENTAXY_ConnectorName -|Имя коннектора, через который было получено сообщение -| -|true - -|ENTAXY_Source -|Имя отправителя -| -|true - -|ENTAXY_SourceType -|Tип отправителя -|system.name, system-group.name, queue.name, topic.name -|false - -|ENTAXY_Destination -|Имя получателя -| -|false - -|ENTAXY_DestinationType -|Tип получателя -|system.name, system-group.name, queue.name, topic.name -|false - -|ENTAXY_Priority -|Приоритет сообщения -|0-9 -|false - -|ENTAXY_ContentType -|Тип сообщения -|application/xml, message/external-body -|false - -|ENTAXY_EmptyContent -|Является ли сообщение пустым -|true; false -|false -|=== - diff --git a/documentation/connectors/uniform-exchange-service/US-active.png b/documentation/connectors/uniform-exchange-service/US-active.png deleted file mode 100644 index ec9c65d..0000000 Binary files a/documentation/connectors/uniform-exchange-service/US-active.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/US.png b/documentation/connectors/uniform-exchange-service/US.png deleted file mode 100644 index a3a36d3..0000000 Binary files a/documentation/connectors/uniform-exchange-service/US.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/active-mode.adoc b/documentation/connectors/uniform-exchange-service/active-mode.adoc deleted file mode 100644 index 848d95e..0000000 --- a/documentation/connectors/uniform-exchange-service/active-mode.adoc +++ /dev/null @@ -1,76 +0,0 @@ -= Активный режим коннектора - -image::US-active.png[] - -== Сервис для отладки активного коннектора - -Поднимается на endpoint _/active_connector_test_consumer_ -при выставленной настройке _active.mode.dev=true_ в файле конфигураций _uniform.service.support.cfg_ - - -== Requests Examples - - POST http://192.168.122.83:8181/cxf/uniform-exchange - -==== SEND MESSAGE: - -[source,xml] ----- - - - - - - - b7e6aab7-8f02-443c-8f67-e2d638dd4da0 - - s1 - - - s2 - - - - - - - - - - - ----- - -==== GET MESSAGE: - - -[source,xml] ----- - - - - - - s2 - system.name - - 1 - 0 - - - ----- - -==== ACK MESSAGE: - -[source,xml] ----- - - - - - {{message_uuid}} - - - ----- diff --git a/documentation/connectors/uniform-exchange-service/ignite.adoc b/documentation/connectors/uniform-exchange-service/ignite.adoc deleted file mode 100644 index 361195d..0000000 --- a/documentation/connectors/uniform-exchange-service/ignite.adoc +++ /dev/null @@ -1,35 +0,0 @@ -= IGNITE - -IgniteAggregationRepository сделано на основе JdbsAggregationRepository -документация https://help.talend.com/reader/Uc2IlRuFVfGrjaFPdRI7kA/fBdqK2kf6iIkLHQf9nLh6g - -Есть некоторые внутренние баги karaf, которые не позволяют установить некоторые ignite фичи в караф -https://github.com/apache/ignite/blob/fd921a233d35408883695419b6f9979ac674d1b9/modules/osgi-karaf/src/main/resources/features.xml#L87 - -В карафе поднимается ignite, с рабочей директорией, прописанной в ru.entaxy.esb.ignite.cfg, -в параметре ignite.work.directory.path. Это место, где игнайт -создает для себя все, что нужно, и будет хранить данные. - -Ignite настроен с сохранением персисетнтности данных(сохранением их на диск) и -созданием реплицации(бэкапов) на других узлах кластера.(при потере одной ноды, -другие восстановят данные, которе хранились на текущем узле) - -IGNITE_QUIET=false - параметр необходимый для того, чтобы игнайт не писал информацию о себе в лог, -для того что бы параметр применился, необходимо выставить setGridLogger, -смогла установить в караф только JclLogger. - -**AggregationProcessor** - -AggregationProcessor стандартный, не расчитан на работу в кластере из-за чего пришлось вытаскивать исходники -и редактировать сам процессор.(AggregationProcessorWithRestoreTimeout) -Т к теперь AggregationProcessor вызывается как bean, а не как стандартный камеловский процессор, -то процесс старта и остановки происходит в отличном порядке. - -Для работы к кластере: -- добавлен механизм восстановления работы таймаутов на других нодах, -- отредактирован механизм удаления сообщения из репозитория(возникало состояние гонки и появлялись дубликаты), -- исправлен механизм продолжения работы с "застрявшими" сообщениями (recoverTask из таблицы _completed) -- добавлен безопасный механизм забора сообщений из очереди(восстановление сообщения в очереди, если не пришло подтверждение) - - - diff --git a/documentation/connectors/uniform-exchange-service/tests/artemis.adoc b/documentation/connectors/uniform-exchange-service/tests/artemis.adoc deleted file mode 100644 index 1614aab..0000000 --- a/documentation/connectors/uniform-exchange-service/tests/artemis.adoc +++ /dev/null @@ -1,35 +0,0 @@ -== Работа с artemis, проверка сообщений - -Консоль управления artemis расположена на _http://localhost:8161/console/login_ - -* Необходимо аутентифицироваться в artemis(где логин и пароль по умолчанию entaxy/entaxy) - -image::img/image_2021-09-13_21-39-23.png[] - -* После успешного прохождения аутентификации, консоль artemis будет выглядеть так: - -image::img/image_2021-09-13_21-40-11.png[] - -* В левой части интерфейса находятся созданные очереди artemis, где необходимо выбрать очередь, как и показано на скрине: - -image::img/image_2021-09-13_21-40-38.png[] - -* В верхней части artemis необходимо выбрать раздел _Browse_, который отображает находящиеся в очереди сообщения: - -image::img/image_2021-09-13_21-41-56.png[] - -* Выбрав сообщение, отобразится информация о сообщении: - -а) тело сообщения - -image::img/image_2021-09-13_21-42-24.png[] - -б) заголовки сообщения - -image::img/image_2021-09-13_21-42-53.png[] - -* После того как сообщение было прочитано из entaxy, и если оно было там одно, то очередь автоматически удалится из artemis. Иначе сообщение будет забрано из очереди. - -image::img/image_2021-09-13_21-43-15.png[] - - diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-39-23.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-39-23.png deleted file mode 100644 index 0f4ec07..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-39-23.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-11.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-11.png deleted file mode 100644 index be624a9..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-11.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-38.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-38.png deleted file mode 100644 index 20449f7..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-40-38.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-41-56.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-41-56.png deleted file mode 100644 index d300eb6..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-41-56.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-24.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-24.png deleted file mode 100644 index f6818ee..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-24.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-53.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-53.png deleted file mode 100644 index a259d42..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-42-53.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-43-15.png b/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-43-15.png deleted file mode 100644 index de28fe5..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/image_2021-09-13_21-43-15.png and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302025.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302025.jpg deleted file mode 100644 index e1e003a..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302025.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302028.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302028.jpg deleted file mode 100644 index 714838f..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302028.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302031.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302031.jpg deleted file mode 100644 index 153d8bd..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302031.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302034.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302034.jpg deleted file mode 100644 index 0dea892..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302034.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302035.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302035.jpg deleted file mode 100644 index e569c36..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302035.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302038.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302038.jpg deleted file mode 100644 index 6abd2a8..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302038.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302039.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302039.jpg deleted file mode 100644 index f67b1f3..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302039.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302041.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302041.jpg deleted file mode 100644 index 3c9ef44..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302041.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302042.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302042.jpg deleted file mode 100644 index b9f8691..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302042.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302043.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302043.jpg deleted file mode 100644 index 916d6ab..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302043.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302044.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302044.jpg deleted file mode 100644 index d9086a2..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302044.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302046.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302046.jpg deleted file mode 100644 index 4eaf336..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302046.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302047.jpg b/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302047.jpg deleted file mode 100644 index 68afa25..0000000 Binary files a/documentation/connectors/uniform-exchange-service/tests/img/photo5298499320133302047.jpg and /dev/null differ diff --git a/documentation/connectors/uniform-exchange-service/tests/postman.adoc b/documentation/connectors/uniform-exchange-service/tests/postman.adoc deleted file mode 100644 index 2a5166d..0000000 --- a/documentation/connectors/uniform-exchange-service/tests/postman.adoc +++ /dev/null @@ -1,89 +0,0 @@ -= Инструкция для работы с шиной через универсальный коннектор - -=== Преднастройка окружения - -. Скачать и установить postman(https://www.postman.com/downloads/). -. Импортировать коллекцию запросов и окружение в postman - -Далее показано как импортироваться коллекцию запросов и окружение в postman Version 8.11.1, если стоит другая версия и возникли сложности с инструкцией, то обратитесь к документации postman(https://learning.postman.com/docs/getting-started/importing-and-exporting-data/). - -=== Импорт коллекции запросов и окружения в postman - -* Если вы на домашней странице postman, то нажмите _Import file_, как показано ниже на скрине. - -image::img/photo5298499320133302025.jpg[] - -* Если вы не на домашней странице postman, то нажмите _File_, _Import..._, как показано ниже на скрине. - -image::img/photo5298499320133302031.jpg[] - -* Далее откроется окно с импортом файла, где нужно нажать на _Upload Files_ и импортировать файлы, по одному или сразу оба(xref:postman/uniform-connector.postman_environment.json[Окружение], xref:postman/uniform-connector.postman_collection.json[Коллекция запросов]) - -image::img/photo5298499320133302028.jpg[] - -* Или можно импортировать сразу всю папку с файлами(xref:postman/uniform-connector.postman_environment.json[Окружение], xref:postman/uniform-connector.postman_collection.json[Коллекция запросов]) - -image::img/photo5298499320133302034.jpg[] - -image::img/photo5298499320133302035.jpg[] - -* Далее мы увидим импортированную коллекцию запросов слева и необходимо выбрать импортированное ранее окружение - -image::img/photo5298499320133302038.jpg[] -image::img/photo5298499320133302039.jpg[] - -* Есть возможность настраивать параметры запросов, документация на данную тему(https://learning.postman.com/docs/sending-requests/managing-environments/) - -image::img/photo5298499320133302041.jpg[] - -* Коллекция запросов и окружение были успешно импортированы в postman и готовы к использованию, можно запустить все запросы в автоматическом режиме или запускать их в ручную по очереди - -=== Запуск всех запросов в автоматическом режиме - -* Необходимо нажать на _Run Collection_ в меню коллекции, как показано ниже - -image::img/photo5298499320133302042.jpg[] -image::img/photo5298499320133302043.jpg[] - -* Можно увидеть успешное прохождение коллекции. При успешном прохождении коллекции тестов шина будет очищена. Если не подразумевалось данное поведение, то необходимо снять выделение с запросов(_Remove profile system1_, _Remove profile system2_, _Remove Account system1_, _Remove Account system2_) - -image::img/photo5298499320133302044.jpg[] -image::img/photo5298499320133302046.jpg[] - -=== Запуск запросов в ручную по очереди - -* Для запуска конкретного запроса нужно нажать на него в меню слева, затем откроется меню редактирования запроса, где можно посмотреть все параметры запроса и настроить его как необходимо и нажимая на кнопку _Send_ запрос отправляется на шину - -image::img/photo5298499320133302047.jpg[] - -=== Описание окружения - -... _base_url_ - если запросы будут запускаться с машины находящейся с шиной, то данный параметр не нужно менять(http://localhost:8181/cxf), иначе заменить localhost:8181 на необходимый -... _system1_id_ - имя/идентификатор системы, то как будет представлена система в шине(по умолчанию s1) -... _system1Login_ - логин системы, то как будет аутентифицироваться система в шине(по умолчанию s1) -... _system1Password_ - пароль системы, то как будет аутентифицироваться система в шине(по умолчанию s1) -... _system2_id_ - имя/идентификатор системы, то как будет представлена система в шине(по умолчанию s1) -... _system2Login_ - логин системы, то как будет аутентифицироваться система в шине(по умолчанию s1) -... _system2Password_ - пароль системы, то как будет аутентифицироваться система в шине(по умолчанию s1) -... _adminLogin_ - админская учетная запись, для произведения настроек в шине(по умолчанию admin) -... _adminPassword_ - админская учетная запись, для произведения настроек в шине(по умолчанию admin) - -=== Содержимое тестов -. Коллекция запросов содержит следующие шаги: -.. _Create profile system1_ - создание профиля системы 1, которая будет отправлять сообщения в шину -.. _Create profile system2_ - создание профиля системы 2 -.. _Add Account system1_ - создание учетной записи для системы 1 -.. _Add Account system2_ - создание учетной записи для системы 2 -.. _Create uniform-service-in-connector_ - создание входящего коннектора к универсальному сервису для системы 1 -.. _Create uniform-service-out-connector_ - создание исходящего коннектора к универсальному сервису для системы 1 -.. _Create uniform-service-in-connector_ - создание входящего коннектора к универсальному сервису для системы 2 -.. _Get profile system1_ - запросы для проверки на корректное создания профиля системы1 и коннекторов к нему(uniform-service-in-connector) -.. _Get profile system2_ - запросы для проверки на корректное создания профиля системы1 и коннекторов к нему(uniform-service-in-connector, uniform-service-out-connector) -.. _Create permission_ - создание разрешения для отправки сообщений из системы 1 в систему 2 -.. _SEND_ - отправка тестового сообщения из системы 1 в систему 2 (если необходимо, то можно посмотреть как сообщение появилось в xref:artemis.adoc[artemis]) -.. _GET_ - получение тестового сообщения из системы 1 системой 2(если необходимо, то можно посмотреть как сообщение было получено из xref:artemis.adoc[artemis]) -.. _ACK_ - отправка подтверждения получения сообщения системы 2(иначе сообщение будет восстановлено) -.. _Remove profile system1_ - удаление из шины профиля системы 1 и всех связанных с ней коннекторов -.. _Remove profile system2_ - удаление из шины профиля системы 2 и всех связанных с ней коннекторов -.. _Remove Account system1_ - удаление учетной записи системы 1 из шины -.. _Remove Account system2_ - удаление учетной записи системы 2 из шины \ No newline at end of file diff --git a/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_collection.json b/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_collection.json deleted file mode 100644 index 485cada..0000000 --- a/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_collection.json +++ /dev/null @@ -1,1396 +0,0 @@ -{ - "info": { - "_postman_id": "0c9cdab7-0764-42b8-a9d1-a11945d7af2a", - "name": "uniform-connector", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "uniform-exchange", - "item": [ - { - "name": "settings esb", - "item": [ - { - "name": "Create profile system1", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system1_id}}\n {{system1_id}}\n \n description1\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Create profile system2", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system2_id}}\n {{system2_id}}\n \n description2\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Add Account system1", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n {{system1Login}}\n {{system1Password}}\n \n {{system1_id}}\n \n {{system1_id}}\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - } - }, - "response": [] - }, - { - "name": "Add Account system2", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \n {{system2Login}}\n {{system2Password}}\n \n {{system2_id}}\n \n {{system2_id}}\n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - } - }, - "response": [] - }, - { - "name": "Create uniform-service-in-connector", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n uniform-service-in-connector\n {{system1_id}}\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Create uniform-service-out-connector", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n uniform-service-out-connector\n {{system2_id}}\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Create uniform-service-in-connector", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n uniform-service-in-connector\n {{system2_id}}\n \n \n \n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Get profile system1", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var systemId = pm.environment.get(\"system1_id\");", - "", - "pm.test(\"Body matches \" + systemId, function () {", - " pm.expect(pm.response.text()).to.include(systemId);", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system1_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Проверить созданный профиль можно с помощью метода getProfile, где вместо “system_uuid” нужно подставить uuid системы\n" - }, - "response": [] - }, - { - "name": "Get profile system2", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var systemId = pm.environment.get(\"system2_id\");", - "", - "pm.test(\"Body matches \" + systemId, function () {", - " pm.expect(pm.response.text()).to.include(systemId);", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system2_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - }, - "description": "Проверить созданный профиль можно с помощью метода getProfile, где вместо “system_uuid” нужно подставить uuid системы\n" - }, - "response": [] - }, - { - "name": "Create permission", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});", - "", - "setTimeout(function(){}, 5000);", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system1_id}}\n {{system2_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - } - ] - }, - { - "name": "uniform-exchange-connector", - "item": [ - { - "name": "SEND", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is OK\", function () {", - " var response = getSoapBody();", - " pm.expect(response['response']['status']).to.eql('200');", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{system1Password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{system1Login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml; charset=UTF-8", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n \t\n \t\t\n \t{{system2_id}}\n \t\n \t\n \n b7e6aab7-8f02-443c-8f67-e2d638dd4da0\n \n {{system1_id}}\n \n \n RequestNumber\n 111\n \n \n test1\n test1\n val\n \n \n\t \t\t\n\t \t\t\n\t \t\n\t \n \n \n \n \n\n" - }, - "url": { - "raw": "{{base_url}}/uniform-exchange", - "host": [ - "{{base_url}}" - ], - "path": [ - "uniform-exchange" - ] - } - }, - "response": [] - }, - { - "name": "GET", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "var response = getSoapBody();", - "", - "pm.test(\"Has service response\", function () {", - " pm.expect(response).to.have.property('response');", - "});", - "", - "if (response.hasOwnProperty('response')) {", - " var packet = response['response']['packets']['packet'];", - "", - " var header = packet['header'];", - " ", - " var message_id = header['transportUUID'];", - " ", - " console.log(packet['message']['content']);", - " console.log(message_id);", - " ", - " pm.globals.set('message_uuid', message_id);", - " ", - " pm.test(\"Content is OK\", function () {", - " pm.expect(packet['message']['content']).to.be.an('object');", - " });", - " ", - " pm.test(\"message_id is OK\", function () {", - " pm.expect(message_id).to.have.lengthOf(36);", - " });", - "}" - ], - "type": "text/javascript" - } - }, - { - "listen": "prerequest", - "script": { - "exec": [ - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{system2Password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{system2Login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml; charset=UTF-8" - } - ], - "body": { - "mode": "raw", - "raw": "\r\n \r\n \r\n \r\n \r\n {{system2_id}}\r\n system.name\r\n \r\n 1\r\n 0\r\n \r\n \r\n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/uniform-exchange", - "host": [ - "{{base_url}}" - ], - "path": [ - "uniform-exchange" - ] - } - }, - "response": [] - }, - { - "name": "ACK", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is 200\", function () {", - " var response = getSoapBody();", - " pm.expect(response['response']['status']).to.eql('200');", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{system2Password}}", - "type": "string" - }, - { - "key": "username", - "value": "{{system2Login}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "type": "text", - "value": "application/xml; charset=UTF-8" - } - ], - "body": { - "mode": "raw", - "raw": "\r\n \r\n \r\n \r\n {{message_uuid}}\r\n \r\n \r\n\r\n" - }, - "url": { - "raw": "{{base_url}}/uniform-exchange", - "host": [ - "{{base_url}}" - ], - "path": [ - "uniform-exchange" - ] - } - }, - "response": [] - } - ], - "event": [ - { - "listen": "prerequest", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ] - }, - { - "name": "clean esb", - "item": [ - { - "name": "Remove profile system1", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system1_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Remove profile system2", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var jsonObject = xml2Json(responseBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n {{system2_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/system-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "system-management" - ] - } - }, - "response": [] - }, - { - "name": "Remove Account system1", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n {{system1_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - } - }, - "response": [] - }, - { - "name": "Remove Account system2", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Body matches true\", function () {", - " pm.expect(pm.response.text()).to.include(\"true\");", - "});", - "", - "function getSoapBody() {", - " var soapBody = responseBody.match(//g);", - " var jsonObject = xml2Json(soapBody);", - " return jsonObject['soap:Envelope']['soap:Body'];", - "}", - "", - "pm.test(\"Response is true\", function () {", - " var response = getSoapBody();", - " pm.expect(response.response._).to.eql('true');", - "});" - ], - "type": "text/javascript" - } - } - ], - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "{{adminPassword}}", - "type": "string" - }, - { - "key": "username", - "value": "{{adminLogin}}", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Content-Type", - "name": "Content-Type", - "value": "application/xml", - "type": "text" - }, - { - "key": "X-ForwardedUser", - "value": "{{adminLogin}}", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "\n \n \n \n \n {{system2_id}}\n \n \n", - "options": { - "raw": { - "language": "xml" - } - } - }, - "url": { - "raw": "{{base_url}}/basic-auth-management", - "host": [ - "{{base_url}}" - ], - "path": [ - "basic-auth-management" - ] - } - }, - "response": [] - } - ] - } - ], - "description": "для тестирования нужно добавть в environment: system1_id, system2_id", - "event": [ - { - "listen": "prerequest", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_environment.json b/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_environment.json deleted file mode 100644 index eeb0632..0000000 --- a/documentation/connectors/uniform-exchange-service/tests/postman/uniform-connector.postman_environment.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "id": "527e5257-25b4-4246-ac5a-26b88e06eec8", - "name": "uniform-connector", - "values": [ - { - "key": "base_url", - "value": "http://localhost:8181/cxf", - "enabled": true - }, - { - "key": "system1_id", - "value": "s1", - "enabled": true - }, - { - "key": "system2_id", - "value": "s2", - "enabled": true - }, - { - "key": "adminLogin", - "value": "admin", - "enabled": true - }, - { - "key": "adminPassword", - "value": "admin", - "enabled": true - }, - { - "key": "system1Login", - "value": "s1", - "enabled": true - }, - { - "key": "system1Password", - "value": "s1", - "enabled": true - }, - { - "key": "system2Login", - "value": "s2", - "enabled": true - }, - { - "key": "system2Password", - "value": "s2", - "enabled": true - } - ], - "_postman_variable_scope": "environment", - "_postman_exported_at": "2021-08-24T14:43:46.375Z", - "_postman_exported_using": "Postman/7.36.5" -} \ No newline at end of file diff --git a/documentation/connectors/uniform-exchange-service/uniform-exchange-service.adoc b/documentation/connectors/uniform-exchange-service/uniform-exchange-service.adoc deleted file mode 100644 index bb3be05..0000000 --- a/documentation/connectors/uniform-exchange-service/uniform-exchange-service.adoc +++ /dev/null @@ -1,38 +0,0 @@ -= Универсальный сервис(US) - -Универсальный сервис разработан для корректного и единообразного взаимодействия с _Entaxy_ из _1С интеграции_. - -image::US.png[] - -=== US endpoint - -Универсальный сервис выставлен с помощью soap (может быть заменен на любой другой способ обмена сообщения, например rest, с сохранением схемы), в котором 3 метода _sendPackets_, _getPackets_ и _confirmPackets_. US endpoint включает в себя: выставленный soap сервис, проверку на существование коннектора и отправку в коннектор(что верно и для uniform-service-service-endpoint) - -=== US connector - -Коннектор занимается обработкой полученного пакета. - -- _sendPackets_ - шина анализирует пакет, создавая служебную информацию(такую как имя системы отправителя, имя и тип получателя и т д) и отправляет в выходную точку профиля. - -- _getPackets_ - шина делает проверку служебной информации(такую как имя системы отправителя, имя и тип получателя и т д) и забирает сообщение из очереди, дополнительно отправляя его в агрегатор. Агрегатор необходим для гарантированной доставки пакета, если в течение заданного таймаута (по умолчанию - 10 минут) не придет подтверждение, то пакет будет считаться не доставленным и будет восстановлен в очереди. - -- _confirmPackets_ - шина делает проверку служебной информации(такую как имя системы отправителя, имя и тип получателя и т д), достает пакет из соответствующего источника (если оно есть) и отдает его системе, дополнительно отправляя в агрегатор, который если собирает пару(пакет и подтверждение) считает его доставленным и удаляет из шины. - -_Агрегатор_ может хранить сообщения в ignite и базе данных, для переключения режима работы агрегатора необходимо установить необходимый параметр acknowledge.aggregation.repository (по умолчанию - jdbcAggregationRepository) в uniform.service.support.cfg - -https://help.talend.com/r/Bejd_\~iSyuyc~nF9XIgDIw/fBdqK2kf6iIkLHQf9nLh6g[Информация по jdbcAggregationRepository] - -xref:ignite.adoc[Информация по igniteAggregationRepository] - -=== US support - -Необходим как вспомогательный элемент. Содержит в себе: настройку агрегатора, маршруты работы агрегатора, маршрут связанный с отправкой в систему в активном режиме коннектора. - -== Режимы универсального сервиса: - -- _Пассивный_ выражен в поднятом на стороне шины сервисе, который "пассивно" ждет запроса от системы. - -- _Активный_ выражен в поднятом на стороне системы сервисе, который с некоторой периодичностью (настраивается при создании коннектора, по умолчанию 1m) опрашивает шина на предмет подготовленных сообщений, и, отправляет полученные сообщения в систему как только они пришли. - -xref:active-mode.adoc#_активный_режим_коннектора[Информация по активному режиму работы универсального сервиса] - diff --git a/documentation/core/Common-description-of-the-transport-layer.adoc b/documentation/core/Common-description-of-the-transport-layer.adoc deleted file mode 100644 index 2ec470c..0000000 --- a/documentation/core/Common-description-of-the-transport-layer.adoc +++ /dev/null @@ -1,219 +0,0 @@ -= Общее описание Entaxy - -=== Entaxy обеспечивает следующую функциональность: - -. обеспечение доступа внешних систем к шине через опубликованные сервисы (SOAP, REST, прочее) -. поддержка синхронного и асинхронного способа вызова служб; -. использование защищённой шины, с гарантированной доставкой сообщений, поддерживающего транзакционную модель; -. статическая и алгоритмическая (условная, опирающаяся на значение передаваемых данных) маршрутизация сообщений; -. доступ к данным из сторонних информационных систем с помощью готовых или специально разработанных адаптеров; -. обработка и преобразование сообщений; -. отказоустойчивая конфигурация; -. разнообразные механизмы контроля и управления (аудиты, протоколирование); -. мониторинг данных и бизнес-процессов - -=== Entaxy решает следующие задачи: - -. обмен сообщениями/данными между приложениями и ИС -. организация точек доступа к услугам (сервисам) и данным -. унификация взаимодействия с внешними ИС -. мониторинг данных и бизнес-процессов -. снижение трудоемкости процесса сбора и агрегации информации -. повышение оперативности подготовки отчетов -. обеспечение автоматизированной проверки данных, используемых в процессе деятельности - -=== Entaxy реализована на следующем наборе ПО: - -- ОС: _Astra Linux 1.6 смоленск_ ? -- Программная платформа: _Java 11 (librca)_ -- СУБД (предоставляется заказчиком): _MS SQL Server_ -- СУБД (может использоваться): _PostgreSQL JDBC Driver_ -- Платформа исполнения: _Apache Karaf 4.2.9_ -- Платформа интеграции: _Apache Camel 3.4.4_ -- Каркас реализации веб-сервисов: _Apache CXF 3.4.0_ -- Брокер сообщений: _ActiveMQ Artemis 2.15_ -- Система мониторинга (предоставляется заказчиком): _Zabbix, Grafana_ -- Система управления журналами (предоставляется заказчиком): _стек ELK_ - -=== Схема развертывания - -Ниже представлена схема развертывания основных компонентов шины, содержащая следующие элементы: - -. кластер _NGINX_ - два узла, обеспечивающих отказоустойчивый балансировщик нагрузки, с одним виртуальным IP-адресом -. кластер _Karaf_ - в начальной конфигурации используется 2 узла, в дальнейшем схема масштабируется горизонтально. Наличие кластера обеспечивает отказоустойчивость и производительность, так как нагрузка распределяется между всеми активными узлами -. кластер брокера сообщений _ActiveMQ Artemis_ - отказоустойчивая конфигурация "активный - пассивный", в которой все транзакции активного брокера реплицируются на пассивный. При выходе из строя активного брокера, активным становится пассивный. Все вызовы брокера сообщений осуществляются по схеме failover, которая гарантирует переадресацию запроса в случае недоступности основного узла. -. отказоустойчивый кластер СУБД - предоставляется заказчиком -. _NFS Share_ - подключаемое сетевое файловое хранилище, предоставляется заказчиком -. _ELK_ - узел сбора и обработки логов стеком продуктов ELK (ElasticSearch, Logstash, Kibana) -. узел сбора и обработки метрик с установленными продуктами Zabbix и Grafana - -image::clustering.png[] - -Ниже представлена схема деплоя профилей/коннекторов в шине: - -image::System-management.png[] - -=== Список и характеристики узлов предпродуктивного контура - - -|=== -|Имя сервера |Ресурсы |Назначение |Операционная система |Софт - -| PREPRD_NGINX1 -| 2xCPU, 4Gb RAM, 40 Gb Local -| Балансировщик -| AstraLinux SE 1.6 -| Nginx - -| PREPRD_NGINX2 -| 2xCPU, 4Gb RAM, 40 Gb Local -| Балансировщик -| AstraLinux SE 1.6 -| Nginx - -| PREPRD_KRF1 -| 8xCPU, 12 Gb RAM, 60 Gb Local -| Платформа запуска интеграционных маршрутов -| AstraLinux SE 1.6 -| Apache Karaf, Cellar, java-1.8.0-openjdk - -| PREPRD_KRF2 -| 8xCPU, 12 Gb RAM, 60 Gb Local -| Платформа запуска интеграционных маршрутов -| AstraLinux SE 1.6 -| Apache Karaf, Cellar, java-1.8.0-openjdk - -| PREPRD_NEXUS -| 4xCPU, 12 Gb RAM, 60 Gb Local -| Хранение артефактов -| AstraLinux SE 1.6 -| Nexus - -| PREPRD_AMQ1 -| 4xCPU, 16 Gb RAM, 60 Gb Local -| Брокер сообщений -| AstraLinux SE 1.6 -| Java, ActiveMQ Artemis - -| PREPRD_AMQ2 -| 4xCPU, 16 Gb RAM, 60 Gb Local -| Брокер сообщений -| AstraLinux SE 1.6 -| Java, ActiveMQ Artemis -|=== - -=== Схема прохождения пакета _Система1_ - _Система2_ - -Ниже представлена схема прохождения пакета на примере обмена данными между двумя экземплярами системами. - -Экземпляры систем соединяются с шиной через _Коннектор_, который взаимодействует с сервисом SOAP, Универсальный коннектор, (контекст/cxf/uniform-exchange), предоставляемым шиной. - -Укрупненно маршрут выглядит следующим образом: - -. доставка сообщения до очереди получателя: CXF-сервис -> маршрут Camel send-to-jms -> очередь в Artemis -. получение сообщения: CXF-сервис -> очередь в Artemis -. подтверждение получения: CXF-сервис -> маршрут Camel receive-acknowledge - -image::route_packet.png[] - -=== Средства мониторинга и отладки - -Для мониторинга работы и отладки шины для сценария прохождения пакета могут быть использованы следующие инструменты. - -==== Журнал (лог) Nginx - -Логи Nginx’a располагаются в папке по пути “/var/log/nginx”. - -В папке с логами Nginx’a располагаются 2 типа логов: - -. Access - отображает все процессы, которые проходят через Nginx. -В случае когда запрос отработал успешно, сервер возвращает код 200 в access.log и записывает строку с URL запроса, кодом, размером ответа и временем получения ответа. -. Error - отображает процессы, в которых возникли ошибки -В случае когда запрос отработал с ошибкой, сервер возвращает код 400 (например) в error.log и записывает строку с URL запроса, кодом, кратким описанием ошибки, размером ответа, временем получения ответа и юзер-агентом (HTTP-заголовок, который показывает из какого браузера или иного софта был отправлен запрос). - -==== Трассировка маршрутов Camel - -_Apache Сamel_ - это платформа для запуска интеграционных маршрутов (процессов), которые в самой платформе называются “route”. Основными функциями Apache Camel являются подключения по различным протоколам, маршрутизация запросов и сообщений, а также преобразование данных. - -Работа с маршрутами в Apache Camel и самой платформой осуществляется из hawtio. Hawtio - это графическая консоль управления. Hawtio доступна по следующим ссылкам: - -Karaf-1 - http://<<+host+>>:8181/hawtio/ - -image::screenshots/screenshot_hawtio_1.png[] - -Трассировка маршрутов в hawtio производится на вкладке “Camel”, путем выбора маршрута (папка route) в левой области экрана и перехода на вкладку “Trace”. - -image::screenshots/screenshot_hawtio_2.png[] -image::screenshots/screenshot_hawtio_3.png[] - -После перехода необходимо нажать на кнопку “Start tracing”, платформа запустит трассировку маршрута и выведет на экран схему процесса трассировки. - -image::screenshots/screenshot_hawtio_4.png[] - -В связи с тем что в 3й версии Camel, используемой нами, трассировка по умолчанию отключена потребуется подготовить отлаживаемый контекст. Для этого необходимо включить параметры _backlogTrace_ и _useBreadcrumb_. - -Пример: -[source,xml] ----- - ----- - -Так же для удобства работы можно включить отображение потоков в текстовом формате. -Для этого в Настройках(Preferences) hawtio нужно включить флаг Include trace/debug streams - -image::screenshots/screenshot_hawtio_5.png[] - -В веб-консоли hawtio, помимо работы с маршрутами, есть возможность установки бандлов, плагинов (вкладка OSGI) -Возможность просмотра логов и прочее. - -image::screenshots/screenshot_hawtio_6.png[] -image::screenshots/screenshot_hawtio_7.png[] - -=== Веб-консоль брокера сообщений - -Добавить описание, урлы (для обоих брокеров) и скриншоты на примере любой очереди. Показать, где содержимое, где рейт и прочее. - -Apache ActiveMQ - это брокер сообщений, основной функцией которого является отправка и получение сообщений. - -Работа с брокером сообщений производится через веб-консоль, перейти на которые можно по следующим ссылкам: - -ActiveMQ-1 - http://<<+host+>>:8161/console/ - -image::screenshots/screenshot_artemis_1.png[] - -В веб-консоли можно просматривать очереди сообщений на вкладке “Queues”. - -image::screenshots/screenshot_artemis_2.png[] - -На этой же вкладке можно просмотреть название очереди, адрес очереди. - -image::screenshots/screenshot_artemis_3.png[] - -Посмотреть скорость обмена сообщениями (столбец “Rate”), количество сообщений в очереди. - -image::screenshots/screenshot_artemis_4.png[] - -На вкладке “Producer” можно посмотреть данные об отправленных сообщениях (id сообщений, название адресов, на которые были отправлены сообщения). - -image::screenshots/screenshot_artemis_5.png[] - -На вкладке “Consumers” можно посмотреть данные о полученных сообщениях (id сообщений, из какой очереди пришли сообщения, название адресов, с которых были получены сообщения). - -image::screenshots/screenshot_artemis_6.png[] - -В левой области экрана можно выбрать в списке нужную очередь и посмотреть количество сообщений в ней. - -image::screenshots/screenshot_artemis_7.png[] - -При выборе очереди, автоматически открывается вкладка “Browse”, на которой отображаются все сообщения из выбранной очереди. При нажатии на id сообщения, появится диалоговое окно с сообщением. - -image::screenshots/screenshot_artemis_8.png[] - -При необходимости сообщение можно переместить в другую очередь (кнопка “Move”) или удалить (кнопка “Delete”). - -image::screenshots/screenshot_artemis_9.png[] - -Также в консоли имеется возможность полностью очистить очередь от сообщений или полностью удалить очередь из брокера сообщений, выбрав очередь в левой области экрана и перейдя на вкладку “Delete”. - -image::screenshots/screenshot_artemis_10.png[] - diff --git a/documentation/core/Control Service.png b/documentation/core/Control Service.png deleted file mode 100644 index 42ff766..0000000 Binary files a/documentation/core/Control Service.png and /dev/null differ diff --git a/documentation/core/System-management.png b/documentation/core/System-management.png deleted file mode 100644 index 70ac1e4..0000000 Binary files a/documentation/core/System-management.png and /dev/null differ diff --git a/documentation/core/auth/Authentication.png b/documentation/core/auth/Authentication.png deleted file mode 100644 index 992eb01..0000000 Binary files a/documentation/core/auth/Authentication.png and /dev/null differ diff --git a/documentation/core/auth/Authorization.adoc b/documentation/core/auth/Authorization.adoc deleted file mode 100644 index d693556..0000000 --- a/documentation/core/auth/Authorization.adoc +++ /dev/null @@ -1,169 +0,0 @@ -= Общие положения - -При передаче сообщения от внешней системы в шину происходит процесс аутентификации внешней системы в шине. Т.е. при передаче сообщения шине с помощью сервера _nginX_ по протоколу _basic_ аутентификации сверяет присвоенные сообщению логин и пароль системы, от которой передается сообщение с ее логином, зарегистрированным в шине. При совпадении логина и пароля сообщение проходит от внешней системы через шину к другой системе. Если же пара логин – пароль не совпадает, то система блокирует сообщение. - -image::Authentication.png[Аутентификация с помощью nginx] - -Обновление учетных записей на _nginx_ по данным от сервиса _basic-auth-management_ проходит каждую минуту. - -Для компактной установки шины без _nginx_ модуль реализует интерцептор для basic аутентификации при обращении к сервисам. Включить встроенную аутентификацию можно в конфигурационном файле ru.entaxy.esb.system.basic_auth.cfg -> свойство internal.authentication.enabled. - -Сервис _basic-auth-management_ служит для работы с учетными записями (аккаунтами) через протокол _SOAP_. - -В сервисе существуют три вида запросов: - -* Добавление аккаунтов; -* Обновление аккаунтов; -* Удаление неактуальных аккаунтов. -* Выдача прав аккаунту -* Удаление прав аккаунта - -=== Добавление аккаунта - -Метод для добавления учетных записей _(addAccount)_ разработан для добавления новых пользователей в систему. - -Запрос на добавление аккаунта выглядит следующим образом: -[source,xml] ----- - - - - - - - system1login - system1pass - - system1uuid - - - - ----- - - -В теле содержится список аккаунтов – это повторение элементов _account_ неограниченное число раз. Также в теле содержатся обязательные поля __ (логин) и __ (пароль). Поле __ (идентефикатор системы) является необязательным. - -Пароль принимается в прямом виде и шифруется непосредственно перед сохранением, чтобы он не хранился в открытом виде. - -=== Обновление аккаунта - -Метод для обновления учетной записи _(updateAccount)_ разработан для обновления следующей информации: - -* новый пароль системы; -* присвоение учетной записи к другой системе. - -Запрос на обновление аккаунта выглядит следующим образом: -[source,xml] ----- - - - - - - - system1login - system1pass - - system1uuid - - - system2login - system2pass - - - - ----- - -В теле содержится список аккаунтов, который содержит информацию аналогичную из п.2. - -=== Удаление аккаунта - -Метод для удаления аккаунта _(removeAccount)_ служит для удаления аккаунта из системы. - -Запрос на удаление аккаунта выглядит следующим образом: -[source,xml] ----- - - - - - - system1login - system2login - - - ----- - -В теле содержится неограниченный список логинов _(loginList)_, которые будут удалены из системы. - -=== Выдача прав аккаунту - -Метод выдачи прав аккаунту _(addAccountPermission)_ служит для создания _permission_ связанных с переданным аккаунтом. - -Запрос на создание права выглядит следующим образом: -[source,xml] ----- - - - - - - - dog - topic-management - service - - - - - dog - system-management - service - - - - - - ----- - - -Если параметр action пустой либо отсутствует в сервисе _permission_ по умолчанию подставляется _default_. - - -=== Удаление прав аккаунта - -Метод удаления прав аккаунта _(removeAccountPermission)_ служит для удаления _permission_ связанных с переданным аккаунтом. - -Запрос на создание права выглядит следующим образом: -[source,xml] ----- - - - - - - - dog - topic-management - service - - - - - dog - system-management - service - - - - - - ----- - - -Если параметр _action_ пустой либо отсутствует в сервисе permission по умолчанию подставляется _default_. diff --git a/documentation/core/bridge/Bridge-Description-and-Configuration.adoc b/documentation/core/bridge/Bridge-Description-and-Configuration.adoc deleted file mode 100644 index 089a76d..0000000 --- a/documentation/core/bridge/Bridge-Description-and-Configuration.adoc +++ /dev/null @@ -1,79 +0,0 @@ -Связь между двумя независимыми брокерами осуществляется с помощью моста. Карафы подключенные к одному брокеру далее будут именоваться шиной. - -image::Route-in-different-esb.png[Прохождение пакета через группу и мост] - -== Установка и настройка - -Установка модуля происходит через фичу: - -* _feature:install bridge_ - -Фича включена в общий установочный скрипт и будет устанавливаться вместе с остальными модулями. Во время установки фичи в караф копируются файлы конфигурации: - -* _ru.entaxy.esb.system.bridge.cfg (основная конфигурация)_ - -=== ru.entaxy.esb.system.bridge.cfg (основная конфигурация) -[source,properties] ----- -# имя локальной шины() -jms.local=test1 -# значение true - мост текущего узла работает в пассивном режиме, -# т.е. сообщения для соответствующего удалённого узла складываются в очередь на локальном брокере, -# из которой уже читает подключаемый узел (локальный брокер должен быть доступен для соединения) -# По умолчанию false - активный режим, запись сообщения идёт сразу в очередь на удалённом брокере, -# подключаемого узла (брокеры по обе стороны моста должны быть доступны) -jms.local.master=false -# имена удаленных шин, задается через запятую(,) -jms.remote.list=test2 - -# адреса брокера, задаются чеерез запятую(jms.url.) -jms.url.test1=192.168.122.81:61616,192.168.122.82:61616 -# логин для подключения к брокеру(jms.username.) -jms.username.test1=input -# пароль для подключения к брокеру(jms.password.) -jms.password.test1=input -# протокол для передачи сообщений внутри шины(jms.protocol.inner.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра в мосту и в самой шине(ru.entaxy.esb.cfg) -# возможные значения tcp, amqp -jms.protocol.inner.esb.test1=tcp -# протокол для передачи сообщений между шинами(jms.protocol.bridge.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра во всех подключенных шинах -# возможные значения tcp, amqp -jms.protocol.bridge.test1=amqp - -# адреса брокера, задаются чеерез запятую(jms.url.) -jms.url.test2=localhost:61616 -# логин для подключения к брокеру(jms.username.) -jms.username.test2=input -# пароль для подключения к брокеру(jms.password.) -jms.password.test2=input -# jms.master. - выставляем в true, когда соответствующий узел настроен в пассивный режим, -# т.е. для него jms.local.master = true (брокер должен быть доступен для соединения) -jms.master.test2=true -# протокол для передачи сообщений внутри шины(jms.protocol.inner.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра в мосту и в самой шине(ru.entaxy.esb.cfg) -# возможные значения tcp, amqp -jms.protocol.inner.esb.test2=tcp -# протокол для передачи сообщений между шинами(jms.protocol.bridge.esb.) -# для корректной работы синхронного режима передачи сообщений: необходимо следить -# за одинаковым значением данного параметра во всех подключенных шинах -# возможные значения tcp, amqp -jms.protocol.bridge.test2=amqp - -# максимальное колчичество попыток отправить сообщение в очередь -# почитать подробнее можно в https://camel.apache.org/components/latest/eips/dead-letter-channel.html#deadLetterChannel-Redelivery -redelivery.maximumRedeliveries=-1 -# время между попытками отправить сообщение в очередь -redelivery.redeliveryDelay=5000 -# экспоненциальный рост времени между попытками отпрвки сообщений в очередь -redelivery.useExponentialBackOff=true - -queue.sender.concurrentConsumers=1 -queue.receiver.concurrentConsumers=1 ----- - - - diff --git a/documentation/core/bridge/Route-in-different-esb.png b/documentation/core/bridge/Route-in-different-esb.png deleted file mode 100644 index e234240..0000000 Binary files a/documentation/core/bridge/Route-in-different-esb.png and /dev/null differ diff --git a/documentation/core/clustering.png b/documentation/core/clustering.png deleted file mode 100644 index e5893e3..0000000 Binary files a/documentation/core/clustering.png and /dev/null differ diff --git a/documentation/core/deployer/deployer-common.adoc b/documentation/core/deployer/deployer-common.adoc deleted file mode 100644 index 3e4ce6c..0000000 --- a/documentation/core/deployer/deployer-common.adoc +++ /dev/null @@ -1,44 +0,0 @@ -= Файловые репозитории - -*Nexus* - представлен бандлом SYSTEM :: ENTAXY :: NEXUS :: DEPLOYER, реализует взаимодействие с репозиторием Sonatype Nexus. - Конфигурация ru.entaxy.esb.deployer.nexus.cfg -[source] ----- -# все смены адреса расположения nexus и изменение наименования репозитория, необходимо фиксировать в файле -# org.ops4j.pax.url.mvn.cfg параметр: org.ops4j.pax.url.mvn.repositories - -# url расположения nexus -nexus.deployer.url=http://nexusHost -# название репозитория в nexus, необходимого для конфигурирования шины из вне(создание профилей, коннекторов и т д) -nexus.deployer.repository=entaxy -# логин для авторизации в nexus -nexus.deployer.username=deployer -# пароль для авторизации в nexus -nexus.deployer.password=deployer ----- - -*File-system* - представлен бандлом SYSTEM :: ENTAXY :: FILE SYSTEM :: DEPLOYER, реализует взаимодействие с файловой системой, т.е. сохраняет переданные файлы в настроенной папке. - Конфигурация ru.entaxy.esb.deployer.file.system.cfg -[source] ----- -#Корневая папка репозитория -folder.root=/opt/bundle-repository ----- - - -=== Настройка системы - -По умолчанию деплоятся оба бандла и система использует репозиторий File-system. - -Для включения нужного репозитория необходимо оставить включённым бандл того репозитория, который требуется использовать. - -_Пример:_ - По умолчанию включён репозиторий File-system, для включения репозитория Nexus отключаем/удаляем бандл SYSTEM :: ENTAXY :: FILE SYSTEM :: DEPLOYER - - - - - - diff --git a/documentation/core/exception/Centralized-error-handler.adoc b/documentation/core/exception/Centralized-error-handler.adoc deleted file mode 100644 index e4f54a3..0000000 --- a/documentation/core/exception/Centralized-error-handler.adoc +++ /dev/null @@ -1,144 +0,0 @@ -Централизованный обработчик ошибок для формирования кодов ошибок, их синхронного возврата клиенту и для асинхронного дублирования более подробного описания ошибки для клиента и для Центральной Базы Интеграции. - -image::Error-handling-Scheme.jpg[] - -= Установка и настройка - -Установка модуля происходит через фичу: - -* _feature:install error-handler_ - -Фича включена в общий установочный скрипт и будет устанавливаться вместе с остальными модулями. Во время установки фичи в караф копируются файлы конфигурации: - -* _ru.entaxy.esb.error.cfg (основная конфигурация)_ -* _ru.entaxy.esb.error.code.cfg (справочник исключений с маппингом на коды ошибок)_ -* _ru.entaxy.esb.error.text.cfg (справочник кодов ошибок с маппингом на текстовые сообщения)_ - -Есть возможность настройки маппинга уровней журналирования через файл конфигурации ru.entaxy.esb.error.severity.cfg. - -* _ru.entaxy.esb.error.cfg (основная конфигурация)_ - -[source,properties] ----- -# асинхронный пакет с ошибкой отправляется от имени: -# false - системы, вызвавшей ошибку в шине -# true - шины (система с идентификатором "-1") -ru.entaxy.esb.error.bus.always_at_source=false - -# асинхронный пакет с ошибкой в поле description содержит: -# false - сообщение из маппинга в файле ru.entaxy.esb.error.text.cfg -# true - содержит сообщение, сохранённое в исключении -ru.entaxy.esb.error.description.exception_message=true - -# имя очереди для отправки пакета с ошибкой при недоступности системы, указанной в свойстве ru.entaxy.esb.error.system.name -ru.entaxy.esb.error.queue.name=error - -# имя системы для отправки пакета с ошибкой, подразумевается система ЦБИ -ru.entaxy.esb.error.system.name=error - -# true - включает в пакет с ошибкой весь stacktrace исключения -ru.entaxy.esb.error.stacktrace.show=true - -# свойство автоматического запуска тестового маршрута, который при старте модуля бросает исключение java.lang.IllegalArgumentException: Test exception thrown -ru.entaxy.esb.error.test-route.startup=false ----- - -* _ru.entaxy.esb.error.code.cfg (справочник исключений с маппингом на коды ошибок)_ - -Справочник содержит соответствие имён классов исключений и _http_ кодов ошибок. И будет наполняться по мере использования шины в разных ситуациях. Для исключения, имя которого ещё не указано в этом файле, будет возвращаться _http_ код _520 (Unknown Error)._ - -[source,properties] ----- -DefaultException=520 -com.ctc.wstx.exc.WstxParsingException=400 -java.security.AccessControlException=403 -javax.ws.rs.ForbiddenException=403 -ru.onec.esb.system.common.exception.ConnectorNotFound=424 -ru.onec.esb.system.common.exception.DefaultException=520 -ru.onec.esb.system.common.exception.ProfileNotFound=424 -# и т.д. ----- - -* _ru.entaxy.esb.error.text.cfg (справочник кодов ошибок с маппингом на текстовые сообщения)_ - -Если в основной конфигурации свойство _ru.entaxy.esb.error.description.exception_message_ установлено в _false_, то описание ошибки отправляется из этого файла в соответствие с кодом _http_ ошибки. - -[source,properties] ----- -# 1xx: Informational -# 2xx: Success -200=OK - -# 3xx: Redirection -# 4xx: Client Error -400=Bad Request -403=Forbidden -424=Failed Dependency - -# 5xx: Server Error -520=Unknown Error -# и т.д. ----- - -=== Подключение обработчика ошибок - -Для подключения обработчика ошибок к маршрутам какого-либо модуля необходимо выполнить следующие шаги: - -. Добавить в модуль обработки ошибок в директорию _src/main/resources/xslt/operation_ новый _xslt_ для формирования ответа с ошибкой. Файл должен называться по имени операции, для которой будет формироваться ответ. Например _sendToJMS.xsl_. -. Добавить в _camelContext_ аттрибут _errorHandlerRef="commonErrorHandler"_ и внутри зарегистрировать обработчик и политику повторной доставки: - -[source,xml] ----- - - - - - - ----- - -Для контекстов, содержащих конечные точки _cxf_, необходимо: - -через _pom.xml_ импортировать интерцептор для перехвата ошибок (_SoapFault_) - -[source,xml] ----- - - ru.onec.esb.system.core.common.error.handler.interceptor, - ... - ----- - -добавить интерцептор в _cxfEndpoint_ и _bean_ с указанием в первом аргументе идентификатора _camelContext_ - -[source,xml] ----- - - - - - - - - - - - ----- - -в _camelContext_ добавить маршрут - -[source,xml] ----- - - - - - - ----- - - diff --git a/documentation/core/exception/Error-description.adoc b/documentation/core/exception/Error-description.adoc deleted file mode 100644 index 82b3d7f..0000000 --- a/documentation/core/exception/Error-description.adoc +++ /dev/null @@ -1,31 +0,0 @@ -= Использование обработчика ошибок - -Для централизованной обработки ошибок будем использовать “процессор” зарегистрированный через _ - - - - 1 - system - 2 - system - - default - - - ----- - -Пример ответа: - -[source,xml] ----- - - - false - - ----- - - -=== Get - получает запись Permission - -Принимает параметры - -_permissionId_ (long) - идентификатор объекта _permission_ - -Пример запроса: -[source,xml] ----- - - - - 24 - - ----- - -Пример ответа: -[source,xml] ----- - - - - 24 - 7 - system - 8 - system - connect - - - ----- - - -=== GetByAllParams - получает запись Permission - -Принимает параметры - -- _objectId_ (long) - идентификатор объекта, для которого проверяются права -- _objectType_ (String) - тип объекта -- _subjectId_ (String) - идентификатор предмета применяемого права -- _subjectType_ (String) - тип предмета -- _action_ (String) - тип действия, необязательный по умолчанию проставляется значение _default_ - -Пример запроса: -[source,xml] ----- - - - - - 7 - system - 8 - system - - connect - - - ----- - -Пример ответа: -[source,xml] ----- - - - - 24 - 7 - system - 8 - system - connect - - - ----- - - -=== Create - создаёт запись Permission - -Принимает параметры - -- _objectId_ (long) - идентификатор объекта, для которого проверяются права -- _objectType_ (String) - тип объекта -- _subjectId_ (String) - идентификатор предмета применяемого права -- _subjectType_ (String) - тип предмета -- _action_ (String) - тип действия, необязательный по умолчанию проставляется значение _default_ - -Пример запроса: -[source,xml] ----- - - - - - 7 - account - 1234 - system-group - - send - - - ----- - -Пример ответа: -[source,xml] ----- - - - - 25 - 7 - account - 1234 - system-group - send - - - ----- - -В случае если запись уже создана возвращается ошибка -[source,xml] ----- - - - - soap:Server - org.hibernate.exception.ConstraintViolationException: could not execute statement - - - ----- - -=== Update - изменяет запись Permission - -Принимает параметры - -- _permissionId_ (long) - идентификатор объекта permission -- _objectId_ (long) - идентификатор объекта, для которого проверяются права -- _objectType_ (String) - тип объекта, данный параметр соответствует проектной терминалогии: system, system-group -- _subjectId_ (String) - идентификатор предмета применяемого права -- _subjectType_ (String) - тип предмета -- _action_ (String) - тип действия, необязательный по умолчанию проставляется значение _default_ - -Пример запроса: -[source,xml] ----- - - - - - 23 - 8 - account - 1234 - system-group - - send - - - ----- - - -Пример ответа: -[source,xml] ----- - - - - 23 - 8 - account - 1234 - system-group - send - - - ----- - -В случае если запись не найдена возвращается ошибка -[source,xml] ----- - - - - soap:Server - No entity found for query - - - ----- - - -=== _Delete_ - удаляет запись _Permission_ - -Принимает параметры - -- _objectId_ (long) - идентификатор объекта, для которого проверяются права -- _objectType_ (String) - тип объекта -- _subjectId_ (String) - идентификатор предмета применяемого права -- _subjectType_ (String) - тип предмета -- _action_ (String) - тип действия, необязательный по умолчанию проставляется значение _default_ - -Пример запроса: -[source,xml] ----- - - - - - 7 - account - 1234 - system-group - - send - - - ----- - -Пример ответа: -[source,xml] ----- - - - true - - ----- - -В случае если запись не найдена возвращается ошибка -[source,xml] ----- - - - - soap:Server - No entity found for query - - - ----- - diff --git a/documentation/core/route_packet.png b/documentation/core/route_packet.png deleted file mode 100644 index bd6ad04..0000000 Binary files a/documentation/core/route_packet.png and /dev/null differ diff --git a/documentation/core/schema/Schema.adoc b/documentation/core/schema/Schema.adoc deleted file mode 100644 index 440476b..0000000 --- a/documentation/core/schema/Schema.adoc +++ /dev/null @@ -1,462 +0,0 @@ -= Sсhema - -Есть три типа ресурсов, которые можно загружать в шину и использовать в маршрутах: - -. Валидационные типы ресурсов (нпрм xsd). Необходимы для валидации сообщения на соответствие той или иной схеме. -. Трансформационные типы ресурсов (нпрм xslt, amd). Необходимы для трасформации сообщений из одной схемы в другую. -. Ресурсы используемые для генерации сервисов (нпрм wsdl). Необходимы для поднятия сервиса на шине. - -Для загрузки трансформационных ресурсов необходимо указывать, является ли данный трансформатор конвертором и схему-источник и схему-результат для неявного преобразования сообщения(конвертор может быть один и только один для пары: схема источник, схема результат) -Схему-источник и схему-результат необходимо указывать только для конверторов, используемых в неявных преобразованиях - -Желательно указывать или определять схему для коннектора, если предполагается использовать функционал неявных преобразований. Неявное преобразование будет работать, если: - -- в заголовке указана схема-источник -- в заголовке указана схема-приемник -- в реестре есть конвертор для этой пары схем - -Указание схемы может попадать в заголовок неявно (из свойств коннектора или из тела сообщения) или явно через медиатор. - -== Схема работы с ресурсами. - -Сначала загружаем сам ресурс в шину, который мы будем использовать в маршрутах. - -Загружаем ресурс и получаем id, с помощью которого можно и _нужно_ добавить служебную информацию! -Также можно перезагрузить данный ресурс и удалять его из шины. - -Также можно загружать служебную информацию, такую как название ресурса, его расширение и т д. -Выгружать весь список ресурсов, и по отдельности выкачивать сам ресурс для анализа. -Также использовать различные сортировки для поиска определенного типа ресурс. - -== Руководство по загрузке ресурсов в шину. - -*LoadResource.* - -Для загрузки ресурса в шину нужно использовать метод loadResource. - -параметры: - -- resourceValue - сам ресурс, в формате base64 - -[source,xml] ----- - - - - - - - ----- - -ответ -[source,xml] ----- - - - 1 - - ----- - -*GetResource.* - -Для выгрузки заранее загруженного ресурса в шину нужно использовать метод getResource. - -параметры: - -- getResourceRequest - id ресурса, который вернулся при вызове метода LoadResource - -[source,xml] ----- - - - - 1 - - ----- - -ответ - -параметры: - -- id - это id ресурса -- createdDate - дата создания ресурса -- createdBy - логин, загрузивший ресурс в шину -- editedDate - дата перезагрузки ресурса -- editedBy - логин, перезагрузивший ресурс в шине -- resourceValue - сам ресурс, в формате base64 - -[source,xml] ----- - - - - 1 - 12/15/20, 1:11 AM - 12/15/20, 1:11 AM - 12/15/20, 1:18 AM - 12/15/20, 1:18 AM - - - - ----- - -*ReloadResource.* - -Для перезагрузки ресурса в шину есть метод reloadResource. - -параметры: - -- id - id ресурса, который вернулся при вызове метода LoadResource -- resourceValue - сам ресурс, в формате base64 - -[source,xml] ----- - - - - 1 - - - - ----- - -ответ -[source,xml] ----- - - - 1 - - ----- - -*RemoveResource.* - -Для удаления ресурса в шине есть метод removeResource. - -параметры: - -- id - id ресурса, который вернулся при вызове метода LoadResource - -[source,xml] ----- - - - - 1 - - ----- - -ответ -[source,xml] ----- - - - 1 - - ----- - -*LoadResourceInfo.* - -Для загрузки мета информации ресурса в шине есть метод loadResourceInfo. - -параметры: - -- idResource - id ресурса, который вернулся при вызове метода LoadResource -- name - имя ресурса вместе с расширением -- version - версия ресурса -- description - описание ресурса -- convertor - является ли ресурс конвертором из одной схемы в другую -- namespace - входное пространство имен -- namespaceOut - выходное пространство имен, используется для трансформаций из одной схемы в другую - -[source,xml] ----- - - - - lama.xsd - 1 - 1.0 - lama test - false - http:lama.xsd - l - - - ----- - -ответ -[source,xml] ----- - - - 1 - - ----- - -*GetResourceInfo.* - -Для получения мета информации ресурса в шине есть метод getResourceInfo. - -параметры: - -- getResourceInfoRequest - id мета информации ресурса, который вернулся при вызове метода LoadResourceInfo - - -[source,xml] ----- - - - - 1 - - ----- - -ответ - -параметры: - -- id - id мета информации ресурса, который вернулся при вызове метода LoadResourceInfo -- idResource - id ресурса, который вернулся при вызове метода LoadResource -- name - имя ресурса вместе с расширением -- version - версия ресурса -- description - описание ресурса -- convertor - является ли ресурс конвертором из одной схемы в другую -- namespace - входное пространство имен -- namespaceOut - выходное пространство имен, используется для трансформаций из одной схемы в другую -- createdDate - дата создания мета информации ресурса -- createdBy - логин, загрузивший мета информацию ресурса в шину -- editedDate - дата перезагрузки мета информации ресурса -- editedBy - логин, перезагрузивший мета информацию ресурса в шине - -[source,xml] ----- - - - - 14 - lama.xsd - 14 - 1.0 - lama test - false - http:lama.xsd - false - ? - 12/15/20, 1:33 AM - ? - 12/15/20, 1:35 AM - - - ----- - -*EditResourceInfo.* - -Для корректирования мета информации ресурса в шине есть метод еditResourceInfo. - -параметры: - -- id - id мета информации ресурса, который вернулся при вызове метода LoadResourceInfo -- idResource - id ресурса, который вернулся при вызове метода LoadResource -- name - имя ресурса вместе с расширением -- version - версия ресурса -- description - описание ресурса -- convertor - является ли ресурс конвертором из одной схемы в другую -- namespace - входное пространство имен -- namespaceOut - выходное пространство имен, используется для трансформаций из одной схемы в другую - -[source,xml] ----- - - - - 1 - lama.xsd - 1 - 1.0 - lama test - false - http:lama.xsd - l - - - ----- - -ответ - -[source,xml] ----- - - - 14 - - ----- - -*RemoveResourceInfo.* - -Для удаления мета информации ресурса в шине есть метод removeResourceInfo. - -параметры: - -- id - id мета информации ресурса, который вернулся при вызове метода LoadResourceInfo - -[source,xml] ----- - - - - 1 - - ----- - -ответ - -[source,xml] ----- - - - 1 - - ----- - -*GetResourceInfoList.* - -Для получения списка мета информации ресурсов в шине есть метод getResourceInfoList. - -[source,xml] ----- - - - - - - ----- - -ответ - -[source,xml] ----- - - - - - 1 - lama.xsd - 1 - 1.0 - lama test - false - http:lama.xsd - l - ? - 12/14/20, 10:00 PM - - - - ----- - -*GetResourceInfoListByName.* - -Для получения списка мета информации ресурсов по имени ресурса в шине есть метод getResourceInfoListByName. - -параметры: - -- name - часть имени мета информации ресурса - -[source,xml] ----- - - - - - .xsd - - - ----- - -ответ - -[source,xml] ----- - - - - - 1 - lama.xsd - 1 - 1.0 - lama test - false - http:lama.xsd - l - ? - 12/14/20, 10:00 PM - - - - ----- - -*GetResourceInfoListByNamespace.* - -Для получения списка мета информации ресурсов по namespace ресурса в шине есть метод getResourceInfoListByNamespace. - -параметры: - -- namespace - часть namespace мета информации ресурса - -[source,xml] ----- - - - - - lama - - - ----- - -ответ - -[source,xml] ----- - - - - - 1 - lama.xsd - 1 - 1.0 - lama test - false - http:lama.xsd - l - ? - 12/14/20, 10:00 PM - - - - ----- \ No newline at end of file diff --git a/documentation/core/screenshots/screenshot_artemis_1.png b/documentation/core/screenshots/screenshot_artemis_1.png deleted file mode 100644 index ecc4260..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_1.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_10.png b/documentation/core/screenshots/screenshot_artemis_10.png deleted file mode 100644 index df0962f..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_10.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_2.png b/documentation/core/screenshots/screenshot_artemis_2.png deleted file mode 100644 index 0c36f8c..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_2.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_3.png b/documentation/core/screenshots/screenshot_artemis_3.png deleted file mode 100644 index 7e20da4..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_3.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_4.png b/documentation/core/screenshots/screenshot_artemis_4.png deleted file mode 100644 index d84f7f8..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_4.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_5.png b/documentation/core/screenshots/screenshot_artemis_5.png deleted file mode 100644 index 41f337a..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_5.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_6.png b/documentation/core/screenshots/screenshot_artemis_6.png deleted file mode 100644 index 61631e8..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_6.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_7.png b/documentation/core/screenshots/screenshot_artemis_7.png deleted file mode 100644 index db3c894..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_7.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_8.png b/documentation/core/screenshots/screenshot_artemis_8.png deleted file mode 100644 index 07bbebf..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_8.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_artemis_9.png b/documentation/core/screenshots/screenshot_artemis_9.png deleted file mode 100644 index 4d9e1f3..0000000 Binary files a/documentation/core/screenshots/screenshot_artemis_9.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_1.png b/documentation/core/screenshots/screenshot_hawtio_1.png deleted file mode 100644 index b13d15e..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_1.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_2.png b/documentation/core/screenshots/screenshot_hawtio_2.png deleted file mode 100644 index 0ec0442..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_2.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_3.png b/documentation/core/screenshots/screenshot_hawtio_3.png deleted file mode 100644 index d753892..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_3.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_4.png b/documentation/core/screenshots/screenshot_hawtio_4.png deleted file mode 100644 index 62905ba..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_4.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_5.png b/documentation/core/screenshots/screenshot_hawtio_5.png deleted file mode 100644 index 62905ba..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_5.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_6.png b/documentation/core/screenshots/screenshot_hawtio_6.png deleted file mode 100644 index 18d9a7c..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_6.png and /dev/null differ diff --git a/documentation/core/screenshots/screenshot_hawtio_7.png b/documentation/core/screenshots/screenshot_hawtio_7.png deleted file mode 100644 index dcbad9b..0000000 Binary files a/documentation/core/screenshots/screenshot_hawtio_7.png and /dev/null differ diff --git a/documentation/core/system-managment/Users-manual-System-management.adoc b/documentation/core/system-managment/Users-manual-System-management.adoc deleted file mode 100644 index da173ff..0000000 --- a/documentation/core/system-managment/Users-manual-System-management.adoc +++ /dev/null @@ -1,836 +0,0 @@ -= Руководство по управлению коннекторами и профилями в шине. - -_Профиль(profile)_ - это описание внешней системы в шине.(Например s1). - -_Мостовой профиль(bridge-profile)_ - это профиль на другой стороне шины, ведущий через мост в профиль. -(Например s1) - -_Коннектор(connector)_ - это связь между интерфейсом, через который может работать система, и профилем.(Например uniform-service, nsi) - -_Доступ(permission)_ - это разрешение на взаимодействие двух систем.(Например для того чтобы система s1 смогла отправить сообщение s2)(/permission-management) - -_Учетная запись(account)_ - это учетная запись системы для взаимодействия с шиной. -Для каждой системы должна быть учетная запись для возможности отправления сообщений в шину. -Также есть учетные записи для возможности взаимодействия с управленческим слоем(т. е. для того чтобы управлять коннекторами/профилями/учетными записями/топиками нужна учетная запись с соответствующими правами)(/basic-auth-management) - -Коннекторы делятся на входящие и исходящие(in, out), которые отвечают за отправку сообщения в определенный интерфейс и на получение ответа из определенного интерфейса соответственно. -Например, для того чтобы иметь возможность отправить сообщение в soap нужно создать коннектор uniform-service-in-connector, а для того чтобы получить сообщение из soap нужно создать коннектор uniform-service-out-connector. - -По адресу _/system-management-service_ находится сам сервис управления коннекторами и профилями в шине. - -Для работы внешней системы в шине нужно сначала создать профиль данной системы в шине, потом добавлять к нему необходимые коннекторы и пробрасывать его в необходимые шины. - -=== Управление профилями - -*СreateProfile.* - -Для создания профиля системы нужно вызвать метод createProfile, где вместо “system_uuid” нужно подставить uuid системы, вместо “system_name” - имя системы, “description” описание системы: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - - {{description}} - - - - ----- - -Где ответом будет (“true” - если профиль успешно создался, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*GetProfile.* - -Проверить созданный профиль можно с помощью метода getProfile, где вместо “system_uuid” нужно подставить uuid системы: - -[source,xml] ----- - - - - - {{system_uuid}} - - - ----- - -Где ответом будет (профиль со всеми зависимостями, либо ошибка и ее описание): - -[source,xml] ----- - - - - w6 - w6 - description - 2020-01-22+03:00 - System - false - ACTIVE - - - - - ----- - -*GetProfiles* - -Получить список профилей, зарегистрированных в шине, можно с помощью метода getProfiles: - -[source,xml] ----- - - - - - - ----- - -Где ответом будет (список профилей со всеми зависимостями, либо ошибка и ее описание): - -[source,xml] ----- - - - - - w6 - w6 - description - 2020-01-22+03:00 - System - false - ACTIVE - - - - - - ----- - -*StopProfile* - -Остановить профиль и все его зависимости можно с помощью метода stopProfile, где вместо “system_uuid” нужно подставить uuid системы: - -[source,xml] ----- - - - - - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если профиль и его зависимости успешно остановились, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*StartProfile* - -Запустить профиль и все его зависимости можно с помощью метода startProfile, где вместо “system_uuid” нужно подставить uuid системы: - -[source,xml] ----- - - - - - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если профиль успешно запустился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*RemoveProfile* - -Удалить профиль и все его зависимости можно с помощью метода removeProfile, где вместо “system_uuid” нужно подставить uuid системы(ВНИМАНИЕ! -При удалении профиля также удаляются все связанные с ним коннекторы): - -[source,xml] ----- - - - - - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если профиль и его зависимости успешно удалился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -=== Управление коннекторами - -*GetTemplates* - -Для создания коннектора в шине нужно получить список шаблонов(требуются для создания коннекторов) методом getTemplates: - -[source,xml] ----- - - - - - - ----- - -Где ответом будет (список шаблонов с параметрами): - -[source,xml] ----- - - - - - - - - - - ----- - -*GetTemplate* - -Для создания коннектора в шине нужно получить список шаблонов(требуются для создания коннекторов) методом getTemplate, где “template_name” имя шаблона по которому будет сделан коннектор: - -[source,xml] ----- - - - - - {{template_name}} - - - ----- - -Где ответом будет (шаблон с параметрами): - -[source,xml] ----- - - - - - ----- - -*СreateConnector* - -Для создания коннектора в шине нужно вызвать метод createConnector, где templateName - это имя шаблона, полученное из метода getTemplates, system_uuid - это uuid профиля, зарегистрированного в системе ранее, также нужно заполнить список параметров необходимый для создания коннектора(ВНИМАНИЕ! если не заполнить список параметров, то установятся значения по умолчанию) : - -[source,xml] ----- - - - - - {{template_name}} - {{system_uuid}} - - - - - - ----- - -Где ответом будет (“true” - если коннектор успешно создался, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*GetConnectors* - -Можно просматривать список подключенных коннекторов в шине методом getConnectors: - -[source,xml] ----- - - - - - - ----- - -Где ответом будет (список коннкторов с параметрами): - -[source,xml] ----- - - - - - nsi-in-connector-w6 - ACTIVE - - - - - ----- - -*StartConnector* - -Запустить коннектор можно с помощью метода startConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона: - -[source,xml] ----- - - - - - {{template_name}} - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если коннектор успешно запустился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*StopConnector* - -Остановить коннектор можно с помощью метода stopConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона: - -[source,xml] ----- - - - - - {{template_name}} - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если коннектор успешно остановилась, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*RemoveConnector* - -Удалить коннектор можно с помощью метода removeConnector, где вместо “system_uuid” нужно подставить uuid системы, “template_name” это имя шаблона: - -[source,xml] ----- - - - - - {{template_name}} - {{system_uuid}} - - - ----- - -Где ответом будет (“true” - если коннектор успешно удалился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -=== Управление мостовыми профилями - -*GetListEsb* - -Для получения списка подключенных шин можно с помощью метода getListEsb: - -[source,xml] ----- - - - - - - ----- - -Где ответом будет (список подключенных шин, ошибка и ее описание): - -[source,xml] ----- - - - - test1 - - - ----- - -*CreateBridgeProfile* - -Создать профиль, ведущий на мост, можно с помощью метода createBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - {{esb_name}} - - - ----- - -Где ответом будет (“true” - если профиль, ведущий на мост, успешно создался, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*StopBridgeProfile* - -Остановить профиль, ведущий на мост, можно с помощью метода stopBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - {{esb_name}} - - - ----- - -Где ответом будет (“true” - если профиль, ведущий на мост, успешно остановился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*StartBridgeProfile* - -Запустить профиль, ведущий на мост, можно с помощью метода startBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - {{esb_name}} - - - ----- - -Где ответом будет (“true” - если профиль, ведущий на мост, успешно запустился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*GetBridgeProfile* - -Получить профиль, ведущий на мост, можно с помощью метода getBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - {{esb_name}} - - - ----- - -Где ответом будет (профиль, ведущий на мост, пустой ответ): - -[source,xml] ----- - - - - w6 - ACTIVE - test1 - - - ----- - -*RemoveBridgeProfile* - -Удалить профиль, ведущий на мост, можно с помощью метода removeBridgeProfile, где “system_uuid” uuid системы, “esb_name” имя подключенной шины: - -[source,xml] ----- - - - - - {{system_uuid}} - {{system_uuid}} - {{esb_name}} - - - ----- - -Где ответом будет (“true” - если профиль, ведущий на мост, успешно удален, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*GetBridgeProfiles* - -Для получения списка профилей, ведущих на мост, можно использовать метод getBridgeProfiles:(ВНИМАНИЕ! запрос покажет список проброшенных профилей на ТЕКУЩЕЙ шине) - -[source,xml] ----- - - - - - - ----- - -Где ответом будет (список профиль, ведущих на мост, пустой ответ): - -[source,xml] ----- - - - - - w6 - ACTIVE - test1 - - - - ----- - -=== Управление доступами - -*CreatePermission* - -Создать доступ одной системы к другой, можно с помощью метода createPermission, где “objectUuid” uuid системы, которой нужно дать доступ, “subjectUuid” - uuid системы, к которой нужно дать доступ: - -[source,xml] ----- - - - - - {{objectUuid}} - {{subjectUuid}} - - - ----- - -Где ответом будет (“true” - если доступ, успешно создался, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*RemovePermission* - -Удалить доступ одной системы к другой, можно с помощью метода removePermission, где “objectUuid” uuid системы, которой нужно дать доступ, “subjectUuid” - uuid системы, к которой нужно дать доступ: - -[source,xml] ----- - - - - - {{objectUuid}} - {{subjectUuid}} - - - ----- - -Где ответом будет (“true” - если доступ, успешно удалился, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*GetPermissionsByObject* - -Получить список систем, доступ к которым от данной системы разрешен, можно с помощью метода getPermissionByObject, где “objectUuid” uuid системы: - -[source,xml] ----- - - - - - {{objectUuid}} - - - ----- - -Где ответом будет (список систем, которым данная система может отправлять сообщения, ошибка и ее описание): - -[source,xml] ----- - - - - - r2 - - - active - - - - ----- - -*GetPermissionsBySubject* - -Получить список систем, доступ которым разрешен к данной системе, можно с помощью метода getPermissionBySubject, где “subjectUuid” uuid системы: - -[source,xml] ----- - - - - - {{subjectUuid}} - - - ----- - -Где ответом будет (список систем, для которых данная система доступна для отправки сообщений, ошибка и ее описание): - -[source,xml] ----- - - - - - r2 - - - - ----- - -*CreatePermissionForObjectRequest* - -Создать сразу несколько доступов, которым разрешено отправлять сообщения от данной системы, можно с помощью метода сreatePermissionForObjectRequest, где “objectUuid” это uuid системы, от которой буду исходить сообщения, ‘“subjectUuid1”, “subjectUuid2” и т д, это uuid систем, которым будут отправлять сообщения: - -[source,xml] ----- - - - - - {{objectUuid}} - - {{subjectUuid1}} - {{subjectUuid2}} - - - ----- - -Где ответом будет (“true” - если доступа, успешно создались, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- - -*CreatePermissionForSubjectRequest* - -Создать сразу несколько доступов, которым разрешено отправлять сообщения в данную систему, можно с помощью метода сreatePermissionForSubjectRequest, где “objectUuid1”, “objectUuid2” и т д - это uuid систем, от которых буду исходить сообщения, ‘“subjectUuid” - это uuid системы, которой будут отправлять сообщения: - -[source,xml] ----- - - - - - - {{objectUuid1}} - {{objectUuid2}} - {{subjectUuid}} - - - ----- - -Где ответом будет (“true” - если доступа, успешно создались, ошибка и ее описание): - -[source,xml] ----- - - - true - - ----- diff --git a/documentation/core/topic/Scheme_of_work_notifications(events).png b/documentation/core/topic/Scheme_of_work_notifications(events).png deleted file mode 100644 index 615c61f..0000000 Binary files a/documentation/core/topic/Scheme_of_work_notifications(events).png and /dev/null differ diff --git a/documentation/core/topic/Topic-management-Rest-service.adoc b/documentation/core/topic/Topic-management-Rest-service.adoc deleted file mode 100644 index 33b82fb..0000000 --- a/documentation/core/topic/Topic-management-Rest-service.adoc +++ /dev/null @@ -1,555 +0,0 @@ -= Rest сервис Topic-management - -=== Rest сервис для работы с топиками. - -Сервис состоит из 2-х контекстов: - -- _topic-management_ - управление топиками (создание/изменение/удаление) -- _topic-subscription_ - клиентский сервис подписки и публикации сообщения - -При смене контекста в конфигурационных файлах требуется перераздать права на данный сервис. - -Схема работы подписок - -image::Topic_publish_diagram.png[] - -Схема работы нотификаций - -image::Scheme_of_work_notifications(events).png[] - -=== Права - -Право доступа в сервис _topic-management_ - -Для доступа к сервису _topic-management_ у аккаунта должно быть право доступа в данный сервис. - -По умолчанию право на доступ к сервису есть у пользователя _admin_. - -Используя данного пользователя в сервисе _permission-management_ можно раздать права на аккаунты систем. - -Параметры для выдачи аккаунту прав на сервис: - -- _objectId_: идентификатор учётной записи -- _objectType_: account -- _subjectId_: topic-management -- _subjectType_: service - -Право manage сервиса _topic-subscription_ - -Для доступа к менеджерским функциям сервиса _topic-subscription_ у аккаунта должно быть право manage - данное право открывает доступ к управлению подписками. - -Функционал управления подписками реализован в методах _subscribe_ и _unsubscribe_, пример использования приведён в подпунктах “Массовая обработка при наличии права manage для данного сервиса”. - -Параметры для выдачи аккаунту права _manage_: - -- _objectId_: идентификатор учётной записи -- _objectType_: account -- _subjectId_: topic-subscription -- _subjectType_: service -- _action_: manage - -=== Конфигурационные файлы - -Конфигурационные файлы по умолчанию хранятся в папке сервера \etc\ - -- _ru.entaxy.esb.system.event.handler.cfg_ - -[source,properties] ----- -# максимальное колчичество попыток отправить сообщение в очередь -# почитать подробнее можно в https://camel.apache.org/components/latest/eips/dead-letter-channel.html#deadLetterChannel-Redelivery -redelivery.maximumRedeliveries=-1 -# время между попытками отправить сообщение в очередь -redelivery.redeliveryDelay=5000 - -#cron - по умолчанию запускается каждые 00:00:00, -#cron выражение использует знак "+" как разделитель для модуля quartz2l -quartz.job.clean.cron=0+0+0+*+*+?+* ----- - -- _ru.entaxy.esb.system.event.rest.cfg_ - -[source,properties] ----- -service.host=http://0.0.0.0 - -service.port.management=9090 -#Рутовый контекст управляющего сервиса, при изменении требуется перераздать права для данного сервиса -service.root.path.management=/topic-management - -service.port.subscription=9092 -#Рутовый контекст клиентского сервиса, при изменении требуется перераздать права для данного сервиса -service.root.path.subscription=/topic-subscription ----- - -=== Методы topic-management: - -- _create_ - создать топик -При создании и изменении топика, есть возможность передать списки систем, которым доступна подписка или публикация в данном топике. - -Запрос: - -_POST server:9090/topic-management/create_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews", - "possibleSubscribers" : ["systemUuid1", "systemUuid2"], - "possiblePublishers" : ["systemUuid3", "systemUuid4"] -} ----- - -Ответ: - -Статус 201 - -Тело -[source,json] ----- -{ - "title": "Topic created", - "topicName": "", - "subscriberErrors": { - "systemNotFound": [ - "" - ] - }, - "publisherErrors": { - "systemNotFound": [] - } -} ----- - -- update - изменить топик (название не меняется, так как на него завязана сама очередь в брокере) - -Запрос: - -_POST server:9090/topic-management/update_ - -Тело - -[source,json] ----- -{ - "topicName": "boomNews", - "possibleSubscribers" : ["systemUuid1", "systemUuid2"], - "possiblePublishers" : ["systemUuid3", "systemUuid4"] -} ----- - -Ответ: - -Статус 201 - -Тело -[source,json] ----- -{ - "title": "Topic updated", - "topicName": "", - "subscriberErrors": { - "systemNotFound": [ - "" - ] - }, - "publisherErrors": { - "systemNotFound": [] - } -} ----- - -- delete - топик помечается как удалённый - -Запрос: - -_POST server:9090/topic-management/delete_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews" -} ----- - -Ответ: - -Статус 200 - -Тело -[source,json] ----- -{ - "title": "Topic deleted", - "topicName": "" -} ----- - - -- clean - очистка хранилища топиков - -Окончательное удаление топиков, помеченных как удалённые. - -Запрос: - -_POST server:9090/topic-management/clean_ - -Ответ: - -Статус 200 - -Тело -[source,json] ----- -{ - "title": "Cleaned", - "topicDeleted": "" -} ----- - - -=== Методы topic-subscription: - -- _subscribe_ - подписаться на топик - -Запрос: - -_POST server:9090/topic-subscription/subscribe_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews", - "subscriptionType": "PUSH" -} ----- - -Ответ: - -Статус 201 - -Тело -[source,json] ----- -{ - "title": "Subscription created", - "topicName": "", - "systemName": "", - "subscriptionType": "" -} ----- - -=== Массовая обработка при наличии права manage для данного сервиса. - -- _subscribe_ - подписаться на топик - -Запрос: - -_POST server:9092/topic-subscription/subscribe_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews", - "systemUuids": [ - { - "systemUuid": "NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN", - "subscriptionType": "PUSH" - }, - { - "systemUuid": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX", - "subscriptionType": "PULL" - }, - { - "systemUuid": "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY", - "subscriptionType": "PULL" - } - ] -} ----- - -Ответ: - -Статус 200 - -Тело -[source,json] ----- -[ - { - "title": "Internal Server Error", - "detail": "System not found NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN", - "reason": "javax.persistence.NoResultException: No entity found for query" - }, - { - "title": "Subscription created", - "topicName": "ooooo111-ff6e-4219-a878-bff120c495f1", - "systemUUID": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX", - "subscriptionType": "PULL" - }, - { - "title": "Forbidden", - "detail": "No permission to subscribe for system YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY" - } -] ----- - - -- _unsubscribe_ - отписаться от топика - -Запрос: - -_POST server:9090/topic-subscription/unsubscribe_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews" -} ----- - -Ответ: - -Статус 200 - -Тело -[source,json] ----- -{ - "title": "Subscription deleted", - "topicName": "", - "systemName": "" -} ----- - -=== Массовая обработка при наличии права manage для данного сервиса. - -Запрос: - -_POST server:9092/topic-subscription/unsubscribe_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews", - "systemUuids": [ - { - "systemUuid":"NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN", - "subscriptionType": "PUSH" - }, - { - "systemUuid": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX", - "subscriptionType": "PULL" - }, - { - "systemUuid": "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY", - "subscriptionType": "PULL" - } - ] -} ----- - -Ответ: - -Статус 200 - -Тело -[source,json] ----- -[ - { - "title": "Internal Server Error", - "detail": "System not found NNNNNNNN-NNNN-NNNN-NNNN-NNNNNNNNNNNN", - "reason": "javax.persistence.NoResultException: No entity found for query" - }, - { - "title": "Subscription deleted", - "topicName": "ooooo111-ff6e-4219-a878-bff120c495f1", - "systemUUID": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX" - }, - { - "title": "Subscription not found", - "topicName": "ooooo111-ff6e-4219-a878-bff120c495f1", - "systemUUID": "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY" - } -] ----- - -- _publish_ - опубликовать событие - -Запрос: - -_POST server:9090/topic-subscription/publish_ - -Тело -[source,json] ----- -{ - "topicName": "boomNews", "message": "messageText2" -} ----- - - Ответ: - Статус 200 - Тело - { - "title": "Message published", - "topicName": "" - } - -=== Примеры ответов при ошибке - -- _Передан некорректный JSON или логин не определён_ - -Статус 400 - -Тело -[source,json] ----- -{ - "title": "Incorrect input parameters", - "detail": "Cannot parse incoming JSON or login/system not defined" -} ----- - -- _Подписка не найдена_ - -Статус 404 - -Тело -[source,json] ----- -{ - "title": "Subscription not found", - "topicName": "${exchangeProperty.topicName}", - "systemUUID": "${header.X-SystemUuid}" -} ----- - -- _Топик не зарегистрирован_ - -Статус 400 - -Тело -[source,json] ----- -{ - "title": "Topic not registered", - "topicName": "${exchangeProperty.topicName}" -} ----- - -- _Система не найдена_ - -Статус 500 - -Тело -[source,json] ----- -{ - "title": "Internal Server Error", - "detail": "System not found ${header.X-SystemUuid}", - "reason": "${exception.stacktrace}" -} ----- - -- _Неизвестный тип подписки_ - -Статус 500 - -Тело -[source,json] ----- -{ - "title": "Internal Server Error", - "detail": "Unknown subscription type ${exchangeProperty.subscriptionType}", - "reason": "${exception.stacktrace}" -} ----- - -- _Нет прав на выполнение запрошенной операции_ - -Статус 403 - -Тело -[source,json] ----- -{ - "title": "Forbidden", - "detail": "No permission to subscribe" -} ----- - -- _Неизвестная ошибка_ - -Статус 500 - -Тело -[source,json] ----- -{ - "title": "Internal Server Error", - "detail": "Unknown exception", - "reason": "${exception.stacktrace}" -} ----- - -== Работа модуля топиков в кластере - -=== Подписки - -*PULL подписки не реализованы!* - -Для реализации подписки используются _durable shareable_ подписчики _Apache Artemis_ топиков, а для доставки сообщений из топиков создаются специальные маршруты отправляющие сообщения в подписанную систему(PUSH-подписка). При работе в кластере системой создаются дублирующие маршруты на каждом узле, которые работают в конкурентном режиме, т.е. при падении одного из узлов доставка сообщений будет производиться оставшимися узлами. - -Работа в кластере обеспечивается через компоненты _Apache Felix Event Admin_, реализующий рассылку служебных событий по топикам внутри узла, -и _Apache Karaf Cellar_ с интеграцией с _Event Admin_, реализующий рассылку данного события по всем узлам кластера. При создании/удалении подписки система создаёт соответствующее событие и отправляет в специальный топик _subscription_, далее подписчики на всех узлах, входящих в кластер, получают и обрабатывают данное событие. - -=== Настройки - -Настройки производятся на любом узле либо на мастер узле, в зависимости от настроек кластера. - -Для синхронизации топика _subscription_ в конфигурационном файле _org.apache.karaf.cellar.groups.cfg_, нужно добавить строки: - -[source,properties] ----- - default.event.blacklist.inbound = none - default.event.blacklist.outbound = none - default.event.whitelist.inbound = subscription - default.event.whitelist.outbound = subscription ----- - -Далее если _Apache Karaf Cellar_ настроен правильно, то конфигурационные файлы _org.apache.karaf.cellar.groups.cfg_ должны синхронизироваться и строки, представленные выше, появятся на всех узлах. - -Если синхронизация конфигурационных файлов не проходит, можно проверить статус _cellar_ продюсера командой: - - cluster:producer-status - -если выключен, то можно включить командой: - - cluster:producer-start - -=== Удаление топиков - -Удаление топиков происходит в 2 этапа - -- При вызове метода _delete_ топик помечается в БД, как удалённый - -- По расписанию запускается задача (по умолчанию раз в сутки в 00:00), которая удаляет топик окончательно вместе с подписками, правами и консьюмерами. -Либо очистка запускается вручную вызовом метода _clean_ сервиса _topic-management_ - -Если до очистки системы изменить топик помеченный как удалённый или попытаться создать его заново, то восстановится старый топик - -=== Плановая задача по очистке топиков - -Т.к. удаление топиков происходит в 2 этапа, с помощью планировщика _Quartz2_, работающего в кластере, запускается задача по очистке. Запуск происходит в конкурентном режиме, узел первый запустивший задачу получает приоритет, на остальных узлах задача останавливается до следующего запуска. - -Частота запуска задачи настраивается в конфигурационном файле _ru.entaxy.esb.system.event.handler.cfg_ в свойстве quartz.job.clean.cron=0+0+0+*+*+?+* -с помощью cron выражения. Особенность cron выражения для quartz в том что “++” используется, как разделитель. - diff --git a/documentation/core/topic/Topic_publish_diagram.png b/documentation/core/topic/Topic_publish_diagram.png deleted file mode 100644 index 5b1bc1d..0000000 Binary files a/documentation/core/topic/Topic_publish_diagram.png and /dev/null differ diff --git a/documentation/extras/eav.adoc b/documentation/extras/eav.adoc deleted file mode 100644 index 2d23c1b..0000000 --- a/documentation/extras/eav.adoc +++ /dev/null @@ -1,171 +0,0 @@ -= Хранилище данных EAV - -== Описание модуля EXTRAS :: ENTAXY :: EAV (Entity, Attribute, Value) - -Хранилище данных EAV реализует модель _Сущность-Атрибут-Значение_ - это модель данных, предназначенная для описания сущностей, в которых количество атрибутов (свойств, параметров) не ограничено или не известно заранее. - - -== Объекты модуля ЕАV - -image::eav_objects.png[] - -*Внешняя сущность*(External Entity) - любая внешняя сущность относительно модуля EAV. - -*Сущность EAV*(Entity EAV) - именованная сущность, связывающая аттрибуты с внешней сущностью. - Модуль предоставляет возможность объединять сущности EAV в одноуровневую иерархию. - -*Атрибут*(Attribute) - именованный атрибут сущности EAV, содержит значение и его тип. - -*Типы значений:* - -* DOUBLE -* LONG -* TEXT -* JSON - - - - -== Использование хранилища EAV - -В BLUEPRINT подключаем OSGI-сервис EAVProcessor -[source] ----- - ----- - -в маршрутах или java коде осуществляем необходимые вызовы для создания/получения/изменения значений. - -*Примеры вызовов из маршрута Apache Camel XMLDSL* - -Создание атрибута для внешней сущности -[source] ----- - ----- - -Получить все значения сохранённой сущности -[source] ----- - ----- - -Удалить сохранённые значения -[source] ----- - ----- - - - -== OSGI-сервис EAVProcessor. -Сервис, выставляющий api для работы с EAV хранилищем. - - - -*Методы:* - -* _createPrimitive_ - простой метод сохранения примитивного значения(числового, строкового) -* _createComplex_ - простой метод сохранения комплексного значения(JSON) -* _getEntityWithValues_ - получение значений сущности EAV по имени -* _fetchEntityWithValues_ - получение значений сущности EAV по имени либо null, без исключений -* _getEntityNamedAttributes_ - получение значений с определённым именем для сущности EAV -* _getEntityByNameAndAttributeValue_ - получение сущности EAV по атрибуту -* _getParentEntity_ - получение родительской сущности EAV для внешней связанной сущности -* _getChildEntities_ - получение дочерних сущностей EAV для внешней связанной сущности с именем сущности EAV по умолчанию(PARENT) -* _getChildEntitiesByName_ - получение дочерних сущностей EAV для внешней связанной сущности с указанным именем сущности EAV -* _getByExternalEntity_ - получение всех сущностей EAV для внешней связанной сущности -* _getByAttributeSet_ - получение сущностей EAV по множественным наборов параметров, каждый набор составляется из значений элементов с одним порядковым номером всех списков -* _updateAttribute_ - метод для изменения значения аттрибута -* _deleteExternalEntity_ - удаление всех записей связанных с внешней сущностью -* _deleteEntity_ - удаление именованной сущности EAV -* _deleteAllEntityAttributes_ - удаление атрибутов именованной сущности EAV -* _deleteAllEntityAttributesByName_ - удаление аттрибута сущности EAV с определённым наименованием -* _combineEntities_ - метод для объединения внешних сущностей под 1 родителем - - - -== Схема базы данных(БД). - -Схема БД при таком подходе остаётся неизменной независимо от состава и структуры хранимых данных. -Бандл eav-storage разворачивает структуру из 2 таблиц: - -*Таблица eav_entity* -|=== -|Слолбец |Параметры |Описание -//---------------------- -|id -|bigint, not null -|идентификатор сущности модуля EAV - -|external_id -|text, not null -|внешний идентификатор связываемой сущности - -|external_type -|text, not null -|тип связываемой сущности - -|name -|text -|наименование сущности модуля EAV - -|parent_id -|bigint, not null, default 0 -|идентификатор(поле id) родительской сущности модуля EAV - -|create_date -|timestamp, not null -|служебное поле, дата создания - -|edit_date -|timestamp -|служебное поле, дата изменения - -|created_by -|text, not null -|служебное поле, логин автора записи - -|external_type -|text -|служебное поле, логин последнего изменившего сущность -|=== - - -*Таблица eav_attribute* -|=== -|Слолбец |Параметры |Описание -//---------------------- -|id -|bigint, not null -|идентификатор атрибута - -|entity_id -|text, not null -|идентификатор сущности eav_entity - -|name -|text, not null -|наименование аттрибута - -|type -|text -|тип аттрибута - -|double -|double -|служебное поле для хранения значения - -|long -|bigint -|служебное поле для хранения значения - -|text -|text -|служебное поле для хранения значения - -|text2 -|text -|служебное поле для хранения значения - -|=== \ No newline at end of file diff --git a/documentation/extras/eav_objects.png b/documentation/extras/eav_objects.png deleted file mode 100644 index bab4d67..0000000 Binary files a/documentation/extras/eav_objects.png and /dev/null differ diff --git a/documentation/index.adoc b/documentation/index.adoc deleted file mode 100644 index ed0cf6d..0000000 --- a/documentation/index.adoc +++ /dev/null @@ -1,177 +0,0 @@ -= Entaxy -:imagesdir: . -:hardbreaks: - -Entaxy - шина, которую можно конфигурировать извне с помощью графического интерфейса или API, состоящая из модулей: - -image::Entaxy.png[] - -== *Управленческий слой(core):* - -=== basic-auth - -модуль, отвечающий за аутентификацию в шине. Tак же занимается хранением, созданием, редактированием и удалением учетных записей. - -xref:core/auth/Authorization.adoc[Более полную информации о basic-auth найдете по этой ссылке] - -_Для разработчиков: --имеет Api, который занимается Crud операциями, --хранит учетные записи в базе данных, --предоставляет файл с актуальной информацией для nginx, --выставляет interceptor для аутентификации в других сервисах, --выставляет interceptor для определения принадлежности аккаунта определённой системе._ - - -=== permission - -модуль, отвечающий за управление правами доступа. - -xref:core/permission/SOAP-service-Permission-management.adoc[Более полную информации о permission найдете по этой ссылке] - -_Для разработчиков: --имеет Api, который занимается Crud операциями -- хранит права в базе данных, --(camel)компонент, который используется в маршрутах, для проверки возможности отправки из системы a в систему b. --выставляет interceptor для авторизации в служебных сервисах._ - - -=== system-management-api - -модуль, отвечающий за создание систем и разнообразных коннекторов. (коннекторы бывают разных типов, будет описано далее) - -xref:core/system-managment/Users-manual-System-management.adoc[Более полную информации о system-management найдете по этой ссылке] - -__Для разработчиков: --имеет Api, который занимается Crud операциями --хранит параметры в базе данных, --генерирует профиля и коннекторы на основе переданных через Api параметров и деплоит их через репозиторий nexus или файловую систему и cellar (блок Deployer) в шину. --также имеет возможность Crud прав доступа над учетными записями систем. -__ - -=== system-registry - -модуль, осуществляющий поддержку динамического управления профилями систем(профиль - это отражение параметров системы в шине) - -__Для разработчиков: --хранит информацию о системах в базе данных, --(camel)компонент, который используется в маршрутах для определения нужной системы и коннектора для отправки сообщения в нее. -__ - -=== system-group-registry - -модуль, осуществляющий поддержку динамического управления группами систем, которые определяют логику отправки в необходимую систему в определенной группе. - -__Для разработчиков: --хранит информацию о группах в базе данных, --(camel)компонент, который используется в маршрутах для определения нужной системы из группы. -__ - -=== events - -модуль, для работы с топиками(по схеме Publisher (издатель)-Subscriber (подписчик)) для систем. - -xref:core/topic/Topic-management-Rest-service.adoc[Более полную информации о events найдете по этой ссылке] - -__Для разработчиков: --хранит информацию о топиках в базе данных, --имеет Api(Rest), который занимается Crud операциями -__ - -=== schema - -модуль, осуществляющий хранение всех схем, через которые делаются преобразования сообщений, валидация, поднятие сервиса в шине. - -xref:core/schema/Schema.adoc[Более полную информации о schema найдете по этой ссылке] - -__Для разработчиков: --имеет Api, который занимается Crud операциями --хранит информацию о загруженных схемах в базе данных, --(camel)компонент, который используется в маршрутах для валидации xml через xsd, которую загрузили в бд. --service, который подключается к xslt компоненту для подгрузки xsl из бд --service, который подключается к cxf компоненту для подгрузки xsd и wsdl из бд -__ - -=== bridge - -модуль, осуществляющий передачу сообщений в другую шину. - -xref:core/bridge/Bridge-Description-and-Configuration.adoc[Более полную информации о bridge найдете по этой ссылке] - -__Для разработчиков: --знает о всех подключенных шинах и их именах в рамках всей системы --осуществляет передачу сообщений через artemis, также получает сообщения из другой шины. --в перспективе будет создан компонент который по названию будет определять в какую шину отправить, а не напрямую через очереди, как это сделано сейчас. -__ - -=== Error Handler - -модуль, осуществляющий за обработку ошибок в шине. - -Централизованный обработчик ошибок для формирования кодов ошибок, их синхронного возврата клиенту и для асинхронного дублирования более подробного описания ошибки (для клиента и для Центральной Базы Интеграции). - -xref:core/exception/Centralized-error-handler.adoc[Более полную информации о централизованном обработчике ошибок найдете по этой ссылке] - -xref:core/exception/Error-description.adoc[Более полную информации о классификации ошибок найдете по этой ссылке] - -__Для разработчиков: --знает о всех подключенных шинах и их именах в рамках всей системы --осуществляет передачу сообщений через artemis, также получает сообщения из другой шины. --в перспективе будет создан компонент, который по названию будет определять в какую шину отправить, а не напрямую через очереди, как это сделано сейчас. -__ - -=== Deployer - -набор модулей осуществляющих работу с бандлами - -xref:core/deployer/deployer-common.adoc[Более полную информации о Deployer найдете по этой ссылке] - -__Для разработчиков: --deployer-api - интерфейс репозитория для хранения артефактов --file-system-deployer - реализация репозитория в папке --nexus-deployer - реализация репозитория в Sonartype Nexus --cellar-deployer - система управления бандлами через Apache Cellar -__ - -== Также как вспомогательные инструменты используется следующие модули: - -_сellar_ - модуль для загрузки сгенерированных blueprint в шину(в несколько карафов). -_ignite_ - модуль для создания распределенного хранилища ключ-значение.(используется для более быстрой работы некоторых компонентов, которым нужно хранилище) -_liquibase_ - модуль для поддержки актуальной схемы бд. - -== Клиентский слой - -_US_ - универсальный коннектор, через который можно отправлять сообщения в другие системы. -_(делится на обычный и служебный)_ -xref:connectors/uniform-exchange-service/uniform-exchange-service.adoc[Универсальный сервис] - -_file-connector_ - коннектор, который сообщения для определенной системы отправляет с помощью файла(получая сообщение, проводит необходимые преобразования, нпрм архивацию, и складывает в определенную папку). - -_db-connector_ - коннектор, который осуществляет обмен сообщениями с системой через бд. (сообщение полученное из другой системы конвертируется в запись в бд, и для отправки сообщения в шину необходимо сделать запись в бд) - -xref:connectors/create_new_connectors.adoc[Информация о создании новых коннекторов] - -image::connectors/db-connector/deployment_schema.png[] - -_nsi_ - soap коннектор, который был поднят с помощью клиентской wsdl и работает по специальной схеме, определенной клиентом с помощью бд. -_big-packets-connector_ - soap коннектор, через который можно отправлять сообщения в другие системы, предназначенный для отправки больших сообщений, которые отправляются по частям. - -=== Необходимые для шины внешние модули - -nginx(опционально) - балансировщик нагрузки, также занимается предварительной аутентификацией. -nexus(опционально) - необходим для хранения и динамической развертки блюпринтов. -db(поддерживается mssql и postgresql) esb_entaxy - необходима для хранения служебных данных(связанных с настройкой маршрутов в шине). -db(поддерживается mssql и postgresql) cache - необходима для хранения временных данных, связанных с определенным сообщением. -artemis - брокер сообщений. -file-storage(nfs) - необходим для работы сервиса больших пакетов, nginx и тд. - -=== Схема прохождения пакета - -Для разработчиков: - -image::connectors/Message.png[] - -_Все сообщения отправляемые в шину будут отправляться из входного коннектора в выходную точку профиля._ - -Общее описание Entaxy: - -xref:core/Common-description-of-the-transport-layer.adoc[Общее описание Entaxy] \ No newline at end of file diff --git a/documentation/installation/img/services.png b/documentation/installation/img/services.png deleted file mode 100644 index 13a6ed7..0000000 Binary files a/documentation/installation/img/services.png and /dev/null differ diff --git a/documentation/installation/install.adoc b/documentation/installation/install.adoc deleted file mode 100644 index 7590afe..0000000 --- a/documentation/installation/install.adoc +++ /dev/null @@ -1,633 +0,0 @@ -= Руководство по установке Entaxy -:nofooter: -:toc: left -:toc-title: Содержание -:sectnums: -:icons: font -:title-page: -:revnumber: 1.0 - -<<< - -== Цель руководства - -Данное руководство описывает процесс установки системы Entaxy (далее Система) на сервер или рабочую станцию в демонстрационных целях. - -<<< - -== Требования и замечания - -Для установки Системы требуется: - -- Установленная на сервер или рабочую станцию операционная система LTS: AstraLinux 2.12 (Orel), RHEL (CentOS), Ubuntu с настроенными репозиториями для установки программного обеспечения, входящего в состав поставки ОС -- Созданный в системе пользователь с правами sudo. Под этим пользователем будет производиться установка Системы. Далее по инструкции имя пользователя обозначено как ``. Вместо `` нужно подставить имя пользователя, который будет производить установку. -- Опыт работы с Debian/Ubuntu/AstraLinux системами - -<<< - -== Дистрибутивы программных продуктов - -Вместе с инструкцией поставляются все дистрибутивы, необходимые для установки Системы. Их распространение разрешено лицензиями. - -Дистрибутивы доступны в каталоге `distrib`. Перед установкой Системы нужно скопировать этот каталог на сервер или рабочую станцию, куда будет производиться установка в каталог `/home/`. - -Вся дальнейшая установка Системы будет производиться из файлов, скопированных в `/home//distrib` - -<<< - -== Установка PostgresPro 11 Standard Edition - -Система использует СУБД PostgresPro 11 Standard для хранения конфигураций, справочников и т.д. Указанная СУБД входит в Реестр программных продуктов. - -Для установки PostgresPro 11 Standard Edition необходимо перейти в каталог с дистрибутивом PostgresPro 11 Standard Edition, и установить пакеты в следующей последовательности: - -[source,bash] ----- -cd /home//distrib/postgrespro-std-11 -sudo apt install ./postgrespro-std-11-libs_11.12.1-1.orel_amd64.deb -sudo apt install ./postgrespro-std-11-client_11.12.1-1.orel_amd64.deb -sudo apt install ./postgrespro-std-11-server_11.12.1-1.orel_amd64.deb -sudo apt install ./postgrespro-std-11-contrib_11.12.1-1.orel_amd64.deb -sudo apt install ./postgrespro-std-11_11.12.1-1.orel_amd64.deb ----- - -При установке последнего пакета производится автоматическая инициализация кластера СУБД, поэтому никаких действий по начальной инициализации PostgresPro 11 Standard Edition производить не требуется. - -<<< - -== Подготовка СУБД для работы с Entaxy - -Перед установкой Системы нужно подготовить СУБД для работы с ней. - -Подготовка заключается в создании пользователя СУБД и создании баз данных. - -Для работы с СУБД используется инструмент `psql` с правами администратора. Для запуска инструмента выполнить следующие команды: - -[source,bash] ----- -sudo su - postgres -psql ----- - -После запуска иструмента выполняются следующие действия: - -. Создание пользователя: -+ -[source,sql] ----- -CREATE USER entaxy WITH ENCRYPTED PASSWORD 'entaxy'; ----- -+ -. Создание баз данных -+ -[source,sql] ----- -CREATE DATABASE cache; -CREATE DATABASE storage; ----- -+ -. Назначение прав пользователю `entaxy` на только что созданные базы `cache` и `storage`: -+ -[source,sql] ----- -GRANT ALL ON DATABASE cache TO entaxy; -GRANT ALL ON DATABASE storage TO entaxy; ----- - -После создания пользователя и БД выйти из инструмента `psql` с помощью ввода команды `\q` - -После выхода из инструмента для работы с PostgresPro 11 Standard Edition `psql` требуется выйти из консоли пользователя `postgres`. Для этого выполнить команду: - -[source,bash] ----- -exit ----- - -<<< - -== Установка OpenJDK 11 - -Установка OpenJDK 11 производится в каталог `/opt/openjdk` - -Для установки OpenJDK 11 нужно перейти в каталог `/home//distrib/openjdk`, распаковать дистрибутив OpenJDK 11 в каталог установки и назначить на распакованные файлы права пользователя `root`: - -[source,bash] ----- -cd /home//distrib/openjdk -sudo mkdir -p /opt/openjdk -sudo tar xvf bellsoft-jdk11.0.11+9-linux-amd64.tar.gz -C /opt/openjdk -sudo chown -R root:root /opt/openjdk -sudo chmod 755 /opt/openjdk/jdk-11.0.11 ----- - -<<< - -== Установка и настройка nginx - -Для аутентификации пользователей и маршрутизации запросов в Системе используется `nginx`, работающий как реверсивный прокси. -Перед настройкой конфигурации `nginx` необходимо его установить командой: - -[source,bash] ----- -sudo apt install nginx ----- - -Затем удалить конфигурацию nginx по-умолчанию, скопировать предварительно настроенный файл конфигурации `nginx` из каталога `/home//distrib/nginx/sites-available` в `/etc/nginx/sites-available`, создать символьную ссылку на конфигурацию в каталоге разрешённых конфигураций: - -[source,bash] ----- -sudo rm -rf /etc/nginx/sites-enabled/default -sudo cp /home//distrib/nginx/sites-available/entaxy.conf /etc/nginx/sites-available -sudo ln -s /etc/nginx/sites-available/entaxy.conf /etc/nginx/sites-enabled/entaxy.conf ----- - -После установки новой конфигурации и её разрешения, необходимо перезагрузить конфигурацию `nginx` командой: - -[source,bash] ----- -sudo nginx -t <1> -sudo systemctl reload nginx <2> ----- -<1> - валидация конфигурации nginx (если команда вернёт строку `syntax is ok`, то конфигурация валидна) -<2> - перезагрузка конфигурации nginx - -Затем необходимо создать файл паролей Basic аутентификации `htpasswd` в каталоге `/opt/nginx` - -=== Управление сервисом nginx - -Запуск `nginx` выполняется командой: - -[source,bash] ----- -sudo systemctl start nginx ----- - -Остановка `nginx` выполняется командой: - -[source,bash] ----- -sudo systemctl stop nginx ----- - -Перезапуск `nginx` выполняется командой: - -[source,bash] ----- -sudo systemctl restart nginx ----- - -Перезагрузка конфигурации `nginx` выполняется командой: - -[source,bash] ----- -sudo systemctl reload nginx ----- - -<<< - -== Установка Apache Artemis - -Установка Apache Artemis производится в каталог `/opt/artemis` - -Для установки Apache Artemis необходимо выполнить следующие шаги: - -. Создать пользователя `artemis`, под которым будет работать Artemis. При создании пользователя создаётся домашний каталог пользователя `/opt/artemis`, в котором будет установлен сам Artemis: -+ -[source,bash] ----- -sudo useradd -d /opt/artemis -m -r artemis -s /usr/sbin/nologin ----- -+ -. Распаковать дистрибутив Artemis в домашний каталог Artemis и назначить распакованным файлам права пользователя `artemis`: -+ -[source,bash] ----- -cd /home//distrib/artemis -sudo tar xvf apache-artemis-2.17.0-bin.tar.gz -C /opt/artemis -sudo cp -a /opt/artemis/apache-artemis-2.17.0/. /opt/artemis/ -sudo rm -rf /opt/artemis/apache-artemis-2.17.0 -sudo chown -R artemis:artemis /opt/artemis ----- -+ -. Создать каталог для брокера: -+ -[source,bash] ----- -sudo mkdir -p /opt/artemis/brokers -sudo chown artemis:artemis /opt/artemis/brokers ----- -+ -. Создать брокер: -+ -[source,bash] ----- -sudo su -s /bin/sh -c \ - "export JAVACMD=/opt/openjdk/jdk-11.0.11/bin/java; \ - export ARTEMIS_HOME=/opt/artemis; \ - /opt/artemis/bin/artemis create \ - --name entaxy-broker \ - --user artemis \ - --password artemis \ - --require-login \ - /opt/artemis/brokers/entaxy-broker" \ - artemis ----- -+ -После выполнения команды создаётся новый брокер в каталоге `/opt/artemis/brokers/entaxy-broker` с именем `entaxy-broker`. Имя брокера задаётся в параметре `--name`. -Имя пользователя и пароль для входа в Web консоль брокера задаётся в параметрах `--user` и `--password` соответственно. -+ -. Создать файл сервиса `/etc/systemd/system/entaxy@artemis.service`: -+ -.entaxy-broker@artemis.service -[source,bash] ----- -[Unit] -Description=Artemis ActiveMQ Message Broker -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/opt/artemis/brokers/entaxy-broker/bin/artemis-service start -ExecStop=/opt/artemis/brokers/entaxy-broker/bin/artemis-service stop - -User=artemis -Group=artemis - -[Install] -WantedBy=multi-user.target ----- -+ -. Отредактировать переменную окружения `JAVA_HOME` для сервиса брокера: -+ -[source,bash] ----- -sudo systemctl edit entaxy@artemis.service ----- -+ -При выполнении предыдущей команды откроется текстовый редактор, в который надо добавить следующее содержимое, после чего сохранить файл: -+ -[source,bash] ----- -[Service] -Environment="JAVA_HOME=/opt/openjdk/jdk-11.0.11" ----- - -После создания файла сервиса и определения переменных окружения, выполнить команду -[source,bash] ----- -sudo systemctl daemon-reload ----- - -Выполнение команды перезагрузит конфигурацию `systemd`, и сервис для запуска Artemis станет доступен - -Включить автозапуск сервиса Artemis при старте системы: - -[source,bash] ----- -sudo systemctl enable entaxy@artemis.service ----- - -Запустить брокер Entaxy - -[source,bash] ----- -sudo systemctl start entaxy@artemis.service ----- - -=== Управление сервисом Apache Artemis - -Запуск сервиса брокера `entaxy` выполняется командой: - -[source,bash] ----- -sudo systemctl start entaxy@artemis.service ----- - -Остановка сервиса брокера `entaxy` выполняется командой: - -[source,bash] ----- -sudo systemctl stop entaxy@artemis.service ----- - -<<< - -== Установка Apache Karaf - -Установка Apache Karaf производится в каталог `/opt/karaf` - -Для установки Apache Karaf необходимо выполнить следующие шаги: - -. Создать пользователя `karaf`, под которым будет работать Karaf. При создании пользователя создаётся домашний каталог пользователя `/opt/karaf`, в котором будет установлен сам Karaf: -+ -[source,bash] ----- -sudo useradd -d /opt/karaf -m -r karaf -s /usr/sbin/nologin ----- -+ -. Распаковать дистрибутив Karaf в домашний каталог, и назначить распакованным файлам права пользователя `karaf`: -+ -[source,bash] ----- -cd /home//distrib/karaf -sudo tar xvf apache-karaf-4.2.9.tar.gz -C /opt/karaf -sudo cp -a /opt/karaf/apache-karaf-4.2.9/. /opt/karaf -sudo rm -rf /opt/karaf/apache-karaf-4.2.9 -sudo cp /home//distrib/karaf/jre.properties /opt/karaf/etc/jre.properties -sudo chown -R karaf:karaf /opt/karaf ----- -+ -. Отредактировать переменную окружения `JAVA_HOME` для Karaf: -+ -[source,bash] ----- -sudo sed -i 's/# export JAVA_HOME/export JAVA_HOME=\/opt\/openjdk\/jdk-11.0.11/g' /opt/karaf/bin/setenv ----- -+ -. Отредактировать переменную окружения `EXTRA_JAVA_OPTS` для Karaf, чтобы устранить возможность эксплуатацию критической уязвимости Log4j CVE-2021-44228: -+ -[source,bash] ----- -sudo sed -i 's/# export EXTRA_JAVA_OPTS/export EXTRA_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true/g' /opt/karaf/bin/setenv ----- -+ -. Создать файл сервиса `/etc/systemd/system/karaf.service` со следующим содержимым: -+ -.karaf.service -[source,bash] ----- -[Unit] -Description=Entaxy Karaf -After=syslog.target network.target - -[Service] -ExecStart=/opt/karaf/bin/karaf start -ExecStop=/opt/karaf/bin/karaf stop - -User=karaf -Group=karaf - -SuccessExitStatus=0 143 -RestartSec=15 -Restart=on-failure - -LimitNOFILE=102642 - -[Install] -WantedBy=multi-user.target ----- -+ -. После создания файла сервиса и определения переменных окружения, выполнить команду: -+ -[source,bash] ----- -sudo systemctl daemon-reload ----- - -Выполнение команды перезагрузит конфигурацию `systemd`, и сервис для запуска Karaf станет доступен - -Включить автозапуск сервиса Karaf при старте системы: - -[source,bash] ----- -sudo systemctl enable karaf.service ----- - -=== Управление сервисом Apache Karaf - -Запуск сервиса `karaf` выполняется командой: - -[source,bash] ----- -sudo systemctl start karaf.service ----- - -Остановка сервиса `karaf` выполняется командой: - -[source,bash] ----- -sudo systemctl stop karaf.service ----- - -<<< - -== Настройка Apache Karaf - -Скопируйте файлы конфигурации Entaxy из `/home//distrib/entaxy/etc` в каталог `/opt/karaf/etc`. Все файлы предварительно настроены для работы всех компонентов на одной машине: - -[source,bash] ----- -sudo cp -a /home//distrib/entaxy/etc/. /opt/karaf/etc -sudo chown -R karaf:karaf /opt/karaf/etc ----- - -Установочные файлы Системы хранятся в локальном репозитории артефактов. Перед установкой Системы необходимо скопировать локальный репозиторий из каталога `/home//distrib/entaxy/.m2` в `/opt/karaf`: - -[source,bash] ----- -sudo cp /home//distrib/entaxy/.m2/. /opt/karaf/.m2 -sudo chown -R karaf:karaf /opt/karaf/.m2 ----- - -После копирования файлов конфигураций и локального репозитория можно запустить сервис `karaf` - -<<< - -== Подготовка ОС для установки Entaxy - -Система в процессе работы использует файловые ресурсы, в которых хранятся передаваемые файлы, пакеты и т.д. Эти ресурсы перед установкой Системы необходимо создать: - -[source,bash] ----- -sudo mkdir -p /opt/karaf/bundle-repository -sudo mkdir -p /mnt/entaxy/file-connector/message-store -sudo mkdir -p /mnt/entaxy/ignite -sudo mkdir -p /mnt/entaxy/filestore -sudo chown -R karaf:karaf /opt/karaf/bundle-repository -sudo chown -R karaf:karaf /mnt/entaxy ----- - -<<< - -== Установка Entaxy - -=== Проверка работоспособности Apache Karaf - -Установка Entaxy осуществляется из консоли управления Apache Karaf. Чтобы войти в консоль управления Apache Karaf, нужно выполнить в терминале команду: - -[source,bash] ----- -ssh -p 8101 karaf@localhost ----- - -При первом входе в консоль управления необходимо на запрос предоставления доступа ввести слово `yes` и нажать `Enter` -После этого Apache Karaf запросит пароль - в качестве пароля ввести `karaf` - -[source,bash] ----- -Warning: Permanently added '[localhost]:8101' (RSA) to the list of known hosts. -Password authentication -Password: - __ __ ____ - / //_/____ __________ _/ __/ - / ,< / __ `/ ___/ __ `/ /_ - / /| |/ /_/ / / / /_/ / __/ - /_/ |_|\__,_/_/ \__,_/_/ - - Apache Karaf (4.2.9) - -Hit '' for a list of available commands -and '[cmd] --help' for help on a specific command. -Hit 'system:shutdown' to shutdown Karaf. -Hit '' or type 'logout' to disconnect shell from current session. ----- - -Для контроля корректности установки ввести команду `list`: - -[source,bash] ----- -karaf@root()> list -START LEVEL 100 , List Threshold: 50 -ID │ State │ Lvl │ Version │ Name -───┼────────┼─────┼─────────┼──────────────────────────────────────────────── -22 │ Active │ 80 │ 4.2.9 │ Apache Karaf :: OSGi Services :: Event -karaf@root()> ----- - -Если статус компонента `Apache Karaf {two-colons} OSGi Services {two-colons} Event` установлен в состояние `Active`, это значит, что Apache Karaf установлен корректно, и можно переходить к установке Entaxy. - -=== Установка Entaxy - -Установка Entaxy выполняется из консоли управления Apache Karaf. Сначала к списку репозиториев Karaf добавляется репозиторий Entaxy: - -[source,bash] ----- -feature:repo-add mvn:ru.entaxy.esb/karaf-features/1.8.1/xml/features ----- - -Затем запускается команда установки всех компонентов Entaxy -[source,bash] ----- -feature:install entaxy-all ----- - -После завершения установки Entaxy произойдёт выход из консоли управления Apache Karaf. Это связано с перезапуском встроенного в `Karaf` SSH сервера. Это нормальная ситуация, в процессе установки происходит настройка устанавливаемых компонентов. - -=== Проверка работоспособности Entaxy - -Чтобы проверить корректность установки необходимо вновь зайти в консоль управления Karaf: - -[source,bash] ----- -ssh -p 8101 karaf@localhost ----- - -В консоли управления ввести команду: - -[source,bash] ----- -karaf@root()> list ----- - -Отобразится список установленных компонентов Entaxy, и вспомогательных библиотек. Состояние почти всех компонентов должно быть `Active` - -Среди компонентов, которые могут не находиться в состоянии `Active` можно выделить два: - -- `camel-caffeine-lrucache` может находиться в состоянии `Resolved` -- `INTEGRATION {two-colons} ENTAXY {two-colons} DB EXAMPLE CONNECTOR` будет находиться в состоянии `Failure` - -Компонент `INTEGRATION {two-colons} ENTAXY {two-colons} DB EXAMPLE CONNECTOR` необходимо отключить командой: - -[source,bash] ----- -karaf@root()> bundle:stop ----- - -Например, если идентификатор компонента 97, как показано ниже, - -[source,bash] ----- - 97 │ Failure │ 80 │ 1.0.0.SNAPSHOT │ INTEGRATION :: ENTAXY :: DB EXAMPLE CONNECTOR ----- - -то команда будет выглядеть так: - -[source,bash] ----- -karaf@root()> bundle:stop 97 ----- - -После остановки компонент перейдёт в состояние `Resolved` - -=== Отключение компонента установки Nexus - -В процессе своей работы Entaxy генерирует и запускает новые компоненты, например, при создании новой системы, она будет отображаться в Entaxy как отдельный компонент. В момент генерирования и установки нового компонента, производится помещение этого компонента во внешний репозиторий. Это позволяет автоматически переустановить сгенерированные компоненты при добавлении нового узла в кластер Entaxy. -В Entaxy существует два варианта хранения сгенерированных компонентов: - -- Sonatype Nexus -- Файловая система - -По-умолчанию все генерируемые компоненты помещаются в систему управления репозиториями Sonatype Nexus. Это отдельное ПО, целесообразность установки которого оправдана только в кластерных конфигурациях. В нашем случае установка всей системы выполняется на одну машину. - -Чтобы сгенерированные компоненты устанавливались в файловую систему, требуется отключить компонент установки сгенерированных компонентов в Sonatype Nexus. Отключение компонента выполняется следующим образом: - -. Войти в консоль управления Karaf -. Найти идентфикатор компонента `SYSTEM {two-colons} ENTAXY {two-colons} NEXUS {two-colons} DEPLOYER` -. Остановить его командой: -+ -[source,bash] ----- -karaf@root()> bundle:stop ----- - -<<< - -== Настройка обновления файла аутентификации `htpasswd` - -В Entaxy используется Basic аутентификация для всех запросов, приходящих на балансировщик, функции которого выполняет `nginx`. Аутентификация производится средствами самого `nginx`. - -В качестве базы для хранения пользователей `nginx` использует файл в специальном формате htpasswd. - -Для того, чтобы вновь созданные пользователи в Системе могли аутентифицироваться, необходимо передать информацию о них в файл htpasswd. Для этого используется специальный скрипт, который отрабатывает по расписанию. Сам скрипт нужно предварительно скопировать из каталога `/home//distrib/script/htpasswd-checker.sh` в любой каталог, например, в `/opt/htpasswd-checker`: - -[source,bash] ----- -sudo mkdir -p /opt/htpasswd-checker/log -sudo cp /home//distrib/nginx/htpasswd /etc/nginx -sudo cp /home//distrib/script/htpasswd-checker.sh /opt/htpasswd-checker -sudo chown -R root:root /opt/htpasswd-checker ----- - -Так же требуется проверить адреса серверов кластера, публикующих сервис для работы с файлом htpasswd(сервера с karaf) для ключа KARAF_HOST_NAMES: -[source,bash] ----- -KARAF_HOST_NAMES=("http://192.168.122.93:9091" "http://192.168.122.94:9091") ----- - -Затем создать расписание запуска для `cron`: - -[source,bash] ----- -sudo crontab -e ----- - -В открывшемся редакторе добавить запись: - -[source,bash] ----- -* * * * * /opt/htpasswd-checker/htpasswd-checker.sh ----- - -и сохранить файл. Теперь скрипт будет отрабатывать каждую минуту, подключаться к сервису аутентификации в Apache Karaf, проверять изменение пользовательской информации, и обновлять файл `/etc/nginx/htpasswd` если информация обновилась. - -<<< - -== Проверка работоспособности сервисов - -Чтобы проверить, что сервисы Entaxy работают, можно провести быстрый тест. - -Для этого открыть браузер на машине, где установлена Система, и перейти по адресу `http://localhost:8181/cxf`. Браузер запросит имя пользователя и пароль. Ввести `admin` в качестве имени пользователя, и `admin` в качестве пароля. Логин и пароль уже прописаны в файле `/etc/nginx/htpasswd`. При успешной аутентификации отобразится страница следующего вида: - -image::img/services.png[] - -На этом установку Системы можно считать законченной. \ No newline at end of file diff --git a/documentation/installation/installation-table-of-contents.adoc b/documentation/installation/installation-table-of-contents.adoc deleted file mode 100644 index 80a255e..0000000 --- a/documentation/installation/installation-table-of-contents.adoc +++ /dev/null @@ -1,11 +0,0 @@ -__Alternative languages:__ - -* xref:installation-table-of-contents.ru.adoc[Russian] - -= Installation -Entaxy have different installation ways OOTB: - -* xref:../../distribution/entaxy-docker/ReadMe.md[Development docker installation] -* xref:../../features/README.md[Development standalone installation] -* xref:install.adoc[Enterprise environment installation] -* xref:local-installation/local-installation.adoc[Local installation] diff --git a/documentation/installation/installation-table-of-contents.ru.adoc b/documentation/installation/installation-table-of-contents.ru.adoc deleted file mode 100644 index 48eeadb..0000000 --- a/documentation/installation/installation-table-of-contents.ru.adoc +++ /dev/null @@ -1,11 +0,0 @@ -__Alternative languages:__ - -* xref:installation-table-of-contents.adoc[English] - -= Установка -Entaxy из коробки имеет разные варианты установки: - -* xref:../../distribution/entaxy-docker/ReadMe.md[Установка для разработки в докер] -* xref:../../features/README.ru.md[Установка для разработки отдельных серверных приложений] -* xref:install.adoc[Установка на промышленное окружение] -* xref:local-installation/local-installation.ru.adoc[Локальная установка] diff --git a/documentation/installation/local-installation/image/cluster-note-list.png b/documentation/installation/local-installation/image/cluster-note-list.png deleted file mode 100644 index eb33f85..0000000 Binary files a/documentation/installation/local-installation/image/cluster-note-list.png and /dev/null differ diff --git a/documentation/installation/local-installation/image/health-check.png b/documentation/installation/local-installation/image/health-check.png deleted file mode 100644 index a8b56db..0000000 Binary files a/documentation/installation/local-installation/image/health-check.png and /dev/null differ diff --git a/documentation/installation/local-installation/image/pgadmin-create-user.jpg b/documentation/installation/local-installation/image/pgadmin-create-user.jpg deleted file mode 100644 index a859f7b..0000000 Binary files a/documentation/installation/local-installation/image/pgadmin-create-user.jpg and /dev/null differ diff --git a/documentation/installation/local-installation/image/pgadmin-start.jpg b/documentation/installation/local-installation/image/pgadmin-start.jpg deleted file mode 100644 index dce6ec6..0000000 Binary files a/documentation/installation/local-installation/image/pgadmin-start.jpg and /dev/null differ diff --git a/documentation/installation/local-installation/image/postgresql-installation-1.jpg b/documentation/installation/local-installation/image/postgresql-installation-1.jpg deleted file mode 100644 index 2734c56..0000000 Binary files a/documentation/installation/local-installation/image/postgresql-installation-1.jpg and /dev/null differ diff --git a/documentation/installation/local-installation/image/source-download.jpg b/documentation/installation/local-installation/image/source-download.jpg deleted file mode 100644 index 88e99d8..0000000 Binary files a/documentation/installation/local-installation/image/source-download.jpg and /dev/null differ diff --git a/documentation/installation/local-installation/local-installation.adoc b/documentation/installation/local-installation/local-installation.adoc deleted file mode 100644 index d4fde4c..0000000 --- a/documentation/installation/local-installation/local-installation.adoc +++ /dev/null @@ -1,5 +0,0 @@ -= Entaxy local installation on workstation or server. - -__Alternative languages:__ - -* xref:windows-local-installation.ru.adoc[Russian] diff --git a/documentation/installation/local-installation/local-installation.ru.adoc b/documentation/installation/local-installation/local-installation.ru.adoc deleted file mode 100644 index 496675e..0000000 --- a/documentation/installation/local-installation/local-installation.ru.adoc +++ /dev/null @@ -1,246 +0,0 @@ -= Локальная установка Entaxy на рабочую станцию или сервер. - -__Alternative languages:__ - -* xref:windows-local-installation.adoc[English] - - -== Введение. - -В этой инструкции мы рассмотрим установку Entaxy. Установка на все ОС проходит аналогичным образом и отличается выбором соответствующих инсталляторов или использованием пакетных менеджеров. - - -== Установка Java. - -. Скачиваем и устанавливаем JAVA. Для работы Entaxy рекомендуется Java 11. Работа платформы протестирована на OpenJDK и LibericaJDK от BellSoft (https://libericajdk.ru/pages/downloads/) - -. Создаем переменную окружения JAVA_HOME. - -. Добавляем абсолютный путь к директории bin в системную переменную окружения PATH. - - -== Дистрибутивы Entaxy - -Существует несколько вариантов сборок Entaxy, которые доступны по адресу https://entaxy.ru/download - -. `entaxy-assembly-compact*` - все-в-одном, брокер, бд и графический веб-интерфейс в одной сборке. См. xref:#_установка_all_in_one [Установка all-in-one] - -. `entaxy-assembly*` - сборка без предустановленного графического веб-интерфейса. См. xref:#_установка_без_ui [Установка без UI] - -. `entaxy-assembly-with-ui*` - сборка без предустановленного брокера сообщений. См. xref:#_установка_с_внешним_брокером [Установка с внешним брокером] - -. Все компоненты устанавливаются отдельно. См. xref:#_покомпонентная_установка [Покомпонентная установка] - - -== Установка all-in-one - -. Распаковываем архив `entaxy-assembly-compact*` - -. Распакованный архив лучше перенести в другое место, чтобы абсолютный путь до каталога приложения не был слишком длинным, также необходимо чтобы путь содержал только латинские символы и был без пробелов. - -. Переходим в каталог `/bin` приложения и запускаем: - - entaxy - для Linux - - entaxy.bat - для Windows - -. Немного ждем и проверяем, что система корректно запустилась см. xref:#_проверка_готовности_системы [Проверка готовности системы] - - -== Установка без UI - -. Распаковываем архив `entaxy-assembly*` - -. Распакованный архив лучше перенести в другое место, чтобы абсолютный путь до каталога приложения не был слишком длинным, также необходимо чтобы путь содержал только латинские символы и был без пробелов. - -. Переходим в каталог `/bin` приложения и запускаем: - - entaxy - для Linux - - entaxy.bat - для Windows - -. Немного ждем и проверяем, что система корректно запустилась см. xref:#_проверка_готовности_системы [Проверка готовности системы] - -. Веб-интерфейс можно установить, после запуска системы, командой (в консоли Карафа): `source scripts/entaxy-ui.install` - - -== Установка с внешним брокером - -. Для установки брокера смотрите инструкцию: xref:#_установка_и_настройка_брокера[Установка и настройка брокера] - -. Распаковываем архив `entaxy-assembly-with-ui*` - -. Распакованный архив лучше перенести в другое место, чтобы абсолютный путь до каталога приложения не был слишком длинным, также необходимо чтобы путь содержал только латинские символы и был без пробелов. - -. Переходим в каталог `/bin` приложения и запускаем: - - entaxy - для Linux - - entaxy.bat - для Windows - -. Немного ждем и проверяем, что система корректно запустилась см. xref:#_проверка_готовности_системы [Проверка готовности системы] - - -== Покомпонентная установка - -=== Установка и настройка БД. - -Entaxy не привязана к какой-либо конкретной СУБД, но по умолчанию используется встроенная H2, в данной инструкции будет показано как установить и настроить систему на работу с БД Postgres. - -. Скачиваем инсталятор с официального сайта (https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). - -. Запускаем установку. image:image/postgresql-installation-1.jpg[postgresql-installation] - -. Оставляем все настройки по умолчанию и устанавливаем пароль `postgres`. - -. Запускаем pgAdmin 4 и устанавливаем мастер пароль для приложения `postgres`. image:image/pgadmin-start.jpg[pgadmin-start] - -. Добавляем подключение к локальному серверу БД. - -. Выбираем доступную базу данных из списка и переходим в Query Tool, в котором выполняем sql запрос: - -[source,sql] ----- -CREATE USER "entaxy" WITH PASSWORD 'entaxy'; ----- -image:image/pgadmin-create-user.jpg[pgadmin-create-user] - -[start=7] -. Теперь в том же окне по очереди (по одной строчке) выполняем запросы для создания необходимых для Entaxy баз данных. - -[source,sql] ----- -CREATE DATABASE esb_entaxy; ----- - -[source,sql] ----- -GRANT ALL PRIVILEGES ON DATABASE esb_entaxy TO entaxy; ----- - -[source,sql] ----- -CREATE DATABASE cache; ----- - -[source,sql] ----- -GRANT ALL PRIVILEGES ON DATABASE cache TO entaxy; ----- - -На этом настройка СУБД завершена. - - -=== Установка и настройка брокера - -В этой инструкции мы рассмотрим использование брокера сообщений Artemis. - -. Скачиваем архив с официального сайта (https://activemq.apache.org/components/artemis/download/). - -. Распаковываем архив и переходим в директорию bin. - -. Запускаем в командной строке создание брокера `artemis create --user entaxy --password entaxy --allow-anonymous $ARTEMIS_HOME/brokers/entaxy-broker`. - -. После создания брокера надо открыть файл `$ARTEMIS_HOME/brokers/entaxy-broker/etc/broker.xml` и проверить, что автоматическое удаление очередей и адресов отключено: - -[source,xml] ----- - - - - false - false - - ----- - -. Запускаем брокер сообщений `$ARTEMIS_HOME/brokers/entaxy-broker/bin/artemis run` - -Установка брокера завершена. - - -=== Установка Entaxy - -. xref:#_установка_с_внешним_брокером [Выполняем установку Entaxy без брокера] - -. xref:#_настройка_entaxy_на_внешнюю_базы_данных [Перенастраиваем Entaxy на внешнюю БД], установленную на предыдущем шаге. - - -== Проверка готовности системы - -Чтобы проверить, что все сервисы Entaxy готовы к работае, открываем следующий адрес в браузере http://localhost:8181/system/health - -При полной готовности система выдаст следующую информацию: -image:image/health-check.png[] - -Если при первом запуске Entaxy Connections находится в статусе TEMPORARILY_UNAVAILABLE, необходимо перезапустить Entaxy. - -== Настройка Entaxy на внешнюю базу данных - -По умолчанию все сборки Entaxy используют встроенную БД H2. - -Для того чтобы перенестроить Entaxy на использование внешней БД, нужно выполнить следующие шаги: - -В каталоге `/etc` приложения: - -. Найти файлы `org.ops4j.datasource-entaxy.esb.cache.cfg` и `org.ops4j.datasource-entaxy.esb.storage.cfg` - -. Удалить их или переименовать путем добавления постфикса, например, `*.defaultdb`. - -. Найти файлы `org.ops4j.datasource-entaxy.esb.cache.cfg.pg` и `org.ops4j.datasource-entaxy.esb.storage.cfg.pg` и удалить постфикс `.pg` из имени. - -. Если при выполнении установки БД были указаны другие данные или была выполненна установка на другом хосте, то вводим соответствующие значения в файлах. - - -== Тестирование. - -Для проверки работоспособности платформы переходим к xref:../../connectors/uniform-exchange-service/tests/postman.adoc[инструкции по тестированию]. - - -== Кластерный запуск Entaxy - -По умолчанию Entaxy использует мультикаст для поиска компонентов кластера по сети, необходимо убедиться что настройки вашего оборудования и файервол настроены для широковещания. - -Чтобы два и более экземпляра соединились в кластер достаточно их запустить на разных хостах из одной подсети. - - -=== Настройка статичных адресов узлов кластера - -Если требуется указать статичные адреса узлов кластера поиска узлов, то это можно сделать в файле `/etc/hazelcast.xml` - -- Выключаем мультикаст `` -- Включаем ip `` - -например: -[source,xml] ----- - - 224.2.2.3 - 54327 - - - 127.0.0.1 - ----- - -Также можно задавать маски адресов: -[source,xml] ----- - - 192.168.1.* - ----- - - -=== Проверка кластера - -Чтобы понимать, что экземпляры соединились в кластер, выполняем следующую команду в одной из консолей карафа: `cluster:node-list` - -image:image/cluster-note-list.png[] - - -=== Запуск нескольких экземпляров на одном хосте - -Для того чтобы запустить несколько экземпляров системы на одном хосте, необходимо в файле `etc/entaxy.properties` изменить значения свойств: - - - entaxy.rmiRegistryPort - - entaxy.rmiServerPort - - entaxy.jmxmpPort - - entaxy.sshPort - - entaxy.org.osgi.service.http.port - - entaxy.service.port.management - - entaxy.service.port.subscription \ No newline at end of file diff --git a/documentation/monitoring/hawtio.adoc b/documentation/monitoring/hawtio.adoc deleted file mode 100644 index 4be86b2..0000000 --- a/documentation/monitoring/hawtio.adoc +++ /dev/null @@ -1,29 +0,0 @@ -= Использование hawtio для мониторинга entaxy - -hawtio доступно по адресу http://{nginx_address}/hawtio/ - -* Открываем в браузере hawtio и аутентифицируемся как karaf / karaf - -http://10.24.2.33:8181/hawtio/ - -image::screenshots/image_2021-09-30_12-43-58.png[] - -* При успешной аутентификации видим вкладку camel со всеми маршрутами и возможностью посмотреть статистику по маршрутам - -image::screenshots/image_2021-09-30_12-45-07.png[] - -* Возможность просмотреть логи - -image::screenshots/image_2021-09-30_12-45-35.png[] - -* Возможность просмотреть метрику - -image::screenshots/image_2021-09-30_12-45-55.png[] - -* Общую статистику можно увидеть на вкладке JMX, выбрав Camel Contexts (отображение данных бывает с небольшой паузой) - -image::screenshots/image_2021-09-30_12-46-36.png[] - -* Также можно увидеть визуальное отображение маршрута - -image::screenshots/image_2021-09-30_12-47-18.png[] diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-43-58.png b/documentation/monitoring/screenshots/image_2021-09-30_12-43-58.png deleted file mode 100644 index 401ea45..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-43-58.png and /dev/null differ diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-45-07.png b/documentation/monitoring/screenshots/image_2021-09-30_12-45-07.png deleted file mode 100644 index 9706d59..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-45-07.png and /dev/null differ diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-45-35.png b/documentation/monitoring/screenshots/image_2021-09-30_12-45-35.png deleted file mode 100644 index 6c3c9ce..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-45-35.png and /dev/null differ diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-45-55.png b/documentation/monitoring/screenshots/image_2021-09-30_12-45-55.png deleted file mode 100644 index c4b4361..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-45-55.png and /dev/null differ diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-46-36.png b/documentation/monitoring/screenshots/image_2021-09-30_12-46-36.png deleted file mode 100644 index 758bba1..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-46-36.png and /dev/null differ diff --git a/documentation/monitoring/screenshots/image_2021-09-30_12-47-18.png b/documentation/monitoring/screenshots/image_2021-09-30_12-47-18.png deleted file mode 100644 index 34e39a8..0000000 Binary files a/documentation/monitoring/screenshots/image_2021-09-30_12-47-18.png and /dev/null differ diff --git a/platform/pom.xml b/platform/pom.xml index 52aabf6..ce8cb1a 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -1,11 +1,9 @@ - + root ru.entaxy.esb - 1.8.2.2 + 1.8.3 4.0.0 @@ -17,109 +15,13 @@ runtime - + - - install-script - - - src/main/scripts/entaxy-platform.install - - - - - - org.codehaus.mojo - license-maven-plugin - - - update-file-header - - update-file-header - - process-sources - - ${license.organizationName} - ${license.inceptionYear} - ${license.projectName} - ${license.copyrightOwners} - ${license.licenseName} + - - false - false - - **/*.json - - - - properties - - - true - true - - ${license.processStartTag} - ${license.processEndTag} - ${license.sectionDelimiter} - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-resources - - validate - - copy-resources - - - ${basedir}/target/scripts - - - src/main/scripts - true - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-script - verify - - attach-artifact - - - - - target/scripts/entaxy-platform.install - install - entaxy-platform - - - - - - - - - - + \ No newline at end of file diff --git a/platform/runtime/base/base-support/pom.xml b/platform/runtime/base/base-support/pom.xml index 771a342..e3a3724 100644 --- a/platform/runtime/base/base-support/pom.xml +++ b/platform/runtime/base/base-support/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base base-support diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/CommonUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/CommonUtils.java index f11b83d..d8379e2 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/CommonUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/CommonUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/DependencySorter.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/DependencySorter.java index 8b8b773..9afde57 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/DependencySorter.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/DependencySorter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,11 +44,29 @@ public class DependencySorter { .collect(Collectors.toList()); if (nextObjects.isEmpty()) // TODO create more informative exception - throw new Exception("Contains unsatisfied dependencies"); + throw new UnsatisfiedDependenciesException( + origin.stream().filter(obj->!result.contains(obj)) + .collect(Collectors.toList()) + ); result.addAll(nextObjects); } return result; } + + @SuppressWarnings("serial") + public static class UnsatisfiedDependenciesException extends Exception { + + protected List objects; + + public UnsatisfiedDependenciesException(List list) { + super("Contains unsatisfied dependencies"); + this.objects.addAll(list); + } + + public List getObjects() { + return objects; + } + } } diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/FileUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/FileUtils.java index 0dddc8a..777286a 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/FileUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/FileUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/JSONUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/JSONUtils.java index fceecb9..8808819 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/JSONUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/JSONUtils.java @@ -1,7 +1,7 @@ /* ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,13 +103,19 @@ public class JSONUtils { return result; } + public static String getJsonRootObjectString(URL url) throws IOException { + try (BufferedReader reader = new BufferedReader(new InputStreamReader( + url.openStream(), StandardCharsets.UTF_8))){ + String data = reader + .lines() + .collect(Collectors.joining("\n")); + return data; + } + + } + public static JsonObject getJsonRootObject(URL url) throws IOException { - String metadata = new BufferedReader ( - new InputStreamReader( - url.openStream(), StandardCharsets.UTF_8)) - .lines() - .collect(Collectors.joining("\n")); - return JSONUtils.getJsonRootObject(metadata); + return JSONUtils.getJsonRootObject(getJsonRootObjectString(url)); } public static JsonObject getJsonRootObject(String jsonData) { @@ -207,6 +213,40 @@ public class JSONUtils { // System.out.println("\n -- found --\n" + currentElement.toString() + "\n"); return true; } + + public static JsonElement findElement(JsonObject jsonObject, String pathFragment) { + JsonElement result = findElement(jsonObject, pathFragment, ""); + + return result; + } + + public static JsonElement findElement(JsonObject jsonObject, String pathFragment, String parentPath) { + + for (Entry entry: jsonObject.entrySet()) { + + String currentPath = parentPath + "." + entry.getKey(); + if (currentPath.endsWith(pathFragment)) + return entry.getValue(); + + } + + for (Entry entry: jsonObject.entrySet()) { + + if (!entry.getValue().isJsonObject()) + continue; + + String currentPath = parentPath + "." + entry.getKey(); + + JsonElement currentResult = findElement(entry.getValue().getAsJsonObject(), pathFragment, currentPath); + + if (currentResult != null) + return currentResult; + } + + + return null; + } + public static class JsonTraverse { diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/BundleUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/BundleUtils.java index c04c1bf..47c909d 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/BundleUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/BundleUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/OSGIUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/OSGIUtils.java index cb6edb3..617f3fe 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/OSGIUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/OSGIUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleContextAware.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleContextAware.java index 1520a4a..5d868ca 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleContextAware.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleContextAware.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleFilter.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleFilter.java index db3dbbb..11633a9 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleFilter.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleFilter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerCustomizerListener.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerCustomizerListener.java index 4c4cbcd..1724b01 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerCustomizerListener.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerCustomizerListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerUtils.java index 518bb46..65df22e 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/BundleTrackerUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/UniformBundleTrackerCustomizer.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/UniformBundleTrackerCustomizer.java index b1c4076..5a81f3e 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/UniformBundleTrackerCustomizer.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/UniformBundleTrackerCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/AbstractBundleFilter.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/AbstractBundleFilter.java index 03968a0..f514743 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/AbstractBundleFilter.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/AbstractBundleFilter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleCapabilityFilter.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleCapabilityFilter.java index db8d413..808f0fe 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleCapabilityFilter.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleCapabilityFilter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleHeaderFilter.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleHeaderFilter.java index 3370be9..f338ea2 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleHeaderFilter.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/osgi/tracker/filter/BundleHeaderFilter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/xml/CommonXMLUtils.java b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/xml/CommonXMLUtils.java index 8a89bf3..ea62054 100644 --- a/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/xml/CommonXMLUtils.java +++ b/platform/runtime/base/base-support/src/main/java/ru/entaxy/platform/base/support/xml/CommonXMLUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * base-support * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/branding/pom.xml b/platform/runtime/base/branding/pom.xml index 3ddbc23..e169eca 100644 --- a/platform/runtime/base/branding/pom.xml +++ b/platform/runtime/base/branding/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/branding/src/main/cfg/branding.properties b/platform/runtime/base/branding/src/main/cfg/branding.properties index f74f56e..6d8f9cf 100644 --- a/platform/runtime/base/branding/src/main/cfg/branding.properties +++ b/platform/runtime/base/branding/src/main/cfg/branding.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # branding # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/pom.xml b/platform/runtime/base/config-extensions/pom.xml index 3d83e0c..ebb31aa 100644 --- a/platform/runtime/base/config-extensions/pom.xml +++ b/platform/runtime/base/config-extensions/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base config-extensions diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ConfigLookupConfigurationPlugin.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ConfigLookupConfigurationPlugin.java index 8d8be5c..7722661 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ConfigLookupConfigurationPlugin.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ConfigLookupConfigurationPlugin.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * config-plugin * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProvider.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProvider.java index 8e0660f..dc7f00d 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProvider.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProviderWithImmutables.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProviderWithImmutables.java index 3248795..5db3dff 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProviderWithImmutables.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/DefaultPropertiesProviderWithImmutables.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/Immutables.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/Immutables.java index 9c5b278..7020fe0 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/Immutables.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/Immutables.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesCollector.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesCollector.java index d864023..dcedf57 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesCollector.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesConfigurationPlugin.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesConfigurationPlugin.java index 8c2e58f..878d765 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesConfigurationPlugin.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesConfigurationPlugin.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesImpl.java b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesImpl.java index 2da78f4..8ea41b4 100644 --- a/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesImpl.java +++ b/platform/runtime/base/config-extensions/src/main/java/ru/entaxy/platform/base/config/ImmutablesImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * configuration-test-1 * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/pom.xml b/platform/runtime/base/connecting/adapter/adapters-core/pom.xml index 7fe3528..a6a0521 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/pom.xml +++ b/platform/runtime/base/connecting/adapter/adapters-core/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/api/Adapter.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/api/Adapter.java index 6391aef..a88eda5 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/api/Adapter.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/api/Adapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/impl/DefaultAdapter.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/impl/DefaultAdapter.java index 046e449..491d173 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/impl/DefaultAdapter.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/impl/DefaultAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBean.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBean.java index 9830732..ccadeed 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBean.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBeanImpl.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBeanImpl.java index 70befc0..e13a761 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBeanImpl.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdapterMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBean.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBean.java index f3ab725..6528764 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBean.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBeanImpl.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBeanImpl.java index f286f69..d9b3706 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBeanImpl.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/management/AdaptersMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterFieldElement.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterFieldElement.java index 8ed583b..fb7485e 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterFieldElement.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterFieldElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterGeneratorElement.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterGeneratorElement.java index a72affe..9644a2b 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterGeneratorElement.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterGeneratorElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterMetadataElement.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterMetadataElement.java index 3c4803f..7257ea5 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterMetadataElement.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/metadata/AdapterMetadataElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterHelper.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterHelper.java index 3eb4b07..2de54af 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterHelper.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTracker.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTracker.java index 23c8bd0..c3c8767 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTracker.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTracker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTrackerActivator.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTrackerActivator.java index e23be38..700d9b6 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTrackerActivator.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/tracker/AdapterTrackerActivator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/AdapterUtil.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/AdapterUtil.java index c74dcec..8a96ae4 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/AdapterUtil.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/AdapterUtil.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/ConnectionUsageType.java b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/ConnectionUsageType.java index c42a6b8..702bef6 100644 --- a/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/ConnectionUsageType.java +++ b/platform/runtime/base/connecting/adapter/adapters-core/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/adapter/core/util/ConnectionUsageType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * adapters-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/pom.xml b/platform/runtime/base/connecting/adapter/amqp-adapter/pom.xml index 73ded03..f6b272f 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/from.ftl index 1d2e53b..a5510fc 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/init.ftl index 3a83961..e79a8ae 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/queryParameters.ftl index e594c1d..2ba3a68 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/ref.ftl index 7e50fe5..2f2d54e 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/to.ftl index 944aaf4..0c4f8ff 100644 --- a/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/amqp-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/pom.xml b/platform/runtime/base/connecting/adapter/artemis-adapter/pom.xml index a39e418..0442916 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/from.ftl index 5a3bc37..05006ef 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/init.ftl index e78e0c3..a395b93 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/queryParameters.ftl index 1ab0b81..5af6d0b 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/ref.ftl index 0925da0..21cb4c7 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/to.ftl index 58ac7c2..e566b18 100644 --- a/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/pom.xml b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/pom.xml index ba68dcb..d967f13 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/from.ftl index f213d9f..957026e 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/init.ftl index 88330f8..ea4182e 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/queryParameters.ftl index 0bd5124..c80c9f2 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/ref.ftl index 4aafb40..2209bd7 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/to.ftl index 55adffb..2d8d278 100644 --- a/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/artemis-amqp-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ artemis-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/pom.xml b/platform/runtime/base/connecting/adapter/file-adapter/pom.xml index 6d33a62..0bd8536 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/file-adapter/pom.xml @@ -4,7 +4,7 @@ ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/java/ru/entaxy/platform/adapter/file/ExtendedFileComponent.java b/platform/runtime/base/connecting/adapter/file-adapter/src/main/java/ru/entaxy/platform/adapter/file/ExtendedFileComponent.java index d571e02..f989aed 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/java/ru/entaxy/platform/adapter/file/ExtendedFileComponent.java +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/java/ru/entaxy/platform/adapter/file/ExtendedFileComponent.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * file-adapter * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/factory/file-adapter.json b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/factory/file-adapter.json index 9b65317..8074222 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/factory/file-adapter.json +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/factory/file-adapter.json @@ -1,2746 +1,2884 @@ { - "factory": { - "id": "file-adapter", - "type": "entaxy.runtime.connection", - "label": "file,core", - "description": "Read and write files.", - "category": "adapter" - }, - "entaxy.runtime.connection": {}, - "fields": { - "bridgeErrorHandler": { - "displayName": "Bridge Error Handler", - "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "old": { - "kind": "property", - "javaType": "boolean", - "deprecated": false - }, - "new": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - } - }, - "lazyStartProducer": { - "displayName": "Lazy Start Producer", - "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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing.", - "label": "producer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "producer", - "##others": { - "old": { - "kind": "property", - "javaType": "boolean", - "deprecated": false - }, - "new": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - } - }, - "basicPropertyBinding": { - "displayName": "Basic Property Binding", - "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities", - "label": "advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "advanced", - "##others": { - "old": { - "kind": "property", - "javaType": "boolean", - "deprecated": false - }, - "new": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - } - }, - "directoryName": { - "displayName": "Directory Name", - "description": "The starting directory", - "label": "", - "type": "string", - "required": true, - "hidden": false, - "group": "common", - "##others": { - "kind": "path", - "javaType": "java.io.File", - "deprecated": false, - "deprecationNote": "" - } - }, - "charset": { - "displayName": "Charset", - "description": "This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to convert the data into the configured charset, so do not use this if you have big messages.", - "label": "", - "type": "string", - "required": false, - "hidden": false, - "group": "common", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "doneFileName": { - "displayName": "Done File Name", - "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The done file is always expected in the same folder as the original file. Only ${file.name} and ${file.name.next} is supported as dynamic placeholders.", - "label": "", - "type": "string", - "required": false, - "hidden": false, - "group": "common", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "fileName": { - "displayName": "File Name", - "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it\u0027s used as a filename filter. For producers, it\u0027s used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If the expression is an Expression type, the specified Expression type is used - this allows you, for instance, to use OGNL expressions. For the consumer, you can use it to filter filenames, so you can for instance consume today\u0027s file using the File Language syntax: mydata-${date:now:yyyyMMdd}.txt. The producers support the CamelOverruleFileName header which takes precedence over any existing CamelFileName header; the CamelOverruleFileName is a header that is used only once, and makes it easier as this avoids to temporary store CamelFileName and have to restore it afterwards.", - "label": "", - "type": "string", - "required": false, - "hidden": false, - "group": "common", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "delete": { - "displayName": "Delete", - "description": "If true, the file will be deleted after it is processed successfully.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "moveFailed": { - "displayName": "Move Failed", - "description": "Sets the move failure expression based on Simple language. For example, to move files into a .error subdirectory use: .error. Note: When moving the files to the fail location Camel will handle the error and will not pick up the file again.", - "label": "consumer", - "type": "string", - "required": false, - "hidden": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "noop": { - "displayName": "Noop", - "description": "If true, the file is not moved or deleted in any way. This option is good for readonly data, or for ETL type requirements. If noop\u003dtrue, Camel will set idempotent\u003dtrue as well, to avoid consuming the same files over and over again.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "preMove": { - "displayName": "Pre Move", - "description": "Expression (such as File Language) used to dynamically set the filename when moving it before processing. For example to move in-progress files into the order directory set this value to order.", - "label": "consumer", - "type": "string", - "required": false, - "hidden": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "preSort": { - "displayName": "Pre Sort", - "description": "When pre-sort is enabled then the consumer will sort the file and directory names during polling, that was retrieved from the file system. You may want to do this in case you need to operate on the files in a sorted order. The pre-sort is executed before the consumer starts to filter, and accept files to process by Camel. This option is default\u003dfalse meaning disabled.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "recursive": { - "displayName": "Recursive", - "description": "If a directory, will look for files in all the sub-directories as well.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "sendEmptyMessageWhenIdle": { - "displayName": "Send Empty Message When Idle", - "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.", - "label": "consumer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "directoryMustExist": { - "displayName": "Directory Must Exist", - "description": "Similar to the startingDirectoryMustExist option but this applies during polling (after starting the consumer).", - "label": "consumer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "exceptionHandler": { - "displayName": "Exception Handler", - "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.spi.ExceptionHandler", - "optionalPrefix": "consumer.", - "deprecated": false - } - }, - "exchangePattern": { - "displayName": "Exchange Pattern", - "description": "Sets the exchange pattern when the consumer creates an exchange.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.ExchangePattern", - "enum": [ - "InOnly", - "InOut", - "InOptionalOut" - ], - "deprecated": false - } - }, - "extendedAttributes": { - "displayName": "Extended Attributes", - "description": "To define which file attributes of interest. Like posix:permissions,posix:owner,basic:lastAccessTime, it supports basic wildcard like posix:, basic:lastAccessTime", - "label": "consumer,advanced", - "type": "string", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "inProgressRepository": { - "displayName": "In Progress Repository", - "description": "A pluggable in-progress repository org.apache.camel.spi.IdempotentRepository. The in-progress repository is used to account the current in progress files being consumed. By default a memory based repository is used.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.spi.IdempotentRepository", - "deprecated": false - } - }, - "localWorkDirectory": { - "displayName": "Local Work Directory", - "description": "When consuming, a local work directory can be used to store the remote file content directly in local files, to avoid loading the content into memory. This is beneficial, if you consume a very big remote file and thus can conserve memory.", - "label": "consumer,advanced", - "type": "string", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "onCompletionExceptionHandler": { - "displayName": "On Completion Exception Handler", - "description": "To use a custom org.apache.camel.spi.ExceptionHandler to handle any thrown exceptions that happens during the file on completion process where the consumer does either a commit or rollback. The default implementation will log any exception at WARN level and ignore.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.spi.ExceptionHandler", - "deprecated": false - } - }, - "pollStrategy": { - "displayName": "Poll Strategy", - "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", - "deprecated": false - } - }, - "probeContentType": { - "displayName": "Probe Content Type", - "description": "Whether to enable probing of the content type. If enable then the consumer uses Files#probeContentType(java.nio.file.Path) to determine the content-type of the file, and store that as a header with key Exchange#FILE_CONTENT_TYPE on the Message.", - "label": "consumer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "processStrategy": { - "displayName": "Process Strategy", - "description": "A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply.", - "label": "consumer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.component.file.GenericFileProcessStrategy\u003cjava.io.File\u003e", - "deprecated": false - } - }, - "startingDirectoryMustExist": { - "displayName": "Starting Directory Must Exist", - "description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn\u0027t exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn\u0027t exist.", - "label": "consumer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "startingDirectoryMustHaveAccess": { - "displayName": "Starting Directory Must Have Access", - "description": "Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn\u0027t have read and write permissions.", - "label": "consumer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "consumer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "appendChars": { - "displayName": "Append Chars", - "description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.", - "label": "producer", - "type": "string", - "required": false, - "hidden": false, - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "fileExist": { - "displayName": "File Exist", - "description": "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. The option eagerDeleteTargetFile can be used to control what to do if an moving the file, and there exists already an existing file, otherwise causing the move operation to fail. The Move option will move any existing files, before writing the target file. - TryRename is only applicable if tempFileName option is in use. This allows to try renaming the file from the temporary name to the actual name, without doing any exists check. This check may be faster on some file systems and especially FTP servers.", - "label": "producer", - "type": "object", - "required": false, - "hidden": false, - "defaultValue": "Override", - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.component.file.GenericFileExist", - "enum": [ - "Override", - "Append", - "Fail", - "Ignore", - "Move", - "TryRename" - ], - "deprecated": false - } - }, - "flatten": { - "displayName": "Flatten", - "description": "Flatten is used to flatten the file name path to strip any leading paths, so it\u0027s just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths.", - "label": "producer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "jailStartingDirectory": { - "displayName": "Jail Starting Directory", - "description": "Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders.", - "label": "producer", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "moveExisting": { - "displayName": "Move Existing", - "description": "Expression (such as File Language) used to compute file name to use when fileExist\u003dMove is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name, file:name.ext, file:name.noext, file:onlyname, file:onlyname.noext, file:ext, and file:parent. Notice the file:parent is not supported by the FTP component, as the FTP component can only move any existing files to a relative directory based on current dir as base.", - "label": "producer", - "type": "string", - "required": false, - "hidden": false, - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "tempFileName": { - "displayName": "Temp File Name", - "description": "The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. The location for tempFilename is relative to the final file location in the option \u0027fileName\u0027, not the target directory in the base uri. For example if option fileName includes a directory prefix: dir/finalFilename then tempFileName is relative to that subdirectory dir.", - "label": "producer", - "type": "string", - "required": false, - "hidden": false, - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "tempPrefix": { - "displayName": "Temp Prefix", - "description": "This option is used to write the file using a temporary name and then, after the write is complete, rename it to the real name. Can be used to identify files being written and also avoid consumers (not using exclusive read locks) reading in progress files. Is often used by FTP when uploading big files.", - "label": "producer", - "type": "string", - "required": false, - "hidden": false, - "group": "producer", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "allowNullBody": { - "displayName": "Allow Null Body", - "description": "Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of \u0027Cannot write null body to file.\u0027 will be thrown. If the fileExist option is set to \u0027Override\u0027, then the file will be truncated, and if set to append the file will remain unchanged.", - "label": "producer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "chmod": { - "displayName": "Chmod", - "description": "Specify the file permissions which is sent by the producer, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it.", - "label": "producer,advanced", - "type": "string", - "required": false, - "hidden": false, - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "chmodDirectory": { - "displayName": "Chmod Directory", - "description": "Specify the directory permissions used when the producer creates missing directories, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it.", - "label": "producer,advanced", - "type": "string", - "required": false, - "hidden": false, - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "eagerDeleteTargetFile": { - "displayName": "Eager Delete Target File", - "description": "Whether or not to eagerly delete any existing target file. This option only applies when you use fileExists\u003dOverride and the tempFileName option as well. You can use this to disable (set it to false) deleting the target file before the temp file is written. For example you may write big files and want the target file to exists during the temp file is being written. This ensure the target file is only deleted until the very last moment, just before the temp file is being renamed to the target filename. This option is also used to control whether to delete any existing files when fileExist\u003dMove is enabled, and an existing file exists. If this option copyAndDeleteOnRenameFails false, then an exception will be thrown if an existing file existed, if its true, then the existing file is deleted before the move operation.", - "label": "producer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "forceWrites": { - "displayName": "Force Writes", - "description": "Whether to force syncing writes to the file system. You can turn this off if you do not want this level of guarantee, for example if writing to logs / audit logs etc; this would yield better performance.", - "label": "producer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "keepLastModified": { - "displayName": "Keep Last Modified", - "description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.", - "label": "producer,advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "moveExistingFileStrategy": { - "displayName": "Move Existing File Strategy", - "description": "Strategy (Custom Strategy) used to move file with special naming token to use when fileExist\u003dMove is configured. By default, there is an implementation used if no custom strategy is provided", - "label": "producer,advanced", - "type": "object", - "required": false, - "hidden": false, - "group": "producer (advanced)", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.component.file.strategy.FileMoveExistingStrategy", - "deprecated": false - } - }, - "autoCreate": { - "displayName": "Auto Create", - "description": "Automatically create missing directories in the file\u0027s pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to.", - "label": "advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "advanced", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "bufferSize": { - "displayName": "Buffer Size", - "description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).", - "label": "advanced", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "131072", - "group": "advanced", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "copyAndDeleteOnRenameFail": { - "displayName": "Copy And Delete On Rename Fail", - "description": "Whether to fallback and do a copy and delete file, in case the file could not be renamed directly. This option is not available for the FTP component.", - "label": "advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "advanced", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "renameUsingCopy": { - "displayName": "Rename Using Copy", - "description": "Perform rename operations using a copy and delete strategy. This is primarily used in environments where the regular rename operation is unreliable (e.g. across different file systems or networks). This option takes precedence over the copyAndDeleteOnRenameFail parameter that will automatically fall back to the copy and delete strategy, but only after additional delays.", - "label": "advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "advanced", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "synchronous": { - "displayName": "Synchronous", - "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).", - "label": "advanced", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "false", - "group": "advanced", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "antExclude": { - "displayName": "Ant Exclude", - "description": "Ant style filter exclusion. If both antInclude and antExclude are used, antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format.", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "antFilterCaseSensitive": { - "displayName": "Ant Filter Case Sensitive", - "description": "Sets case sensitive flag on ant filter.", - "label": "consumer,filter", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "antInclude": { - "displayName": "Ant Include", - "description": "Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format.", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "eagerMaxMessagesPerPoll": { - "displayName": "Eager Max Messages Per Poll", - "description": "Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files, and then perform sorting. Setting this option to false allows for sorting all files first, and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting.", - "label": "consumer,filter", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "exclude": { - "displayName": "Exclude", - "description": "Is used to exclude files, if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "filter": { - "displayName": "Filter", - "description": "Pluggable filter as a org.apache.camel.component.file.GenericFileFilter class. Will skip files if filter returns false in its accept() method.", - "label": "consumer,filter", - "type": "object", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.component.file.GenericFileFilter\u003cjava.io.File\u003e", - "deprecated": false - } - }, - "filterDirectory": { - "displayName": "Filter Directory", - "description": "Filters the directory based on Simple language. For example to filter on current date, you can use a simple date pattern such as ${date:now:yyyMMdd}", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "filterFile": { - "displayName": "Filter File", - "description": "Filters the file based on Simple language. For example to filter on file size, you can use ${file:size} 5000", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "idempotent": { - "displayName": "Idempotent", - "description": "Option to use the Idempotent Consumer EIP pattern to let Camel skip already processed files. Will by default use a memory based LRUCache that holds 1000 entries. If noop\u003dtrue then idempotent will be enabled as well to avoid consuming the same files over and over again.", - "label": "consumer,filter", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "false", - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.Boolean", - "deprecated": false - } - }, - "idempotentKey": { - "displayName": "Idempotent Key", - "description": "To use a custom idempotent key. By default the absolute path of the file is used. You can use the File Language, for example to use the file name and file size, you can do: idempotentKey\u003d${file:name}-${file:size}", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "idempotentRepository": { - "displayName": "Idempotent Repository", - "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which by default use MemoryMessageIdRepository if none is specified and idempotent is true.", - "label": "consumer,filter", - "type": "object", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.spi.IdempotentRepository", - "deprecated": false - } - }, - "include": { - "displayName": "Include", - "description": "Is used to include files, if filename matches the regex pattern (matching is case in-sensitive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "maxDepth": { - "displayName": "Max Depth", - "description": "The maximum depth to traverse when recursively processing a directory.", - "label": "consumer,filter", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "2147483647", - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "maxMessagesPerPoll": { - "displayName": "Max Messages Per Poll", - "description": "To define a maximum messages to gather per poll. By default no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. Notice: If this option is in use then the File and FTP components will limit before any sorting. For example if you have 100000 files and use maxMessagesPerPoll\u003d500, then only the first 500 files will be picked up, and then sorted. You can use the eagerMaxMessagesPerPoll option and set this to false to allow to scan all files first and then sort afterwards.", - "label": "consumer,filter", - "type": "integer", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "minDepth": { - "displayName": "Min Depth", - "description": "The minimum depth to start processing when recursively processing a directory. Using minDepth\u003d1 means the base directory. Using minDepth\u003d2 means the first sub directory.", - "label": "consumer,filter", - "type": "integer", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "move": { - "displayName": "Move", - "description": "Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done.", - "label": "consumer,filter", - "type": "string", - "required": false, - "hidden": false, - "group": "filter", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "exclusiveReadLockStrategy": { - "displayName": "Exclusive Read Lock Strategy", - "description": "Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation.", - "label": "consumer,lock", - "type": "object", - "required": false, - "hidden": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy\u003cjava.io.File\u003e", - "deprecated": false - } - }, - "readLock": { - "displayName": "Read Lock", - "description": "Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: - none - No read lock is in use - markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component - changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this, so this option cannot consume files as fast as the others, but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. - fileLock - is for using java.nio.channels.FileLock. This option is not avail for Windows OS and the FTP component. This approach should be avoided when accessing a remote file system via a mount/share unless that file system supports distributed file locks. - rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. - idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that.Notice: The various read locks is not all suited to work in clustered mode, where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file, but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks, and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering, such as Hazelcast Component or Infinispan.", - "label": "consumer,lock", - "type": "string", - "required": false, - "hidden": false, - "defaultValue": "none", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "enum": [ - "none", - "markerFile", - "fileLock", - "rename", - "changed", - "idempotent", - "idempotent-changed", - "idempotent-rename" - ], - "deprecated": false - } - }, - "readLockCheckInterval": { - "displayName": "Read Lock Check Interval", - "description": "Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "1000", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "readLockDeleteOrphanLockFiles": { - "displayName": "Read Lock Delete Orphan Lock Files", - "description": "Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory.", - "label": "consumer,lock", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "readLockIdempotentReleaseAsync": { - "displayName": "Read Lock Idempotent Release Async", - "description": "Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option.", - "label": "consumer,lock", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "readLockIdempotentReleaseAsyncPoolSize": { - "displayName": "Read Lock Idempotent Release Async Pool Size", - "description": "The number of threads in the scheduled thread pool when using asynchronous release tasks. Using a default of 1 core threads should be sufficient in almost all use-cases, only set this to a higher value if either updating the idempotent repository is slow, or there are a lot of files to process. This option is not in-use if you use a shared thread pool by configuring the readLockIdempotentReleaseExecutorService option. See more details at the readLockIdempotentReleaseDelay option.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "readLockIdempotentReleaseDelay": { - "displayName": "Read Lock Idempotent Release Delay", - "description": "Whether to delay the release task for a period of millis. This can be used to delay the release tasks to expand the window when a file is regarded as read-locked, in an active/active cluster scenario with a shared idempotent repository, to ensure other nodes cannot potentially scan and acquire the same file, due to race-conditions. By expanding the time-window of the release tasks helps prevents these situations. Note delaying is only needed if you have configured readLockRemoveOnCommit to true.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "readLockIdempotentReleaseExecutorService": { - "displayName": "Read Lock Idempotent Release Executor Service", - "description": "To use a custom and shared thread pool for asynchronous release tasks. See more details at the readLockIdempotentReleaseDelay option.", - "label": "consumer,lock", - "type": "object", - "required": false, - "hidden": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "java.util.concurrent.ScheduledExecutorService", - "deprecated": false - } - }, - "readLockLoggingLevel": { - "displayName": "Read Lock Logging Level", - "description": "Logging level used when a read lock could not be acquired. By default a DEBUG is logged. You can change this level, for example to OFF to not have any logging. This option is only applicable for readLock of types: changed, fileLock, idempotent, idempotent-changed, idempotent-rename, rename.", - "label": "consumer,lock", - "type": "object", - "required": false, - "hidden": false, - "defaultValue": "DEBUG", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.LoggingLevel", - "enum": [ - "TRACE", - "DEBUG", - "INFO", - "WARN", - "ERROR", - "OFF" - ], - "deprecated": false - } - }, - "readLockMarkerFile": { - "displayName": "Read Lock Marker File", - "description": "Whether to use marker file with the changed, rename, or exclusive read lock types. By default a marker file is used as well to guard against other processes picking up the same files. This behavior can be turned off by setting this option to false. For example if you do not want to write marker files to the file systems by the Camel application.", - "label": "consumer,lock", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "readLockMinAge": { - "displayName": "Read Lock Min Age", - "description": "This option is applied only for readLock\u003dchanged. It allows to specify a minimum age the file must be before attempting to acquire the read lock. For example use readLockMinAge\u003d300s to require the file is at last 5 minutes old. This can speedup the changed read lock as it will only attempt to acquire files which are at least that given age.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "0", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "readLockMinLength": { - "displayName": "Read Lock Min Length", - "description": "This option is applied only for readLock\u003dchanged. It allows you to configure a minimum file length. By default Camel expects the file to contain data, and thus the default value is 1. You can set this option to zero, to allow consuming zero-length files.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "1", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "readLockRemoveOnCommit": { - "displayName": "Read Lock Remove On Commit", - "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file is succeeded and a commit happens. By default the file is not removed which ensures that any race-condition do not occur so another active node may attempt to grab the file. Instead the idempotent repository may support eviction strategies that you can configure to evict the file name entry after X minutes - this ensures no problems with race conditions. See more details at the readLockIdempotentReleaseDelay option.", - "label": "consumer,lock", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "readLockRemoveOnRollback": { - "displayName": "Read Lock Remove On Rollback", - "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file failed and a rollback happens. If this option is false, then the file name entry is confirmed (as if the file did a commit).", - "label": "consumer,lock", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "readLockTimeout": { - "displayName": "Read Lock Timeout", - "description": "Optional timeout in millis for the read-lock, if supported by the read-lock. If the read-lock could not be granted and the timeout triggered, then Camel will skip the file. At next poll Camel, will try the file again, and this time maybe the read-lock could be granted. Use a value of 0 or lower to indicate forever. Currently fileLock, changed and rename support the timeout. Notice: For FTP the default readLockTimeout value is 20000 instead of 10000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit.", - "label": "consumer,lock", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "10000", - "group": "lock", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "backoffErrorThreshold": { - "displayName": "Backoff Error Threshold", - "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "backoffIdleThreshold": { - "displayName": "Backoff Idle Threshold", - "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "backoffMultiplier": { - "displayName": "Backoff Multiplier", - "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "int", - "deprecated": false - } - }, - "delay": { - "displayName": "Delay", - "description": "Milliseconds before the next poll.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "500", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "greedy": { - "displayName": "Greedy", - "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.", - "label": "consumer,scheduler", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "initialDelay": { - "displayName": "Initial Delay", - "description": "Milliseconds before the first poll starts.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "1000", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "repeatCount": { - "displayName": "Repeat Count", - "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.", - "label": "consumer,scheduler", - "type": "integer", - "required": false, - "hidden": false, - "defaultValue": "0", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "long", - "deprecated": false - } - }, - "runLoggingLevel": { - "displayName": "Run Logging Level", - "description": "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.", - "label": "consumer,scheduler", - "type": "object", - "required": false, - "hidden": false, - "defaultValue": "TRACE", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "org.apache.camel.LoggingLevel", - "enum": [ - "TRACE", - "DEBUG", - "INFO", - "WARN", - "ERROR", - "OFF" - ], - "deprecated": false - } - }, - "scheduledExecutorService": { - "displayName": "Scheduled Executor Service", - "description": "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.", - "label": "consumer,scheduler", - "type": "object", - "required": false, - "hidden": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "java.util.concurrent.ScheduledExecutorService", - "deprecated": false - } - }, - "scheduler": { - "displayName": "Scheduler", - "description": "To use a cron scheduler from either camel-spring or camel-quartz component", - "label": "consumer,scheduler", - "type": "string", - "required": false, - "hidden": false, - "defaultValue": "none", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "enum": [ - "none", - "spring", - "quartz" - ], - "deprecated": false - } - }, - "schedulerProperties": { - "displayName": "Scheduler Properties", - "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.", - "label": "consumer,scheduler", - "type": "object", - "required": false, - "hidden": false, - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "java.util.Map\u003cjava.lang.String, java.lang.Object\u003e", - "prefix": "scheduler.", - "multiValue": true, - "deprecated": false - } - }, - "startScheduler": { - "displayName": "Start Scheduler", - "description": "Whether the scheduler should be auto started.", - "label": "consumer,scheduler", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "timeUnit": { - "displayName": "Time Unit", - "description": "Time unit for initialDelay and delay options.", - "label": "consumer,scheduler", - "type": "object", - "required": false, - "hidden": false, - "defaultValue": "MILLISECONDS", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "java.util.concurrent.TimeUnit", - "enum": [ - "NANOSECONDS", - "MICROSECONDS", - "MILLISECONDS", - "SECONDS", - "MINUTES", - "HOURS", - "DAYS" - ], - "deprecated": false - } - }, - "useFixedDelay": { - "displayName": "Use Fixed Delay", - "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.", - "label": "consumer,scheduler", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": "true", - "group": "scheduler", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "shuffle": { - "displayName": "Shuffle", - "description": "To shuffle the list of files (sort in random order)", - "label": "consumer,sort", - "type": "boolean", - "required": false, - "hidden": false, - "defaultValue": false, - "group": "sort", - "##others": { - "kind": "parameter", - "javaType": "boolean", - "deprecated": false - } - }, - "sortBy": { - "displayName": "Sort By", - "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date.", - "label": "consumer,sort", - "type": "string", - "required": false, - "hidden": false, - "group": "sort", - "##others": { - "kind": "parameter", - "javaType": "java.lang.String", - "deprecated": false - } - }, - "sorter": { - "displayName": "Sorter", - "description": "Pluggable sorter as a java.util.Comparator class.", - "label": "consumer,sort", - "type": "object", - "required": false, - "hidden": false, - "group": "sort", - "##others": { - "kind": "parameter", - "javaType": "java.util.Comparator\u003corg.apache.camel.component.file.GenericFile\u003cjava.io.File\u003e\u003e", - "deprecated": false - } - }, - "rootDirectory": { - "type": "String", - "group": "entaxy", - "required": true - } - }, - "outputs": { - "init": { - "isDefault": true, - "generator": "", - "config": { - "configurable": true - }, - "fields": { - "rootDirectory": {} - } - } - }, - "##origin": { - "component": { - "kind": "component", - "name": "file", - "title": "File", - "description": "Read and write files.", - "deprecated": false, - "firstVersion": "1.0.0", - "label": "file,core", - "javaType": "org.apache.camel.component.file.FileComponent", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-file", - "version": "3.4.5", - "scheme": "file", - "extendsScheme": "", - "syntax": "file:directoryName", - "async": false, - "consumerOnly": false, - "producerOnly": false, - "lenientProperties": false - }, - "componentProperties": { - "bridgeErrorHandler": { - "kind": "property", - "displayName": "Bridge Error Handler", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored." - }, - "lazyStartProducer": { - "kind": "property", - "displayName": "Lazy Start Producer", - "group": "producer", - "label": "producer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": 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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." - }, - "basicPropertyBinding": { - "kind": "property", - "displayName": "Basic Property Binding", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" - } - }, - "properties": { - "directoryName": { - "kind": "path", - "displayName": "Directory Name", - "group": "common", - "label": "", - "required": true, - "type": "string", - "javaType": "java.io.File", - "deprecated": false, - "deprecationNote": "", - "secret": false, - "description": "The starting directory" - }, - "charset": { - "kind": "parameter", - "displayName": "Charset", - "group": "common", - "label": "", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to convert the data into the configured charset, so do not use this if you have big messages." - }, - "doneFileName": { - "kind": "parameter", - "displayName": "Done File Name", - "group": "common", - "label": "", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The done file is always expected in the same folder as the original file. Only ${file.name} and ${file.name.next} is supported as dynamic placeholders." - }, - "fileName": { - "kind": "parameter", - "displayName": "File Name", - "group": "common", - "label": "", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it\u0027s used as a filename filter. For producers, it\u0027s used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If the expression is an Expression type, the specified Expression type is used - this allows you, for instance, to use OGNL expressions. For the consumer, you can use it to filter filenames, so you can for instance consume today\u0027s file using the File Language syntax: mydata-${date:now:yyyyMMdd}.txt. The producers support the CamelOverruleFileName header which takes precedence over any existing CamelFileName header; the CamelOverruleFileName is a header that is used only once, and makes it easier as this avoids to temporary store CamelFileName and have to restore it afterwards." - }, - "bridgeErrorHandler": { - "kind": "parameter", - "displayName": "Bridge Error Handler", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored." - }, - "delete": { - "kind": "parameter", - "displayName": "Delete", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "If true, the file will be deleted after it is processed successfully." - }, - "moveFailed": { - "kind": "parameter", - "displayName": "Move Failed", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Sets the move failure expression based on Simple language. For example, to move files into a .error subdirectory use: .error. Note: When moving the files to the fail location Camel will handle the error and will not pick up the file again." - }, - "noop": { - "kind": "parameter", - "displayName": "Noop", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "If true, the file is not moved or deleted in any way. This option is good for readonly data, or for ETL type requirements. If noop\u003dtrue, Camel will set idempotent\u003dtrue as well, to avoid consuming the same files over and over again." - }, - "preMove": { - "kind": "parameter", - "displayName": "Pre Move", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Expression (such as File Language) used to dynamically set the filename when moving it before processing. For example to move in-progress files into the order directory set this value to order." - }, - "preSort": { - "kind": "parameter", - "displayName": "Pre Sort", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "When pre-sort is enabled then the consumer will sort the file and directory names during polling, that was retrieved from the file system. You may want to do this in case you need to operate on the files in a sorted order. The pre-sort is executed before the consumer starts to filter, and accept files to process by Camel. This option is default\u003dfalse meaning disabled." - }, - "recursive": { - "kind": "parameter", - "displayName": "Recursive", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "If a directory, will look for files in all the sub-directories as well." - }, - "sendEmptyMessageWhenIdle": { - "kind": "parameter", - "displayName": "Send Empty Message When Idle", - "group": "consumer", - "label": "consumer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." - }, - "directoryMustExist": { - "kind": "parameter", - "displayName": "Directory Must Exist", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Similar to the startingDirectoryMustExist option but this applies during polling (after starting the consumer)." - }, - "exceptionHandler": { - "kind": "parameter", - "displayName": "Exception Handler", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.spi.ExceptionHandler", - "optionalPrefix": "consumer.", - "deprecated": false, - "secret": false, - "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored." - }, - "exchangePattern": { - "kind": "parameter", - "displayName": "Exchange Pattern", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.ExchangePattern", - "enum": [ - "InOnly", - "InOut", - "InOptionalOut" - ], - "deprecated": false, - "secret": false, - "description": "Sets the exchange pattern when the consumer creates an exchange." - }, - "extendedAttributes": { - "kind": "parameter", - "displayName": "Extended Attributes", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "To define which file attributes of interest. Like posix:permissions,posix:owner,basic:lastAccessTime, it supports basic wildcard like posix:, basic:lastAccessTime" - }, - "inProgressRepository": { - "kind": "parameter", - "displayName": "In Progress Repository", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.spi.IdempotentRepository", - "deprecated": false, - "secret": false, - "description": "A pluggable in-progress repository org.apache.camel.spi.IdempotentRepository. The in-progress repository is used to account the current in progress files being consumed. By default a memory based repository is used." - }, - "localWorkDirectory": { - "kind": "parameter", - "displayName": "Local Work Directory", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "When consuming, a local work directory can be used to store the remote file content directly in local files, to avoid loading the content into memory. This is beneficial, if you consume a very big remote file and thus can conserve memory." - }, - "onCompletionExceptionHandler": { - "kind": "parameter", - "displayName": "On Completion Exception Handler", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.spi.ExceptionHandler", - "deprecated": false, - "secret": false, - "description": "To use a custom org.apache.camel.spi.ExceptionHandler to handle any thrown exceptions that happens during the file on completion process where the consumer does either a commit or rollback. The default implementation will log any exception at WARN level and ignore." - }, - "pollStrategy": { - "kind": "parameter", - "displayName": "Poll Strategy", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", - "deprecated": false, - "secret": false, - "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel." - }, - "probeContentType": { - "kind": "parameter", - "displayName": "Probe Content Type", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether to enable probing of the content type. If enable then the consumer uses Files#probeContentType(java.nio.file.Path) to determine the content-type of the file, and store that as a header with key Exchange#FILE_CONTENT_TYPE on the Message." - }, - "processStrategy": { - "kind": "parameter", - "displayName": "Process Strategy", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.component.file.GenericFileProcessStrategy\u003cjava.io.File\u003e", - "deprecated": false, - "secret": false, - "description": "A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply." - }, - "startingDirectoryMustExist": { - "kind": "parameter", - "displayName": "Starting Directory Must Exist", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn\u0027t exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn\u0027t exist." - }, - "startingDirectoryMustHaveAccess": { - "kind": "parameter", - "displayName": "Starting Directory Must Have Access", - "group": "consumer (advanced)", - "label": "consumer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn\u0027t have read and write permissions." - }, - "appendChars": { - "kind": "parameter", - "displayName": "Append Chars", - "group": "producer", - "label": "producer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n." - }, - "fileExist": { - "kind": "parameter", - "displayName": "File Exist", - "group": "producer", - "label": "producer", - "required": false, - "type": "object", - "javaType": "org.apache.camel.component.file.GenericFileExist", - "enum": [ - "Override", - "Append", - "Fail", - "Ignore", - "Move", - "TryRename" - ], - "deprecated": false, - "secret": false, - "defaultValue": "Override", - "description": "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. The option eagerDeleteTargetFile can be used to control what to do if an moving the file, and there exists already an existing file, otherwise causing the move operation to fail. The Move option will move any existing files, before writing the target file. - TryRename is only applicable if tempFileName option is in use. This allows to try renaming the file from the temporary name to the actual name, without doing any exists check. This check may be faster on some file systems and especially FTP servers." - }, - "flatten": { - "kind": "parameter", - "displayName": "Flatten", - "group": "producer", - "label": "producer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Flatten is used to flatten the file name path to strip any leading paths, so it\u0027s just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths." - }, - "jailStartingDirectory": { - "kind": "parameter", - "displayName": "Jail Starting Directory", - "group": "producer", - "label": "producer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders." - }, - "lazyStartProducer": { - "kind": "parameter", - "displayName": "Lazy Start Producer", - "group": "producer", - "label": "producer", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": 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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." - }, - "moveExisting": { - "kind": "parameter", - "displayName": "Move Existing", - "group": "producer", - "label": "producer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Expression (such as File Language) used to compute file name to use when fileExist\u003dMove is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name, file:name.ext, file:name.noext, file:onlyname, file:onlyname.noext, file:ext, and file:parent. Notice the file:parent is not supported by the FTP component, as the FTP component can only move any existing files to a relative directory based on current dir as base." - }, - "tempFileName": { - "kind": "parameter", - "displayName": "Temp File Name", - "group": "producer", - "label": "producer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. The location for tempFilename is relative to the final file location in the option \u0027fileName\u0027, not the target directory in the base uri. For example if option fileName includes a directory prefix: dir/finalFilename then tempFileName is relative to that subdirectory dir." - }, - "tempPrefix": { - "kind": "parameter", - "displayName": "Temp Prefix", - "group": "producer", - "label": "producer", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "This option is used to write the file using a temporary name and then, after the write is complete, rename it to the real name. Can be used to identify files being written and also avoid consumers (not using exclusive read locks) reading in progress files. Is often used by FTP when uploading big files." - }, - "allowNullBody": { - "kind": "parameter", - "displayName": "Allow Null Body", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of \u0027Cannot write null body to file.\u0027 will be thrown. If the fileExist option is set to \u0027Override\u0027, then the file will be truncated, and if set to append the file will remain unchanged." - }, - "chmod": { - "kind": "parameter", - "displayName": "Chmod", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Specify the file permissions which is sent by the producer, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it." - }, - "chmodDirectory": { - "kind": "parameter", - "displayName": "Chmod Directory", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Specify the directory permissions used when the producer creates missing directories, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it." - }, - "eagerDeleteTargetFile": { - "kind": "parameter", - "displayName": "Eager Delete Target File", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether or not to eagerly delete any existing target file. This option only applies when you use fileExists\u003dOverride and the tempFileName option as well. You can use this to disable (set it to false) deleting the target file before the temp file is written. For example you may write big files and want the target file to exists during the temp file is being written. This ensure the target file is only deleted until the very last moment, just before the temp file is being renamed to the target filename. This option is also used to control whether to delete any existing files when fileExist\u003dMove is enabled, and an existing file exists. If this option copyAndDeleteOnRenameFails false, then an exception will be thrown if an existing file existed, if its true, then the existing file is deleted before the move operation." - }, - "forceWrites": { - "kind": "parameter", - "displayName": "Force Writes", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether to force syncing writes to the file system. You can turn this off if you do not want this level of guarantee, for example if writing to logs / audit logs etc; this would yield better performance." - }, - "keepLastModified": { - "kind": "parameter", - "displayName": "Keep Last Modified", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers." - }, - "moveExistingFileStrategy": { - "kind": "parameter", - "displayName": "Move Existing File Strategy", - "group": "producer (advanced)", - "label": "producer,advanced", - "required": false, - "type": "object", - "javaType": "org.apache.camel.component.file.strategy.FileMoveExistingStrategy", - "deprecated": false, - "secret": false, - "description": "Strategy (Custom Strategy) used to move file with special naming token to use when fileExist\u003dMove is configured. By default, there is an implementation used if no custom strategy is provided" - }, - "autoCreate": { - "kind": "parameter", - "displayName": "Auto Create", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Automatically create missing directories in the file\u0027s pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to." - }, - "basicPropertyBinding": { - "kind": "parameter", - "displayName": "Basic Property Binding", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" - }, - "bufferSize": { - "kind": "parameter", - "displayName": "Buffer Size", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "defaultValue": "131072", - "description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files)." - }, - "copyAndDeleteOnRenameFail": { - "kind": "parameter", - "displayName": "Copy And Delete On Rename Fail", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether to fallback and do a copy and delete file, in case the file could not be renamed directly. This option is not available for the FTP component." - }, - "renameUsingCopy": { - "kind": "parameter", - "displayName": "Rename Using Copy", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Perform rename operations using a copy and delete strategy. This is primarily used in environments where the regular rename operation is unreliable (e.g. across different file systems or networks). This option takes precedence over the copyAndDeleteOnRenameFail parameter that will automatically fall back to the copy and delete strategy, but only after additional delays." - }, - "synchronous": { - "kind": "parameter", - "displayName": "Synchronous", - "group": "advanced", - "label": "advanced", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "false", - "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." - }, - "antExclude": { - "kind": "parameter", - "displayName": "Ant Exclude", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Ant style filter exclusion. If both antInclude and antExclude are used, antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format." - }, - "antFilterCaseSensitive": { - "kind": "parameter", - "displayName": "Ant Filter Case Sensitive", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Sets case sensitive flag on ant filter." - }, - "antInclude": { - "kind": "parameter", - "displayName": "Ant Include", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format." - }, - "eagerMaxMessagesPerPoll": { - "kind": "parameter", - "displayName": "Eager Max Messages Per Poll", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files, and then perform sorting. Setting this option to false allows for sorting all files first, and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting." - }, - "exclude": { - "kind": "parameter", - "displayName": "Exclude", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Is used to exclude files, if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris" - }, - "filter": { - "kind": "parameter", - "displayName": "Filter", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "object", - "javaType": "org.apache.camel.component.file.GenericFileFilter\u003cjava.io.File\u003e", - "deprecated": false, - "secret": false, - "description": "Pluggable filter as a org.apache.camel.component.file.GenericFileFilter class. Will skip files if filter returns false in its accept() method." - }, - "filterDirectory": { - "kind": "parameter", - "displayName": "Filter Directory", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Filters the directory based on Simple language. For example to filter on current date, you can use a simple date pattern such as ${date:now:yyyMMdd}" - }, - "filterFile": { - "kind": "parameter", - "displayName": "Filter File", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Filters the file based on Simple language. For example to filter on file size, you can use ${file:size} 5000" - }, - "idempotent": { - "kind": "parameter", - "displayName": "Idempotent", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "boolean", - "javaType": "java.lang.Boolean", - "deprecated": false, - "secret": false, - "defaultValue": "false", - "description": "Option to use the Idempotent Consumer EIP pattern to let Camel skip already processed files. Will by default use a memory based LRUCache that holds 1000 entries. If noop\u003dtrue then idempotent will be enabled as well to avoid consuming the same files over and over again." - }, - "idempotentKey": { - "kind": "parameter", - "displayName": "Idempotent Key", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "To use a custom idempotent key. By default the absolute path of the file is used. You can use the File Language, for example to use the file name and file size, you can do: idempotentKey\u003d${file:name}-${file:size}" - }, - "idempotentRepository": { - "kind": "parameter", - "displayName": "Idempotent Repository", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "object", - "javaType": "org.apache.camel.spi.IdempotentRepository", - "deprecated": false, - "secret": false, - "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which by default use MemoryMessageIdRepository if none is specified and idempotent is true." - }, - "include": { - "kind": "parameter", - "displayName": "Include", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Is used to include files, if filename matches the regex pattern (matching is case in-sensitive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris" - }, - "maxDepth": { - "kind": "parameter", - "displayName": "Max Depth", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "defaultValue": "2147483647", - "description": "The maximum depth to traverse when recursively processing a directory." - }, - "maxMessagesPerPoll": { - "kind": "parameter", - "displayName": "Max Messages Per Poll", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "To define a maximum messages to gather per poll. By default no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. Notice: If this option is in use then the File and FTP components will limit before any sorting. For example if you have 100000 files and use maxMessagesPerPoll\u003d500, then only the first 500 files will be picked up, and then sorted. You can use the eagerMaxMessagesPerPoll option and set this to false to allow to scan all files first and then sort afterwards." - }, - "minDepth": { - "kind": "parameter", - "displayName": "Min Depth", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "The minimum depth to start processing when recursively processing a directory. Using minDepth\u003d1 means the base directory. Using minDepth\u003d2 means the first sub directory." - }, - "move": { - "kind": "parameter", - "displayName": "Move", - "group": "filter", - "label": "consumer,filter", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done." - }, - "exclusiveReadLockStrategy": { - "kind": "parameter", - "displayName": "Exclusive Read Lock Strategy", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "object", - "javaType": "org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy\u003cjava.io.File\u003e", - "deprecated": false, - "secret": false, - "description": "Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation." - }, - "readLock": { - "kind": "parameter", - "displayName": "Read Lock", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "enum": [ - "none", - "markerFile", - "fileLock", - "rename", - "changed", - "idempotent", - "idempotent-changed", - "idempotent-rename" - ], - "deprecated": false, - "secret": false, - "defaultValue": "none", - "description": "Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: - none - No read lock is in use - markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component - changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this, so this option cannot consume files as fast as the others, but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. - fileLock - is for using java.nio.channels.FileLock. This option is not avail for Windows OS and the FTP component. This approach should be avoided when accessing a remote file system via a mount/share unless that file system supports distributed file locks. - rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. - idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that.Notice: The various read locks is not all suited to work in clustered mode, where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file, but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks, and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering, such as Hazelcast Component or Infinispan." - }, - "readLockCheckInterval": { - "kind": "parameter", - "displayName": "Read Lock Check Interval", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "1000", - "description": "Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit." - }, - "readLockDeleteOrphanLockFiles": { - "kind": "parameter", - "displayName": "Read Lock Delete Orphan Lock Files", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory." - }, - "readLockIdempotentReleaseAsync": { - "kind": "parameter", - "displayName": "Read Lock Idempotent Release Async", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option." - }, - "readLockIdempotentReleaseAsyncPoolSize": { - "kind": "parameter", - "displayName": "Read Lock Idempotent Release Async Pool Size", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "The number of threads in the scheduled thread pool when using asynchronous release tasks. Using a default of 1 core threads should be sufficient in almost all use-cases, only set this to a higher value if either updating the idempotent repository is slow, or there are a lot of files to process. This option is not in-use if you use a shared thread pool by configuring the readLockIdempotentReleaseExecutorService option. See more details at the readLockIdempotentReleaseDelay option." - }, - "readLockIdempotentReleaseDelay": { - "kind": "parameter", - "displayName": "Read Lock Idempotent Release Delay", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "Whether to delay the release task for a period of millis. This can be used to delay the release tasks to expand the window when a file is regarded as read-locked, in an active/active cluster scenario with a shared idempotent repository, to ensure other nodes cannot potentially scan and acquire the same file, due to race-conditions. By expanding the time-window of the release tasks helps prevents these situations. Note delaying is only needed if you have configured readLockRemoveOnCommit to true." - }, - "readLockIdempotentReleaseExecutorService": { - "kind": "parameter", - "displayName": "Read Lock Idempotent Release Executor Service", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "object", - "javaType": "java.util.concurrent.ScheduledExecutorService", - "deprecated": false, - "secret": false, - "description": "To use a custom and shared thread pool for asynchronous release tasks. See more details at the readLockIdempotentReleaseDelay option." - }, - "readLockLoggingLevel": { - "kind": "parameter", - "displayName": "Read Lock Logging Level", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "object", - "javaType": "org.apache.camel.LoggingLevel", - "enum": [ - "TRACE", - "DEBUG", - "INFO", - "WARN", - "ERROR", - "OFF" - ], - "deprecated": false, - "secret": false, - "defaultValue": "DEBUG", - "description": "Logging level used when a read lock could not be acquired. By default a DEBUG is logged. You can change this level, for example to OFF to not have any logging. This option is only applicable for readLock of types: changed, fileLock, idempotent, idempotent-changed, idempotent-rename, rename." - }, - "readLockMarkerFile": { - "kind": "parameter", - "displayName": "Read Lock Marker File", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether to use marker file with the changed, rename, or exclusive read lock types. By default a marker file is used as well to guard against other processes picking up the same files. This behavior can be turned off by setting this option to false. For example if you do not want to write marker files to the file systems by the Camel application." - }, - "readLockMinAge": { - "kind": "parameter", - "displayName": "Read Lock Min Age", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "0", - "description": "This option is applied only for readLock\u003dchanged. It allows to specify a minimum age the file must be before attempting to acquire the read lock. For example use readLockMinAge\u003d300s to require the file is at last 5 minutes old. This can speedup the changed read lock as it will only attempt to acquire files which are at least that given age." - }, - "readLockMinLength": { - "kind": "parameter", - "displayName": "Read Lock Min Length", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "1", - "description": "This option is applied only for readLock\u003dchanged. It allows you to configure a minimum file length. By default Camel expects the file to contain data, and thus the default value is 1. You can set this option to zero, to allow consuming zero-length files." - }, - "readLockRemoveOnCommit": { - "kind": "parameter", - "displayName": "Read Lock Remove On Commit", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file is succeeded and a commit happens. By default the file is not removed which ensures that any race-condition do not occur so another active node may attempt to grab the file. Instead the idempotent repository may support eviction strategies that you can configure to evict the file name entry after X minutes - this ensures no problems with race conditions. See more details at the readLockIdempotentReleaseDelay option." - }, - "readLockRemoveOnRollback": { - "kind": "parameter", - "displayName": "Read Lock Remove On Rollback", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file failed and a rollback happens. If this option is false, then the file name entry is confirmed (as if the file did a commit)." - }, - "readLockTimeout": { - "kind": "parameter", - "displayName": "Read Lock Timeout", - "group": "lock", - "label": "consumer,lock", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "10000", - "description": "Optional timeout in millis for the read-lock, if supported by the read-lock. If the read-lock could not be granted and the timeout triggered, then Camel will skip the file. At next poll Camel, will try the file again, and this time maybe the read-lock could be granted. Use a value of 0 or lower to indicate forever. Currently fileLock, changed and rename support the timeout. Notice: For FTP the default readLockTimeout value is 20000 instead of 10000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit." - }, - "backoffErrorThreshold": { - "kind": "parameter", - "displayName": "Backoff Error Threshold", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." - }, - "backoffIdleThreshold": { - "kind": "parameter", - "displayName": "Backoff Idle Threshold", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." - }, - "backoffMultiplier": { - "kind": "parameter", - "displayName": "Backoff Multiplier", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "int", - "deprecated": false, - "secret": false, - "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured." - }, - "delay": { - "kind": "parameter", - "displayName": "Delay", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "500", - "description": "Milliseconds before the next poll." - }, - "greedy": { - "kind": "parameter", - "displayName": "Greedy", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." - }, - "initialDelay": { - "kind": "parameter", - "displayName": "Initial Delay", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "1000", - "description": "Milliseconds before the first poll starts." - }, - "repeatCount": { - "kind": "parameter", - "displayName": "Repeat Count", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "integer", - "javaType": "long", - "deprecated": false, - "secret": false, - "defaultValue": "0", - "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." - }, - "runLoggingLevel": { - "kind": "parameter", - "displayName": "Run Logging Level", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "object", - "javaType": "org.apache.camel.LoggingLevel", - "enum": [ - "TRACE", - "DEBUG", - "INFO", - "WARN", - "ERROR", - "OFF" - ], - "deprecated": false, - "secret": false, - "defaultValue": "TRACE", - "description": "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that." - }, - "scheduledExecutorService": { - "kind": "parameter", - "displayName": "Scheduled Executor Service", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "object", - "javaType": "java.util.concurrent.ScheduledExecutorService", - "deprecated": false, - "secret": false, - "description": "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." - }, - "scheduler": { - "kind": "parameter", - "displayName": "Scheduler", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "enum": [ - "none", - "spring", - "quartz" - ], - "deprecated": false, - "secret": false, - "defaultValue": "none", - "description": "To use a cron scheduler from either camel-spring or camel-quartz component" - }, - "schedulerProperties": { - "kind": "parameter", - "displayName": "Scheduler Properties", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "object", - "javaType": "java.util.Map\u003cjava.lang.String, java.lang.Object\u003e", - "prefix": "scheduler.", - "multiValue": true, - "deprecated": false, - "secret": false, - "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." - }, - "startScheduler": { - "kind": "parameter", - "displayName": "Start Scheduler", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Whether the scheduler should be auto started." - }, - "timeUnit": { - "kind": "parameter", - "displayName": "Time Unit", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "object", - "javaType": "java.util.concurrent.TimeUnit", - "enum": [ - "NANOSECONDS", - "MICROSECONDS", - "MILLISECONDS", - "SECONDS", - "MINUTES", - "HOURS", - "DAYS" - ], - "deprecated": false, - "secret": false, - "defaultValue": "MILLISECONDS", - "description": "Time unit for initialDelay and delay options." - }, - "useFixedDelay": { - "kind": "parameter", - "displayName": "Use Fixed Delay", - "group": "scheduler", - "label": "consumer,scheduler", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": "true", - "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." - }, - "shuffle": { - "kind": "parameter", - "displayName": "Shuffle", - "group": "sort", - "label": "consumer,sort", - "required": false, - "type": "boolean", - "javaType": "boolean", - "deprecated": false, - "secret": false, - "defaultValue": false, - "description": "To shuffle the list of files (sort in random order)" - }, - "sortBy": { - "kind": "parameter", - "displayName": "Sort By", - "group": "sort", - "label": "consumer,sort", - "required": false, - "type": "string", - "javaType": "java.lang.String", - "deprecated": false, - "secret": false, - "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." - }, - "sorter": { - "kind": "parameter", - "displayName": "Sorter", - "group": "sort", - "label": "consumer,sort", - "required": false, - "type": "object", - "javaType": "java.util.Comparator\u003corg.apache.camel.component.file.GenericFile\u003cjava.io.File\u003e\u003e", - "deprecated": false, - "secret": false, - "description": "Pluggable sorter as a java.util.Comparator class." - } - } - } -} \ No newline at end of file + "factory": { + "id": "file-adapter", + "type": "entaxy.runtime.connection", + "isAbstract": false, + "label": "file,core", + "description": "Read and write files.", + "category": "adapter" + }, + "entaxy.runtime.connection": { + }, + "fields": { + "bridgeErrorHandler": { + "displayName": "Bridge Error Handler", + "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "old": { + "kind": "property", + "javaType": "boolean", + "deprecated": false + }, + "new": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + } + }, + "kind": [ + "property", + "parameter" + ] + }, + "lazyStartProducer": { + "displayName": "Lazy Start Producer", + "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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing.", + "label": "producer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "producer", + "##others": { + "old": { + "kind": "property", + "javaType": "boolean", + "deprecated": false + }, + "new": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + } + }, + "kind": [ + "property", + "parameter" + ] + }, + "basicPropertyBinding": { + "displayName": "Basic Property Binding", + "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities", + "label": "advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "advanced", + "##others": { + "old": { + "kind": "property", + "javaType": "boolean", + "deprecated": false + }, + "new": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + } + }, + "kind": [ + "property", + "parameter" + ] + }, + "directoryName": { + "displayName": "Directory Name", + "description": "The starting directory", + "label": "", + "type": "string", + "required": true, + "hidden": false, + "group": "common", + "##others": { + "kind": "path", + "javaType": "java.io.File", + "deprecated": false, + "deprecationNote": "" + }, + "kind": "path" + }, + "charset": { + "displayName": "Charset", + "description": "This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to convert the data into the configured charset, so do not use this if you have big messages.", + "label": "", + "type": "string", + "required": false, + "hidden": false, + "group": "common", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "doneFileName": { + "displayName": "Done File Name", + "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The done file is always expected in the same folder as the original file. Only ${file.name} and ${file.name.next} is supported as dynamic placeholders.", + "label": "", + "type": "string", + "required": false, + "hidden": false, + "group": "common", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "fileName": { + "displayName": "File Name", + "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it\u0027s used as a filename filter. For producers, it\u0027s used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If the expression is an Expression type, the specified Expression type is used - this allows you, for instance, to use OGNL expressions. For the consumer, you can use it to filter filenames, so you can for instance consume today\u0027s file using the File Language syntax: mydata-${date:now:yyyyMMdd}.txt. The producers support the CamelOverruleFileName header which takes precedence over any existing CamelFileName header; the CamelOverruleFileName is a header that is used only once, and makes it easier as this avoids to temporary store CamelFileName and have to restore it afterwards.", + "label": "", + "type": "string", + "required": false, + "hidden": false, + "group": "common", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "delete": { + "displayName": "Delete", + "description": "If true, the file will be deleted after it is processed successfully.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "moveFailed": { + "displayName": "Move Failed", + "description": "Sets the move failure expression based on Simple language. For example, to move files into a .error subdirectory use: .error. Note: When moving the files to the fail location Camel will handle the error and will not pick up the file again.", + "label": "consumer", + "type": "string", + "required": false, + "hidden": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "noop": { + "displayName": "Noop", + "description": "If true, the file is not moved or deleted in any way. This option is good for readonly data, or for ETL type requirements. If noop\u003dtrue, Camel will set idempotent\u003dtrue as well, to avoid consuming the same files over and over again.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "preMove": { + "displayName": "Pre Move", + "description": "Expression (such as File Language) used to dynamically set the filename when moving it before processing. For example to move in-progress files into the order directory set this value to order.", + "label": "consumer", + "type": "string", + "required": false, + "hidden": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "preSort": { + "displayName": "Pre Sort", + "description": "When pre-sort is enabled then the consumer will sort the file and directory names during polling, that was retrieved from the file system. You may want to do this in case you need to operate on the files in a sorted order. The pre-sort is executed before the consumer starts to filter, and accept files to process by Camel. This option is default\u003dfalse meaning disabled.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "recursive": { + "displayName": "Recursive", + "description": "If a directory, will look for files in all the sub-directories as well.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "sendEmptyMessageWhenIdle": { + "displayName": "Send Empty Message When Idle", + "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.", + "label": "consumer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "directoryMustExist": { + "displayName": "Directory Must Exist", + "description": "Similar to the startingDirectoryMustExist option but this applies during polling (after starting the consumer).", + "label": "consumer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "exceptionHandler": { + "displayName": "Exception Handler", + "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.spi.ExceptionHandler", + "optionalPrefix": "consumer.", + "deprecated": false + }, + "kind": "parameter" + }, + "exchangePattern": { + "displayName": "Exchange Pattern", + "description": "Sets the exchange pattern when the consumer creates an exchange.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.ExchangePattern", + "enum": [ + "InOnly", + "InOut", + "InOptionalOut" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "extendedAttributes": { + "displayName": "Extended Attributes", + "description": "To define which file attributes of interest. Like posix:permissions,posix:owner,basic:lastAccessTime, it supports basic wildcard like posix:, basic:lastAccessTime", + "label": "consumer,advanced", + "type": "string", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "inProgressRepository": { + "displayName": "In Progress Repository", + "description": "A pluggable in-progress repository org.apache.camel.spi.IdempotentRepository. The in-progress repository is used to account the current in progress files being consumed. By default a memory based repository is used.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.spi.IdempotentRepository", + "deprecated": false + }, + "kind": "parameter" + }, + "localWorkDirectory": { + "displayName": "Local Work Directory", + "description": "When consuming, a local work directory can be used to store the remote file content directly in local files, to avoid loading the content into memory. This is beneficial, if you consume a very big remote file and thus can conserve memory.", + "label": "consumer,advanced", + "type": "string", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "onCompletionExceptionHandler": { + "displayName": "On Completion Exception Handler", + "description": "To use a custom org.apache.camel.spi.ExceptionHandler to handle any thrown exceptions that happens during the file on completion process where the consumer does either a commit or rollback. The default implementation will log any exception at WARN level and ignore.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.spi.ExceptionHandler", + "deprecated": false + }, + "kind": "parameter" + }, + "pollStrategy": { + "displayName": "Poll Strategy", + "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", + "deprecated": false + }, + "kind": "parameter" + }, + "probeContentType": { + "displayName": "Probe Content Type", + "description": "Whether to enable probing of the content type. If enable then the consumer uses Files#probeContentType(java.nio.file.Path) to determine the content-type of the file, and store that as a header with key Exchange#FILE_CONTENT_TYPE on the Message.", + "label": "consumer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "processStrategy": { + "displayName": "Process Strategy", + "description": "A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply.", + "label": "consumer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.component.file.GenericFileProcessStrategy\u003cjava.io.File\u003e", + "deprecated": false + }, + "kind": "parameter" + }, + "startingDirectoryMustExist": { + "displayName": "Starting Directory Must Exist", + "description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn\u0027t exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn\u0027t exist.", + "label": "consumer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "startingDirectoryMustHaveAccess": { + "displayName": "Starting Directory Must Have Access", + "description": "Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn\u0027t have read and write permissions.", + "label": "consumer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "consumer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "appendChars": { + "displayName": "Append Chars", + "description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.", + "label": "producer", + "type": "string", + "required": false, + "hidden": false, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "fileExist": { + "displayName": "File Exist", + "description": "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. The option eagerDeleteTargetFile can be used to control what to do if an moving the file, and there exists already an existing file, otherwise causing the move operation to fail. The Move option will move any existing files, before writing the target file. - TryRename is only applicable if tempFileName option is in use. This allows to try renaming the file from the temporary name to the actual name, without doing any exists check. This check may be faster on some file systems and especially FTP servers.", + "label": "producer", + "type": "object", + "required": false, + "hidden": false, + "defaultValue": "Override", + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.component.file.GenericFileExist", + "enum": [ + "Override", + "Append", + "Fail", + "Ignore", + "Move", + "TryRename" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "flatten": { + "displayName": "Flatten", + "description": "Flatten is used to flatten the file name path to strip any leading paths, so it\u0027s just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths.", + "label": "producer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "jailStartingDirectory": { + "displayName": "Jail Starting Directory", + "description": "Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders.", + "label": "producer", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "moveExisting": { + "displayName": "Move Existing", + "description": "Expression (such as File Language) used to compute file name to use when fileExist\u003dMove is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name, file:name.ext, file:name.noext, file:onlyname, file:onlyname.noext, file:ext, and file:parent. Notice the file:parent is not supported by the FTP component, as the FTP component can only move any existing files to a relative directory based on current dir as base.", + "label": "producer", + "type": "string", + "required": false, + "hidden": false, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "tempFileName": { + "displayName": "Temp File Name", + "description": "The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. The location for tempFilename is relative to the final file location in the option \u0027fileName\u0027, not the target directory in the base uri. For example if option fileName includes a directory prefix: dir/finalFilename then tempFileName is relative to that subdirectory dir.", + "label": "producer", + "type": "string", + "required": false, + "hidden": false, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "tempPrefix": { + "displayName": "Temp Prefix", + "description": "This option is used to write the file using a temporary name and then, after the write is complete, rename it to the real name. Can be used to identify files being written and also avoid consumers (not using exclusive read locks) reading in progress files. Is often used by FTP when uploading big files.", + "label": "producer", + "type": "string", + "required": false, + "hidden": false, + "group": "producer", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "allowNullBody": { + "displayName": "Allow Null Body", + "description": "Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of \u0027Cannot write null body to file.\u0027 will be thrown. If the fileExist option is set to \u0027Override\u0027, then the file will be truncated, and if set to append the file will remain unchanged.", + "label": "producer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "chmod": { + "displayName": "Chmod", + "description": "Specify the file permissions which is sent by the producer, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it.", + "label": "producer,advanced", + "type": "string", + "required": false, + "hidden": false, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "chmodDirectory": { + "displayName": "Chmod Directory", + "description": "Specify the directory permissions used when the producer creates missing directories, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it.", + "label": "producer,advanced", + "type": "string", + "required": false, + "hidden": false, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "eagerDeleteTargetFile": { + "displayName": "Eager Delete Target File", + "description": "Whether or not to eagerly delete any existing target file. This option only applies when you use fileExists\u003dOverride and the tempFileName option as well. You can use this to disable (set it to false) deleting the target file before the temp file is written. For example you may write big files and want the target file to exists during the temp file is being written. This ensure the target file is only deleted until the very last moment, just before the temp file is being renamed to the target filename. This option is also used to control whether to delete any existing files when fileExist\u003dMove is enabled, and an existing file exists. If this option copyAndDeleteOnRenameFails false, then an exception will be thrown if an existing file existed, if its true, then the existing file is deleted before the move operation.", + "label": "producer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "forceWrites": { + "displayName": "Force Writes", + "description": "Whether to force syncing writes to the file system. You can turn this off if you do not want this level of guarantee, for example if writing to logs / audit logs etc; this would yield better performance.", + "label": "producer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "keepLastModified": { + "displayName": "Keep Last Modified", + "description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.", + "label": "producer,advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "moveExistingFileStrategy": { + "displayName": "Move Existing File Strategy", + "description": "Strategy (Custom Strategy) used to move file with special naming token to use when fileExist\u003dMove is configured. By default, there is an implementation used if no custom strategy is provided", + "label": "producer,advanced", + "type": "object", + "required": false, + "hidden": false, + "group": "producer (advanced)", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.component.file.strategy.FileMoveExistingStrategy", + "deprecated": false + }, + "kind": "parameter" + }, + "autoCreate": { + "displayName": "Auto Create", + "description": "Automatically create missing directories in the file\u0027s pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to.", + "label": "advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "advanced", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "bufferSize": { + "displayName": "Buffer Size", + "description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).", + "label": "advanced", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 131072, + "group": "advanced", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "copyAndDeleteOnRenameFail": { + "displayName": "Copy And Delete On Rename Fail", + "description": "Whether to fallback and do a copy and delete file, in case the file could not be renamed directly. This option is not available for the FTP component.", + "label": "advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "advanced", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "renameUsingCopy": { + "displayName": "Rename Using Copy", + "description": "Perform rename operations using a copy and delete strategy. This is primarily used in environments where the regular rename operation is unreliable (e.g. across different file systems or networks). This option takes precedence over the copyAndDeleteOnRenameFail parameter that will automatically fall back to the copy and delete strategy, but only after additional delays.", + "label": "advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "advanced", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "synchronous": { + "displayName": "Synchronous", + "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).", + "label": "advanced", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "advanced", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "antExclude": { + "displayName": "Ant Exclude", + "description": "Ant style filter exclusion. If both antInclude and antExclude are used, antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format.", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "antFilterCaseSensitive": { + "displayName": "Ant Filter Case Sensitive", + "description": "Sets case sensitive flag on ant filter.", + "label": "consumer,filter", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "antInclude": { + "displayName": "Ant Include", + "description": "Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format.", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "eagerMaxMessagesPerPoll": { + "displayName": "Eager Max Messages Per Poll", + "description": "Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files, and then perform sorting. Setting this option to false allows for sorting all files first, and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting.", + "label": "consumer,filter", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "exclude": { + "displayName": "Exclude", + "description": "Is used to exclude files, if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "filter": { + "displayName": "Filter", + "description": "Pluggable filter as a org.apache.camel.component.file.GenericFileFilter class. Will skip files if filter returns false in its accept() method.", + "label": "consumer,filter", + "type": "object", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.component.file.GenericFileFilter\u003cjava.io.File\u003e", + "deprecated": false + }, + "kind": "parameter" + }, + "filterDirectory": { + "displayName": "Filter Directory", + "description": "Filters the directory based on Simple language. For example to filter on current date, you can use a simple date pattern such as ${date:now:yyyMMdd}", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "filterFile": { + "displayName": "Filter File", + "description": "Filters the file based on Simple language. For example to filter on file size, you can use ${file:size} 5000", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "idempotent": { + "displayName": "Idempotent", + "description": "Option to use the Idempotent Consumer EIP pattern to let Camel skip already processed files. Will by default use a memory based LRUCache that holds 1000 entries. If noop\u003dtrue then idempotent will be enabled as well to avoid consuming the same files over and over again.", + "label": "consumer,filter", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.Boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "idempotentKey": { + "displayName": "Idempotent Key", + "description": "To use a custom idempotent key. By default the absolute path of the file is used. You can use the File Language, for example to use the file name and file size, you can do: idempotentKey\u003d${file:name}-${file:size}", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "idempotentRepository": { + "displayName": "Idempotent Repository", + "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which by default use MemoryMessageIdRepository if none is specified and idempotent is true.", + "label": "consumer,filter", + "type": "object", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.spi.IdempotentRepository", + "deprecated": false + }, + "kind": "parameter" + }, + "include": { + "displayName": "Include", + "description": "Is used to include files, if filename matches the regex pattern (matching is case in-sensitive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "maxDepth": { + "displayName": "Max Depth", + "description": "The maximum depth to traverse when recursively processing a directory.", + "label": "consumer,filter", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 2147483647, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "maxMessagesPerPoll": { + "displayName": "Max Messages Per Poll", + "description": "To define a maximum messages to gather per poll. By default no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. Notice: If this option is in use then the File and FTP components will limit before any sorting. For example if you have 100000 files and use maxMessagesPerPoll\u003d500, then only the first 500 files will be picked up, and then sorted. You can use the eagerMaxMessagesPerPoll option and set this to false to allow to scan all files first and then sort afterwards.", + "label": "consumer,filter", + "type": "integer", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "minDepth": { + "displayName": "Min Depth", + "description": "The minimum depth to start processing when recursively processing a directory. Using minDepth\u003d1 means the base directory. Using minDepth\u003d2 means the first sub directory.", + "label": "consumer,filter", + "type": "integer", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "move": { + "displayName": "Move", + "description": "Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done.", + "label": "consumer,filter", + "type": "string", + "required": false, + "hidden": false, + "group": "filter", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "exclusiveReadLockStrategy": { + "displayName": "Exclusive Read Lock Strategy", + "description": "Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation.", + "label": "consumer,lock", + "type": "object", + "required": false, + "hidden": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy\u003cjava.io.File\u003e", + "deprecated": false + }, + "kind": "parameter" + }, + "readLock": { + "displayName": "Read Lock", + "description": "Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: - none - No read lock is in use - markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component - changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this, so this option cannot consume files as fast as the others, but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. - fileLock - is for using java.nio.channels.FileLock. This option is not avail for Windows OS and the FTP component. This approach should be avoided when accessing a remote file system via a mount/share unless that file system supports distributed file locks. - rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. - idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that.Notice: The various read locks is not all suited to work in clustered mode, where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file, but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks, and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering, such as Hazelcast Component or Infinispan.", + "label": "consumer,lock", + "type": "string", + "required": false, + "hidden": false, + "defaultValue": "none", + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "enum": [ + "none", + "markerFile", + "fileLock", + "rename", + "changed", + "idempotent", + "idempotent-changed", + "idempotent-rename" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "readLockCheckInterval": { + "displayName": "Read Lock Check Interval", + "description": "Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 1000, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockDeleteOrphanLockFiles": { + "displayName": "Read Lock Delete Orphan Lock Files", + "description": "Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory.", + "label": "consumer,lock", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockIdempotentReleaseAsync": { + "displayName": "Read Lock Idempotent Release Async", + "description": "Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option.", + "label": "consumer,lock", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockIdempotentReleaseAsyncPoolSize": { + "displayName": "Read Lock Idempotent Release Async Pool Size", + "description": "The number of threads in the scheduled thread pool when using asynchronous release tasks. Using a default of 1 core threads should be sufficient in almost all use-cases, only set this to a higher value if either updating the idempotent repository is slow, or there are a lot of files to process. This option is not in-use if you use a shared thread pool by configuring the readLockIdempotentReleaseExecutorService option. See more details at the readLockIdempotentReleaseDelay option.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockIdempotentReleaseDelay": { + "displayName": "Read Lock Idempotent Release Delay", + "description": "Whether to delay the release task for a period of millis. This can be used to delay the release tasks to expand the window when a file is regarded as read-locked, in an active/active cluster scenario with a shared idempotent repository, to ensure other nodes cannot potentially scan and acquire the same file, due to race-conditions. By expanding the time-window of the release tasks helps prevents these situations. Note delaying is only needed if you have configured readLockRemoveOnCommit to true.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockIdempotentReleaseExecutorService": { + "displayName": "Read Lock Idempotent Release Executor Service", + "description": "To use a custom and shared thread pool for asynchronous release tasks. See more details at the readLockIdempotentReleaseDelay option.", + "label": "consumer,lock", + "type": "object", + "required": false, + "hidden": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "java.util.concurrent.ScheduledExecutorService", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockLoggingLevel": { + "displayName": "Read Lock Logging Level", + "description": "Logging level used when a read lock could not be acquired. By default a DEBUG is logged. You can change this level, for example to OFF to not have any logging. This option is only applicable for readLock of types: changed, fileLock, idempotent, idempotent-changed, idempotent-rename, rename.", + "label": "consumer,lock", + "type": "object", + "required": false, + "hidden": false, + "defaultValue": "DEBUG", + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.LoggingLevel", + "enum": [ + "TRACE", + "DEBUG", + "INFO", + "WARN", + "ERROR", + "OFF" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "readLockMarkerFile": { + "displayName": "Read Lock Marker File", + "description": "Whether to use marker file with the changed, rename, or exclusive read lock types. By default a marker file is used as well to guard against other processes picking up the same files. This behavior can be turned off by setting this option to false. For example if you do not want to write marker files to the file systems by the Camel application.", + "label": "consumer,lock", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockMinAge": { + "displayName": "Read Lock Min Age", + "description": "This option is applied only for readLock\u003dchanged. It allows to specify a minimum age the file must be before attempting to acquire the read lock. For example use readLockMinAge\u003d300s to require the file is at last 5 minutes old. This can speedup the changed read lock as it will only attempt to acquire files which are at least that given age.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 0, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockMinLength": { + "displayName": "Read Lock Min Length", + "description": "This option is applied only for readLock\u003dchanged. It allows you to configure a minimum file length. By default Camel expects the file to contain data, and thus the default value is 1. You can set this option to zero, to allow consuming zero-length files.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 1, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockRemoveOnCommit": { + "displayName": "Read Lock Remove On Commit", + "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file is succeeded and a commit happens. By default the file is not removed which ensures that any race-condition do not occur so another active node may attempt to grab the file. Instead the idempotent repository may support eviction strategies that you can configure to evict the file name entry after X minutes - this ensures no problems with race conditions. See more details at the readLockIdempotentReleaseDelay option.", + "label": "consumer,lock", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockRemoveOnRollback": { + "displayName": "Read Lock Remove On Rollback", + "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file failed and a rollback happens. If this option is false, then the file name entry is confirmed (as if the file did a commit).", + "label": "consumer,lock", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "readLockTimeout": { + "displayName": "Read Lock Timeout", + "description": "Optional timeout in millis for the read-lock, if supported by the read-lock. If the read-lock could not be granted and the timeout triggered, then Camel will skip the file. At next poll Camel, will try the file again, and this time maybe the read-lock could be granted. Use a value of 0 or lower to indicate forever. Currently fileLock, changed and rename support the timeout. Notice: For FTP the default readLockTimeout value is 20000 instead of 10000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit.", + "label": "consumer,lock", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 10000, + "group": "lock", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "backoffErrorThreshold": { + "displayName": "Backoff Error Threshold", + "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "backoffIdleThreshold": { + "displayName": "Backoff Idle Threshold", + "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "backoffMultiplier": { + "displayName": "Backoff Multiplier", + "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "int", + "deprecated": false + }, + "kind": "parameter" + }, + "delay": { + "displayName": "Delay", + "description": "Milliseconds before the next poll.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 500, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "greedy": { + "displayName": "Greedy", + "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.", + "label": "consumer,scheduler", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "initialDelay": { + "displayName": "Initial Delay", + "description": "Milliseconds before the first poll starts.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 1000, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "repeatCount": { + "displayName": "Repeat Count", + "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.", + "label": "consumer,scheduler", + "type": "integer", + "required": false, + "hidden": false, + "defaultValue": 0, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "long", + "deprecated": false + }, + "kind": "parameter" + }, + "runLoggingLevel": { + "displayName": "Run Logging Level", + "description": "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.", + "label": "consumer,scheduler", + "type": "object", + "required": false, + "hidden": false, + "defaultValue": "TRACE", + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "org.apache.camel.LoggingLevel", + "enum": [ + "TRACE", + "DEBUG", + "INFO", + "WARN", + "ERROR", + "OFF" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "scheduledExecutorService": { + "displayName": "Scheduled Executor Service", + "description": "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.", + "label": "consumer,scheduler", + "type": "object", + "required": false, + "hidden": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "java.util.concurrent.ScheduledExecutorService", + "deprecated": false + }, + "kind": "parameter" + }, + "scheduler": { + "displayName": "Scheduler", + "description": "To use a cron scheduler from either camel-spring or camel-quartz component", + "label": "consumer,scheduler", + "type": "string", + "required": false, + "hidden": false, + "defaultValue": "none", + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "enum": [ + "none", + "spring", + "quartz" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "schedulerProperties": { + "displayName": "Scheduler Properties", + "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.", + "label": "consumer,scheduler", + "type": "object", + "required": false, + "hidden": false, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "java.util.Map\u003cjava.lang.String, java.lang.Object\u003e", + "prefix": "scheduler.", + "multiValue": true, + "deprecated": false + }, + "kind": "parameter" + }, + "startScheduler": { + "displayName": "Start Scheduler", + "description": "Whether the scheduler should be auto started.", + "label": "consumer,scheduler", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "timeUnit": { + "displayName": "Time Unit", + "description": "Time unit for initialDelay and delay options.", + "label": "consumer,scheduler", + "type": "object", + "required": false, + "hidden": false, + "defaultValue": "MILLISECONDS", + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "java.util.concurrent.TimeUnit", + "enum": [ + "NANOSECONDS", + "MICROSECONDS", + "MILLISECONDS", + "SECONDS", + "MINUTES", + "HOURS", + "DAYS" + ], + "deprecated": false + }, + "kind": "parameter" + }, + "useFixedDelay": { + "displayName": "Use Fixed Delay", + "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.", + "label": "consumer,scheduler", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": true, + "group": "scheduler", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "shuffle": { + "displayName": "Shuffle", + "description": "To shuffle the list of files (sort in random order)", + "label": "consumer,sort", + "type": "boolean", + "required": false, + "hidden": false, + "defaultValue": false, + "group": "sort", + "##others": { + "kind": "parameter", + "javaType": "boolean", + "deprecated": false + }, + "kind": "parameter" + }, + "sortBy": { + "displayName": "Sort By", + "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date.", + "label": "consumer,sort", + "type": "string", + "required": false, + "hidden": false, + "group": "sort", + "##others": { + "kind": "parameter", + "javaType": "java.lang.String", + "deprecated": false + }, + "kind": "parameter" + }, + "sorter": { + "displayName": "Sorter", + "description": "Pluggable sorter as a java.util.Comparator class.", + "label": "consumer,sort", + "type": "object", + "required": false, + "hidden": false, + "group": "sort", + "##others": { + "kind": "parameter", + "javaType": "java.util.Comparator\u003corg.apache.camel.component.file.GenericFile\u003cjava.io.File\u003e\u003e", + "deprecated": false + }, + "kind": "parameter" + }, + "rootDirectory": { + "type": "String", + "group": "entaxy", + "required": true + } + }, + "outputs": { + "init": { + "isDefault": true, + "generator": "", + "config": { + "configurable": true + }, + "fields": { + "rootDirectory": { + }, + "@IMPORT": [ + { + "sourceFactoryId": "#", + "location": "fields", + "prefix": "file_", + "filter": { + "contains": [ + { + "attribute": "kind", + "values": [ + "property" + ] + } + ] + } + } + ], + "ext_createResourceProvider": { + "type": "Boolean", + "group": "entaxy", + "defaultValue": false, + "configurable": false + } + }, + "scopes": [ + "public", + "private" + ] + }, + "ref": { + "scopes": [ + "public", + "private" + ] + } + }, + "##origin": { + "component": { + "kind": "component", + "name": "file", + "title": "File", + "description": "Read and write files.", + "deprecated": false, + "firstVersion": "1.0.0", + "label": "file,core", + "javaType": "org.apache.camel.component.file.FileComponent", + "supportLevel": "Stable", + "groupId": "org.apache.camel", + "artifactId": "camel-file", + "version": "3.4.5", + "scheme": "file", + "extendsScheme": "", + "syntax": "file:directoryName", + "async": false, + "consumerOnly": false, + "producerOnly": false, + "lenientProperties": false + }, + "componentProperties": { + "bridgeErrorHandler": { + "kind": "property", + "displayName": "Bridge Error Handler", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored." + }, + "lazyStartProducer": { + "kind": "property", + "displayName": "Lazy Start Producer", + "group": "producer", + "label": "producer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": 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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." + }, + "basicPropertyBinding": { + "kind": "property", + "displayName": "Basic Property Binding", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" + } + }, + "properties": { + "directoryName": { + "kind": "path", + "displayName": "Directory Name", + "group": "common", + "label": "", + "required": true, + "type": "string", + "javaType": "java.io.File", + "deprecated": false, + "deprecationNote": "", + "secret": false, + "description": "The starting directory" + }, + "charset": { + "kind": "parameter", + "displayName": "Charset", + "group": "common", + "label": "", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to convert the data into the configured charset, so do not use this if you have big messages." + }, + "doneFileName": { + "kind": "parameter", + "displayName": "Done File Name", + "group": "common", + "label": "", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders.The done file is always expected in the same folder as the original file. Only ${file.name} and ${file.name.next} is supported as dynamic placeholders." + }, + "fileName": { + "kind": "parameter", + "displayName": "File Name", + "group": "common", + "label": "", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Use Expression such as File Language to dynamically set the filename. For consumers, it\u0027s used as a filename filter. For producers, it\u0027s used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If the expression is an Expression type, the specified Expression type is used - this allows you, for instance, to use OGNL expressions. For the consumer, you can use it to filter filenames, so you can for instance consume today\u0027s file using the File Language syntax: mydata-${date:now:yyyyMMdd}.txt. The producers support the CamelOverruleFileName header which takes precedence over any existing CamelFileName header; the CamelOverruleFileName is a header that is used only once, and makes it easier as this avoids to temporary store CamelFileName and have to restore it afterwards." + }, + "bridgeErrorHandler": { + "kind": "parameter", + "displayName": "Bridge Error Handler", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored." + }, + "delete": { + "kind": "parameter", + "displayName": "Delete", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "If true, the file will be deleted after it is processed successfully." + }, + "moveFailed": { + "kind": "parameter", + "displayName": "Move Failed", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Sets the move failure expression based on Simple language. For example, to move files into a .error subdirectory use: .error. Note: When moving the files to the fail location Camel will handle the error and will not pick up the file again." + }, + "noop": { + "kind": "parameter", + "displayName": "Noop", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "If true, the file is not moved or deleted in any way. This option is good for readonly data, or for ETL type requirements. If noop\u003dtrue, Camel will set idempotent\u003dtrue as well, to avoid consuming the same files over and over again." + }, + "preMove": { + "kind": "parameter", + "displayName": "Pre Move", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Expression (such as File Language) used to dynamically set the filename when moving it before processing. For example to move in-progress files into the order directory set this value to order." + }, + "preSort": { + "kind": "parameter", + "displayName": "Pre Sort", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "When pre-sort is enabled then the consumer will sort the file and directory names during polling, that was retrieved from the file system. You may want to do this in case you need to operate on the files in a sorted order. The pre-sort is executed before the consumer starts to filter, and accept files to process by Camel. This option is default\u003dfalse meaning disabled." + }, + "recursive": { + "kind": "parameter", + "displayName": "Recursive", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "If a directory, will look for files in all the sub-directories as well." + }, + "sendEmptyMessageWhenIdle": { + "kind": "parameter", + "displayName": "Send Empty Message When Idle", + "group": "consumer", + "label": "consumer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." + }, + "directoryMustExist": { + "kind": "parameter", + "displayName": "Directory Must Exist", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Similar to the startingDirectoryMustExist option but this applies during polling (after starting the consumer)." + }, + "exceptionHandler": { + "kind": "parameter", + "displayName": "Exception Handler", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.spi.ExceptionHandler", + "optionalPrefix": "consumer.", + "deprecated": false, + "secret": false, + "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored." + }, + "exchangePattern": { + "kind": "parameter", + "displayName": "Exchange Pattern", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.ExchangePattern", + "enum": [ + "InOnly", + "InOut", + "InOptionalOut" + ], + "deprecated": false, + "secret": false, + "description": "Sets the exchange pattern when the consumer creates an exchange." + }, + "extendedAttributes": { + "kind": "parameter", + "displayName": "Extended Attributes", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "To define which file attributes of interest. Like posix:permissions,posix:owner,basic:lastAccessTime, it supports basic wildcard like posix:, basic:lastAccessTime" + }, + "inProgressRepository": { + "kind": "parameter", + "displayName": "In Progress Repository", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.spi.IdempotentRepository", + "deprecated": false, + "secret": false, + "description": "A pluggable in-progress repository org.apache.camel.spi.IdempotentRepository. The in-progress repository is used to account the current in progress files being consumed. By default a memory based repository is used." + }, + "localWorkDirectory": { + "kind": "parameter", + "displayName": "Local Work Directory", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "When consuming, a local work directory can be used to store the remote file content directly in local files, to avoid loading the content into memory. This is beneficial, if you consume a very big remote file and thus can conserve memory." + }, + "onCompletionExceptionHandler": { + "kind": "parameter", + "displayName": "On Completion Exception Handler", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.spi.ExceptionHandler", + "deprecated": false, + "secret": false, + "description": "To use a custom org.apache.camel.spi.ExceptionHandler to handle any thrown exceptions that happens during the file on completion process where the consumer does either a commit or rollback. The default implementation will log any exception at WARN level and ignore." + }, + "pollStrategy": { + "kind": "parameter", + "displayName": "Poll Strategy", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", + "deprecated": false, + "secret": false, + "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel." + }, + "probeContentType": { + "kind": "parameter", + "displayName": "Probe Content Type", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether to enable probing of the content type. If enable then the consumer uses Files#probeContentType(java.nio.file.Path) to determine the content-type of the file, and store that as a header with key Exchange#FILE_CONTENT_TYPE on the Message." + }, + "processStrategy": { + "kind": "parameter", + "displayName": "Process Strategy", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.component.file.GenericFileProcessStrategy\u003cjava.io.File\u003e", + "deprecated": false, + "secret": false, + "description": "A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply." + }, + "startingDirectoryMustExist": { + "kind": "parameter", + "displayName": "Starting Directory Must Exist", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn\u0027t exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn\u0027t exist." + }, + "startingDirectoryMustHaveAccess": { + "kind": "parameter", + "displayName": "Starting Directory Must Have Access", + "group": "consumer (advanced)", + "label": "consumer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn\u0027t have read and write permissions." + }, + "appendChars": { + "kind": "parameter", + "displayName": "Append Chars", + "group": "producer", + "label": "producer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n." + }, + "fileExist": { + "kind": "parameter", + "displayName": "File Exist", + "group": "producer", + "label": "producer", + "required": false, + "type": "object", + "javaType": "org.apache.camel.component.file.GenericFileExist", + "enum": [ + "Override", + "Append", + "Fail", + "Ignore", + "Move", + "TryRename" + ], + "deprecated": false, + "secret": false, + "defaultValue": "Override", + "description": "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. The option eagerDeleteTargetFile can be used to control what to do if an moving the file, and there exists already an existing file, otherwise causing the move operation to fail. The Move option will move any existing files, before writing the target file. - TryRename is only applicable if tempFileName option is in use. This allows to try renaming the file from the temporary name to the actual name, without doing any exists check. This check may be faster on some file systems and especially FTP servers." + }, + "flatten": { + "kind": "parameter", + "displayName": "Flatten", + "group": "producer", + "label": "producer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Flatten is used to flatten the file name path to strip any leading paths, so it\u0027s just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths." + }, + "jailStartingDirectory": { + "kind": "parameter", + "displayName": "Jail Starting Directory", + "group": "producer", + "label": "producer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders." + }, + "lazyStartProducer": { + "kind": "parameter", + "displayName": "Lazy Start Producer", + "group": "producer", + "label": "producer", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": 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 during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel\u0027s routing error handlers. Beware that when the first message is processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." + }, + "moveExisting": { + "kind": "parameter", + "displayName": "Move Existing", + "group": "producer", + "label": "producer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Expression (such as File Language) used to compute file name to use when fileExist\u003dMove is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name, file:name.ext, file:name.noext, file:onlyname, file:onlyname.noext, file:ext, and file:parent. Notice the file:parent is not supported by the FTP component, as the FTP component can only move any existing files to a relative directory based on current dir as base." + }, + "tempFileName": { + "kind": "parameter", + "displayName": "Temp File Name", + "group": "producer", + "label": "producer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. The location for tempFilename is relative to the final file location in the option \u0027fileName\u0027, not the target directory in the base uri. For example if option fileName includes a directory prefix: dir/finalFilename then tempFileName is relative to that subdirectory dir." + }, + "tempPrefix": { + "kind": "parameter", + "displayName": "Temp Prefix", + "group": "producer", + "label": "producer", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "This option is used to write the file using a temporary name and then, after the write is complete, rename it to the real name. Can be used to identify files being written and also avoid consumers (not using exclusive read locks) reading in progress files. Is often used by FTP when uploading big files." + }, + "allowNullBody": { + "kind": "parameter", + "displayName": "Allow Null Body", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of \u0027Cannot write null body to file.\u0027 will be thrown. If the fileExist option is set to \u0027Override\u0027, then the file will be truncated, and if set to append the file will remain unchanged." + }, + "chmod": { + "kind": "parameter", + "displayName": "Chmod", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Specify the file permissions which is sent by the producer, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it." + }, + "chmodDirectory": { + "kind": "parameter", + "displayName": "Chmod Directory", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Specify the directory permissions used when the producer creates missing directories, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it." + }, + "eagerDeleteTargetFile": { + "kind": "parameter", + "displayName": "Eager Delete Target File", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether or not to eagerly delete any existing target file. This option only applies when you use fileExists\u003dOverride and the tempFileName option as well. You can use this to disable (set it to false) deleting the target file before the temp file is written. For example you may write big files and want the target file to exists during the temp file is being written. This ensure the target file is only deleted until the very last moment, just before the temp file is being renamed to the target filename. This option is also used to control whether to delete any existing files when fileExist\u003dMove is enabled, and an existing file exists. If this option copyAndDeleteOnRenameFails false, then an exception will be thrown if an existing file existed, if its true, then the existing file is deleted before the move operation." + }, + "forceWrites": { + "kind": "parameter", + "displayName": "Force Writes", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether to force syncing writes to the file system. You can turn this off if you do not want this level of guarantee, for example if writing to logs / audit logs etc; this would yield better performance." + }, + "keepLastModified": { + "kind": "parameter", + "displayName": "Keep Last Modified", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers." + }, + "moveExistingFileStrategy": { + "kind": "parameter", + "displayName": "Move Existing File Strategy", + "group": "producer (advanced)", + "label": "producer,advanced", + "required": false, + "type": "object", + "javaType": "org.apache.camel.component.file.strategy.FileMoveExistingStrategy", + "deprecated": false, + "secret": false, + "description": "Strategy (Custom Strategy) used to move file with special naming token to use when fileExist\u003dMove is configured. By default, there is an implementation used if no custom strategy is provided" + }, + "autoCreate": { + "kind": "parameter", + "displayName": "Auto Create", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Automatically create missing directories in the file\u0027s pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to." + }, + "basicPropertyBinding": { + "kind": "parameter", + "displayName": "Basic Property Binding", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" + }, + "bufferSize": { + "kind": "parameter", + "displayName": "Buffer Size", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "defaultValue": 131072, + "description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files)." + }, + "copyAndDeleteOnRenameFail": { + "kind": "parameter", + "displayName": "Copy And Delete On Rename Fail", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether to fallback and do a copy and delete file, in case the file could not be renamed directly. This option is not available for the FTP component." + }, + "renameUsingCopy": { + "kind": "parameter", + "displayName": "Rename Using Copy", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Perform rename operations using a copy and delete strategy. This is primarily used in environments where the regular rename operation is unreliable (e.g. across different file systems or networks). This option takes precedence over the copyAndDeleteOnRenameFail parameter that will automatically fall back to the copy and delete strategy, but only after additional delays." + }, + "synchronous": { + "kind": "parameter", + "displayName": "Synchronous", + "group": "advanced", + "label": "advanced", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." + }, + "antExclude": { + "kind": "parameter", + "displayName": "Ant Exclude", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Ant style filter exclusion. If both antInclude and antExclude are used, antExclude takes precedence over antInclude. Multiple exclusions may be specified in comma-delimited format." + }, + "antFilterCaseSensitive": { + "kind": "parameter", + "displayName": "Ant Filter Case Sensitive", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Sets case sensitive flag on ant filter." + }, + "antInclude": { + "kind": "parameter", + "displayName": "Ant Include", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Ant style filter inclusion. Multiple inclusions may be specified in comma-delimited format." + }, + "eagerMaxMessagesPerPoll": { + "kind": "parameter", + "displayName": "Eager Max Messages Per Poll", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Allows for controlling whether the limit from maxMessagesPerPoll is eager or not. If eager then the limit is during the scanning of files. Where as false would scan all files, and then perform sorting. Setting this option to false allows for sorting all files first, and then limit the poll. Mind that this requires a higher memory usage as all file details are in memory to perform the sorting." + }, + "exclude": { + "kind": "parameter", + "displayName": "Exclude", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Is used to exclude files, if filename matches the regex pattern (matching is case in-senstive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris" + }, + "filter": { + "kind": "parameter", + "displayName": "Filter", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "object", + "javaType": "org.apache.camel.component.file.GenericFileFilter\u003cjava.io.File\u003e", + "deprecated": false, + "secret": false, + "description": "Pluggable filter as a org.apache.camel.component.file.GenericFileFilter class. Will skip files if filter returns false in its accept() method." + }, + "filterDirectory": { + "kind": "parameter", + "displayName": "Filter Directory", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Filters the directory based on Simple language. For example to filter on current date, you can use a simple date pattern such as ${date:now:yyyMMdd}" + }, + "filterFile": { + "kind": "parameter", + "displayName": "Filter File", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Filters the file based on Simple language. For example to filter on file size, you can use ${file:size} 5000" + }, + "idempotent": { + "kind": "parameter", + "displayName": "Idempotent", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "boolean", + "javaType": "java.lang.Boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Option to use the Idempotent Consumer EIP pattern to let Camel skip already processed files. Will by default use a memory based LRUCache that holds 1000 entries. If noop\u003dtrue then idempotent will be enabled as well to avoid consuming the same files over and over again." + }, + "idempotentKey": { + "kind": "parameter", + "displayName": "Idempotent Key", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "To use a custom idempotent key. By default the absolute path of the file is used. You can use the File Language, for example to use the file name and file size, you can do: idempotentKey\u003d${file:name}-${file:size}" + }, + "idempotentRepository": { + "kind": "parameter", + "displayName": "Idempotent Repository", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "object", + "javaType": "org.apache.camel.spi.IdempotentRepository", + "deprecated": false, + "secret": false, + "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which by default use MemoryMessageIdRepository if none is specified and idempotent is true." + }, + "include": { + "kind": "parameter", + "displayName": "Include", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Is used to include files, if filename matches the regex pattern (matching is case in-sensitive). Notice if you use symbols such as plus sign and others you would need to configure this using the RAW() syntax if configuring this as an endpoint uri. See more details at configuring endpoint uris" + }, + "maxDepth": { + "kind": "parameter", + "displayName": "Max Depth", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "defaultValue": 2147483647, + "description": "The maximum depth to traverse when recursively processing a directory." + }, + "maxMessagesPerPoll": { + "kind": "parameter", + "displayName": "Max Messages Per Poll", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "To define a maximum messages to gather per poll. By default no maximum is set. Can be used to set a limit of e.g. 1000 to avoid when starting up the server that there are thousands of files. Set a value of 0 or negative to disabled it. Notice: If this option is in use then the File and FTP components will limit before any sorting. For example if you have 100000 files and use maxMessagesPerPoll\u003d500, then only the first 500 files will be picked up, and then sorted. You can use the eagerMaxMessagesPerPoll option and set this to false to allow to scan all files first and then sort afterwards." + }, + "minDepth": { + "kind": "parameter", + "displayName": "Min Depth", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "The minimum depth to start processing when recursively processing a directory. Using minDepth\u003d1 means the base directory. Using minDepth\u003d2 means the first sub directory." + }, + "move": { + "kind": "parameter", + "displayName": "Move", + "group": "filter", + "label": "consumer,filter", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done." + }, + "exclusiveReadLockStrategy": { + "kind": "parameter", + "displayName": "Exclusive Read Lock Strategy", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "object", + "javaType": "org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy\u003cjava.io.File\u003e", + "deprecated": false, + "secret": false, + "description": "Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation." + }, + "readLock": { + "kind": "parameter", + "displayName": "Read Lock", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "enum": [ + "none", + "markerFile", + "fileLock", + "rename", + "changed", + "idempotent", + "idempotent-changed", + "idempotent-rename" + ], + "deprecated": false, + "secret": false, + "defaultValue": "none", + "description": "Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: - none - No read lock is in use - markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component - changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this, so this option cannot consume files as fast as the others, but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. - fileLock - is for using java.nio.channels.FileLock. This option is not avail for Windows OS and the FTP component. This approach should be avoided when accessing a remote file system via a mount/share unless that file system supports distributed file locks. - rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. - idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. - idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that.Notice: The various read locks is not all suited to work in clustered mode, where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file, but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks, and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering, such as Hazelcast Component or Infinispan." + }, + "readLockCheckInterval": { + "kind": "parameter", + "displayName": "Read Lock Check Interval", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 1000, + "description": "Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit." + }, + "readLockDeleteOrphanLockFiles": { + "kind": "parameter", + "displayName": "Read Lock Delete Orphan Lock Files", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory." + }, + "readLockIdempotentReleaseAsync": { + "kind": "parameter", + "displayName": "Read Lock Idempotent Release Async", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option." + }, + "readLockIdempotentReleaseAsyncPoolSize": { + "kind": "parameter", + "displayName": "Read Lock Idempotent Release Async Pool Size", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "The number of threads in the scheduled thread pool when using asynchronous release tasks. Using a default of 1 core threads should be sufficient in almost all use-cases, only set this to a higher value if either updating the idempotent repository is slow, or there are a lot of files to process. This option is not in-use if you use a shared thread pool by configuring the readLockIdempotentReleaseExecutorService option. See more details at the readLockIdempotentReleaseDelay option." + }, + "readLockIdempotentReleaseDelay": { + "kind": "parameter", + "displayName": "Read Lock Idempotent Release Delay", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "Whether to delay the release task for a period of millis. This can be used to delay the release tasks to expand the window when a file is regarded as read-locked, in an active/active cluster scenario with a shared idempotent repository, to ensure other nodes cannot potentially scan and acquire the same file, due to race-conditions. By expanding the time-window of the release tasks helps prevents these situations. Note delaying is only needed if you have configured readLockRemoveOnCommit to true." + }, + "readLockIdempotentReleaseExecutorService": { + "kind": "parameter", + "displayName": "Read Lock Idempotent Release Executor Service", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "object", + "javaType": "java.util.concurrent.ScheduledExecutorService", + "deprecated": false, + "secret": false, + "description": "To use a custom and shared thread pool for asynchronous release tasks. See more details at the readLockIdempotentReleaseDelay option." + }, + "readLockLoggingLevel": { + "kind": "parameter", + "displayName": "Read Lock Logging Level", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "object", + "javaType": "org.apache.camel.LoggingLevel", + "enum": [ + "TRACE", + "DEBUG", + "INFO", + "WARN", + "ERROR", + "OFF" + ], + "deprecated": false, + "secret": false, + "defaultValue": "DEBUG", + "description": "Logging level used when a read lock could not be acquired. By default a DEBUG is logged. You can change this level, for example to OFF to not have any logging. This option is only applicable for readLock of types: changed, fileLock, idempotent, idempotent-changed, idempotent-rename, rename." + }, + "readLockMarkerFile": { + "kind": "parameter", + "displayName": "Read Lock Marker File", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether to use marker file with the changed, rename, or exclusive read lock types. By default a marker file is used as well to guard against other processes picking up the same files. This behavior can be turned off by setting this option to false. For example if you do not want to write marker files to the file systems by the Camel application." + }, + "readLockMinAge": { + "kind": "parameter", + "displayName": "Read Lock Min Age", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 0, + "description": "This option is applied only for readLock\u003dchanged. It allows to specify a minimum age the file must be before attempting to acquire the read lock. For example use readLockMinAge\u003d300s to require the file is at last 5 minutes old. This can speedup the changed read lock as it will only attempt to acquire files which are at least that given age." + }, + "readLockMinLength": { + "kind": "parameter", + "displayName": "Read Lock Min Length", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 1, + "description": "This option is applied only for readLock\u003dchanged. It allows you to configure a minimum file length. By default Camel expects the file to contain data, and thus the default value is 1. You can set this option to zero, to allow consuming zero-length files." + }, + "readLockRemoveOnCommit": { + "kind": "parameter", + "displayName": "Read Lock Remove On Commit", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file is succeeded and a commit happens. By default the file is not removed which ensures that any race-condition do not occur so another active node may attempt to grab the file. Instead the idempotent repository may support eviction strategies that you can configure to evict the file name entry after X minutes - this ensures no problems with race conditions. See more details at the readLockIdempotentReleaseDelay option." + }, + "readLockRemoveOnRollback": { + "kind": "parameter", + "displayName": "Read Lock Remove On Rollback", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "This option is applied only for readLock\u003didempotent. It allows to specify whether to remove the file name entry from the idempotent repository when processing the file failed and a rollback happens. If this option is false, then the file name entry is confirmed (as if the file did a commit)." + }, + "readLockTimeout": { + "kind": "parameter", + "displayName": "Read Lock Timeout", + "group": "lock", + "label": "consumer,lock", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 10000, + "description": "Optional timeout in millis for the read-lock, if supported by the read-lock. If the read-lock could not be granted and the timeout triggered, then Camel will skip the file. At next poll Camel, will try the file again, and this time maybe the read-lock could be granted. Use a value of 0 or lower to indicate forever. Currently fileLock, changed and rename support the timeout. Notice: For FTP the default readLockTimeout value is 20000 instead of 10000. The readLockTimeout value must be higher than readLockCheckInterval, but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit." + }, + "backoffErrorThreshold": { + "kind": "parameter", + "displayName": "Backoff Error Threshold", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." + }, + "backoffIdleThreshold": { + "kind": "parameter", + "displayName": "Backoff Idle Threshold", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." + }, + "backoffMultiplier": { + "kind": "parameter", + "displayName": "Backoff Multiplier", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "int", + "deprecated": false, + "secret": false, + "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured." + }, + "delay": { + "kind": "parameter", + "displayName": "Delay", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 500, + "description": "Milliseconds before the next poll." + }, + "greedy": { + "kind": "parameter", + "displayName": "Greedy", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." + }, + "initialDelay": { + "kind": "parameter", + "displayName": "Initial Delay", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 1000, + "description": "Milliseconds before the first poll starts." + }, + "repeatCount": { + "kind": "parameter", + "displayName": "Repeat Count", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "integer", + "javaType": "long", + "deprecated": false, + "secret": false, + "defaultValue": 0, + "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." + }, + "runLoggingLevel": { + "kind": "parameter", + "displayName": "Run Logging Level", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "object", + "javaType": "org.apache.camel.LoggingLevel", + "enum": [ + "TRACE", + "DEBUG", + "INFO", + "WARN", + "ERROR", + "OFF" + ], + "deprecated": false, + "secret": false, + "defaultValue": "TRACE", + "description": "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that." + }, + "scheduledExecutorService": { + "kind": "parameter", + "displayName": "Scheduled Executor Service", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "object", + "javaType": "java.util.concurrent.ScheduledExecutorService", + "deprecated": false, + "secret": false, + "description": "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." + }, + "scheduler": { + "kind": "parameter", + "displayName": "Scheduler", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "enum": [ + "none", + "spring", + "quartz" + ], + "deprecated": false, + "secret": false, + "defaultValue": "none", + "description": "To use a cron scheduler from either camel-spring or camel-quartz component" + }, + "schedulerProperties": { + "kind": "parameter", + "displayName": "Scheduler Properties", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "object", + "javaType": "java.util.Map\u003cjava.lang.String, java.lang.Object\u003e", + "prefix": "scheduler.", + "multiValue": true, + "deprecated": false, + "secret": false, + "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." + }, + "startScheduler": { + "kind": "parameter", + "displayName": "Start Scheduler", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Whether the scheduler should be auto started." + }, + "timeUnit": { + "kind": "parameter", + "displayName": "Time Unit", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "object", + "javaType": "java.util.concurrent.TimeUnit", + "enum": [ + "NANOSECONDS", + "MICROSECONDS", + "MILLISECONDS", + "SECONDS", + "MINUTES", + "HOURS", + "DAYS" + ], + "deprecated": false, + "secret": false, + "defaultValue": "MILLISECONDS", + "description": "Time unit for initialDelay and delay options." + }, + "useFixedDelay": { + "kind": "parameter", + "displayName": "Use Fixed Delay", + "group": "scheduler", + "label": "consumer,scheduler", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": true, + "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." + }, + "shuffle": { + "kind": "parameter", + "displayName": "Shuffle", + "group": "sort", + "label": "consumer,sort", + "required": false, + "type": "boolean", + "javaType": "boolean", + "deprecated": false, + "secret": false, + "defaultValue": false, + "description": "To shuffle the list of files (sort in random order)" + }, + "sortBy": { + "kind": "parameter", + "displayName": "Sort By", + "group": "sort", + "label": "consumer,sort", + "required": false, + "type": "string", + "javaType": "java.lang.String", + "deprecated": false, + "secret": false, + "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." + }, + "sorter": { + "kind": "parameter", + "displayName": "Sorter", + "group": "sort", + "label": "consumer,sort", + "required": false, + "type": "object", + "javaType": "java.util.Comparator\u003corg.apache.camel.component.file.GenericFile\u003cjava.io.File\u003e\u003e", + "deprecated": false, + "secret": false, + "description": "Pluggable sorter as a java.util.Comparator class." + } + } + } +} diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/templates/file-adapter/init.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/templates/file-adapter/init.ftl index df1a1f3..f1826fd 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/templates/file-adapter/init.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/ru/entaxy/templates/file-adapter/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,11 +34,34 @@ + [#if properties??] + [#if properties.ext_createResourceProvider??] + [#if properties.ext_createResourceProvider] + + + + + + + + + + + + + [/#if] + [/#if] + [/#if] + [#if properties??] [#list properties as key, value] - [#if !key?starts_with("##") && !key?starts_with("__")] [#-- we skip additional properties --] + [#if !key?starts_with("##") && !key?starts_with("__") && !key?starts_with("ext_")] [#-- we skip additional properties --] + [#if key?starts_with("file_")] [#-- we add parent component properties --] + + [#else] + [/#if] [/#if] [/#list] [/#if] diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/from.ftl index 02f4bd4..b792993 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/init.ftl index 5896815..42e6b1a 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/queryParameters.ftl index e054566..64e66a6 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/ref.ftl index f28ca3e..913ff8e 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/to.ftl index 76a1139..d8896fe 100644 --- a/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/file-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ file-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/pom.xml b/platform/runtime/base/connecting/adapter/h2-adapter/pom.xml index b965466..8753c3a 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/h2-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -31,7 +30,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/example/org.ops4j.datasource-entaxy.esb.storage.cfg b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/example/org.ops4j.datasource-entaxy.esb.storage.cfg index 18fdc12..08a7fc7 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/example/org.ops4j.datasource-entaxy.esb.storage.cfg +++ b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/example/org.ops4j.datasource-entaxy.esb.storage.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # h2-adapter # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/init.ftl index 0451ea0..edb0811 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ h2-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/queryParameters.ftl index a10de26..dbd719e 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ h2-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/ref.ftl index 3ddd934..c6aaf84 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ h2-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,5 @@ ~~~~~~/licensing~~~~~~ --] - diff --git a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/to.ftl index 7cd1fb7..9703625 100644 --- a/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/h2-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ h2-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,5 @@ ~~~~~~/licensing~~~~~~ --] - [#include 'queryParameters.ftl'] diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/pom.xml b/platform/runtime/base/connecting/adapter/jms-adapter/pom.xml index 5037dbe..2afc500 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/jms-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/from.ftl index f39c308..e45e3d3 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ jms-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/init.ftl index 8084bfb..718e1d0 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ jms-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/queryParameters.ftl index ea5bdac..55c152c 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ jms-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/ref.ftl index f595ae6..1d643e1 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ jms-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/to.ftl index fb65516..032c97c 100644 --- a/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/jms-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ jms-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/pom.xml b/platform/runtime/base/connecting/adapter/pom.xml index 6a96087..b45de2e 100644 --- a/platform/runtime/base/connecting/adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base connecting - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/adapter/postgresql-adapter/pom.xml b/platform/runtime/base/connecting/adapter/postgresql-adapter/pom.xml index c854ca9..909827b 100644 --- a/platform/runtime/base/connecting/adapter/postgresql-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/postgresql-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/init.ftl index 3ed1818..cd6f2d3 100644 --- a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ postgresql-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/queryParameters.ftl index 842c6ad..02e966e 100644 --- a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ postgresql-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/ref.ftl index c3129ed..217e93b 100644 --- a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ postgresql-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,5 @@ ~~~~~~/licensing~~~~~~ --] - diff --git a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/to.ftl index 1ba0dad..b7f78a5 100644 --- a/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/postgresql-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ postgresql-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,5 @@ ~~~~~~/licensing~~~~~~ --] - [#include 'queryParameters.ftl'] diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/pom.xml b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/pom.xml index 43f8694..40f15ad 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/pom.xml +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting adapter - 1.8.2.2 + 1.8.3 4.0.0 @@ -30,7 +29,7 @@ true - + diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/from.ftl b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/from.ftl index 00a20a3..9954f69 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/from.ftl +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/from.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ rabbitmq-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/init.ftl b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/init.ftl index 5775243..1080930 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/init.ftl +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ rabbitmq-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/queryParameters.ftl b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/queryParameters.ftl index fc5f967..a72a2da 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/queryParameters.ftl +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/queryParameters.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ rabbitmq-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/ref.ftl b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/ref.ftl index ac1b88b..28393ae 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/ref.ftl +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/ref.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ rabbitmq-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/to.ftl b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/to.ftl index 53d47ef..42a6576 100644 --- a/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/to.ftl +++ b/platform/runtime/base/connecting/adapter/rabbitmq-amqp-adapter/src/main/resources/template/to.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ rabbitmq-amqp-adapter ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/connection/pom.xml b/platform/runtime/base/connecting/connection/pom.xml index 5678b61..1178ac1 100644 --- a/platform/runtime/base/connecting/connection/pom.xml +++ b/platform/runtime/base/connecting/connection/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base connecting - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/Connection.java b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/Connection.java index 89912b7..9d8338f 100644 --- a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/Connection.java +++ b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/Connection.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/ConnectionImpl.java b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/ConnectionImpl.java index 10b2e3d..0f65b66 100644 --- a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/ConnectionImpl.java +++ b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/ConnectionImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/util/ConnectionUtil.java b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/util/ConnectionUtil.java index ca72cd6..4a104f7 100644 --- a/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/util/ConnectionUtil.java +++ b/platform/runtime/base/connecting/connection/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/connection/util/ConnectionUtil.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/common-templates-collection/pom.xml b/platform/runtime/base/connecting/generator/common-templates-collection/pom.xml index 90c16e8..3107d92 100644 --- a/platform/runtime/base/connecting/generator/common-templates-collection/pom.xml +++ b/platform/runtime/base/connecting/generator/common-templates-collection/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.base.connecting generator - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base.connecting.generator common-templates-collection diff --git a/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/bundle.manifest.ftl b/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/bundle.manifest.ftl index 4a1d5a7..8e4e8ab 100644 --- a/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/bundle.manifest.ftl +++ b/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/bundle.manifest.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ common-templates-collection ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/common.config.ftl b/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/common.config.ftl index 3e16159..f458117 100644 --- a/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/common.config.ftl +++ b/platform/runtime/base/connecting/generator/common-templates-collection/src/main/resources/ru/entaxy/templates/common.config.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ common-templates-collection ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/ftl-generator/pom.xml b/platform/runtime/base/connecting/generator/ftl-generator/pom.xml index 299226d..a16d7ef 100644 --- a/platform/runtime/base/connecting/generator/ftl-generator/pom.xml +++ b/platform/runtime/base/connecting/generator/ftl-generator/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting generator - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/generator/ftl-generator/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/ftl/FTLGenerator.java b/platform/runtime/base/connecting/generator/ftl-generator/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/ftl/FTLGenerator.java index de52563..ade393d 100644 --- a/platform/runtime/base/connecting/generator/ftl-generator/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/ftl/FTLGenerator.java +++ b/platform/runtime/base/connecting/generator/ftl-generator/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/ftl/FTLGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * ftl-generator * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -193,7 +193,7 @@ public class FTLGenerator extends AbstractSelfPublishGenerator Template temp = getTemplateByFullName(templateUrl, templateFullName); Object value = temp.getCustomAttribute(FTLGenerator.ATTR_GENERATED_TYPE); String type = null==value?null:value.toString(); - log.info("--TEMPLATE--\n" + templateUrl.toString() + templateFullName + "\ngenerated.type: " + (null==value?Generated.GENERATED_TYPE_UNKNOWN:value.toString())); + log.debug("--TEMPLATE--\n" + templateUrl.toString() + templateFullName + "\ngenerated.type: " + (null==value?Generated.GENERATED_TYPE_UNKNOWN:value.toString())); try (StringWriter writer = new StringWriter()) { temp.process(params, writer); return enrich(Generated.create(type, writer.toString())) @@ -268,9 +268,14 @@ public class FTLGenerator extends AbstractSelfPublishGenerator @Override protected URL getURL(String templateName) { try { + if (templateName.contains(":")) + return new URL(templateName); return new URL(templateUrl + templateName); } catch (MalformedURLException e) { - log.error(e.getMessage(), e); + // skip printing typical error + // while searching for template + if ((templateUrl!=null) || (!"root.ftl".equals(templateName))) + log.error(e.getMessage(), e); } return null; } diff --git a/platform/runtime/base/connecting/generator/generator-api/pom.xml b/platform/runtime/base/connecting/generator/generator-api/pom.xml index 32024ba..3230bab 100644 --- a/platform/runtime/base/connecting/generator/generator-api/pom.xml +++ b/platform/runtime/base/connecting/generator/generator-api/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting generator - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/Template.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/Template.java index e1dd388..2ea8a20 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/Template.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/Template.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateAwareGenerator.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateAwareGenerator.java index ed24c04..0d6d73a 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateAwareGenerator.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateAwareGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateImpl.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateImpl.java index 2792e3b..86df9e3 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateImpl.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateService.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateService.java index 4c842f7..5d22b29 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateService.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/TemplateService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/Activator.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/Activator.java index 29b9bc9..3f03da6 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/Activator.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/Activator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/LegacyTemplateAdapter.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/LegacyTemplateAdapter.java index d7b953d..ee444f5 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/LegacyTemplateAdapter.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/LegacyTemplateAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/ProvidedTemplate.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/ProvidedTemplate.java index 9d435ea..351f645 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/ProvidedTemplate.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/ProvidedTemplate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTracker.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTracker.java index c3585c9..72f4312 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTracker.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTracker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTrackerCustomizer.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTrackerCustomizer.java index 6b85125..a558b38 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTrackerCustomizer.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateBundleTrackerCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,7 @@ import com.google.gson.JsonParser; import ru.entaxy.base.generator.template.Template; import ru.entaxy.base.generator.template.TemplateImpl; import ru.entaxy.base.generator.template.TemplateService; +import ru.entaxy.platform.base.support.JSONUtils; public class TemplateBundleTrackerCustomizer implements BundleTrackerCustomizer { @@ -98,19 +99,12 @@ public class TemplateBundleTrackerCustomizer implements BundleTrackerCustomizer< if (metadataUrl != null) { // descriptor is found - - String metadata = new BufferedReader ( - new InputStreamReader( - metadataUrl.openStream(), StandardCharsets.UTF_8)) - .lines() - .collect(Collectors.joining("\n")); - + GsonBuilder builder = new GsonBuilder(); Gson gson = builder.create(); - - JsonElement je = (new JsonParser()).parse(metadata); - JsonObject root = je.getAsJsonObject(); - + + JsonObject root = JSONUtils.getJsonRootObject(metadataUrl); + JsonElement templatesElement = root.get("templates"); if (templatesElement == null) return null; @@ -129,6 +123,8 @@ public class TemplateBundleTrackerCustomizer implements BundleTrackerCustomizer< log.debug("BEGIN :: Searching for templates in " + bundle.getBundleId()); Enumeration foundEntries = bundle.findEntries(TemplateProvider.TEMPLATE_PATH, "*.*", true); + if (foundEntries == null) + return null; while (foundEntries.hasMoreElements()) { URL entry = foundEntries.nextElement(); log.debug("FOUND :: " + entry.toString()); diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateMetadata.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateMetadata.java index a11453f..1980a46 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateMetadata.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateMetadata.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateProvider.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateProvider.java index 370c6a3..4db4f75 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateProvider.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateServiceImpl.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateServiceImpl.java index 08a9496..1a97443 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateServiceImpl.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/base/generator/template/impl/TemplateServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/AbstractSelfPublishGenerator.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/AbstractSelfPublishGenerator.java index 4e6c031..6bdc49a 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/AbstractSelfPublishGenerator.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/AbstractSelfPublishGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generated.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generated.java index c78b5c9..1209dc1 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generated.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generated.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generator.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generator.java index 987c6da..9645fb6 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generator.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/Generator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/GeneratorService.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/GeneratorService.java index 9605fda..676c7d4 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/GeneratorService.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/GeneratorService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/impl/GeneratedImpl.java b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/impl/GeneratedImpl.java index 53536fe..b448f4b 100644 --- a/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/impl/GeneratedImpl.java +++ b/platform/runtime/base/connecting/generator/generator-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/impl/GeneratedImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/generator-factory/pom.xml b/platform/runtime/base/connecting/generator/generator-factory/pom.xml index f0a0fb3..a593e71 100644 --- a/platform/runtime/base/connecting/generator/generator-factory/pom.xml +++ b/platform/runtime/base/connecting/generator/generator-factory/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting generator - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/generator/generator-factory/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/factory/GeneratorFactory.java b/platform/runtime/base/connecting/generator/generator-factory/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/factory/GeneratorFactory.java index 4f77acb..0e34b29 100644 --- a/platform/runtime/base/connecting/generator/generator-factory/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/factory/GeneratorFactory.java +++ b/platform/runtime/base/connecting/generator/generator-factory/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/generator/factory/GeneratorFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * generator-factory * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/pom.xml b/platform/runtime/base/connecting/generator/pom.xml index ffed106..768ebb0 100644 --- a/platform/runtime/base/connecting/generator/pom.xml +++ b/platform/runtime/base/connecting/generator/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base connecting - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/generator/template-service-shell/pom.xml b/platform/runtime/base/connecting/generator/template-service-shell/pom.xml index 8e3c2d9..6cb218a 100644 --- a/platform/runtime/base/connecting/generator/template-service-shell/pom.xml +++ b/platform/runtime/base/connecting/generator/template-service-shell/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.base.connecting generator - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base.connecting.generator template-service-shell diff --git a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/Generate.java b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/Generate.java index 99592df..4e82ae2 100644 --- a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/Generate.java +++ b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/Generate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template-service-test * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/ListTemplates.java b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/ListTemplates.java index 873a450..67afa9b 100644 --- a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/ListTemplates.java +++ b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/ListTemplates.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template-service-test * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/TemplateServiceSupport.java b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/TemplateServiceSupport.java index bdb3614..7dfebcf 100644 --- a/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/TemplateServiceSupport.java +++ b/platform/runtime/base/connecting/generator/template-service-shell/src/main/java/ru/entaxy/base/generator/template/shell/TemplateServiceSupport.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template-service-test * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/pom.xml b/platform/runtime/base/connecting/pom.xml index 15723c1..de2a0a0 100644 --- a/platform/runtime/base/connecting/pom.xml +++ b/platform/runtime/base/connecting/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/producer/connection-producer/pom.xml b/platform/runtime/base/connecting/producer/connection-producer/pom.xml index 2591613..e6d7bb3 100644 --- a/platform/runtime/base/connecting/producer/connection-producer/pom.xml +++ b/platform/runtime/base/connecting/producer/connection-producer/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting producer - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/ConnectionProducer.java b/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/ConnectionProducer.java index 4b9d2c7..fd6e122 100644 --- a/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/ConnectionProducer.java +++ b/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/ConnectionProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-producer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/util/ConnectionProducerUtil.java b/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/util/ConnectionProducerUtil.java index 16b582d..0b487d3 100644 --- a/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/util/ConnectionProducerUtil.java +++ b/platform/runtime/base/connecting/producer/connection-producer/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/connection/util/ConnectionProducerUtil.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-producer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/connecting/producer/pom.xml b/platform/runtime/base/connecting/producer/pom.xml index 7559602..d8ee3f1 100644 --- a/platform/runtime/base/connecting/producer/pom.xml +++ b/platform/runtime/base/connecting/producer/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base connecting - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/producer/producer-api/pom.xml b/platform/runtime/base/connecting/producer/producer-api/pom.xml index f7f706d..1926e21 100644 --- a/platform/runtime/base/connecting/producer/producer-api/pom.xml +++ b/platform/runtime/base/connecting/producer/producer-api/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.base.connecting producer - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/base/connecting/producer/producer-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/Producer.java b/platform/runtime/base/connecting/producer/producer-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/Producer.java index 10aad37..c746ab8 100644 --- a/platform/runtime/base/connecting/producer/producer-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/Producer.java +++ b/platform/runtime/base/connecting/producer/producer-api/src/main/java/ru/entaxy/esb/platform/runtime/base/connecting/producer/Producer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * producer-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/pom.xml b/platform/runtime/base/management-core/pom.xml index e16a290..598a321 100644 --- a/platform/runtime/base/management-core/pom.xml +++ b/platform/runtime/base/management-core/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base management-core diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/ManagementCore.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/ManagementCore.java index f3bbed9..a0f0b6a 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/ManagementCore.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/ManagementCore.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/Qualifier.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/Qualifier.java index 922fbbb..c9758e0 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/Qualifier.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/Qualifier.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/AnnotatedMBean.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/AnnotatedMBean.java index 89dc907..7a4361a 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/AnnotatedMBean.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/AnnotatedMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Attribute.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Attribute.java index 376368d..bc70997 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Attribute.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Attribute.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/EntaxyRuntimeTyped.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/EntaxyRuntimeTyped.java index 935f20d..979fdba 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/EntaxyRuntimeTyped.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/EntaxyRuntimeTyped.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanAnnotated.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanAnnotated.java index 1f1628a..6687d9d 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanAnnotated.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanAnnotated.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanExportPolicy.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanExportPolicy.java index 618427a..289c1d3 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanExportPolicy.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/MBeanExportPolicy.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/NotExported.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/NotExported.java index 4a705ab..a2a1525 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/NotExported.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/NotExported.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Operation.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Operation.java index ec2bcaf..c50041e 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Operation.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Operation.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Parameter.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Parameter.java index d339177..400e0d3 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Parameter.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/Parameter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/RuntimeTypedMBean.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/RuntimeTypedMBean.java index 7418068..3916e4a 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/RuntimeTypedMBean.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/api/RuntimeTypedMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/AttributeChangeTracker.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/AttributeChangeTracker.java index 36bf574..e2e257e 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/AttributeChangeTracker.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/AttributeChangeTracker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBean.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBean.java index c391ed2..dd0d44d 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBean.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBeanImpl.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBeanImpl.java index 17fe442..73668ba 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBeanImpl.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObject.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObject.java index 29d9e5c..3e68aa1 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObject.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObject.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObjectImpl.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObjectImpl.java index a68cf11..9b07c8a 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObjectImpl.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/BundleAwareManagedObjectImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ExtendedBundleTrackerCustomizer.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ExtendedBundleTrackerCustomizer.java index 2e4cb4d..34da2c4 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ExtendedBundleTrackerCustomizer.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ExtendedBundleTrackerCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/MBeanInfoHelper.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/MBeanInfoHelper.java index 10be24b..3e42058 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/MBeanInfoHelper.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/MBeanInfoHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * management-core * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectDescriptor.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectDescriptor.java index bb432ea..4c9502f 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectDescriptor.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectDescriptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectsListener.java b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectsListener.java index 916e3d4..d317b2c 100644 --- a/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectsListener.java +++ b/platform/runtime/base/management-core/src/main/java/ru/entaxy/esb/platform/base/management/core/utils/ManagedObjectsListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,15 @@ import org.slf4j.LoggerFactory; import ru.entaxy.esb.platform.base.management.core.ManagementCore; import ru.entaxy.platform.base.support.osgi.tracker.BundleTrackerCustomizerListener; +/** + * + * @author sstarovoytenkov + * + * @param type of iterable managed objects collection, e.g. List + * @param type of item in the collection above, e.g. ManagedProfile + * @param interface of the service to register, e.g. ProfileMBean + * @param class implementing the interface above, e.g. ProfileMBeanImpl + */ public abstract class ManagedObjectsListener implements BundleTrackerCustomizerListener { private static final Logger log = LoggerFactory.getLogger(ManagedObjectsListener.class); @@ -88,7 +97,7 @@ public abstract class ManagedObjectsListener implements Bu @Override public void modified(T managedObject) { - log.info(">> modified"); + log.debug(">> modified"); Iterator iter = getIterator(managedObject); while (iter.hasNext()) { S object = iter.next(); @@ -97,9 +106,9 @@ public abstract class ManagedObjectsListener implements Bu C service = managed.get(key).service; if (service instanceof BundleAwareMBean) { ((BundleAwareMBean)service).refreshBundleInfo(); - log.info(">> refreshBundleInfo"); + log.debug(">> refreshBundleInfo"); } else { - log.info(">> NOT BundleAwareMBean"); + log.debug(">> NOT BundleAwareMBean"); } } } diff --git a/platform/runtime/base/objects-base/object-factory/pom.xml b/platform/runtime/base/objects-base/object-factory/pom.xml index 475edd3..5da8c49 100644 --- a/platform/runtime/base/objects-base/object-factory/pom.xml +++ b/platform/runtime/base/objects-base/object-factory/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.base objects-base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base.objects-base object-factory @@ -15,6 +15,7 @@ ru.entaxy.platform.base.objects.factory, ru.entaxy.platform.base.objects.factory.configuration, + ru.entaxy.platform.base.objects.factory.exceptions, ru.entaxy.platform.base.objects.factory.impl, ru.entaxy.platform.base.objects.factory.tracker @@ -53,4 +54,22 @@ ${project.version} + + + + + org.apache.felix + maven-bundle-plugin + ${maven-bundle-plugin.version} + true + + + true + + + + + + + \ No newline at end of file diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactory.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactory.java index 1429ec7..04d3555 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactory.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,10 +52,16 @@ public interface EntaxyFactory extends EntaxyFactoryElements.EntaxyFactoryExtend String ID = "id"; String TYPE = "type"; + String DISPLAY_NAME = "displayName"; String DESCRIPTION = "description"; String LABEL = "label"; String CATEGORY = "category"; + String PARENT = "parent"; + String REQUIRES = "requires"; + + String IS_ABSTRACT = "isAbstract"; + String IS_DEPRECATED = "isDeprecated"; } public static interface FIELDS { @@ -88,6 +94,8 @@ public interface EntaxyFactory extends EntaxyFactoryElements.EntaxyFactoryExtend String IS_REF = "isRef"; + String ADD_TO_OUTPUT = "addToOutput"; + } String OBJECT_ID = "objectId"; @@ -110,8 +118,78 @@ public interface EntaxyFactory extends EntaxyFactoryElements.EntaxyFactoryExtend } } + public static interface DIRECTIVES { + + String OVERRIDE = "@OVERRIDE"; + String IMPORT = "@IMPORT"; + String VARIANTS = "@VARIANTS"; + String CALCULATED = "@CALCULATED"; + String SCOPED = "@SCOPED"; + String INTERNAL = "@INTERNAL"; + + static Set getAllDirectives(){ + return new HashSet() { + + private static final long serialVersionUID = 1L; + + { + add(OVERRIDE); + add(IMPORT); + add(VARIANTS); + }}; + } + + public static enum OVERRIDE_MODE { + + // leave parent value, no changes made + // parent value is 'final' + IGNORE("ignore"), + + // child value is used + // parent value is ignored + REPLACE("replace"), + + // use parent value + // with addition of new elements from child + APPEND("append"), + + // use parent value updated from child + // with addition of new elements from child + UPDATE("update"); + + public String label; + + private OVERRIDE_MODE(String label) { + this.label = label; + } + + public static OVERRIDE_MODE valueOfLabel(String label) { + for (OVERRIDE_MODE e : values()) { + if (e.label.equalsIgnoreCase(label)) { + return e; + } + } + return null; + } + + } + + + } + } + public static interface GENERATION { + + public static interface ATTRIBUTES { + + String OUTPUT = "generation.output"; + String SCOPE = "generation.scope"; + String FACTORY = "generation.factory"; + + } + + } static public enum SCOPE { PUBLIC("public"), @@ -192,6 +270,10 @@ public interface EntaxyFactory extends EntaxyFactoryElements.EntaxyFactoryExtend return getType(); }; + public boolean isAbstract(); + public boolean isDeprecated(); + + public String getParent(); public List getOutputs(); public OutputInfo getDefaultOutput(); @@ -199,6 +281,10 @@ public interface EntaxyFactory extends EntaxyFactoryElements.EntaxyFactoryExtend public List getFields(); public List getFields(String outputType); + + public Map getTypeInfo(); + + public String getJsonConfiguration(); public Generated generate(Map parameters) throws EntaxyFactoryException ; public Generated generate(String outputType, Map parameters) throws EntaxyFactoryException; diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactoryElements.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactoryElements.java index bcfff33..a73b16b 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactoryElements.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/EntaxyFactoryElements.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-factory * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,11 +31,25 @@ public interface EntaxyFactoryElements { String getLabel(); + default boolean hasLabel(String label) { + if ((label==null) || (label.trim().length() == 0) ) + return false; + if (getLabel() == null) + return false; + String test = label.trim(); + String[] labels = getLabel().split(","); + for (int i=0; i { protected String id; protected String type; + protected String displayName; protected String description; protected String label; protected String category; + protected String parent; + protected boolean isAbstract = false; + protected boolean isDeprecated = false; + public String getId() { return id; } @@ -61,5 +66,29 @@ public class FactoryElement extends AbstractElement { public void setCategory(String category) { this.category = category; } + public String getParent() { + return parent; + } + public void setParent(String parent) { + this.parent = parent; + } + public boolean isAbstract() { + return isAbstract; + } + public void setAbstract(boolean isAbstract) { + this.isAbstract = isAbstract; + } + public String getDisplayName() { + return displayName; + } + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + public boolean isDeprecated() { + return isDeprecated; + } + public void setDeprecated(boolean isDeprecated) { + this.isDeprecated = isDeprecated; + } } diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldElement.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldElement.java index 7bb051d..294b9d6 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldElement.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import ru.entaxy.platform.base.objects.factory.EntaxyFactory; +import ru.entaxy.platform.base.objects.factory.EntaxyFactory.CONFIGURATION.FIELDS; +import ru.entaxy.platform.base.support.CommonUtils; import ru.entaxy.platform.base.support.JSONUtils; public class FieldElement implements EntaxyFactory.FieldInfo { @@ -39,11 +41,30 @@ public class FieldElement implements EntaxyFactory.FieldInfo { boolean required = false; Object defaultValue = ""; - boolean conditional = false; + /*boolean conditional = false;*/ String condition = null; boolean isRef = false; + public static FieldElement fromJson(String name, JsonElement element) { + Class feClass = FieldElement.class; + + if (element.isJsonObject()) + if (element.getAsJsonObject().has(FIELDS.ATTRIBUTES.IS_REF)) { + JsonElement val = element.getAsJsonObject().get(FIELDS.ATTRIBUTES.IS_REF); + if (val.isJsonPrimitive() && val.getAsJsonPrimitive().isBoolean()) + if (val.getAsJsonPrimitive().getAsBoolean()) { + feClass = RefFieldElement.class; + } + } + + FieldElement fe = (new Gson()).fromJson(element, feClass); + fe.setName(name); + fe.setJsonOrigin(element.isJsonObject()?element.getAsJsonObject():new JsonObject()); + + return fe; + } + public static FieldElement merge(FieldElement...elements) { JsonObject result = new JsonObject(); @@ -58,7 +79,7 @@ public class FieldElement implements EntaxyFactory.FieldInfo { JSONUtils.mergeObjects(jsonObject, result); } - FieldElement fe = (new Gson()).fromJson(result, FieldElement.class); + FieldElement fe = FieldElement.fromJson("merged", result); fe.setJsonOrigin(result.deepCopy()); return fe; } @@ -107,7 +128,7 @@ public class FieldElement implements EntaxyFactory.FieldInfo { @Override public boolean isConditional() { - return conditional; + return CommonUtils.isValid(this.condition); } @Override @@ -153,9 +174,9 @@ public class FieldElement implements EntaxyFactory.FieldInfo { this.jsonOrigin = jsonOrigin; } - public void setConditional(boolean conditional) { +/* public void setConditional(boolean conditional) { this.conditional = conditional; - } + } */ public void setCondition(String condition) { this.condition = condition; diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldsElement.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldsElement.java index db49ec9..e341f17 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldsElement.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/FieldsElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ package ru.entaxy.platform.base.objects.factory.configuration; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -41,7 +41,7 @@ public class FieldsElement extends AbstractElement { public static final String ELEMENT_NAME = EntaxyFactory.CONFIGURATION.FIELDS_SECTION_NAME; - protected Map fields = new HashMap<>(); + protected Map fields = new LinkedHashMap<>(); @Override public FieldsElement fromJson(JsonElement jsonElement) { diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/OutputElement.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/OutputElement.java index 0d27925..015f4c9 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/OutputElement.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/configuration/OutputElement.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -60,9 +61,9 @@ public class OutputElement implements EntaxyFactory.OutputInfo { protected FieldsElement fields = null; - protected Map commonFields = new HashMap<>(); + protected Map commonFields = new LinkedHashMap<>(); - protected Map effectiveFields = new HashMap<>(); + protected Map effectiveFields = new LinkedHashMap<>(); protected boolean isEffectiveCalculated = false; @@ -122,6 +123,8 @@ public class OutputElement implements EntaxyFactory.OutputInfo { } else { // use only locally mentioned fields + // except common fields with "addToOutput" set to current output type or "*" + ownedFields = fields.getFieldsMap(); log.debug("->" + getType() + " ownedFields: " + fields.getFieldsMap().size()); @@ -131,6 +134,23 @@ public class OutputElement implements EntaxyFactory.OutputInfo { FieldElement fe = FieldElement.merge(entry.getValue(), ownedFields.get(entry.getKey())); fe.setName(entry.getKey()); this.effectiveFields.put(entry.getKey(), fe); + } else { + if (entry.getValue().getJsonOrigin().has(EntaxyFactory.CONFIGURATION.FIELDS.ATTRIBUTES.ADD_TO_OUTPUT)) { + String value = entry.getValue().getJsonOrigin() + .get(EntaxyFactory.CONFIGURATION.FIELDS.ATTRIBUTES.ADD_TO_OUTPUT) + .getAsString(); + String[] values = value.split(","); + boolean addField = false; + for (int i=0; i> elementSet = root.entrySet(); for (Entry entry: elementSet) { @@ -132,7 +147,11 @@ public class DefaultFactory implements EntaxyFactory { this.factoryType = fe.getType(); this.category = fe.getCategory(); this.label = fe.getLabel(); + this.displayName = fe.getDisplayName(); this.description = fe.getDescription(); + this.parent = fe.getParent(); + this.isAbstract = fe.isAbstract(); + this.isDeprecated = fe.isDeprecated(); } else if (object instanceof OutputsElement) { log.debug("POSTPROCESS :: OutputsElement"); this.outputs = (OutputsElement)object; @@ -175,6 +194,11 @@ public class DefaultFactory implements EntaxyFactory { return this.factoryType; } + @Override + public String getDisplayName() { + return displayName; + } + @Override public String getDescription() { return description; @@ -190,6 +214,34 @@ public class DefaultFactory implements EntaxyFactory { return category; } + @Override + public String getParent() { + return parent; + } + + @Override + public boolean isAbstract() { + return isAbstract; + } + + @Override + public boolean isDeprecated() { + return isDeprecated; + } + + @Override + public Map getTypeInfo() { + if (factoryData.containsKey(getType())) + return (Map)factoryData.get(getType()); + return Collections.emptyMap(); + } + + @Override + public String getJsonConfiguration() { + //JsonElement je = (new Gson()).toJsonTree(this.factoryData); + return EntaxyFactoryUtils.getEffectiveJson(this); + } + @Override public Generated generate(Map parameters) throws EntaxyFactoryException { return generate(this.outputs.getDefaultOutputType(), parameters); @@ -207,13 +259,15 @@ public class DefaultFactory implements EntaxyFactory { log.debug("Generating for: output type [{}], scope [{}]", outputType, scope); if (!this.outputs.hasOutput(outputType)) { - log.debug("Unknown output: {}", outputType); + log.debug("Factory: {}. Unknown output: {}", this.getId(), outputType); throw new EntaxyFactoryException(); } OutputElement oe = this.outputs.getOutput(outputType); if (!oe.isScopeSupported(scope)) { - log.error("Scope not supported: {}; supported scopes: [{}]" + log.error("Factory: {}, output: {}. Scope not supported: {}; supported scopes: [{}]" + , this.getId() + , oe.getType() , scope , oe.getSupportedScopes().stream().map(s -> s.label).collect(Collectors.joining(","))); throw new EntaxyFactoryException(); diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/impl/GenerationHelper.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/impl/GenerationHelper.java index 71aead1..7e382de 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/impl/GenerationHelper.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/impl/GenerationHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ */ package ru.entaxy.platform.base.objects.factory.impl; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -41,6 +42,7 @@ import ru.entaxy.esb.platform.runtime.base.connecting.generator.factory.Generato import ru.entaxy.platform.base.objects.factory.EntaxyFactory; import ru.entaxy.platform.base.objects.factory.EntaxyFactory.OutputInfo; import ru.entaxy.platform.base.objects.factory.EntaxyFactory.SCOPE; +import ru.entaxy.platform.base.support.CommonUtils; @Component(immediate = true, service = {GenerationHelper.class}) public class GenerationHelper { @@ -50,10 +52,13 @@ public class GenerationHelper { @Reference(cardinality = ReferenceCardinality.MANDATORY, collectionType = CollectionType.SERVICE, policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY) protected volatile TemplateService templateService; + @Reference(cardinality = ReferenceCardinality.MANDATORY) + FactoryRegistry factoryRegistry; + public Generated generateForFactory(EntaxyFactory factory, String outputType, SCOPE scope, Map parameters) throws Exception { - log.debug("GENERATING for factory [" + factory.getFactoryId() + "]"); - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: PARAMETERS \n" + log.debug("GENERATING for factory [" + factory.getId() + "]"); + log.debug("GENERATING for factory [" + factory.getId() + "] :: PARAMETERS \n" + parameters.entrySet().stream().map(e -> e.getKey() + ":" + (null==e.getValue()?"null":e.getValue())) .collect(Collectors.toList()) .stream().collect(Collectors.joining(", ")) @@ -63,39 +68,63 @@ public class GenerationHelper { if (outputInfo == null) { // @TODO throw Exception - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: output [{}] not found", outputType); + log.debug("GENERATING for factory [" + factory.getId() + "] :: output [{}] not found", outputType); return null; } if (!outputInfo.getScopes().contains(scope.label)) { // @TODO throw Exception - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: scope [{}] not supported", scope.label); + log.debug("GENERATING for factory [" + factory.getId() + "] :: scope [{}] not supported", scope.label); return null; } + Map generationProperties = new HashMap<>(); + generationProperties.put(EntaxyFactory.GENERATION.ATTRIBUTES.OUTPUT, outputType); + generationProperties.put(EntaxyFactory.GENERATION.ATTRIBUTES.SCOPE, scope.label); + generationProperties.put(EntaxyFactory.GENERATION.ATTRIBUTES.FACTORY, factory.getId()); + // try to generate via GeneratorFactory - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: TRY via GeneratorFactory"); - Generator g = GeneratorFactory.createGenerator(outputInfo.getGenerator(), outputInfo.getConfig()); - if (g.isGeneratable(parameters)) { - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: generating"); - return g.generate(parameters); + log.debug("GENERATING for factory [" + factory.getId() + "] :: TRY via GeneratorFactory"); + + Map generatorProperties = new HashMap<>(outputInfo.getConfig()); + generatorProperties.putAll(generationProperties); + Generator g = GeneratorFactory.createGenerator(outputInfo.getGenerator(), generatorProperties); + + Map generationParameters = new HashMap<>(parameters); + generationParameters.putAll(generationProperties); + + if (g.isGeneratable(generationParameters)) { + log.debug("GENERATING for factory [" + factory.getId() + "] :: generating"); + return g.generate(generationParameters); } else { - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: NOT generatable"); + log.debug("GENERATING for factory [" + factory.getId() + "] :: NOT generatable"); } // try to generate via TemplateService - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: TRY via TemplateService"); + log.debug("GENERATING for factory [" + factory.getId() + "] :: TRY via TemplateService"); List candidates = new LinkedList<>(); - candidates.add(factory.getFactoryId() + "." + outputType + "." + scope.label); - candidates.add(factory.getFactoryId() + "." + outputType); + candidates.add(factory.getId() + "." + outputType + "." + scope.label); + candidates.add(factory.getId() + "." + outputType); if (outputInfo.isDefault()) { - candidates.add(factory.getFactoryId() + ".default." + scope.label); - candidates.add(factory.getFactoryId() + ".default"); - candidates.add(factory.getFactoryId() + "." + scope.label); - candidates.add(factory.getFactoryId()); + candidates.add(factory.getId() + ".default." + scope.label); + candidates.add(factory.getId() + ".default"); + candidates.add(factory.getId() + "." + scope.label); + candidates.add(factory.getId()); + } + String parent = factory.getParent(); + while (CommonUtils.isValid(parent)) { + candidates.add(parent + "." + outputType + "." + scope.label); + candidates.add(parent + "." + outputType); + String newParent = factoryRegistry.getParentFactory(parent); + + // exclude cyclic references + if (parent.equalsIgnoreCase(newParent)) + break; + + parent = newParent; } - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: CANDIDATES : [" + log.debug("GENERATING for factory [" + factory.getId() + "] :: CANDIDATES : [" + candidates.stream().collect(Collectors.joining(";")) + "]" ); @@ -103,12 +132,12 @@ public class GenerationHelper { for (String candidate: candidates) { Template t = templateService.getTemplateById(candidate); if (t != null) { - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: FOUND TEMPLATE : [" + log.debug("GENERATING for factory [" + factory.getId() + "] :: FOUND TEMPLATE : [" + candidate + "]"); Generated result = GeneratorFactory.createGenerator(t).generate(t, parameters); return result; } else { - log.debug("GENERATING for factory [" + factory.getFactoryId() + "] :: NOT FOUND TEMPLATE : [" + log.debug("GENERATING for factory [" + factory.getId() + "] :: NOT FOUND TEMPLATE : [" + candidate + "]"); } } diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactory.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactory.java index edcfffe..af353f6 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactory.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,10 @@ import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.gson.JsonObject; + import ru.entaxy.platform.base.objects.factory.EntaxyFactory; +import ru.entaxy.platform.base.support.CommonUtils; public class TrackedFactory { @@ -77,6 +80,11 @@ public class TrackedFactory { if (this.serviceRegistration != null) try { this.serviceRegistration.unregister(); + } catch (IllegalStateException e) { + // skip exception typical for bundle refreshing process + if (CommonUtils.isValid(e.getMessage()) && e.getMessage().contains("Service already unregistered")) + return; + log.warn("TrackedFactory [" + getId() + "]", e); } catch (Exception e) { log.warn("TrackedFactory [" + getId() + "]", e); } diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactoryCustomizer.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactoryCustomizer.java index e9853d3..b360e87 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactoryCustomizer.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackedFactoryCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ import org.osgi.framework.BundleEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.entaxy.platform.base.support.JSONUtils; import ru.entaxy.platform.base.support.osgi.tracker.UniformBundleTrackerCustomizer; public class TrackedFactoryCustomizer extends UniformBundleTrackerCustomizer> { @@ -60,11 +61,13 @@ public class TrackedFactoryCustomizer extends UniformBundleTrackerCustomizer> { diff --git a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackerManager.java b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackerManager.java index 19189bb..34e1fb7 100644 --- a/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackerManager.java +++ b/platform/runtime/base/objects-base/object-factory/src/main/java/ru/entaxy/platform/base/objects/factory/tracker/TrackerManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; +import org.osgi.service.component.annotations.ReferenceCardinality; import org.osgi.util.tracker.BundleTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +45,9 @@ public class TrackerManager { protected BundleTracker> factoryTracker; + @Reference (cardinality = ReferenceCardinality.MANDATORY) + TrackedFactoryManager factoryManager; + @Activate public void activate(ComponentContext componentContext) { this.bundleContext = componentContext.getBundleContext(); @@ -54,7 +59,8 @@ public class TrackerManager { ) .customizer( (new TrackedFactoryCustomizer()) - .listener(new TrackedFactoryCustomizerListener(bundleContext)) + // .listener(new TrackedFactoryCustomizerListener(bundleContext)) + .listener(factoryManager) ) .bundleState(Bundle.ACTIVE | Bundle.INSTALLED | Bundle.RESOLVED) .get(); diff --git a/platform/runtime/base/objects-base/objects-core/pom.xml b/platform/runtime/base/objects-base/objects-core/pom.xml index 3cf4ae6..0926de2 100644 --- a/platform/runtime/base/objects-base/objects-core/pom.xml +++ b/platform/runtime/base/objects-base/objects-core/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.base objects-base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base.objects-base objects-core diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObject.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObject.java index 18c7d0a..4e35635 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObject.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObject.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ public interface EntaxyObject { public interface HEADERS { + String ENTAXY_GENERATED = "Entaxy-Generated"; String MAIN_OBJECT = "Entaxy-Main-Object"; String GENERATED_OBJECTS = "Entaxy-Generated-Object"; // public static final String HEADER_MAIN_OBJECT_ID = "Entaxy-Main-Object-Id"; @@ -73,11 +74,22 @@ public interface EntaxyObject { public long getBundleId(); } - public String getObjectId(); - public String getObjectType(); - public default String getObjectFullId() { - return getObjectId() + ":" + getObjectType(); + public String getId(); + public String getType(); + @Deprecated + public default String getObjectId() { + return getId(); }; + @Deprecated + public default String getObjectType() { + return getType(); + }; + + public default String getObjectFullId() { + return getId() + ":" + getType(); + }; + + public String getScope(); public String getFactoryId(); public BundleInfo getBundleInfo(); diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectService.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectService.java index 1c660e8..d40e7e7 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectService.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,5 +24,7 @@ import java.util.List; public interface EntaxyObjectService { public List getObjects(); - + + public EntaxyObject findObject(String objectId, String objectType); + } diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorage.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorage.java index d510b9d..126655a 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorage.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorage.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorageService.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorageService.java index 2d26546..099eb43 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorageService.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/EntaxyObjectStorageService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/BundleInfoImpl.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/BundleInfoImpl.java index 0ead595..a654d07 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/BundleInfoImpl.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/BundleInfoImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/EntaxyObjectServiceImpl.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/EntaxyObjectServiceImpl.java index 8095740..d9c7470 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/EntaxyObjectServiceImpl.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/EntaxyObjectServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ package ru.entaxy.platform.base.objects.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import org.osgi.framework.Bundle; @@ -69,6 +70,14 @@ public class EntaxyObjectServiceImpl implements EntaxyObjectService { return trackedObjects.values().stream().collect(Collectors.toList()); } + @Override + public EntaxyObject findObject(String objectId, String objectType) { + Optional object = getObjects().stream() + .filter(obj -> (obj.getObjectId().equals(objectId) && obj.getObjectType().equals(objectType))) + .findFirst(); + return object.orElse(null); + } + protected void openTracker() { objectTracker = BundleTrackerUtils.>createBuilder() .addFilter( diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/TrackedEntaxyObject.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/TrackedEntaxyObject.java index fb563ab..8d3c240 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/TrackedEntaxyObject.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/impl/TrackedEntaxyObject.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,11 +32,16 @@ public class TrackedEntaxyObject implements EntaxyObject { static public TrackedEntaxyObject create(BundleContext bundleContext, String objectId, String objectType) { return new TrackedEntaxyObject(bundleContext, objectId, objectType); } + + static public TrackedEntaxyObject create(BundleContext bundleContext, String objectId, String objectType, String scope) { + return new TrackedEntaxyObject(bundleContext, objectId, objectType, scope); + } protected BundleContext bundleContext; protected String objectId; protected String objectType; + protected String objectScope = "public"; protected String factoryId = "UNKNOWN"; protected JsonObject configuration; @@ -50,16 +55,26 @@ public class TrackedEntaxyObject implements EntaxyObject { this.objectType = objectType; } + protected TrackedEntaxyObject(BundleContext bundleContext, String objectId, String objectType, String scope) { + this(bundleContext, objectId, objectType); + this.objectScope = scope; + } + @Override - public String getObjectId() { + public String getId() { return this.objectId; } @Override - public String getObjectType() { + public String getType() { return this.objectType; } + @Override + public String getScope() { + return this.objectScope; + } + @Override public String getFactoryId() { return this.factoryId; diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizer.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizer.java index 7dc0016..0d932ec 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizer.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,9 +65,19 @@ public class TrackedEntaxyObjectCustomizer extends UniformBundleTrackerCustomize configuration = "{}"; } - TrackedEntaxyObject obj = TrackedEntaxyObject.create( - objectServiceImpl.getBundleContext(), objectData[0], objectData[1] - ).bundle(bundle).configuration(configuration); + TrackedEntaxyObject obj; + if (objectData.length>2) + obj = TrackedEntaxyObject.create( + objectServiceImpl.getBundleContext() + , objectData[0] + , objectData[1] + , objectData[2] + ); + else + obj = TrackedEntaxyObject.create( + objectServiceImpl.getBundleContext(), objectData[0], objectData[1] + ); + obj.bundle(bundle).configuration(configuration); result.add(obj); } diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizerListener.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizerListener.java index 2bd5120..a0e715b 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizerListener.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/service/tracker/TrackedEntaxyObjectCustomizerListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/EntaxyObjectServiceSupport.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/EntaxyObjectServiceSupport.java index 8dc8f45..a3bbec1 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/EntaxyObjectServiceSupport.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/EntaxyObjectServiceSupport.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ListObjects.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ListObjects.java index 50f8c21..1470689 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ListObjects.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ListObjects.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,14 +36,16 @@ public class ListObjects extends EntaxyObjectServiceSupport implements Action { ShellTable shellTable = new ShellTable(); shellTable.column("Id"); shellTable.column("Type"); + shellTable.column("Scope"); shellTable.column("Full Id"); shellTable.column("Factory Id"); shellTable.column("Bundle Id"); for (EntaxyObject object: objectService.getObjects()) shellTable.addRow().addContent( - object.getObjectId(), - object.getObjectType(), + object.getId(), + object.getType(), + object.getScope(), object.getObjectFullId(), object.getFactoryId(), object.getBundleInfo().getBundleId() diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectAwareCommand.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectAwareCommand.java index bc3dbdc..a8cbdf1 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectAwareCommand.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectAwareCommand.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectConfiguration.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectConfiguration.java index a88b909..a522815 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectConfiguration.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/ObjectConfiguration.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/completers/ObjectCompleter.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/completers/ObjectCompleter.java index f1741bb..72e73e1 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/completers/ObjectCompleter.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/shell/completers/ObjectCompleter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/storage/impl/EntaxyObjectStorageServiceImpl.java b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/storage/impl/EntaxyObjectStorageServiceImpl.java index 8c22d58..2b6af72 100644 --- a/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/storage/impl/EntaxyObjectStorageServiceImpl.java +++ b/platform/runtime/base/objects-base/objects-core/src/main/java/ru/entaxy/platform/base/objects/storage/impl/EntaxyObjectStorageServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/base/objects-base/pom.xml b/platform/runtime/base/objects-base/pom.xml index eb0d01e..d29169c 100644 --- a/platform/runtime/base/objects-base/pom.xml +++ b/platform/runtime/base/objects-base/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime base - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.base objects-base diff --git a/platform/runtime/base/pom.xml b/platform/runtime/base/pom.xml index f2c9639..5938f0b 100644 --- a/platform/runtime/base/pom.xml +++ b/platform/runtime/base/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform runtime - 1.8.2.2 + 1.8.3 4.0.0 @@ -34,5 +32,6 @@ management-core objects-base config-extensions + resources \ No newline at end of file diff --git a/platform/runtime/base/src/main/features/features.xml b/platform/runtime/base/src/main/features/features.xml index 7e944dd..9832479 100644 --- a/platform/runtime/base/src/main/features/features.xml +++ b/platform/runtime/base/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ base ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ --> - @@ -28,17 +28,16 @@ mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features mvn:ru.entaxy.esb.underlying/entaxy-underlying-features/${project.version}/xml/features - - mvn:ru.entaxy.esb.system/system-parent/${project.version}/xml/features + mvn:ru.entaxy.esb.platform.runtime/base/${project.version}/xml/support - - mvn:org.freemarker/freemarker/${freemarker.version} - + + mvn:ru.entaxy.esb.system/system-parent/${project.version}/xml/basics entaxy-freemarker-support entaxy-legacy-system base-support + resources extensions entaxy-branding management-core @@ -52,16 +51,11 @@ - - mvn:ru.entaxy.esb.platform.runtime.base/base-support/${project.version} - - base-support mvn:ru.entaxy.esb.platform.runtime.base/config-extensions/${project.version} - mvn:ru.entaxy.esb.platform.runtime.base/management-core/${project.version} @@ -80,15 +74,6 @@ adapter - - base-support - mvn:ru.entaxy.esb.platform.runtime.base.connecting.generator/generator-api/${project.version} - mvn:ru.entaxy.esb.platform.runtime.base.connecting.generator/generator-factory/${project.version} - mvn:ru.entaxy.esb.platform.runtime.base.connecting.generator/template-service-shell/${project.version} - mvn:ru.entaxy.esb.platform.runtime.base.connecting.generator/ftl-generator/${project.version} - mvn:ru.entaxy.esb.platform.runtime.base.connecting.generator/common-templates-collection/${project.version} - - camel-gson mvn:ru.entaxy.esb.platform.runtime.base.connecting.producer/producer-api/${project.version} @@ -148,4 +133,4 @@ mvn:ru.entaxy.esb.platform.runtime.base.connecting.adapter/h2-adapter/${project.version} - \ No newline at end of file + diff --git a/platform/runtime/core/artifact-management/pom.xml b/platform/runtime/core/artifact-management/pom.xml index 4a13eb2..b9d29d9 100644 --- a/platform/runtime/core/artifact-management/pom.xml +++ b/platform/runtime/core/artifact-management/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime core - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core artifact-management @@ -118,7 +118,16 @@ org.apache.karaf.cellar.core ${cellar.version} + + commons-codec + commons-codec + + ru.entaxy.esb.system.commons system-commons ${project.version} diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifact.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifact.java index 5c260f8..8f51328 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifact.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifact.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactCoordinates.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactCoordinates.java index 21b245b..363831c 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactCoordinates.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactCoordinates.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactManifest.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactManifest.java index 4b7a27e..12a21d1 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactManifest.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/ArtifactManifest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifacts.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifacts.java index 127ba36..afb7000 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifacts.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Artifacts.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Blueprint.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Blueprint.java index f16b4b8..c35a4dc 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Blueprint.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Blueprint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/BlueprintManifest.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/BlueprintManifest.java index 2be790b..ec0b772 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/BlueprintManifest.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/BlueprintManifest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DefaultArtifact.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DefaultArtifact.java index 2c26969..13e5234 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DefaultArtifact.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DefaultArtifact.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; import org.apache.camel.tooling.model.Strings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import ru.entaxy.platform.core.artifact.annotation.ArtifactSupport; import ru.entaxy.platform.core.artifact.capabilities.CapabilityDescriptor; @@ -36,6 +38,8 @@ import ru.entaxy.platform.core.artifact.impl.CapabilityDescriptorImpl; public class DefaultArtifact implements Artifact { + private static final Logger log = LoggerFactory.getLogger(DefaultArtifact.class); + protected ArtifactCoordinates coordinates; protected ArtifactSupport artifactSupport = null; @@ -122,14 +126,11 @@ public class DefaultArtifact implements Artifact { @Override public void toFile(File destination) { if (this.content != null) { - try { - FileWriter writer = new FileWriter(destination); + try (FileWriter writer = new FileWriter(destination)) { writer.write(this.content.toString()); - writer.close(); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + log.error("Error writing to file", e); + } } } diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DeployedArtifact.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DeployedArtifact.java index 5ea366b..d8773d5 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DeployedArtifact.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/DeployedArtifact.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Manifested.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Manifested.java index 58a0ef4..5316d4a 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Manifested.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/Manifested.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/annotation/ArtifactSupport.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/annotation/ArtifactSupport.java index 4d8fbeb..c54bda0 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/annotation/ArtifactSupport.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/annotation/ArtifactSupport.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptor.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptor.java index fe6131c..4d0c9ac 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptor.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptorImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptorImpl.java index 4cbfd39..d8035c4 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptorImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityDescriptorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,6 +54,8 @@ public class CapabilityDescriptorImpl implements CapabilityDescriptor { return null; if (CapabilityDescriptor.ATTRIBUTE_TYPES.isList(type)) return CapabilityTypeHelper.getListAsString((List)value); + if (CapabilityDescriptor.ATTRIBUTE_TYPES.STRING.equals(type)) + return "\"" + value.toString() + "\""; return value.toString(); } @@ -72,7 +74,7 @@ public class CapabilityDescriptorImpl implements CapabilityDescriptor { return this.attributes.entrySet().stream() .map(entry-> entry.getKey() - + (!ATTRIBUTE_TYPES.STRING.equals(entry.getValue().type)?(":" + entry.getValue().type):"") + + /* (!ATTRIBUTE_TYPES.STRING.equals(entry.getValue().type)?(*/":" + entry.getValue().type/* ):"") */ + "=" + entry.getValue().getValueAsString()) .collect(Collectors.joining(";")); } diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityTypeHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityTypeHelper.java index 414f226..908e1a1 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityTypeHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/CapabilityTypeHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/ManifestCapabilityHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/ManifestCapabilityHelper.java index 0b95ed9..2ca51b3 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/ManifestCapabilityHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/capabilities/ManifestCapabilityHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/impl/CapabilityDescriptorImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/impl/CapabilityDescriptorImpl.java index 43ffc40..496b5e2 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/impl/CapabilityDescriptorImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/impl/CapabilityDescriptorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/ArtifactInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/ArtifactInstaller.java index 1a87dd4..e6199ce 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/ArtifactInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/ArtifactInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/ClusterInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/ClusterInstaller.java index d7ca123..b22a0ce 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/ClusterInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/ClusterInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/CommonInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/CommonInstaller.java index 30a48f0..c702351 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/CommonInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/CommonInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallationResult.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallationResult.java index 01423a4..4ccb37d 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallationResult.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallationResult.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installer.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installer.java index 09fa90f..a83b2a8 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installer.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installers.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installers.java index be968de..79b4093 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installers.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/Installers.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallersWithDefaults.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallersWithDefaults.java index 77aa97e..e5a92fc 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallersWithDefaults.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/InstallersWithDefaults.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/LocalInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/LocalInstaller.java index b700ae9..067e16d 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/LocalInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/LocalInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/AbstractInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/AbstractInstaller.java index f07e9d1..bf02376 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/AbstractInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/AbstractInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallationResultImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallationResultImpl.java index 5975a64..eab133d 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallationResultImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallationResultImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersImpl.java index 3a849da..db52a48 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersWithDefaultsImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersWithDefaultsImpl.java index ec0104e..164aa8c 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersWithDefaultsImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/InstallersWithDefaultsImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterCommonBundleInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterCommonBundleInstallerHelper.java index 9197aee..ba5abd1 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterCommonBundleInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterCommonBundleInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterInstallerWrapperImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterInstallerWrapperImpl.java index 47b8f77..1863bae 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterInstallerWrapperImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterInstallerWrapperImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterTypedInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterTypedInstallerHelper.java index b767392..fc30810 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterTypedInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/ClusterTypedInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/DefaultCellarInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/DefaultCellarInstaller.java index 0f81d96..33fdd02 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/DefaultCellarInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/cluster/DefaultCellarInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/DefaultLocalInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/DefaultLocalInstaller.java index 2ab9227..1a09f66 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/DefaultLocalInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/DefaultLocalInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalCommonBundleInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalCommonBundleInstallerHelper.java index 340284b..466112c 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalCommonBundleInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalCommonBundleInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalTypedInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalTypedInstallerHelper.java index cf29444..6b4a8af 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalTypedInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/impl/local/LocalTypedInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BlueprintInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BlueprintInstaller.java index 6cf006a..a335369 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BlueprintInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BlueprintInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BundleInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BundleInstaller.java index 19d1150..278fbe8 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BundleInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/BundleInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/CommonBundleInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/CommonBundleInstaller.java index b7fb491..8e638e5 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/CommonBundleInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/CommonBundleInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/ConfigInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/ConfigInstaller.java index 84206c8..350bdcb 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/ConfigInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/ConfigInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/FeaturesInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/FeaturesInstaller.java index c0bb55d..c47902b 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/FeaturesInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/FeaturesInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/JarInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/JarInstaller.java index 2377d57..ba812a2 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/JarInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/JarInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StartAware.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StartAware.java index 56fb150..93c271e 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StartAware.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StartAware.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StopAware.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StopAware.java index 9a30baf..c5b5b95 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StopAware.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/StopAware.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/TypedInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/TypedInstaller.java index 83596db..ec416cf 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/TypedInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/TypedInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BlueprintInstallerImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BlueprintInstallerImpl.java index ecf57ba..4810005 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BlueprintInstallerImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BlueprintInstallerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BundleInstallerImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BundleInstallerImpl.java index efe7bca..025a9b1 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BundleInstallerImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/BundleInstallerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelper.java index 42eee49..fa35c31 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelperConfig.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelperConfig.java index a410589..4fb0e8d 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelperConfig.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerHelperConfig.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerImpl.java index 84e9545..7838a76 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/CommonBundleInstallerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/JarInstallerImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/JarInstallerImpl.java index c3761ac..7b463dd 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/JarInstallerImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/JarInstallerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerHelper.java index 648865d..25fff40 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerImpl.java index 2f97fa2..76ceb9e 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/builder/typed/impl/TypedInstallerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/AbstractArtifactInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/AbstractArtifactInstaller.java index 72cc7c6..2652a02 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/AbstractArtifactInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/AbstractArtifactInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/ArtifactInstallerCollector.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/ArtifactInstallerCollector.java index afe8a7f..f994ffc 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/ArtifactInstallerCollector.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/ArtifactInstallerCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultClusterArtifactInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultClusterArtifactInstaller.java index 1e2e439..c485c01 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultClusterArtifactInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultClusterArtifactInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultLocalArtifactInstaller.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultLocalArtifactInstaller.java index 285d937..1b93256 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultLocalArtifactInstaller.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/installer/impl/DefaultLocalArtifactInstaller.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/legacy/BundleController.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/legacy/BundleController.java index f63a9be..237f6c8 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/legacy/BundleController.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/legacy/BundleController.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cellar-deployer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepository.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepository.java index b892382..3bdd05d 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepository.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepositoryInitializer.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepositoryInitializer.java index c853baa..079468b 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepositoryInitializer.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/ArtifactRepositoryInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.core.ConfigRepository; import org.osgi.framework.InvalidSyntaxException; @@ -142,21 +142,42 @@ public class ArtifactRepositoryInitializer extends AbstractInitializer { ServiceReference ref1 = this.bundleContext.getServiceReference(ConfigRepository.class); this.configRepository = this.bundleContext.getService(ref1); + /* + ServiceReference refCa = this.bundleContext.getServiceReference(ConfigurationAdmin.class); + ConfigurationAdmin ca = this.bundleContext.getService(refCa); + + Dictionary clearProps = new Hashtable<>(); + + try { + Configuration config = ca.getConfiguration(MVN_PID); + clearProps = config.getProperties(); + } catch (IOException e1) { + log.error("Error getting config: " + MVN_PID, e1); + } + */ + try { TypedProperties properties = this.configRepository.getConfig(MVN_PID); + + String hashKey = PROP_ENTAXY_REPO_LIST + ".md5"; - properties.put(PROP_ENTAXY_REPO_LIST, repositoryUrlsResult); - this.configRepository.update(MVN_PID, properties); + String newHash = DigestUtils.md5Hex(repositoryUrlsResult); + String currentHash = properties.getOrDefault(hashKey, "").toString(); + + // To avoid extra config rewriting + // which may cause config loss while updating + if (!newHash.equals(currentHash)) { + properties.put(PROP_ENTAXY_REPO_LIST, repositoryUrlsResult); + properties.put(hashKey, newHash); + this.configRepository.update(MVN_PID, properties); + } } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error("Error updating config", e); } catch (InvalidSyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error("Error updating config", e); } - } @Override diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/ArtifactRepositoryImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/ArtifactRepositoryImpl.java index 54a8153..0b85ac7 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/ArtifactRepositoryImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/ArtifactRepositoryImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/DeployedArtifactImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/DeployedArtifactImpl.java index b2989db..0752e26 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/DeployedArtifactImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/DeployedArtifactImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelper.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelper.java index cef2b10..9ee131a 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelper.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelperCollector.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelperCollector.java index dddb650..119a23b 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelperCollector.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryConfigurableHelperCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryDescriptor.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryDescriptor.java index cc7d609..e483c09 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryDescriptor.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/RepositoryDescriptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/AbstractRemoteRepository.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/AbstractRemoteRepository.java index b3e01e3..7dd6f32 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/AbstractRemoteRepository.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/AbstractRemoteRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/NexusRepository.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/NexusRepository.java index 51b5085..946c752 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/NexusRepository.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/NexusRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepository.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepository.java index b93932b..220a729 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepository.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryDescriptor.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryDescriptor.java index 29a6e72..8140da6 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryDescriptor.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryDescriptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryFactory.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryFactory.java index 28e6301..c52a679 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryFactory.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/repository/impl/remote/RemoteRepositoryFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/ArtifactService.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/ArtifactService.java index 8dd09c6..10681dd 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/ArtifactService.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/ArtifactService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/impl/ArtifactServiceImpl.java b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/impl/ArtifactServiceImpl.java index c041cb3..75fda2c 100644 --- a/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/impl/ArtifactServiceImpl.java +++ b/platform/runtime/core/artifact-management/src/main/java/ru/entaxy/platform/core/artifact/service/impl/ArtifactServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artifact-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/non-packaged-resources/etc/ru.entaxy.esb.artifact.repositories.cfg b/platform/runtime/core/artifact-management/src/main/non-packaged-resources/etc/ru.entaxy.esb.artifact.repositories.cfg index 427b4f6..51c8103 100644 --- a/platform/runtime/core/artifact-management/src/main/non-packaged-resources/etc/ru.entaxy.esb.artifact.repositories.cfg +++ b/platform/runtime/core/artifact-management/src/main/non-packaged-resources/etc/ru.entaxy.esb.artifact.repositories.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # artifact-management # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/artifact-management/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/platform/runtime/core/artifact-management/src/main/resources/OSGI-INF/blueprint/blueprint.xml index cc2f65e..91b8f7e 100644 --- a/platform/runtime/core/artifact-management/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/platform/runtime/core/artifact-management/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ uniform-service-exchange-endpoint ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/pom.xml b/platform/runtime/core/cluster/cluster-persistence-service/pom.xml index 3e7c009..f64cf59 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/pom.xml +++ b/platform/runtime/core/cluster/cluster-persistence-service/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core cluster - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.cluster cluster-persistence-service diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Helper.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Helper.java index dc45e8b..d482db5 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Helper.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Helper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/PersistenceManager.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/PersistenceManager.java index 16ab4e4..8fbc8df 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/PersistenceManager.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/PersistenceManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Serializer.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Serializer.java index dde57eb..f513284 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Serializer.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/Serializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/ServiceProvider.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/ServiceProvider.java index 01c9ba0..aa82882 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/ServiceProvider.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/ServiceProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/activator/Activator.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/activator/Activator.java index c33827c..f45d9f8 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/activator/Activator.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/activator/Activator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * hazelcast-test * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalBundleEventHandler.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalBundleEventHandler.java index 91d009a..3ff8467 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalBundleEventHandler.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalBundleEventHandler.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventDispatchTask.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventDispatchTask.java index 3e71aa3..4180b89 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventDispatchTask.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventDispatchTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventHandlerRegistryDispatcher.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventHandlerRegistryDispatcher.java index b565daf..275e2c3 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventHandlerRegistryDispatcher.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalEventHandlerRegistryDispatcher.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalHandlerRegistry.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalHandlerRegistry.java index 86607f8..9ed5a4d 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalHandlerRegistry.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalHandlerRegistry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalTopicConsumer.java b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalTopicConsumer.java index 695d136..aca0f54 100644 --- a/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalTopicConsumer.java +++ b/platform/runtime/core/cluster/cluster-persistence-service/src/main/java/ru/entaxy/esb/platform/core/cluster/persistence/handler/LocalTopicConsumer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-persistence-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/cluster/pom.xml b/platform/runtime/core/cluster/pom.xml index bd43c2c..28a167c 100644 --- a/platform/runtime/core/cluster/pom.xml +++ b/platform/runtime/core/cluster/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime core - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core cluster diff --git a/platform/runtime/core/infrastructure/pom.xml b/platform/runtime/core/infrastructure/pom.xml index 8db5bcc..e27d1c7 100644 --- a/platform/runtime/core/infrastructure/pom.xml +++ b/platform/runtime/core/infrastructure/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.platform.runtime core - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core diff --git a/platform/runtime/core/infrastructure/schema/pom.xml b/platform/runtime/core/infrastructure/schema/pom.xml index e533f79..fabf65b 100644 --- a/platform/runtime/core/infrastructure/schema/pom.xml +++ b/platform/runtime/core/infrastructure/schema/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core infrastructure - 1.8.2.2 + 1.8.3 4.0.0 pom diff --git a/platform/runtime/core/infrastructure/schema/schema-api/pom.xml b/platform/runtime/core/infrastructure/schema/schema-api/pom.xml index 5b2a9bf..660c7c1 100644 --- a/platform/runtime/core/infrastructure/schema/schema-api/pom.xml +++ b/platform/runtime/core/infrastructure/schema/schema-api/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core.infrastructure schema - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/ResourceService.java b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/ResourceService.java index 364bd5a..d730333 100644 --- a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/ResourceService.java +++ b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/ResourceService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,8 @@ public interface ResourceService { Optional getResourceByName(String name); + Optional getResourceByFullName(String name); + Optional getResourceByIdAndVersion(long id, String version); void removeResource(long id); @@ -59,6 +61,12 @@ public interface ResourceService { List getListResourceInfoByName(String name); + List getResourceInfoByFullName(String name); + + List getResourceInfoByPath(String path); + + List getResourceInfoByFullPath(String path); + List getListResourceInfoByNamespace(String namespace); } diff --git a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/Resource.java b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/Resource.java index f5cbef0..34a2577 100644 --- a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/Resource.java +++ b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/Resource.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/ResourceInfo.java b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/ResourceInfo.java index 3cbe4b0..151169e 100644 --- a/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/ResourceInfo.java +++ b/platform/runtime/core/infrastructure/schema/schema-api/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/api/entity/ResourceInfo.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,8 @@ public class ResourceInfo { private String editedBy; @Column(name = "namespace_out") private String namespaceOut; + @Column(name = "path") + private String path; @Column(name = "resource_id") private Long resourceId; @@ -150,6 +152,14 @@ public class ResourceInfo { this.resourceId = resourceId; } + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + @Override public String toString() { return "ResourceInfo{" + @@ -158,12 +168,13 @@ public class ResourceInfo { ", namespace='" + namespace + '\'' + ", description='" + description + '\'' + ", version='" + version + '\'' + - ", convertor='" + convertor + '\'' + + ", convertor=" + convertor + ", createdDate=" + createdDate + ", createdBy='" + createdBy + '\'' + ", editedDate=" + editedDate + ", editedBy='" + editedBy + '\'' + ", namespaceOut='" + namespaceOut + '\'' + + ", path='" + path + '\'' + ", resourceId=" + resourceId + '}'; } diff --git a/platform/runtime/core/infrastructure/schema/schema-component/pom.xml b/platform/runtime/core/infrastructure/schema/schema-component/pom.xml index ec2ea7d..4b93af2 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/pom.xml +++ b/platform/runtime/core/infrastructure/schema/schema-component/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core.infrastructure schema - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatingProcessor.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatingProcessor.java index 37e03b6..729082c 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatingProcessor.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatingProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageComponent.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageComponent.java index db45c8b..d25a833 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageComponent.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageComponent.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageEndpoint.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageEndpoint.java index 00558a3..681b7f4 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageEndpoint.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageEndpoint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageProducer.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageProducer.java index 16b0f1a..e97e214 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageProducer.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/ValidatorWithDBStorageProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/exception/SchemaNotFoundException.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/exception/SchemaNotFoundException.java index f83b7cd..5bded9f 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/exception/SchemaNotFoundException.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/exception/SchemaNotFoundException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/util/SchemaReaderFromDB.java b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/util/SchemaReaderFromDB.java index 67c63b1..f0ff0be 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/util/SchemaReaderFromDB.java +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/component/util/SchemaReaderFromDB.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -208,9 +208,9 @@ public class SchemaReaderFromDB { Optional resource = Optional.empty(); if (schemaResourceUri != null && schemaResourceUri.contains("namespace:")) { resource = resourceService.getResourceByNamespace(schemaResourceUri.replace("namespace:", "")); - } - - if (schemaResourceUri != null && schemaResourceUri.contains("uuid:")) { + } else if (schemaResourceUri != null && schemaResourceUri.contains("name:")) { + resource = resourceService.getResourceByFullName(schemaResourceUri.replace("name:", "")); + } else if (schemaResourceUri != null && schemaResourceUri.contains("uuid:")) { resource = resourceService.getResourceByNamespace(schemaResourceUri.replace("uuid:", "")); } diff --git a/platform/runtime/core/infrastructure/schema/schema-component/src/main/resources/log4j2.properties b/platform/runtime/core/infrastructure/schema/schema-component/src/main/resources/log4j2.properties index e3e8215..8fc66d4 100644 --- a/platform/runtime/core/infrastructure/schema/schema-component/src/main/resources/log4j2.properties +++ b/platform/runtime/core/infrastructure/schema/schema-component/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # schema-component # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/pom.xml b/platform/runtime/core/infrastructure/schema/schema-impl/pom.xml index 9ee0323..8ec4781 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/pom.xml +++ b/platform/runtime/core/infrastructure/schema/schema-impl/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core.infrastructure schema - 1.8.2.2 + 1.8.3 4.0.0 @@ -28,6 +26,7 @@ ru.entaxy.esb.platform.runtime.core.infrastructure.schema.resolver.resource.*, ru.entaxy.esb.platform.runtime.core.infrastructure.schema.impl.*, + 1.4.0 @@ -69,5 +68,15 @@ schema-api ${project.version} + + org.apache.camel + camel-file + ${camel.version} + + + org.osgi + org.osgi.service.component.annotations + ${org.osgi.annotations} + \ No newline at end of file diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceInfoNotFound.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceInfoNotFound.java index 11a272d..cb2814f 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceInfoNotFound.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceInfoNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceNotFound.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceNotFound.java index 4518205..6d566aa 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceNotFound.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/exception/ResourceNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/impl/ResourceServiceImpl.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/impl/ResourceServiceImpl.java index a942138..a306032 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/impl/ResourceServiceImpl.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/impl/ResourceServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import ru.entaxy.esb.platform.runtime.core.infrastructure.schema.exception.Resou import javax.persistence.EntityNotFoundException; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Expression; import javax.persistence.criteria.Root; import java.util.List; import java.util.Optional; @@ -142,6 +143,34 @@ public class ResourceServiceImpl implements ResourceService { return resource; } + @Override + public Optional getResourceByFullName(String name) { + Optional resourceInfo; + Optional resource; + try (Session s = getSession()) { + s.getTransaction().begin(); + + CriteriaBuilder builder = s.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = builder.createQuery(ResourceInfo.class); + Root root = criteriaQuery.from(ResourceInfo.class); + + Expression concat = builder.concat(root.get("name"), root.get("path")); + criteriaQuery.where( + builder.equal(concat, name) + ); + resourceInfo = s.createQuery(criteriaQuery).uniqueResultOptional(); + + if (resourceInfo.isEmpty()) { + throw new ResourceInfoNotFound(); + } + + resource = getResource(resourceInfo.get().getResourceId()); + s.getTransaction().commit(); + s.close(); + } + return resource; + } + @Override public Optional getResourceByIdAndVersion(long id, String version) { Optional resourceInfo; @@ -337,6 +366,67 @@ public class ResourceServiceImpl implements ResourceService { return list; } + @Override + public List getResourceInfoByFullName(String name) { + List list; + try (Session s = getSession()) { + s.getTransaction().begin(); + + CriteriaBuilder builder = s.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = builder.createQuery(ResourceInfo.class); + Root root = criteriaQuery.from(ResourceInfo.class); + Expression concat = builder.concat(root.get("path"), root.get("name")); + criteriaQuery.where( + builder.equal(concat, name) + ); + list = s.createQuery(criteriaQuery).getResultList(); + + s.getTransaction().commit(); + s.close(); + } + return list; + } + + @Override + public List getResourceInfoByPath(String path) { + List list; + try (Session s = getSession()) { + s.getTransaction().begin(); + + CriteriaBuilder builder = s.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = builder.createQuery(ResourceInfo.class); + Root root = criteriaQuery.from(ResourceInfo.class); + criteriaQuery.where( + builder.like(root.get("path"), "%" + path + "%") + ); + list = s.createQuery(criteriaQuery).getResultList(); + + s.getTransaction().commit(); + s.close(); + } + return list; + } + + @Override + public List getResourceInfoByFullPath(String path) { + List list; + try (Session s = getSession()) { + s.getTransaction().begin(); + + CriteriaBuilder builder = s.getCriteriaBuilder(); + CriteriaQuery criteriaQuery = builder.createQuery(ResourceInfo.class); + Root root = criteriaQuery.from(ResourceInfo.class); + criteriaQuery.where( + builder.equal(root.get("path"), path) + ); + list = s.createQuery(criteriaQuery).getResultList(); + + s.getTransaction().commit(); + s.close(); + } + return list; + } + @Override public List getListResourceInfoByNamespace(String namespace) { List list; diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/CxfDBResourceResolver.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/CxfDBResourceResolver.java index 18b8efa..3419d67 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/CxfDBResourceResolver.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/CxfDBResourceResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResolverSettings.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResolverSettings.java index 7ee046a..19778e0 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResolverSettings.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResolverSettings.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResourceResolver.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResourceResolver.java index df3b673..e04a6b4 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResourceResolver.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/DBResourceResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/XslUrlResolver.java b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/XslUrlResolver.java index f94753d..4275e75 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/XslUrlResolver.java +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/resolver/resource/XslUrlResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml index dd307be..424c368 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ schema-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/hibernate.cfg.xml b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/hibernate.cfg.xml index 541e4ea..3238db9 100644 --- a/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/hibernate.cfg.xml +++ b/platform/runtime/core/infrastructure/schema/schema-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ schema-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/pom.xml b/platform/runtime/core/infrastructure/schema/schema-soap/pom.xml index 0ada81a..b73ffe2 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/pom.xml +++ b/platform/runtime/core/infrastructure/schema/schema-soap/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core.infrastructure schema - 1.8.2.2 + 1.8.3 4.0.0 @@ -126,9 +124,10 @@ ${basedir}/src/main/resources/wsdl/registry-schema-service.wsdl + classpath:wsdl/registry-schema-service.wsdl -p - ru.entaxy.esb.system.registry.schema.soap.cxf + ru.entaxy.esb.platform.runtime.core.infrastructure.schema.soap.cxf -bareMethods true diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/RegistrySchemaServiceImpl.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/RegistrySchemaServiceImpl.java index 45d9e12..785d3f5 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/RegistrySchemaServiceImpl.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/RegistrySchemaServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,6 +77,7 @@ public class RegistrySchemaServiceImpl implements RegistrySchemaService { @Override public String loadResourceInfo(ResourceInfoType request, String header) { try { + request.setPath(preparePath(request.getPath())); ResourceInfo resourceInfo = resourceMapper.toResourceInfo(request); resourceInfo.setCreatedBy(header); return String.valueOf(resourceService.loadResourceInfo(resourceInfo)); @@ -88,6 +89,7 @@ public class RegistrySchemaServiceImpl implements RegistrySchemaService { @Override public String editResourceInfo(EditedResourceInfoFullType request, String header) { try { + request.setPath(preparePath(request.getPath())); ResourceInfo resourceInfo = resourceMapper.editedResourceInfoFullTypeResourceInfo(request); resourceInfo.setEditedBy(header); return String.valueOf(resourceService.editResourceInfo(resourceInfo)); @@ -142,6 +144,45 @@ public class RegistrySchemaServiceImpl implements RegistrySchemaService { } } + @Override + public GetResourceInfoList getResourceInfoListByFullName(GetResourceInfoListByFullNameRequest request) { + try { + GetResourceInfoList list = new GetResourceInfoList(); + for (ResourceInfo resourceInfo : resourceService.getResourceInfoByFullName(request.getFullName())) { + list.getResourceInfoFullType().add(resourceMapper.toResourceInfoFullType(resourceInfo)); + } + return list; + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + @Override + public GetResourceInfoList getResourceInfoListByPath(GetResourceInfoListByPathRequest request) { + try { + GetResourceInfoList list = new GetResourceInfoList(); + for (ResourceInfo resourceInfo : resourceService.getResourceInfoByPath(request.getPath())) { + list.getResourceInfoFullType().add(resourceMapper.toResourceInfoFullType(resourceInfo)); + } + return list; + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + @Override + public GetResourceInfoList getResourceInfoListByFullPath(GetResourceInfoListByFullPathRequest request) { + try { + GetResourceInfoList list = new GetResourceInfoList(); + for (ResourceInfo resourceInfo : resourceService.getResourceInfoByFullPath(preparePath(request.getPath()))) { + list.getResourceInfoFullType().add(resourceMapper.toResourceInfoFullType(resourceInfo)); + } + return list; + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } + @Override public GetResourceInfoList getResourceInfoListByNamespace(GetResourceInfoListByNamespaceRequest request) { try { @@ -155,6 +196,13 @@ public class RegistrySchemaServiceImpl implements RegistrySchemaService { } } + public String preparePath(String path) { + if (path != null && !path.isEmpty() && !(path.charAt(path.length() - 1) == '/')) { + path = path + "/"; + } + return path; + } + public void setResourceService(ResourceService resourceService) { this.resourceService = resourceService; } diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/EditedResourceInfoFullType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/EditedResourceInfoFullType.java index 7fc741f..7d4f739 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/EditedResourceInfoFullType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/EditedResourceInfoFullType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="id" type="{http://www.w3.org/2001/XMLSchema}long"/> + * <element name="path" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="idResource" type="{http://www.w3.org/2001/XMLSchema}long"/> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -55,6 +56,7 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "EditedResourceInfoFullType", propOrder = { "id", + "path", "idResource", "name", "version", @@ -66,6 +68,8 @@ import javax.xml.bind.annotation.XmlType; public class EditedResourceInfoFullType { protected long id; + @XmlElement(required = true) + protected String path; protected long idResource; @XmlElement(required = true) protected String name; @@ -94,6 +98,30 @@ public class EditedResourceInfoFullType { this.id = value; } + /** + * Gets the value of the path property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPath() { + return path; + } + + /** + * Sets the value of the path property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPath(String value) { + this.path = value; + } + /** * Gets the value of the idResource property. * diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/FullResourceType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/FullResourceType.java index 19023c3..a487214 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/FullResourceType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/FullResourceType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoList.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoList.java index e9b8d1b..126583b 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoList.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoList.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNameRequest.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNameRequest.java index 491bd54..204adae 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNameRequest.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNameRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNamespaceRequest.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNamespaceRequest.java index 925aec3..5b04810 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNamespaceRequest.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListByNamespaceRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListRequest.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListRequest.java index d9141ca..699f153 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListRequest.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/GetResourceInfoListRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/LoadResourceType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/LoadResourceType.java index 3a4ce99..6986912 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/LoadResourceType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/LoadResourceType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ObjectFactory.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ObjectFactory.java index de6656f..2e6f602 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ObjectFactory.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ObjectFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the ru.entaxy.esb.system.registry.schema.soap.cxf package. + * generated in the ru.entaxy.esb.platform.runtime.core.infrastructure.schema.soap.cxf package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -58,7 +58,7 @@ public class ObjectFactory { private final static QName _Response_QNAME = new QName("http://www.entaxy.ru/registry-schema-service/", "response"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: ru.entaxy.esb.system.registry.schema.soap.cxf + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: ru.entaxy.esb.platform.runtime.core.infrastructure.schema.soap.cxf * */ public ObjectFactory() { @@ -128,6 +128,30 @@ public class ObjectFactory { return new GetResourceInfoListByNameRequest(); } + /** + * Create an instance of {@link GetResourceInfoListByFullNameRequest } + * + */ + public GetResourceInfoListByFullNameRequest createGetResourceInfoListByFullNameRequest() { + return new GetResourceInfoListByFullNameRequest(); + } + + /** + * Create an instance of {@link GetResourceInfoListByPathRequest } + * + */ + public GetResourceInfoListByPathRequest createGetResourceInfoListByPathRequest() { + return new GetResourceInfoListByPathRequest(); + } + + /** + * Create an instance of {@link GetResourceInfoListByFullPathRequest } + * + */ + public GetResourceInfoListByFullPathRequest createGetResourceInfoListByFullPathRequest() { + return new GetResourceInfoListByFullPathRequest(); + } + /** * Create an instance of {@link GetResourceInfoListByNamespaceRequest } * diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService.java index 3fa1e46..a9e9d28 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.3.6 - * 2021-02-03T15:56:39.006+07:00 + * 2022-11-24T13:47:15.641+03:00 * Generated source version: 3.3.6 * */ @@ -37,20 +37,12 @@ import javax.xml.bind.annotation.XmlSeeAlso; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface RegistrySchemaService { - @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/get-resourceInfo-info-list-by-namespace") + @WebMethod @WebResult(name = "getResourceInfoListResponse", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") - public GetResourceInfoList getResourceInfoListByNamespace( + public GetResourceInfoList getResourceInfoListByFullPath( - @WebParam(partName = "request", name = "getResourceInfoListByNamespaceRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") - GetResourceInfoListByNamespaceRequest request - ); - - @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/remove-resourceInfo") - @WebResult(name = "response", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") - public java.lang.String removeResource( - - @WebParam(partName = "request", name = "removeResourceRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") - long request + @WebParam(partName = "request", name = "getResourceInfoListByFullPathRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + GetResourceInfoListByFullPathRequest request ); @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/get-resourceInfo-info-list") @@ -89,16 +81,6 @@ public interface RegistrySchemaService { java.lang.String header ); - @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/edit-resourceInfo-info") - @WebResult(name = "response", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") - public java.lang.String editResourceInfo( - - @WebParam(partName = "request", name = "editResourceInfoRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") - EditedResourceInfoFullType request, - @WebParam(partName = "header", name = "createdBy", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", header = true) - java.lang.String header - ); - @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/remove-resourceInfo-info") @WebResult(name = "response", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") public java.lang.String removeResourceInfo( @@ -125,6 +107,48 @@ public interface RegistrySchemaService { GetResourceInfoListByNameRequest request ); + @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/get-resourceInfo-info-list-by-namespace") + @WebResult(name = "getResourceInfoListResponse", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") + public GetResourceInfoList getResourceInfoListByNamespace( + + @WebParam(partName = "request", name = "getResourceInfoListByNamespaceRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + GetResourceInfoListByNamespaceRequest request + ); + + @WebMethod + @WebResult(name = "getResourceInfoListResponse", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") + public GetResourceInfoList getResourceInfoListByPath( + + @WebParam(partName = "request", name = "getResourceInfoListByPathRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + GetResourceInfoListByPathRequest request + ); + + @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/remove-resourceInfo") + @WebResult(name = "response", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") + public java.lang.String removeResource( + + @WebParam(partName = "request", name = "removeResourceRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + long request + ); + + @WebMethod + @WebResult(name = "getResourceInfoListResponse", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") + public GetResourceInfoList getResourceInfoListByFullName( + + @WebParam(partName = "request", name = "getResourceInfoListByFullNameRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + GetResourceInfoListByFullNameRequest request + ); + + @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/edit-resourceInfo-info") + @WebResult(name = "response", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") + public java.lang.String editResourceInfo( + + @WebParam(partName = "request", name = "editResourceInfoRequest", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") + EditedResourceInfoFullType request, + @WebParam(partName = "header", name = "createdBy", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", header = true) + java.lang.String header + ); + @WebMethod(action = "http://www.entaxy.ru/registry-schema-service/get-resourceInfo-info") @WebResult(name = "getResourceInfoResponse", targetNamespace = "http://www.entaxy.ru/registry-schema-service/", partName = "response") public ResourceInfoFullType getResourceInfo( diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService_Service.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService_Service.java index 0c07ceb..ba75f0d 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService_Service.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/RegistrySchemaService_Service.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ */ package ru.entaxy.esb.platform.runtime.core.infrastructure.schema.soap.cxf; -import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.WebEndpoint; @@ -29,12 +28,12 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.3.6 - * 2021-02-03T15:56:39.112+07:00 + * 2022-11-24T13:47:15.676+03:00 * Generated source version: 3.3.6 * */ @WebServiceClient(name = "registry-schema-service", - wsdlLocation = "file:/C:/Projects/entaxy-framework/system/registry/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl", + wsdlLocation = "classpath:wsdl/registry-schema-service.wsdl", targetNamespace = "http://www.entaxy.ru/registry-schema-service/") public class RegistrySchemaService_Service extends Service { @@ -43,13 +42,11 @@ public class RegistrySchemaService_Service extends Service { public final static QName SERVICE = new QName("http://www.entaxy.ru/registry-schema-service/", "registry-schema-service"); public final static QName RegistrySchemaServiceSOAP = new QName("http://www.entaxy.ru/registry-schema-service/", "registry-schema-serviceSOAP"); static { - URL url = null; - try { - url = new URL("file:/C:/Projects/entaxy-framework/system/registry/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl"); - } catch (MalformedURLException e) { + URL url = RegistrySchemaService_Service.class.getClassLoader().getResource("wsdl/registry-schema-service.wsdl"); + if (url == null) { java.util.logging.Logger.getLogger(RegistrySchemaService_Service.class.getName()) .log(java.util.logging.Level.INFO, - "Can not initialize the default wsdl from {0}", "file:/C:/Projects/entaxy-framework/system/registry/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl"); + "Can not initialize the default wsdl from {0}", "classpath:wsdl/registry-schema-service.wsdl"); } WSDL_LOCATION = url; } diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoFullType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoFullType.java index bb87a45..73aa309 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoFullType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoFullType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ import javax.xml.bind.annotation.XmlType; * <sequence> * <element name="id" type="{http://www.w3.org/2001/XMLSchema}long"/> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="path" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="idResource" type="{http://www.w3.org/2001/XMLSchema}long"/> * <element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -60,6 +61,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "ResourceInfoFullType", propOrder = { "id", "name", + "path", "idResource", "version", "description", @@ -76,6 +78,8 @@ public class ResourceInfoFullType { protected long id; @XmlElement(required = true) protected String name; + @XmlElement(required = true) + protected String path; protected long idResource; @XmlElement(required = true) protected String version; @@ -135,6 +139,30 @@ public class ResourceInfoFullType { this.name = value; } + /** + * Gets the value of the path property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPath() { + return path; + } + + /** + * Sets the value of the path property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPath(String value) { + this.path = value; + } + /** * Gets the value of the idResource property. * diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoType.java index 6d526a4..ea19d41 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceInfoType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="path" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="idResource" type="{http://www.w3.org/2001/XMLSchema}long"/> * <element name="version" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -54,6 +55,7 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ResourceInfoType", propOrder = { "name", + "path", "idResource", "version", "description", @@ -65,6 +67,8 @@ public class ResourceInfoType { @XmlElement(required = true) protected String name; + @XmlElement(required = true) + protected String path; protected long idResource; @XmlElement(required = true) protected String version; @@ -100,6 +104,30 @@ public class ResourceInfoType { this.name = value; } + /** + * Gets the value of the path property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPath() { + return path; + } + + /** + * Sets the value of the path property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPath(String value) { + this.path = value; + } + /** * Gets the value of the idResource property. * diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceType.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceType.java index cfaf486..b2ee813 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceType.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/ResourceType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/package-info.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/package-info.java index afe8ab2..9f52315 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/package-info.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/cxf/package-info.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/mapper/ResourceMapper.java b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/mapper/ResourceMapper.java index 05c957d..bbd9db7 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/mapper/ResourceMapper.java +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/java/ru/entaxy/esb/platform/runtime/core/infrastructure/schema/soap/mapper/ResourceMapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * schema-soap * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/non-packaged-resources/etc/ru.entaxy.esb.platform.runtime.core.infrastructure.schema.cfg b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/non-packaged-resources/etc/ru.entaxy.esb.platform.runtime.core.infrastructure.schema.cfg index 9b4acb2..5cc4ae2 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/non-packaged-resources/etc/ru.entaxy.esb.platform.runtime.core.infrastructure.schema.cfg +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/non-packaged-resources/etc/ru.entaxy.esb.platform.runtime.core.infrastructure.schema.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 388ffd3..d4be6e2 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ schema-soap ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl index f474cd8..1ead80d 100644 --- a/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl +++ b/platform/runtime/core/infrastructure/schema/schema-soap/src/main/resources/wsdl/registry-schema-service.wsdl @@ -38,6 +38,7 @@ + @@ -50,6 +51,7 @@ + @@ -66,6 +68,7 @@ + @@ -90,6 +93,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -179,6 +203,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -365,6 +410,21 @@ + + + + + + + + + + + + + + + diff --git a/platform/runtime/core/initializer/connection-initializer/pom.xml b/platform/runtime/core/initializer/connection-initializer/pom.xml index d74109f..97befa5 100644 --- a/platform/runtime/core/initializer/connection-initializer/pom.xml +++ b/platform/runtime/core/initializer/connection-initializer/pom.xml @@ -1,11 +1,10 @@ - + ru.entaxy.esb.platform.runtime.core initializer - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java b/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java index d796dd3..2377f1a 100644 --- a/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java +++ b/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-initializer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,15 @@ */ package ru.entaxy.esb.platform.runtime.core.initializer.connection; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.List; +import java.util.stream.Collectors; + import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,20 +41,10 @@ import ru.entaxy.platform.base.support.FileUtils; import ru.entaxy.platform.base.support.JSONUtils; import ru.entaxy.platform.base.support.osgi.OSGIUtils; import ru.entaxy.platform.core.artifact.ArtifactCoordinates; -import ru.entaxy.platform.core.artifact.service.ArtifactService; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.EntaxyProducerUtils; import ru.entaxy.platform.core.producer.executor.objectmodel.ObjectModel; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.List; -import java.util.stream.Collectors; - public class ConnectionInitializer extends AbstractInitializer { private static final Logger log = LoggerFactory.getLogger(ConnectionInitializer.class); @@ -184,10 +183,11 @@ public class ConnectionInitializer extends AbstractInitializer { // EntaxyProducerUtils.InstructionsBuilder builder = EntaxyProducerUtils.instructions() + .lifecycle("general") .any() .command("add-config") .command("pre-generate") - .set(EntaxyProducerService.INSTRUCTIONS.PRINT_OUTPUT, true) + .set(EntaxyProducerService.INSTRUCTIONS.PRINT_OUTPUT, false) .command("build") .set(EntaxyProducerService.INSTRUCTIONS.ARTIFACT.VERSION_POLICY , ArtifactCoordinates.VERSION_POLICY_DATED_EMBEDDED) diff --git a/platform/runtime/core/initializer/connection-initializer/src/main/non-packaged-resources/etc/init/file-connections.json b/platform/runtime/core/initializer/connection-initializer/src/main/non-packaged-resources/etc/init/file-connections.json index a7c9482..23cf94a 100644 --- a/platform/runtime/core/initializer/connection-initializer/src/main/non-packaged-resources/etc/init/file-connections.json +++ b/platform/runtime/core/initializer/connection-initializer/src/main/non-packaged-resources/etc/init/file-connections.json @@ -4,7 +4,8 @@ "factoryId": "file-adapter", "objectId": "entaxy-file", "properties": { - "rootDirectory": "data/shared" + "rootDirectory": "data/shared", + "ext_createResourceProvider": true } }, { @@ -20,9 +21,13 @@ "targetId": "entaxy-file" }, "rootDirectory": { - "isCalculated": true, - "expression": "${__parentConnection}/.entaxy" - } + "@CALCULATED": { + "expression": "${?.__parentConnection}/.entaxy", + "lazy": false, + "allowObjects": false + } + }, + "ext_createResourceProvider": true } } ] diff --git a/platform/runtime/core/initializer/core-initializer/pom.xml b/platform/runtime/core/initializer/core-initializer/pom.xml index fa9273a..2c90eea 100644 --- a/platform/runtime/core/initializer/core-initializer/pom.xml +++ b/platform/runtime/core/initializer/core-initializer/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core initializer - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.initializer core-initializer diff --git a/platform/runtime/core/initializer/core-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/core/CoreInitializer.java b/platform/runtime/core/initializer/core-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/core/CoreInitializer.java index 520ddbb..3721043 100644 --- a/platform/runtime/core/initializer/core-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/core/CoreInitializer.java +++ b/platform/runtime/core/initializer/core-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/core/CoreInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * core-initializer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/pom.xml b/platform/runtime/core/initializer/datasources-initializer/pom.xml index cd7d2a2..fda3898 100644 --- a/platform/runtime/core/initializer/datasources-initializer/pom.xml +++ b/platform/runtime/core/initializer/datasources-initializer/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core initializer - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.initializer datasources-initializer diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/assembly/datasources.xml b/platform/runtime/core/initializer/datasources-initializer/src/main/assembly/datasources.xml index dc055cb..4193be0 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/assembly/datasources.xml +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/assembly/datasources.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-assembly ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesCollector.java b/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesCollector.java index 51e9fb1..87288bb 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesCollector.java +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * datasources-initializer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesInitializer.java b/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesInitializer.java index d52d646..779e242 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesInitializer.java +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/datasources/DataSourcesInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * datasources-initializer * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.h2 b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.h2 index d46430d..3023a35 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.h2 +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.h2 @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # h2-adapter # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.pg b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.pg index 781ffb0..9af4b2c 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.pg +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.cache.cfg.pg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # datasources-initializer # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.h2 b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.h2 index 39a177e..54cc79b 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.h2 +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.h2 @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # h2-adapter # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.pg b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.pg index f104be4..f5ba1f1 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.pg +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/non-packaged-resources/etc/org.ops4j.datasource-entaxy.esb.storage.cfg.pg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # datasources-initializer # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/datasources-initializer/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/platform/runtime/core/initializer/datasources-initializer/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2ea2cf2..d0b25bb 100644 --- a/platform/runtime/core/initializer/datasources-initializer/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/platform/runtime/core/initializer/datasources-initializer/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ datasources-initializer ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/init-manager/pom.xml b/platform/runtime/core/initializer/init-manager/pom.xml index 40b6c31..e1c6733 100644 --- a/platform/runtime/core/initializer/init-manager/pom.xml +++ b/platform/runtime/core/initializer/init-manager/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core initializer - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.initializer init-manager diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/Activator.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/Activator.java index 9e6ff4d..37615f2 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/Activator.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/Activator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitManager.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitManager.java index 2bdbbb9..444bb9d 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitManager.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitManager.java @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -61,6 +61,8 @@ public class InitManager { protected static final Logger log = LoggerFactory.getLogger(InitManager.class); + public static final String PROP_SKIP_ALL = "skip.all"; + /** * pid of config to store initialization status (true/false) * will be created on first start of InitManager @@ -70,6 +72,9 @@ public class InitManager { protected ConfigRepository configRepository; protected BundleContext bundleContext; + // used when updating to avoid multiple extra initializations + protected boolean skipAll = false; + protected Map> initersToDeps = new HashMap<>(); protected Map> depsToIniters = new HashMap<>(); @@ -201,13 +206,15 @@ public class InitManager { ClassLoader cl = wiring.getClassLoader(); Class clazz; try { - clazz = cl.loadClass(className); - log.info("Loaded class {}", clazz.getName()); - Constructor constructor = clazz.getConstructor(); - Initializer initializer = (Initializer) constructor.newInstance(); - initializer.setBundleContext(bundle.getBundleContext()); - initializer.setInitializerId(id); - initializer.init(); + if (!InitManager.this.skipAll) { + clazz = cl.loadClass(className); + log.info("Loaded class {}", clazz.getName()); + Constructor constructor = clazz.getConstructor(); + Initializer initializer = (Initializer) constructor.newInstance(); + initializer.setBundleContext(bundle.getBundleContext()); + initializer.setInitializerId(id); + initializer.init(); + } InitManager.this.updateById(id, true); this.executed = true; this.notifyDependent(); @@ -254,7 +261,7 @@ public class InitManager { @Override public void inited(Initializer owner) { - log.info("Initializer with id {} notified of successful init via callback"); + log.info("Initializer with id {} notified of successful init via callback", id); InitManager.this.updateById(id, true); this.executed = true; this.notifyDependent(); @@ -344,6 +351,9 @@ public class InitManager { if (!getValueById(this.getClass().getName())){ updateById(this.getClass().getName(), true); } + + this.skipAll = getValueById(PROP_SKIP_ALL); + } protected InitializerMeta createMeta(String initializerMeta, Bundle bundle) { diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitializerTracker.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitializerTracker.java index e1d8abd..d52c8c2 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitializerTracker.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/InitializerTracker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/AbstractInitializer.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/AbstractInitializer.java index 5c4915a..65b17b0 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/AbstractInitializer.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/AbstractInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/Initializer.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/Initializer.java index 0fd576c..837447e 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/Initializer.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/Initializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/InitializerException.java b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/InitializerException.java index 26d857a..276e41e 100644 --- a/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/InitializerException.java +++ b/platform/runtime/core/initializer/init-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/api/InitializerException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * init-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/pom.xml b/platform/runtime/core/initializer/pom.xml index 459eac5..49d20db 100644 --- a/platform/runtime/core/initializer/pom.xml +++ b/platform/runtime/core/initializer/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime core - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core initializer diff --git a/platform/runtime/core/initializer/storage-initializer/cache/pom.xml b/platform/runtime/core/initializer/storage-initializer/cache/pom.xml index 52582b6..1ff0754 100644 --- a/platform/runtime/core/initializer/storage-initializer/cache/pom.xml +++ b/platform/runtime/core/initializer/storage-initializer/cache/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 storage-initializer ru.entaxy.esb.platform.runtime.core.initializer - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.initializer.storage.initializer diff --git a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/OSGI-INF/blueprint/camel-contex.xml b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/OSGI-INF/blueprint/camel-contex.xml index 92e8d05..6e69676 100644 --- a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/OSGI-INF/blueprint/camel-contex.xml +++ b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/OSGI-INF/blueprint/camel-contex.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-cache ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changelog.xml b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changelog.xml index 7c6d558..e15a7da 100644 --- a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changelog.xml +++ b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changelog.xml @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ storage-cache ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/001-aggregation-table-create.xml b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/001-aggregation-table-create.xml index 450191b..cf1ce40 100644 --- a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/001-aggregation-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/001-aggregation-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-cache ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/002-quartz.xml b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/002-quartz.xml index be4e526..5e71947 100644 --- a/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/002-quartz.xml +++ b/platform/runtime/core/initializer/storage-initializer/cache/src/main/resources/db/changeset/002-quartz.xml @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ storage-cache ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/pom.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/pom.xml index d0cdd4a..4474ad0 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/pom.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 storage-initializer ru.entaxy.esb.platform.runtime.core.initializer - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.initializer.storage.initializer diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/OSGI-INF/blueprint/camel-contex.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/OSGI-INF/blueprint/camel-contex.xml index 6f2dbe1..58e1afe 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/OSGI-INF/blueprint/camel-contex.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/OSGI-INF/blueprint/camel-contex.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changelog.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changelog.xml index e8f6f8a..19bc08d 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changelog.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changelog.xml @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,4 +36,5 @@ + diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/001-storage-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/001-storage-table-create.xml index c749087..0f321ae 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/001-storage-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/001-storage-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/002-service_registry-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/002-service_registry-table-create.xml index 0dac7d5..17f9dfb 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/002-service_registry-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/002-service_registry-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/003-bundle-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/003-bundle-table-create.xml index 3ef320e..34e0078 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/003-bundle-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/003-bundle-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/004-system-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/004-system-table-create.xml index 87b64ad..dbfb0d0 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/004-system-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/004-system-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/005-basic_auth_accounts-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/005-basic_auth_accounts-table-create.xml index 0de40ca..4424c37 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/005-basic_auth_accounts-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/005-basic_auth_accounts-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/006-event_topic-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/006-event_topic-table-create.xml index d3aca4a..2cccdf2 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/006-event_topic-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/006-event_topic-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/007-system_subscription_registry-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/007-system_subscription_registry-table-create.xml index b9d6c01..20b73e1 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/007-system_subscription_registry-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/007-system_subscription_registry-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/008-connector-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/008-connector-table-create.xml index 9de2163..c6b7048 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/008-connector-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/008-connector-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/009-export-allowed-create-table.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/009-export-allowed-create-table.xml index 4e9776d..3396270 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/009-export-allowed-create-table.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/009-export-allowed-create-table.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/010-permission-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/010-permission-table-create.xml index bd070b1..a5ab391 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/010-permission-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/010-permission-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/011-admin-account.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/011-admin-account.xml index ad4735e..dea37de 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/011-admin-account.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/011-admin-account.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/012-alter-version-on-string.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/012-alter-version-on-string.xml index f0be122..de5968c 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/012-alter-version-on-string.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/012-alter-version-on-string.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/013-admin-topic-permission.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/013-admin-topic-permission.xml index 7ad7f35..6902574 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/013-admin-topic-permission.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/013-admin-topic-permission.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/014-alter-tables-topic-subscription.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/014-alter-tables-topic-subscription.xml index 55a8da4..1420598 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/014-alter-tables-topic-subscription.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/014-alter-tables-topic-subscription.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/015-schema-table-create.xml b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/015-schema-table-create.xml index 46f9835..b5f8082 100644 --- a/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/015-schema-table-create.xml +++ b/platform/runtime/core/initializer/storage-initializer/esb_entaxy/src/main/resources/db/changeset/015-schema-table-create.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ storage-esb_entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -81,4 +81,11 @@ + + + + + + diff --git a/platform/runtime/core/initializer/storage-initializer/liquibase-updater/pom.xml b/platform/runtime/core/initializer/storage-initializer/liquibase-updater/pom.xml index dcc778c..f6243ed 100644 --- a/platform/runtime/core/initializer/storage-initializer/liquibase-updater/pom.xml +++ b/platform/runtime/core/initializer/storage-initializer/liquibase-updater/pom.xml @@ -1,11 +1,9 @@ - + storage-initializer ru.entaxy.esb.platform.runtime.core.initializer - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/core/initializer/storage-initializer/liquibase-updater/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/storage/initializer/liquibase/updater/LiquibaseUpdater.java b/platform/runtime/core/initializer/storage-initializer/liquibase-updater/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/storage/initializer/liquibase/updater/LiquibaseUpdater.java index 5b671ba..c89232f 100644 --- a/platform/runtime/core/initializer/storage-initializer/liquibase-updater/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/storage/initializer/liquibase/updater/LiquibaseUpdater.java +++ b/platform/runtime/core/initializer/storage-initializer/liquibase-updater/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/storage/initializer/liquibase/updater/LiquibaseUpdater.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * liquibase-updater * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/initializer/storage-initializer/pom.xml b/platform/runtime/core/initializer/storage-initializer/pom.xml index 4f835ae..7960726 100644 --- a/platform/runtime/core/initializer/storage-initializer/pom.xml +++ b/platform/runtime/core/initializer/storage-initializer/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.core initializer - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/core/management/blueprint-generator-service/pom.xml b/platform/runtime/core/management/blueprint-generator-service/pom.xml index b05d908..15b6e30 100644 --- a/platform/runtime/core/management/blueprint-generator-service/pom.xml +++ b/platform/runtime/core/management/blueprint-generator-service/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management blueprint-generator-service diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/Blueprint.java b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/Blueprint.java index f0c6583..e4de60d 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/Blueprint.java +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/Blueprint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * blueprint-generator * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGenerator.java b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGenerator.java index a579d20..ef0573e 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGenerator.java +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * blueprint-generator * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGeneratorImpl.java b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGeneratorImpl.java index d803b3e..bf3e7ae 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGeneratorImpl.java +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/java/ru/entaxy/platform/core/blueprint/generator/BlueprintGeneratorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * blueprint-generator * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/bridge-profile.ftl b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/bridge-profile.ftl index 7a84907..b1a42e0 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/bridge-profile.ftl +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/bridge-profile.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ blueprint-generator-service ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/default-route.ftl b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/default-route.ftl index 4a7eff6..5ed2eb9 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/default-route.ftl +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/default-route.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ blueprint-generator-service ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/profile.ftl b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/profile.ftl index 7bf957b..49e0c0d 100644 --- a/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/profile.ftl +++ b/platform/runtime/core/management/blueprint-generator-service/src/main/resources/ru/entaxy/templates/profile.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ blueprint-generator-service ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/pom.xml b/platform/runtime/core/management/cluster-node-management/pom.xml index 3c01146..3c0cd73 100644 --- a/platform/runtime/core/management/cluster-node-management/pom.xml +++ b/platform/runtime/core/management/cluster-node-management/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management cluster-node-management diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/Attributes.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/Attributes.java index 6f45ef8..d0ea075 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/Attributes.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/Attributes.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/Activator.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/Activator.java index 3b991a0..63bd122 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/Activator.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/Activator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterLocalNodeDataProviderImpl.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterLocalNodeDataProviderImpl.java index 0dade0a..2b7c16b 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterLocalNodeDataProviderImpl.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterLocalNodeDataProviderImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterNodeMBeanImpl.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterNodeMBeanImpl.java index 38c181d..94e6c73 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterNodeMBeanImpl.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/ClusterNodeMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberAwareDataProvider.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberAwareDataProvider.java index 6587f53..1e2392f 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberAwareDataProvider.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberAwareDataProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberMBeanManager.java b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberMBeanManager.java index 124f445..6b5c7fe 100644 --- a/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberMBeanManager.java +++ b/platform/runtime/core/management/cluster-node-management/src/main/java/ru/entaxy/esb/platform/core/management/cluster/node/impl/MemberMBeanManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cluster-node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-management/pom.xml b/platform/runtime/core/management/connection-management/pom.xml index b69c7e7..9c2520e 100644 --- a/platform/runtime/core/management/connection-management/pom.xml +++ b/platform/runtime/core/management/connection-management/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management @@ -51,6 +49,11 @@ management-core ${project.version} + + ru.entaxy.esb.platform.runtime.base.objects-base + objects-core + ${project.version} + diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionMBean.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionMBean.java index 9067477..8b577e1 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionMBean.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,5 +61,10 @@ public interface ConnectionMBean extends RuntimeTypedMBean { * null for blended */ public String getBundleId(); + + /* + * connection label + */ + public String getLabel(); } diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionsMBean.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionsMBean.java index 53e09aa..9aeb2f3 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionsMBean.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/ConnectionsMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,12 @@ */ package ru.entaxy.esb.platform.core.management.connection; +import ru.entaxy.esb.platform.base.management.core.api.MBeanAnnotated; +import ru.entaxy.esb.platform.base.management.core.api.MBeanExportPolicy; +import ru.entaxy.esb.platform.base.management.core.api.Operation; +import ru.entaxy.esb.platform.base.management.core.api.Parameter; + +@MBeanAnnotated(policy = MBeanExportPolicy.ANNOTATION_ENRICH) public interface ConnectionsMBean { public static final String CAPABILITY_NAMESPACE = "entaxy.runtime.connection"; @@ -26,5 +32,9 @@ public interface ConnectionsMBean { public static final String CONNECTIONS_KEY = "category"; public static final String CONNECTIONS_KEY_VALUE = "connections"; - + + @Operation(desc = "Gets connection's configuration") + public String getConnectionConfig( + @Parameter(name = "connectionName", desc = "Connection name") String connectionName) throws Exception; + } diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionMBeanImpl.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionMBeanImpl.java index e2449a8..ebb7405 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionMBeanImpl.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,5 +90,10 @@ public class ConnectionMBeanImpl extends StandardMBean implements ConnectionMBea public String getBundleId() { return connection.getBundleId() + ""; } + + @Override + public String getLabel() { + return connection.getLabel(); + } } diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionsMBeanImpl.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionsMBeanImpl.java index 45c2fb0..7d5037d 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionsMBeanImpl.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ConnectionsMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,23 +26,21 @@ import java.util.Map; import javax.management.DynamicMBean; import javax.management.MBeanRegistration; import javax.management.NotCompliantMBeanException; -import javax.management.StandardMBean; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.component.annotations.Activate; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Deactivate; -import org.osgi.service.component.annotations.ServiceScope; +import org.osgi.service.component.annotations.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.entaxy.esb.platform.base.management.core.ManagementCore; import ru.entaxy.esb.platform.base.management.core.Qualifier; +import ru.entaxy.esb.platform.base.management.core.api.AnnotatedMBean; import ru.entaxy.esb.platform.core.management.connection.ConnectionMBean; import ru.entaxy.esb.platform.core.management.connection.ConnectionsMBean; import ru.entaxy.esb.platform.core.management.connection.tracker.DeployedConnectionTracker; +import ru.entaxy.platform.base.objects.EntaxyObjectService; @Component( service = {ConnectionsMBean.class, DynamicMBean.class, MBeanRegistration.class}, @@ -53,7 +51,7 @@ import ru.entaxy.esb.platform.core.management.connection.tracker.DeployedConnect scope = ServiceScope.SINGLETON, immediate = true ) -public class ConnectionsMBeanImpl extends StandardMBean +public class ConnectionsMBeanImpl extends AnnotatedMBean implements ConnectionsMBean, ManagedConnectionsListener { private static final Logger log = LoggerFactory.getLogger(ConnectionsMBeanImpl.class); @@ -64,7 +62,10 @@ public class ConnectionsMBeanImpl extends StandardMBean protected BundleContext bundleContext; protected DeployedConnectionTracker tracker; - + + @Reference(cardinality = ReferenceCardinality.MANDATORY) + EntaxyObjectService entaxyObjectService; + protected static class ManagedConnectionDescriptor { ManagedConnection connection; @@ -124,4 +125,9 @@ public class ConnectionsMBeanImpl extends StandardMBean } } } + + @Override + public String getConnectionConfig(String connectionName) throws Exception { + return entaxyObjectService.findObject(connectionName, "entaxy.runtime.connection").getConfiguration(); + } } diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnection.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnection.java index a958bb5..87584f3 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnection.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnection.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ public class ManagedConnection { protected boolean isShared; protected long bundleId; protected boolean isDeployed; + protected String label; public String getName() { return name; @@ -46,6 +47,9 @@ public class ManagedConnection { public boolean isDeployed() { return isDeployed; } + public String getLabel() { + return label; + } public void setName(String name) { this.name = name; @@ -65,6 +69,9 @@ public class ManagedConnection { public void setDeployed(boolean isDeployed) { this.isDeployed = isDeployed; } + public void setLabel(String label) { + this.label = label; + } public ManagedConnection name(String name) { setName(name); @@ -95,4 +102,9 @@ public class ManagedConnection { setDeployed(deployed); return this; } + + public ManagedConnection label(String label) { + setLabel(label); + return this; + } } diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnections.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnections.java index e3fc8f3..493b346 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnections.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnections.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnectionsListener.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnectionsListener.java index f507e3a..6898b5a 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnectionsListener.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/impl/ManagedConnectionsListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/tracker/DeployedConnectionCustomizer.java b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/tracker/DeployedConnectionCustomizer.java index 75ebad3..97d77d2 100644 --- a/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/tracker/DeployedConnectionCustomizer.java +++ b/platform/runtime/core/management/connection-management/src/main/java/ru/entaxy/esb/platform/core/management/connection/tracker/DeployedConnectionCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,13 +65,16 @@ public class DeployedConnectionCustomizer implements BundleTrackerCustomizer - + 4.0.0 ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management diff --git a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/api/ConnectionManager.java b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/api/ConnectionManager.java index 6de70cd..5d654c8 100644 --- a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/api/ConnectionManager.java +++ b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/api/ConnectionManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/impl/ConnectionManagerImpl.java b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/impl/ConnectionManagerImpl.java index 71488e6..7529742 100644 --- a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/impl/ConnectionManagerImpl.java +++ b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/impl/ConnectionManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/util/ConnectionManagerUtil.java b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/util/ConnectionManagerUtil.java index eb46244..8a178e9 100644 --- a/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/util/ConnectionManagerUtil.java +++ b/platform/runtime/core/management/connection-manager/src/main/java/ru/entaxy/esb/platform/runtime/core/management/connection/util/ConnectionManagerUtil.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connection-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/connection-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/platform/runtime/core/management/connection-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2108fb7..0f0e31b 100644 --- a/platform/runtime/core/management/connection-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/platform/runtime/core/management/connection-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ connection-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/pom.xml b/platform/runtime/core/management/node-management/pom.xml index 8ce1145..7597afc 100644 --- a/platform/runtime/core/management/node-management/pom.xml +++ b/platform/runtime/core/management/node-management/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management node-management diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterLocalNodeDataProvider.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterLocalNodeDataProvider.java index cddb794..790d187 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterLocalNodeDataProvider.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterLocalNodeDataProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterNodeMBean.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterNodeMBean.java index 5c0b680..19156cd 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterNodeMBean.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/ClusterNodeMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/LocalNodeMBean.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/LocalNodeMBean.java index 441a40c..4a4e269 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/LocalNodeMBean.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/LocalNodeMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProvider.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProvider.java index 9280d51..18e3d88 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProvider.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProvider.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProviderAware.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProviderAware.java index 496770f..abe3ed0 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProviderAware.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeDataProviderAware.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeMBean.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeMBean.java index 6c82b23..db3d366 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeMBean.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/NodeMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/impl/LocalNodeMBeanImpl.java b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/impl/LocalNodeMBeanImpl.java index a71a2fc..00c0afc 100644 --- a/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/impl/LocalNodeMBeanImpl.java +++ b/platform/runtime/core/management/node-management/src/main/java/ru/entaxy/esb/platform/core/management/node/impl/LocalNodeMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * node-management * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/pom.xml b/platform/runtime/core/management/pom.xml index 69cbae5..4eca9e6 100644 --- a/platform/runtime/core/management/pom.xml +++ b/platform/runtime/core/management/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.platform.runtime core - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core diff --git a/platform/runtime/core/management/profile-management-service-adapters/pom.xml b/platform/runtime/core/management/profile-management-service-adapters/pom.xml index c5f847c..a77d4a2 100644 --- a/platform/runtime/core/management/profile-management-service-adapters/pom.xml +++ b/platform/runtime/core/management/profile-management-service-adapters/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management diff --git a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ConnectorManagerAdapter.java b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ConnectorManagerAdapter.java index 9b6f486..f95ce0b 100644 --- a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ConnectorManagerAdapter.java +++ b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ConnectorManagerAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management-service-adapters * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/PermissionManagerAdapter.java b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/PermissionManagerAdapter.java index fffebd8..ccb089e 100644 --- a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/PermissionManagerAdapter.java +++ b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/PermissionManagerAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management-service-adapters * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ProfileManagerAdapter.java b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ProfileManagerAdapter.java index e104930..fc46bc0 100644 --- a/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ProfileManagerAdapter.java +++ b/platform/runtime/core/management/profile-management-service-adapters/src/main/java/ru/entaxy/esb/platform/core/management/profile/adapters/ProfileManagerAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management-service-adapters * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,8 @@ import ru.entaxy.esb.system.management.profile.manager.ProfileManager; import ru.entaxy.esb.system.management.profile.manager.dto.ProfileDto; import ru.entaxy.esb.system.management.profile.manager.mapper.ProfileMapper; +import javax.naming.OperationNotSupportedException; + @Component ( service = {ru.entaxy.esb.platform.core.management.profile.api.ProfileManager.class} , immediate = true @@ -86,6 +88,11 @@ public class ProfileManagerAdapter implements ru.entaxy.esb.platform.core.manage profileManager.uninstallProfile(dto); } + @Override + public String getProfileConfig(String idOrName) throws Exception { + throw new OperationNotSupportedException(); + } + protected System getSystemByIdOrName(String idOrName) { System result = systemService.getByName(idOrName); if (result == null) diff --git a/platform/runtime/core/management/profile-management/pom.xml b/platform/runtime/core/management/profile-management/pom.xml index bf05e1d..93b9045 100644 --- a/platform/runtime/core/management/profile-management/pom.xml +++ b/platform/runtime/core/management/profile-management/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.platform.runtime.core management - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.management @@ -64,6 +62,11 @@ system-api ${project.version} + + ru.entaxy.esb.platform.runtime.base.objects-base + objects-core + ${project.version} + diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorMBean.java index 6facb19..8e86839 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,16 @@ public interface ConnectorMBean extends BundleAwareMBean, RuntimeTypedMBean { @Attribute(desc = "Connector registered name used in registry") public String getRegisteredName(); - + + @Attribute(desc = "Connector system") + public String getSystem(); + + @Attribute(desc = "Connector classifier") + public String getClassifier(); + + @Attribute(desc = "Connector direction") + public String getDirection(); + @Operation(desc = "Starts the connector") public void start() throws Exception; diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorsMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorsMBean.java index a962c0d..20c3f90 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorsMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ConnectorsMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/DefaultRouteMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/DefaultRouteMBean.java index 50f4f1e..56e5188 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/DefaultRouteMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/DefaultRouteMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,10 @@ package ru.entaxy.esb.platform.core.management.profile; import ru.entaxy.esb.platform.base.management.core.Qualifier; -import ru.entaxy.esb.platform.base.management.core.api.RuntimeTypedMBean; +import ru.entaxy.esb.platform.base.management.core.api.*; import ru.entaxy.esb.platform.base.management.core.utils.BundleAwareMBean; +@MBeanAnnotated(policy = MBeanExportPolicy.ANNOTATION_ENRICH) public interface DefaultRouteMBean extends BundleAwareMBean, RuntimeTypedMBean { public static interface Helper { @@ -41,5 +42,8 @@ public interface DefaultRouteMBean extends BundleAwareMBean, RuntimeTypedMBean { public static final String ROUTE_KEY_VALUE_DEFAULT = "default"; public boolean isDefault(); - + + @Operation(desc = "Gets route's configuration") + public String doGetRouteConfig() throws Exception; + } diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfileMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfileMBean.java index 43ee28a..8ef6d92 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfileMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfileMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,7 +80,11 @@ public interface ProfileMBean extends BundleAwareMBean, RuntimeTypedMBean { @Operation(desc = "Stops connector in profile") public void stopConnector( @Parameter(name = "connectorName", desc = "Connector name") String connectorName) throws Exception; - + + @Operation(desc = "Gets connector's configuration") + public String getConnectorConfig( + @Parameter(name = "connectorName", desc = "Connector name") String connectorName) throws Exception; + @Operation(desc = "Creates account for this system", impact = MBeanOperationInfo.ACTION) public void createAccount( @Parameter(name = "login", desc = "Login") String login diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfilesMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfilesMBean.java index 2c53586..003de3e 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfilesMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/ProfilesMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/RoutesMBean.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/RoutesMBean.java index be27eb1..5761534 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/RoutesMBean.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/RoutesMBean.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ConnectorManager.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ConnectorManager.java index aca15ba..1493f6c 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ConnectorManager.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ConnectorManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/PermissionManager.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/PermissionManager.java index 4b22d46..a858d36 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/PermissionManager.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/PermissionManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ProfileManager.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ProfileManager.java index 8c02a4f..d8a7622 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ProfileManager.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/api/ProfileManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,10 @@ public interface ProfileManager { @Parameter(desc = "Profile ID", name = "id") String id, @Parameter(desc = "System name", name = "name") String name, @Parameter(desc = "Description", name = "description") String description) throws Exception; - + + @Operation(desc = "Get profile configuration") + public String getProfileConfig(@Parameter(desc = "Profile ID or system name", name = "idOrName") String idOrName) throws Exception; + @Operation(desc = "Start profile") public void startProfile(@Parameter(desc = "Profile ID or system name", name = "idOrName") String idOrName) throws Exception; diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/DeployedProfileCustomizer.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/DeployedProfileCustomizer.java index 8f1fddb..a48fc79 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/DeployedProfileCustomizer.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/DeployedProfileCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfile.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfile.java index 3f53398..c7fcc79 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfile.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfilesListener.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfilesListener.java index 3249e2a..b7cd636 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfilesListener.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ManagedProfilesListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelper.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelper.java index d41cbe7..b88fb78 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelper.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelperImpl.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelperImpl.java index 3d3b97d..e37956e 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelperImpl.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileHelperImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,6 +69,11 @@ public class ProfileHelperImpl implements ProfileHelper { public void createProfile(String id, String name, String description) throws Exception { throw new OperationNotSupportedException(EXPLANATION); } + + @Override + public String getProfileConfig(String idOrName) throws Exception { + throw new OperationNotSupportedException(EXPLANATION); + } }; } @@ -101,6 +106,11 @@ public class ProfileHelperImpl implements ProfileHelper { getEffectiveProfileManager().createProfile(id, name, description); } + @Override + public String getProfileConfig(String idOrName) throws Exception { + return getEffectiveProfileManager().getProfileConfig(idOrName); + } + @Override public void startProfile(String idOrName) throws Exception { getEffectiveProfileManager().startProfile(idOrName); diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileMBeanImpl.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileMBeanImpl.java index f35c7fb..66e1b58 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileMBeanImpl.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfileMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -110,6 +110,11 @@ public class ProfileMBeanImpl extends BundleAwareMBeanImpl getAllowedTargets() { try { diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfilesMBeanImpl.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfilesMBeanImpl.java index 908e080..06492b4 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfilesMBeanImpl.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/ProfilesMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,7 +113,7 @@ public class ProfilesMBeanImpl extends AnnotatedMBean routeTracker = BundleTrackerUtils.>createBuilder() .customizer( (new DeployedDefaultRouteCustomizer()) - .listener(new ManagedRoutesListener(bundleContext)) + .listener(new ManagedRoutesListener(bundleContext, helpers)) ) .addFilter( (new BundleCapabilityFilter()).namespace(DefaultRouteMBean.CAPABILITY_NAMESPACE) @@ -153,6 +153,11 @@ public class ProfilesMBeanImpl extends AnnotatedMBean this.helpers.profileHelper.createProfile(id, name, description); } + @Override + public String getProfileConfig(String idOrName) throws Exception { + return this.helpers.entaxyObjectService.findObject(idOrName, "entaxy.runtime.profile").getConfiguration(); + } + @Override public void startProfile(String idOrName) throws Exception { this.helpers.profileHelper.startProfile(idOrName); diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelper.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelper.java index a967168..02e5c64 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelper.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelperImpl.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelperImpl.java index 42f9911..6b3775d 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelperImpl.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorHelperImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorMBeanImpl.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorMBeanImpl.java index b43e208..ab726ec 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorMBeanImpl.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/connector/ConnectorMBeanImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,22 @@ public class ConnectorMBeanImpl extends BundleAwareMBeanImpl implements DefaultRouteMBean { - - - public DefaultRouteMBeanImpl(BundleContext bundleContext, ManagedRoute managedRoute) throws NotCompliantMBeanException { + + Helpers helpers; + + public DefaultRouteMBeanImpl(BundleContext bundleContext, ManagedRoute managedRoute, Helpers helpers) throws NotCompliantMBeanException { super(DefaultRouteMBean.class, managedRoute); this.bundleContext = bundleContext; this.managedObject = managedRoute; + this.helpers = helpers; } @Override public boolean isDefault() { return this.managedObject.isDefault(); } - + + @Override + public String doGetRouteConfig() throws Exception { + return this.helpers.entaxyObjectService.findObject(managedObject.getName(), "entaxy.runtime.default-route").getConfiguration(); + } } diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/DeployedDefaultRouteCustomizer.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/DeployedDefaultRouteCustomizer.java index b360fcd..59548f5 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/DeployedDefaultRouteCustomizer.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/DeployedDefaultRouteCustomizer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,12 +41,17 @@ public class DeployedDefaultRouteCustomizer extends ExtendedBundleTrackerCustomi capabilities = new ArrayList<>(); List result = new ArrayList<>(); for (BundleCapability capability: capabilities) { - Object val = capability.getAttributes().get("name"); + Object val = capability.getAttributes().get("objectId"); // fixme this is temporary solution String name = val==null?"":val.toString(); if (!CommonUtils.isValid(name)) continue; + val = capability.getAttributes().get("system"); + String profile = val==null?"":val.toString(); + if (!CommonUtils.isValid(profile)) + continue; ManagedRoute mr = (new ManagedRoute()) .name(name) + .profile(profile) .defaultRoute(true); enrich(bundle, event, filterResults, mr); result.add(mr); diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoute.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoute.java index 12ac1c2..05852be 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoute.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoute.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,9 @@ public class ManagedRoute extends BundleAwareManagedObjectImpl { protected boolean isDefault; protected String name; - + + protected String profile; + public boolean isDefault() { return isDefault; } @@ -52,5 +54,17 @@ public class ManagedRoute extends BundleAwareManagedObjectImpl { setName(name); return this; } - + + public String getProfile() { + return profile; + } + + public void setProfile(String profile) { + this.profile = profile; + } + + public ManagedRoute profile(String profile) { + setProfile(profile); + return this; + } } diff --git a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoutesListener.java b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoutesListener.java index f838d17..727daaa 100644 --- a/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoutesListener.java +++ b/platform/runtime/core/management/profile-management/src/main/java/ru/entaxy/esb/platform/core/management/profile/impl/route/ManagedRoutesListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-management * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,13 +28,17 @@ import org.slf4j.LoggerFactory; import ru.entaxy.esb.platform.base.management.core.utils.ManagedObjectsListener; import ru.entaxy.esb.platform.core.management.profile.DefaultRouteMBean; +import ru.entaxy.esb.platform.core.management.profile.impl.helper.Helpers; public class ManagedRoutesListener extends ManagedObjectsListener, ManagedRoute, DefaultRouteMBean, DefaultRouteMBeanImpl> { private static final Logger log = LoggerFactory.getLogger(ManagedRoutesListener.class); - - public ManagedRoutesListener(BundleContext bundleContext) { + + protected Helpers helpers; + + public ManagedRoutesListener(BundleContext bundleContext, Helpers helpers) { super(bundleContext, DefaultRouteMBean.class); + this.helpers = helpers; } @Override @@ -51,7 +55,7 @@ public class ManagedRoutesListener extends ManagedObjectsListener ru.entaxy.esb.platform.runtime.core object-producing - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.object-producing object-producer-api diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducer.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducer.java index 7aa7b5f..e424898 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducer.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerService.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerService.java index 342bc68..6aed7a6 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerService.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,10 +27,27 @@ import ru.entaxy.platform.base.objects.factory.EntaxyFactory; public interface EntaxyProducerService { + public static interface DIRECTIVES { + + String LIFECYCLE = "@LIFECYCLE"; + + /* + * usage: {"@SKIP": ['command1', 'command2-', 'command3+']} + * where + * 'command1' - skip command1 + * 'command2-' - skip ALL BEFORE command2 + * 'command3+' - skip ALL AFTER command3 + */ + String SKIP = "@SKIP"; + + }; + public static interface INSTRUCTIONS { - public static final String PRINT_OUTPUT = "printOutput"; - public static final String SKIP = "skip"; + String PRINT_OUTPUT = "printOutput"; + String SKIP = "skip"; + String MAX_COUNT = "maxCount"; + String CURRENT_ITERATION = "currentCount"; public static interface ARTIFACT { diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerUtils.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerUtils.java index 7b794aa..66b5f3a 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerUtils.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyProducerUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-api * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,11 @@ package ru.entaxy.platform.core.producer.api; import com.google.gson.Gson; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import ru.entaxy.platform.base.objects.EntaxyObjectService; + public class EntaxyProducerUtils { protected static Gson sharedGson = new Gson(); @@ -41,6 +44,14 @@ public class EntaxyProducerUtils { protected InstructionsBuilder(JsonObject jsonObject) { super(jsonObject); } + + public InstructionsBuilder lifecycle(String lifecycle) { + if (!instructionsJson.has(EntaxyProducerService.DIRECTIVES.LIFECYCLE)) + instructionsJson.add(EntaxyProducerService.DIRECTIVES.LIFECYCLE, new JsonArray()); + JsonArray lc = instructionsJson.get(EntaxyProducerService.DIRECTIVES.LIFECYCLE).getAsJsonArray(); + lc.add(lifecycle); + return this; + } public CommandBuilder command(String commandName) { if (!instructionsJson.has(commandName)) diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyWrappedFactory.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyWrappedFactory.java index d31247e..85f63dc 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyWrappedFactory.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/EntaxyWrappedFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionPlan.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionPlan.java index 18328d6..6e6f232 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionPlan.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionPlan.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionTask.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionTask.java index d2c0d70..3a5e36d 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionTask.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ExecutionTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducerResult.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducerResult.java index 9aad2d6..70b54e5 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducerResult.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducerResult.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducingCommandExecutor.java b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducingCommandExecutor.java index b0bcac5..590c1a1 100644 --- a/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducingCommandExecutor.java +++ b/platform/runtime/core/object-producing/object-producer-api/src/main/java/ru/entaxy/platform/core/producer/api/ProducingCommandExecutor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,12 @@ import java.util.List; import java.util.Map; public interface ProducingCommandExecutor { + public String getId(); public List getRequiredPredecessors(); public List getDescendants(); public List> getAcceptedInputClasses(); public List> getProducedOutputClasses(); public ProducerResult execute(ProducerResult currentResult, Map parameters); + } diff --git a/platform/runtime/core/object-producing/object-producer-core/pom.xml b/platform/runtime/core/object-producing/object-producer-core/pom.xml index b5429a1..e40cb91 100644 --- a/platform/runtime/core/object-producing/object-producer-core/pom.xml +++ b/platform/runtime/core/object-producing/object-producer-core/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core object-producing - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.object-producing object-producer-core @@ -28,5 +28,37 @@ artifact-management ${project.version} + + org.apache.camel + camel-core + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + src/main/config/producing.lifecycles.json + json + producing.lifecycles + + + + + + + + + \ No newline at end of file diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/AbstractCommandExecutor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/AbstractCommandExecutor.java index e15d3ac..c3dfc97 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/AbstractCommandExecutor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/AbstractCommandExecutor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,16 +28,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; +import ru.entaxy.platform.core.producer.api.EntaxyProducerService.INSTRUCTIONS; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.api.ProducingCommandExecutor; +import ru.entaxy.platform.core.producer.executor.support.AbstractPrintOutputSupport; -public abstract class AbstractCommandExecutor implements ProducingCommandExecutor { +public abstract class AbstractCommandExecutor extends AbstractPrintOutputSupport + implements ProducingCommandExecutor { private static final Logger log = LoggerFactory.getLogger(AbstractCommandExecutor.class); - public static String SKIP_INSTRUSTION = "skip"; - public static String PRINT_OUTPUT_INSTRUSTION = "printOutput"; + public static int DEFAULT_MAX_COUNT = 15; protected EntaxyProducerService entaxyProducerService; @@ -47,8 +49,6 @@ public abstract class AbstractCommandExecutor implements ProducingCommandExecuto protected List> acceptedInputClasses = new ArrayList<>(); protected List> producedOutputClasses = new ArrayList<>(); - protected boolean isPrintOutput = false; - protected Map instructions; protected AbstractCommandExecutor(EntaxyProducerService entaxyProducerService) { @@ -113,39 +113,69 @@ public abstract class AbstractCommandExecutor implements ProducingCommandExecuto CommandResult cr = new CommandResult(getId()); this.instructions = instructions; setPrintOutput(instructions); - if (isSkipped(instructions)) + int maxCount = getMaxCount(instructions); + int currentCount = getCurrentCount(instructions); + printOutput("\n\n\t== " + getId().toUpperCase() + " == #" + currentCount + " of " + maxCount + " ==\n"); + if (isSkipped(instructions)) { cr.skipped = true; - else + printOutput(" :: SKIPPED "); + } else { try { cr.result = doExecute(currentResult, cr, instructions); } catch (Exception e) { log.error("Error executing [" + getId() + "]", e); cr.exception(e).result(false); } + if (currentCount >= maxCount) { + instructions.put(INSTRUCTIONS.SKIP, true); + printOutput(" !! Max iteration count of [" + maxCount + "] is reached" + + "\n futher iterations will be skipped "); + } else { + increaseCurrentCount(instructions); + } + } + printOutput("\n\n\t== /" + getId().toUpperCase() + " == "); currentResult.addCommandResult(cr); return currentResult; } - - protected void setPrintOutput(Map parameters) { - if (parameters.containsKey(PRINT_OUTPUT_INSTRUSTION)) { - Object val = parameters.get(PRINT_OUTPUT_INSTRUSTION); - if (val == null) - return; - if (val instanceof Boolean) - this.isPrintOutput = (Boolean)val; - } - } - protected void printOutput(String message) { - if (this.isPrintOutput) - // OUTPUT TO CONSOLE - System.out.println(message); + protected int getMaxCount(Map parameters) { + int result = DEFAULT_MAX_COUNT; + if (parameters.containsKey(INSTRUCTIONS.MAX_COUNT)) { + Object val = parameters.get(INSTRUCTIONS.MAX_COUNT); + try { + result = ((Number)val).intValue(); + } catch (Exception e) { + parameters.put(INSTRUCTIONS.MAX_COUNT, DEFAULT_MAX_COUNT); + } + } + return result; + } + + protected int getCurrentCount(Map parameters) { + int result = 1; + if (parameters.containsKey(INSTRUCTIONS.CURRENT_ITERATION)) { + Object val = parameters.get(INSTRUCTIONS.CURRENT_ITERATION); + try { + result = (Integer)val; + } catch (Exception e) { + parameters.put(INSTRUCTIONS.CURRENT_ITERATION, 1); + } + } + return result; + } + + protected int increaseCurrentCount(Map parameters) { + int currentCount = getCurrentCount(parameters); + currentCount++; + parameters.put(INSTRUCTIONS.CURRENT_ITERATION, currentCount); + return getCurrentCount(parameters); } protected boolean isSkipped(Map parameters) { - if (!parameters.containsKey(SKIP_INSTRUSTION)) + if (!parameters.containsKey(INSTRUCTIONS.SKIP)) return false; - Object obj = parameters.get(SKIP_INSTRUSTION); + Object obj = parameters.get(INSTRUCTIONS.SKIP); if (obj instanceof Boolean) return (Boolean)obj; if (obj instanceof String) diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandExecutor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandExecutor.java index 6899e9d..8b772b7 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandExecutor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandExecutor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandInstructions.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandInstructions.java index a51b08e..a4f3f23 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandInstructions.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/CommandInstructions.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/ProducingExecutor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/ProducingExecutor.java index f8bfd86..76fe93c 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/ProducingExecutor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/ProducingExecutor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,10 +26,12 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -37,6 +39,7 @@ import ru.entaxy.platform.base.support.CommonUtils; import ru.entaxy.platform.base.support.DependencySorter; import ru.entaxy.platform.base.support.JSONUtils; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; +import ru.entaxy.platform.core.producer.api.EntaxyProducerService.INSTRUCTIONS; import ru.entaxy.platform.core.producer.api.ExecutionPlan; import ru.entaxy.platform.core.producer.api.ExecutionPlan.ExecutionPlanUpdate; import ru.entaxy.platform.core.producer.api.ExecutionPlan.ExecutionPlanUpdate.OPERATIONS; @@ -48,6 +51,8 @@ public class ProducingExecutor { private static final Logger log = LoggerFactory.getLogger(ProducingExecutor.class); + public static final String DIRECTIVE_SKIP = EntaxyProducerService.DIRECTIVES.SKIP; + protected static final String DEFAULT_EXECUTION_PLAN = "{'validate':{}}"; protected static final String ANY_COMMAND = "*"; @@ -103,8 +108,24 @@ public class ProducingExecutor { Map taskMap = new HashMap<>(); Map anyCommandInstructions = new HashMap<>(); - if (executionPlanJSON.has(ANY_COMMAND)) - anyCommandInstructions = JSONUtils.element2map(executionPlanJSON.get(ANY_COMMAND)); + JsonObject directives = new JsonObject(); + if (executionPlanJSON.has(ANY_COMMAND)) { + JsonElement anyCommandElement = executionPlanJSON.get(ANY_COMMAND).deepCopy(); + if (anyCommandElement.isJsonObject()) { + JsonObject anyCommandObject = anyCommandElement.getAsJsonObject(); + List toRemove = new ArrayList<>(); + for (Entry entry: anyCommandObject.entrySet()) + if (entry.getKey().startsWith("@")) { + directives.add(entry.getKey(), entry.getValue().deepCopy()); + toRemove.add(entry.getKey()); + } + // remove directives + for (String s: toRemove) + anyCommandObject.remove(s); + } + anyCommandInstructions = JSONUtils.element2map(anyCommandElement); + } + List neededCommands = new ArrayList<>(); for (String id: executionPlanJSON.keySet()) { @@ -134,7 +155,7 @@ public class ProducingExecutor { log.debug("Adding command [{}]", s); newCommandsToCheck.add(s); neededCommands.add(s); - if (createExecutionTask(taskMap, s, anyCommandInstructions).executor == null) { + if (createExecutionTask(taskMap, s, new HashMap<>(anyCommandInstructions)).executor == null) { log.error("Command [{}] not found", s); throw new Exception("Command not found: " + s); } @@ -168,7 +189,53 @@ public class ProducingExecutor { }); executionPlan.tasks = sorted; - + applyDirectives(directives); + } + + protected void applyDirectives(JsonObject directives) { + // apply @SKIP + if (directives.has(DIRECTIVE_SKIP)) { + JsonElement je = directives.get(DIRECTIVE_SKIP); + List toSkip = new ArrayList<>(); + if (je.isJsonPrimitive()) + toSkip.add(je.getAsString()); + if (je.isJsonArray()) { + JsonArray ja = je.getAsJsonArray(); + for (int i=0; i instructions) throws Exception { - log.info("Executing command [{}]", getId()); + log.debug("Executing command [{}]", getId()); JsonObject jo = currentResult.findResultObject(JsonObject.class); - printOutput("\n\n\t== ANALYZE == \n\n"); printOutput("\n\tIncoming JSON ::\n\n"); printOutput(jo.toString()); @@ -61,7 +60,7 @@ public class Analyze extends AbstractCommandExecutor { printOutput("\n\tObjectModel ::\n\n"); for (FactoredObject fo: om.objects) - printOutput("Object :: [" + fo.getObjectId() + "/" + fo.factoryId + ":" + fo.getObjectType() + "]"); + printOutput("Object :: [" + fo.getObjectId() + "/" + fo.factoryId + ":" + fo.getObjectType() + "] :: " + fo.getOutputType()); for (FactoredObjectRef fo: om.refs) printOutput("Reference :: [" + fo.definedIn.getObjectId() + " -> " + fo.getTargetId() + "; isLink=" + fo.isLink() diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java index e18245b..4622193 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,27 +21,21 @@ package ru.entaxy.platform.core.producer.executor.commands; import java.util.Map; -import org.osgi.framework.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.entaxy.esb.platform.runtime.base.connecting.generator.Generated; -import ru.entaxy.platform.base.support.CommonUtils; -import ru.entaxy.platform.core.artifact.Artifact; -import ru.entaxy.platform.core.artifact.ArtifactManifest; -import ru.entaxy.platform.core.artifact.Artifacts; -import ru.entaxy.platform.core.artifact.Manifested; -import ru.entaxy.platform.core.artifact.capabilities.ManifestCapabilityHelper; -import ru.entaxy.platform.base.objects.EntaxyObject.FIELDS; -import ru.entaxy.platform.base.objects.EntaxyObject.HEADERS; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.AbstractCommandExecutor; import ru.entaxy.platform.core.producer.executor.CommandExecutor; -import ru.entaxy.platform.core.producer.executor.generationmodel.GeneratedHeaders; +import ru.entaxy.platform.core.producer.executor.builder.BuiltObject; +import ru.entaxy.platform.core.producer.executor.builder.BuiltObjectList; +import ru.entaxy.platform.core.producer.executor.builder.ObjectBuilder; import ru.entaxy.platform.core.producer.executor.generationmodel.GeneratedList; -import ru.entaxy.platform.core.producer.executor.support.ArtifactList; +import ru.entaxy.platform.core.producer.executor.support.ObjectSupportRegistry; +import ru.entaxy.platform.core.producer.executor.support.PrintOutputSupport; @CommandExecutor(id = "build", predecessors = {"generate"}) public class Build extends AbstractCommandExecutor { @@ -55,103 +49,38 @@ public class Build extends AbstractCommandExecutor { @Override protected boolean doExecute(ProducerResult currentResult, CommandResult commandResult, Map instructions) throws Exception { - printOutput("\n\t == BUILDING ==\n"); GeneratedList generated = currentResult.findResultObject(GeneratedList.class); if (generated == null) { - log.info("Nothing to generate"); + log.info("Nothing to build"); return true; } - ArtifactList artifactList = new ArtifactList(); + BuiltObjectList resultList = new BuiltObjectList(); for (Generated g: generated) { if (g == null) continue; - Artifact artifact = Artifacts.fromGenerated(g); - if ((artifact == null) || Artifact.ARTIFACT_CATEGORY_UNKNOWN.equals(artifact.getCategory()) - || !CommonUtils.isValid(artifact.getCategory())) { - log.info("Artifact is not buildable"); + + printOutput(" = Building for generated of type [" + g.getType() + "]" ); + + ObjectBuilder builder = ObjectSupportRegistry.getInstance().findBuilder(g); + if (builder == null) { + log.warn("ObjectBuilder not found for generated object of type [{}]", g.getType()); + printOutput(" :: ObjectBuilder not found"); continue; } - log.info("Built artifact of category [{}]", artifact.getCategory()); - Map headers = GeneratedHeaders.getHeaders(g.getProperties()).getAsStringMap(); - String mainObjectValue = headers.get(HEADERS.MAIN_OBJECT); - if (!CommonUtils.isValid(mainObjectValue)) - throw new Exception("Main object not found"); - String[] mainObjectData = mainObjectValue.split(":"); - if (mainObjectData.length<2) - throw new Exception("Main object not complete: [" + mainObjectValue + "]"); + printOutput(" :: ObjectBuilder is: " + builder.getClass().getName()); + BuiltObject result = builder.build(g, instructions); + if (result != null) { + resultList.add(result); + printOutput(" :: Result is: " + result.getClass().getName()); + } else + printOutput(" :: Result is: NULL"); - String versionPolicy = g.getProperties().getOrDefault( - EntaxyProducerService.INSTRUCTIONS.ARTIFACT.VERSION_POLICY, - instructions.getOrDefault( - EntaxyProducerService.INSTRUCTIONS.ARTIFACT.VERSION_POLICY - , "")) - .toString(); - String timestamp = g.getProperties().getOrDefault( - EntaxyProducerService.INSTRUCTIONS.ARTIFACT.TIMESTAMP, - instructions.getOrDefault( - EntaxyProducerService.INSTRUCTIONS.ARTIFACT.TIMESTAMP - , "")) - .toString(); - artifact.getCoordinates() - .groupId(mainObjectData[1]) - .artifactId(mainObjectData[0]) - .version("1") - .versionPolicy(versionPolicy) - .timestamp(timestamp); - - if (artifact instanceof Manifested) { - ArtifactManifest manifest = ((Manifested)artifact).getManifest(); - manifest.getCustomAttributes().putAll(headers); - - // Generate provided capabilities for every included object - ManifestCapabilityHelper helper = new ManifestCapabilityHelper(manifest); - - String objectsValue = headers.getOrDefault(HEADERS.GENERATED_OBJECTS, ""); - if (CommonUtils.isValid(objectsValue)) { - String[] objects = objectsValue.split(","); - - for (int i=0; i attributes = null; - if (g.getProperties().containsKey(FIELDS.FIELDS_TO_PUBLISH)) { - Object map = g.getProperties().get(FIELDS.FIELDS_TO_PUBLISH); - if (map != null) { - attributes = (Map)((Map)map).get(objectId); - } - } - helper.provideCapability(objectType).attributes(attributes); - } - - helper.save(); - - } - } - artifact.getProperties().putAll(g.getProperties()); - // TODO get value from manifest - // ArtifactManifest must be improved to provide read access to all attributes - if (!artifact.getProperties().containsKey(Constants.BUNDLE_SYMBOLICNAME)) { - artifact.getProperties().put(Constants.BUNDLE_SYMBOLICNAME - , artifact.getCoordinates().getGroupId() - + "." + artifact.getCoordinates().getArtifactId()); - } - artifactList.add(artifact); - printOutput("\n\t == " + artifact.getCoordinates().toString() + " ==\n"); - printOutput(new String(artifact.asByteArray())); - printOutput("\n\t == \n"); } - commandResult.resultObject(artifactList); + commandResult.resultObject(resultList); return true; } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Deploy.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Deploy.java index c51259d..72f3c1f 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Deploy.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Deploy.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,23 +20,27 @@ package ru.entaxy.platform.core.producer.executor.commands; import java.util.Map; -import java.util.stream.Collectors; -import ru.entaxy.platform.core.artifact.Artifact; -import ru.entaxy.platform.core.artifact.DeployedArtifact; -import ru.entaxy.platform.core.artifact.service.ArtifactService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.AbstractCommandExecutor; import ru.entaxy.platform.core.producer.executor.CommandExecutor; -import ru.entaxy.platform.core.producer.executor.support.ArtifactList; -import ru.entaxy.platform.core.producer.executor.support.ArtifactsHelper; -import ru.entaxy.platform.core.producer.executor.support.DeployedArtifactList; +import ru.entaxy.platform.core.producer.executor.builder.BuiltObject; +import ru.entaxy.platform.core.producer.executor.builder.BuiltObjectList; +import ru.entaxy.platform.core.producer.executor.deployer.DeployedObject; +import ru.entaxy.platform.core.producer.executor.deployer.DeployedObjectList; +import ru.entaxy.platform.core.producer.executor.deployer.ObjectDeployer; +import ru.entaxy.platform.core.producer.executor.support.ObjectSupportRegistry; @CommandExecutor(id = "deploy", predecessors = {"build"}) public class Deploy extends AbstractCommandExecutor { + private static final Logger log = LoggerFactory.getLogger(Deploy.class); + public static final String DEPLOY_LOCAL_INSTRUCTION = "deployLocal"; public Deploy(EntaxyProducerService entaxyProducerService) { @@ -46,32 +50,39 @@ public class Deploy extends AbstractCommandExecutor { @Override protected boolean doExecute(ProducerResult currentResult, CommandResult commandResult, Map instructions) throws Exception { - - boolean deployLocal = false; - - Object deployLocalValue = instructions.get(DEPLOY_LOCAL_INSTRUCTION); - if (deployLocalValue != null) - if (deployLocalValue instanceof Boolean) - deployLocal = (Boolean)deployLocalValue; - - ArtifactList artifactList = currentResult.findResultObject(ArtifactList.class); - DeployedArtifactList deployedArtifactList = new DeployedArtifactList(); - - ArtifactService artifactService = ArtifactsHelper.getInstance().getArtifactService(); - - for (Artifact artifact: artifactList) { - DeployedArtifact da = deployLocal - ?artifactService.deployLocal(artifact) - :artifactService.deployShared(artifact); - deployedArtifactList.add(da); - } - printOutput("\n\n\t== DEPLOY ==\n"); - printOutput("DEPLOYED: [" - + deployedArtifactList.stream().map(da->da.getLocation()).collect(Collectors.joining(",")) - + "]"); + BuiltObjectList objectList = currentResult.findResultObject(BuiltObjectList.class); + if (objectList == null) { + log.info("Nothing to deploy"); + return true; + } + + DeployedObjectList resultList = new DeployedObjectList(); - commandResult.resultObject(deployedArtifactList); + for (BuiltObject obj: objectList) { + if (obj == null) + continue; + + printOutput(" = Deploying for built of type [" + obj.getObject().getClass().getName() + "]" ); + + ObjectDeployer deployer = ObjectSupportRegistry.getInstance().findDeployer(obj); + if (deployer == null) { + log.warn("ObjectDeployer not found for built object of type [{}]", obj.getObject().getClass().getName()); + printOutput(" :: ObjectDeployer not found"); + continue; + } + + printOutput(" :: ObjectDeployer is: " + deployer.getClass().getName()); + DeployedObject result = deployer.deploy(obj, instructions); + if (result != null) { + resultList.add(result); + printOutput(" :: Result is: " + result.getClass().getName()); + } else + printOutput(" :: Result is: NULL"); + + } + + commandResult.resultObject(resultList); return true; } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Enrich.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Enrich.java index 90d68c4..c3575be 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Enrich.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Enrich.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.gson.Gson; +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import ru.entaxy.platform.base.support.CommonUtils; import ru.entaxy.platform.base.support.JSONUtils; @@ -47,6 +49,8 @@ import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.AbstractCommandExecutor; import ru.entaxy.platform.core.producer.executor.CommandExecutor; +import ru.entaxy.platform.core.producer.executor.objectmodel.AbstractItem; +import ru.entaxy.platform.core.producer.executor.objectmodel.Calculation; import ru.entaxy.platform.core.producer.executor.objectmodel.FactoredObject; import ru.entaxy.platform.core.producer.executor.objectmodel.FactoredObjectProxy; import ru.entaxy.platform.core.producer.executor.objectmodel.FactoredObjectRef; @@ -58,12 +62,40 @@ import ru.entaxy.platform.core.producer.impl.RefFieldInfoImpl; public class Enrich extends AbstractCommandExecutor { private static final Logger log = LoggerFactory.getLogger(Enrich.class); - + public Enrich(EntaxyProducerService entaxyProducerService) { super(entaxyProducerService); // TODO Auto-generated constructor stub } + // TODO move to FieldInfo + protected boolean isScoped(FieldInfo fi) { + return fi.getJsonOrigin().has(EntaxyFactory.CONFIGURATION.DIRECTIVES.SCOPED); + } + + // TODO move to FieldInfo + protected boolean isInScope(FieldInfo fi, String currentScope) { + if (!isScoped(fi)) + return true; + JsonElement je = fi.getJsonOrigin().get(EntaxyFactory.CONFIGURATION.DIRECTIVES.SCOPED); + if (!je.isJsonArray()) + return true; + JsonArray ja = je.getAsJsonArray(); + if (ja.size() == 0) + return true; + for (int i=0; i instructions) throws Exception { - int count = 15; - if (!instructions.containsKey("_count")) { - instructions.put("_count", count); - } - - if (instructions.get("_count") instanceof Integer) - count = (Integer)instructions.get("_count"); - else if (instructions.get("_count") instanceof Number) - count = ((Number)instructions.get("_count")).intValue(); - count--; - - printOutput("\n\n\t== ENRICH == #" + count + " ==\n\n"); - ObjectModel objectModel = currentResult.findResultObject(ObjectModel.class); objectModel.startTracking(); @@ -104,7 +123,8 @@ public class Enrich extends AbstractCommandExecutor { Gson gson = new Gson(); - // enrich type to ensure we can resolve refs + // enrich type to ensure we can resolve refs + // and enrich scope for (FactoredObject fo: objectModel.objects) { @@ -123,6 +143,11 @@ public class Enrich extends AbstractCommandExecutor { fo.setObjectType(factory.getFactoryType()); objectModel.setDirty(); } + + if (!fo.origin.has(FIELDS.SCOPE)) { + JSONUtils.setValue(fo.origin, FIELDS.SCOPE, gson.toJsonTree(fo.scope), true); + objectModel.setDirty(); + } } // enrich fields @@ -148,26 +173,35 @@ public class Enrich extends AbstractCommandExecutor { objectModel.setDirty(); } + JSONUtils.setValue(objectOrigin, FactoredObject.IGNORE_SECTION, new JsonObject(), true); + JsonObject objectProperties = objectOrigin.get(FIELDS.PROPERTIES).getAsJsonObject(); - List factoryFields = factory.getFields(OUTPUTS.OUTPUT_TYPE_INIT); + List factoryFields = factory.getFields( + CommonUtils.getValid(fo.getOutputType(), OUTPUTS.OUTPUT_TYPE_INIT) + ); for (FieldInfo fi: factoryFields) { FieldInfo fieldInfo = fi; - log.info("\n ITERATING FOR FIELD: " + fi.getName() + "\n" + fi.getJsonOrigin()); + log.debug("\n ITERATING FOR FIELD: " + fi.getName() + "\n" + fi.getJsonOrigin()); + if (FIELDS.OBJECT_ID.equals(fi.getName()) || FIELDS.OBJECT_TYPE.equals(fi.getName())) continue; + // check scope + if (!isInScope(fi, fo.scope)) + continue; + // check if lookup if (isLookup(fi)) { String lookup = getLookup(fi); - log.info("\n LOOKUP FIELD: " + fi.getName() + " -> " + lookup); + log.debug("\n LOOKUP FIELD: " + fi.getName() + " -> " + lookup); // replace lookup with corresponding ref Optional toLookupOpt = factoryFields.stream() @@ -178,7 +212,7 @@ public class Enrich extends AbstractCommandExecutor { log.error("Factory configuration error: loooked up field [{}] referenced by [{}] not found in factory [{}]" , lookup , fi.getName() - , factory.getFactoryId()); + , factory.getId()); continue; } FieldInfo toLookup = toLookupOpt.get(); @@ -208,7 +242,7 @@ public class Enrich extends AbstractCommandExecutor { } fieldInfoImpl.setJsonOrigin(lookupJson); - log.info("\n LOOKUP FIELD JSON: \n" + lookupJson.toString()); + log.debug("\n LOOKUP FIELD JSON: \n" + lookupJson.toString()); fieldInfo = fieldInfoImpl; @@ -288,12 +322,45 @@ public class Enrich extends AbstractCommandExecutor { delayed.removeAll(toRemove); } + JsonObject ignores = objectOrigin.get(FactoredObject.IGNORE_SECTION).getAsJsonObject(); + + // try to calculate + for (AbstractItem ai: fo.getInternals()) { + if (!(ai instanceof Calculation)) + continue; + Calculation calc = (Calculation)ai; + + // leave lazy calculations until generation + if (calc.isLazy()) + continue; + + Object result = calc.calculate(objectModel, fo); + if (result != Calculation.NOT_ENOUGH_DATA) { + printOutput("[CALCULATION] DONE for [" + fo.getObjectId() + "/" + calc.relativePath + "] :: " + result.toString()); + String currentPath = calc.relativePath; + String targetPath = calc.getTargetPath(); + boolean remove = (!currentPath.equals(targetPath) && calc.isRemoveResolved()); + targetPath = targetPath.replace("$.", ""); + JSONUtils.replaceValue(objectOrigin, targetPath, (new Gson()).toJsonTree(result)); + if (remove) { + int ind = currentPath.lastIndexOf("."); + String fieldName = ind>=0 + ?currentPath.substring(ind+1) + :currentPath; + ignores.addProperty(fieldName, true); + JSONUtils.replaceValue(objectOrigin, currentPath, (new Gson()).toJsonTree("TO_REMOVE")); + } + printOutput("[DIRTY] SET CALCULATED [" + result + "] to [" + targetPath + "]"); + objectModel.setDirty(); + } + } + } - if (objectModel.stopTracking() && count>0) { + if (objectModel.stopTracking()) { // remove ##embedded for (FactoredObject fo: objectModel.objects) @@ -305,8 +372,6 @@ public class Enrich extends AbstractCommandExecutor { .reset().target("analyze").complete(); } - instructions.put("_count", count); - JsonObject outgoingJson = objectModel.getJsonCurrent(); printOutput("\n== INCOMING JSON ==\n"); @@ -321,10 +386,10 @@ public class Enrich extends AbstractCommandExecutor { protected boolean processField(ObjectModel objectModel, FieldInfo fi, FactoredObject fo, Gson gson) { - log.info("\nPROCESSING FIELD: " + fi.getName()); + log.debug("\nPROCESSING FIELD: " + fi.getName()); if (fi.isRef()) { - log.info("\nPROCESSING REF: " + fi.getName()); + log.debug("\nPROCESSING REF: " + fi.getName()); return processRef(objectModel, (RefFieldInfo)fi, fo, gson); } @@ -332,15 +397,38 @@ public class Enrich extends AbstractCommandExecutor { JsonObject objectOrigin = fo.origin; JsonObject objectProperties = objectOrigin.get(FIELDS.PROPERTIES).getAsJsonObject(); + JsonObject ignores = objectOrigin.get(FactoredObject.IGNORE_SECTION).getAsJsonObject(); boolean exists = objectProperties.has(fi.getName()); - if (!exists) { + boolean ignored = ignores.has(fi.getName()); + if (!ignored) { if (fi.isRequired()) { - printOutput("[DIRTY] CREATED " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); - - objectProperties.add(fi.getName(), fi.getJsonOrigin().get(FIELDS.DEFAULT_VALUE)); - objectModel.setDirty(); - result = true; + if (exists) { + printOutput("[CHECK] IS FIXED VALUE " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + if (fi.getJsonOrigin().has("fixedValue")) { + JsonElement fixedValue = fi.getJsonOrigin().get("fixedValue"); + JsonElement currentValue = objectProperties.get(fi.getName()); + boolean replaceValue = false; + if (fixedValue != null) { + if (currentValue == null) + replaceValue = true; + else + replaceValue = !fixedValue.toString().equals(currentValue.toString()); + } + if (replaceValue) { + printOutput("[DIRTY] REPLACED WITH FIXED VALUE: " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + JSONUtils.replaceValue(objectProperties, fi.getName(), fixedValue); + objectModel.setDirty(); + result = true; + } + } + } else { + printOutput("[DIRTY] CREATED " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + + objectProperties.add(fi.getName(), fi.getJsonOrigin().get(FIELDS.DEFAULT_VALUE)); + objectModel.setDirty(); + result = true; + } } } return result; @@ -351,8 +439,14 @@ public class Enrich extends AbstractCommandExecutor { JsonObject objectOrigin = fo.origin; JsonObject objectProperties = objectOrigin.get(FIELDS.PROPERTIES).getAsJsonObject(); + JsonObject ignores = objectOrigin.get(FactoredObject.IGNORE_SECTION).getAsJsonObject(); boolean exists = objectProperties.has(fi.getName()); + boolean ignored = ignores.has(fi.getName()); + + if (ignored) + return true; + if (!exists) { if (fi.isRequired()) { @@ -491,6 +585,11 @@ public class Enrich extends AbstractCommandExecutor { printOutput("[DIRTY] UPDATED " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); objectModel.setDirty(); } + // TODO move to constant + if (refCopy.has("resolveAlways")) { + currentObject.remove("resolveAlways"); + currentObject.add("resolveAlways", refCopy.get("resolveAlways")); + } if (isLookup(fi)) { String lookup = getLookup(fi); JsonElement lookupValue = objectProperties.get(lookup); @@ -534,12 +633,26 @@ public class Enrich extends AbstractCommandExecutor { if (!result) { // we have something which is not a ref and not a object to produce - // we'll treat it as resolved ref value - refCopy.remove(FIELDS.DEFAULT_VALUE); - refCopy.add(FactoredObjectRef.TARGET_VALUE_FIELD, currentValue); - refCopy.addProperty(FactoredObjectRef.IS_RESOLVED_FIELD, true); - printOutput("[DIRTY] CONSIDER VALUE [" + currentValue.toString() + "] AS RESOLVED " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); - objectModel.setDirty(); + if (fi.isRefByValueOnly()) { + // we'll treat it as resolved ref value + ignores.remove(fi.getName()); + ignores.addProperty(fi.getName(), true); + printOutput("[DIRTY] CONSIDER VALUE [" + currentValue.toString() + "] AS RESOLVED; IGNORE " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + objectModel.setDirty(); + } else { + // we'll treat current value as targetId if it's not null and not array + if (currentValue.isJsonPrimitive()) { + refCopy.remove(FIELDS.DEFAULT_VALUE); + refCopy.add(FactoredObjectRef.TARGET_ID_FIELD, currentValue); + refCopy.remove(FactoredObjectRef.TARGET_TYPE_FIELD); + refCopy.addProperty(FactoredObjectRef.TARGET_TYPE_FIELD, fi.getType()); + printOutput("[DIRTY] CONSIDER VALUE [" + currentValue.toString() + "] AS TARGET ID in " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + JSONUtils.replaceValue(objectProperties, fi.getName(), refCopy); + objectModel.setDirty(); + } else { + printOutput("[WARN] IGNORE VALUE [" + currentValue.toString() + "] in " + fi.getName() + " for [" + fo.getObjectId() + "/" + fo.getObjectType() + "]"); + } + } result = true; } } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Generate.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Generate.java index 4601838..aa4d3c6 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Generate.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Generate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ public class Generate extends AbstractCommandExecutor { this.printOutput("\n\t == Execution ==\n"); for (AbstractTask at: generationModel.getTasks()) { at.setPrintOutput(isPrintOutput); + this.printOutput("\tExecuting: " + at.getInfo()); at.execute(currentResult, commandResult, entaxyProducerService, instructions); this.printOutput("\n :: Result ::\n"); if (at.getGeneratedResult()==null) diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java index 3c20460..c791e96 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,30 +21,26 @@ package ru.entaxy.platform.core.producer.executor.commands; import java.util.Map; -import org.osgi.framework.Constants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import ru.entaxy.platform.base.support.CommonUtils; -import ru.entaxy.platform.core.artifact.Blueprint; -import ru.entaxy.platform.core.artifact.DeployedArtifact; -import ru.entaxy.platform.core.artifact.installer.builder.ClusterInstaller; -import ru.entaxy.platform.core.artifact.installer.builder.InstallationResult; -import ru.entaxy.platform.core.artifact.installer.builder.Installer; -import ru.entaxy.platform.core.artifact.installer.builder.LocalInstaller; -import ru.entaxy.platform.core.artifact.installer.builder.typed.BlueprintInstaller; -import ru.entaxy.platform.core.artifact.service.ArtifactService; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.AbstractCommandExecutor; import ru.entaxy.platform.core.producer.executor.CommandExecutor; -import ru.entaxy.platform.core.producer.executor.CommandInstructions; -import ru.entaxy.platform.core.producer.executor.support.ArtifactsHelper; -import ru.entaxy.platform.core.producer.executor.support.DeployedArtifactList; -import ru.entaxy.platform.core.producer.executor.support.InstallationResultList; +import ru.entaxy.platform.core.producer.executor.deployer.DeployedObject; +import ru.entaxy.platform.core.producer.executor.deployer.DeployedObjectList; +import ru.entaxy.platform.core.producer.executor.installer.InstalledObject; +import ru.entaxy.platform.core.producer.executor.installer.InstalledObjectList; +import ru.entaxy.platform.core.producer.executor.installer.ObjectInstaller; +import ru.entaxy.platform.core.producer.executor.support.ObjectSupportRegistry; @CommandExecutor(id = "install", predecessors = "deploy") public class Install extends AbstractCommandExecutor { + private static final Logger log = LoggerFactory.getLogger(Install.class); + public static final String INSTALL_LOCAL_INSTRUCTION = "installLocal"; public static final String UPDATE_INSTRUCTION = "update"; public static final String INSTALL_ONLY_IF_MISSING_INSTRUCTION = "installOnlyIfMissing"; @@ -57,89 +53,39 @@ public class Install extends AbstractCommandExecutor { protected boolean doExecute(ProducerResult currentResult, CommandResult commandResult, Map instructions) throws Exception { - CommandInstructions commandInstructions = new CommandInstructions(instructions); - - boolean installLocal = - commandInstructions.has(INSTALL_LOCAL_INSTRUCTION) - ?commandInstructions.getBoolean(INSTALL_LOCAL_INSTRUCTION) - :false; - - boolean installOnlyIfMissing = - commandInstructions.has(INSTALL_ONLY_IF_MISSING_INSTRUCTION) - ?commandInstructions.getBoolean(INSTALL_ONLY_IF_MISSING_INSTRUCTION) - :false; - - String update = - commandInstructions.has(UPDATE_INSTRUCTION) - ?commandInstructions.getString(UPDATE_INSTRUCTION) - :null; - - Object installLocalValue = instructions.get(INSTALL_LOCAL_INSTRUCTION); - if (installLocalValue != null) - if (installLocalValue instanceof Boolean) - installLocal = (Boolean)installLocalValue; - - DeployedArtifactList deployedArtifactList = currentResult.findResultObject(DeployedArtifactList.class); - InstallationResultList installationResultList = new InstallationResultList(); - - ArtifactService artifactService = ArtifactsHelper.getInstance().getArtifactService(); - - for (DeployedArtifact da: deployedArtifactList) { - - InstallationResult result = null; - - Installer installer = null; - - String artifactUpdate = update; - - printOutput("-> Installing artifact: [" + da.getArtifact().getCoordinates().toString() + "]"); - if (installLocal) { - LocalInstaller localInstaller = artifactService.installers().local() - .artifact(da); - installer = localInstaller; - printOutput("-> Installing locally"); - } else { - ClusterInstaller clusterInstaller = artifactService.installers().cluster() - .artifact(da); - installer = clusterInstaller; - printOutput("-> Installing clustered"); - } - - // TODO add support for other types when they appear - if (da.getArtifact().getCategory().equals(Blueprint.ARTIFACT_CATEGORY_BLUEPRINT)) { - // we're installing blueprint - printOutput("-> Installing: " + da.getArtifact().getCategory()); - BlueprintInstaller blueprintInstaller = installer.typed(BlueprintInstaller.class); - if (installOnlyIfMissing) - blueprintInstaller.installOnlyIfMissing(); - if (artifactUpdate != null) { - if (!CommonUtils.isValid(artifactUpdate)) { - artifactUpdate = da - .getArtifact().getProperties() - .getOrDefault(Constants.BUNDLE_SYMBOLICNAME, "") - .toString(); - } - blueprintInstaller.update(artifactUpdate); - } - result = blueprintInstaller.start().install(); - } else { - printOutput("-> Unknown category: " + da.getArtifact().getCategory()); - } - - if (result != null) { - for (String key: da.getArtifact().getProperties().keySet()) - result.getProperties().putIfAbsent(key, da.getArtifact().getProperties().get(key)); - // TODO imrove Coordinates: add "asMap" method - result.getProperties().put("artifact.artifactId", da.getArtifact().getCoordinates().getArtifactId()); - result.getProperties().put("artifact.groupId", da.getArtifact().getCoordinates().getGroupId()); - result.getProperties().put("artifact.version", da.getArtifact().getCoordinates().getVersion()); - result.getProperties().put("artifact.type", da.getArtifact().getCoordinates().getType()); - result.getProperties().put("artifact.classifier", da.getArtifact().getCoordinates().getClassifier()); - installationResultList.add(result); - } + DeployedObjectList objectList = currentResult.findResultObject(DeployedObjectList.class); + if (objectList == null) { + log.info("Nothing to install"); + return true; } - commandResult.resultObject(installationResultList); + InstalledObjectList resultList = new InstalledObjectList(); + + for (DeployedObject obj: objectList) { + + if (obj == null) + continue; + + printOutput(" = Installing for deployed of type [" + obj.getObject().getClass().getName() + "]" ); + + + ObjectInstaller installer = ObjectSupportRegistry.getInstance().findInstaller(obj); + if (installer == null) { + log.warn("ObjectInstaller not found for deployed object of type [{}]", obj.getObject().getClass().getName()); + printOutput(" :: ObjectInstaller not found"); + continue; + } + + printOutput(" :: ObjectInstaller is: " + installer.getClass().getName()); + InstalledObject result = installer.install(obj, instructions); + if (result != null) { + resultList.add(result); + printOutput(" :: Result is: " + result.getClass().getName()); + } else + printOutput(" :: Result is: NULL"); + } + + commandResult.resultObject(resultList); return true; } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Layout.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Layout.java index 3b4c8d3..580ef22 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Layout.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Layout.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,6 @@ public class Layout extends AbstractCommandExecutor { log.debug("Executing command [{}]", getId()); ObjectModel objectModel = currentResult.findResultObject(ObjectModel.class); - printOutput("\n\n\t== LAYOUT == \n\n"); printOutput("\n\tIncoming JSON ::\n\n"); printOutput(objectModel.getJsonCurrent().toString()); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/PrepareGenerate.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/PrepareGenerate.java index 4979fad..1baea11 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/PrepareGenerate.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/PrepareGenerate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Store.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Store.java index 79e9d5e..33477ac 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Store.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Store.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ */ package ru.entaxy.platform.core.producer.executor.commands; +import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; @@ -36,7 +37,9 @@ import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.AbstractCommandExecutor; import ru.entaxy.platform.core.producer.executor.CommandExecutor; -import ru.entaxy.platform.core.producer.executor.support.InstallationResultList; +import ru.entaxy.platform.core.producer.executor.installer.InstalledObject; +import ru.entaxy.platform.core.producer.executor.installer.InstalledObjectList; +import ru.entaxy.platform.core.producer.executor.support.EntaxyObjectPropertiesHelper; @CommandExecutor(id = "store", predecessors = "install") public class Store extends AbstractCommandExecutor { @@ -58,12 +61,15 @@ public class Store extends AbstractCommandExecutor { protected boolean doExecute(ProducerResult currentResult, CommandResult commandResult, Map instructions) throws Exception { - InstallationResultList installationResultList = currentResult.findResultObject(InstallationResultList.class); + InstalledObjectList objectList = currentResult.findResultObject(InstalledObjectList.class); if (objectStorageService == null) objectStorageService = OSGIUtils.services().ofClass(EntaxyObjectStorageService.class).get(); - for (InstallationResult installationResult: installationResultList) { + for (InstalledObject obj: objectList) { + if (!(obj.getObject() instanceof InstallationResult)) + continue; + InstallationResult installationResult = (InstallationResult)obj.getObject(); printOutput("\n -- INSTALLATION RESULT ::" + "\n\t" + installationResult.getResult().toString() + "\n\tproperties:" @@ -91,8 +97,13 @@ public class Store extends AbstractCommandExecutor { ) ); + Map objectProperties = new HashMap<>(); + objectProperties.putAll(installationResult.getProperties()); + if (EntaxyObjectPropertiesHelper.isMerged(objectProperties)) + objectProperties.putAll(EntaxyObjectPropertiesHelper.getMainObjectProperties(objectProperties)); + EntaxyObjectStorage objectStorage = objectStorageService.getObjectStorage( - installationResult.getProperties() + objectProperties .getOrDefault(EntaxyObject.FIELDS.OBJECT_TYPE, "").toString() ); @@ -102,7 +113,7 @@ public class Store extends AbstractCommandExecutor { continue; } - objectStorage.store(installationResult.getProperties()); + objectStorage.store(objectProperties); } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Validate.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Validate.java index 3b44f29..e27013f 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Validate.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Validate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class Validate extends AbstractCommandExecutor { @Override protected boolean doExecute(ProducerResult currentResult, CommandResult commandResult, Map instructions) throws Exception { - log.info("Executing command [{}]", getId()); + log.debug("Executing command [{}]", getId()); ObjectModel objectModel = currentResult.findResultObject(ObjectModel.class); // TODO check ObjectModel.objects & .refs for // - factory exists diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractObjectTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractObjectTask.java index d57541f..6de7ff7 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractObjectTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractObjectTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractRefTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractRefTask.java index 7543688..7ac96c8 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractRefTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractRefTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractTask.java index cd97585..7e5b03b 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/AbstractTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/CalculateTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/CalculateTask.java index 4591b65..aa6cd8a 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/CalculateTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/CalculateTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,8 @@ public class CalculateTask extends AbstractObjectTask { private static final Logger log = LoggerFactory.getLogger(CalculateTask.class); + private static Gson GSON = new Gson(); + public static boolean hasCalculations(FactoredObject factoredObject) { return factoredObject.getInternals().stream().filter(obj -> (obj instanceof Calculation)) .count() > 0; @@ -67,12 +69,19 @@ public class CalculateTask extends AbstractObjectTask { for (Calculation calculation: calculations) { Object result = calculation.calculate(objectModel, origin); - System.out.println("CALCULATION RESOLVED TO :: " + result); - System.out.println("\n REPLACE" + printOutput("CALCULATION RESOLVED TO :: " + result); + printOutput("\n REPLACE" + "\n\t" + calculation.origin - + "\n\tWITH :: " + (new Gson()).toJsonTree(result) + + "\n\tWITH :: " + GSON.toJsonTree(result) + "\n\tAT :: " + calculation.relativePath); - JSONUtils.replaceValue(origin.origin, calculation.relativePath, (new Gson()).toJsonTree(result)); + String currentPath = calculation.relativePath; + String targetPath = calculation.getTargetPath(); + boolean remove = (!currentPath.equals(targetPath) && calculation.isRemoveResolved()); + targetPath = targetPath.replace("$.", ""); + JSONUtils.replaceValue(origin.origin, targetPath, GSON.toJsonTree(result)); + if (remove) { + JSONUtils.replaceValue(origin.origin, currentPath, GSON.toJsonTree("TO_REMOVE")); + } } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/DefaultObjectDataResolver.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/DefaultObjectDataResolver.java index 22654e6..406200f 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/DefaultObjectDataResolver.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/DefaultObjectDataResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateRefTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateRefTask.java index 773c0bc..a11b05e 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateRefTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateRefTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,6 +91,34 @@ public class GenerateRefTask extends AbstractRefTask { , EntaxyFactory.SCOPE.PRIVATE.label , effectiveProperties); + } else { + JsonObject targetConfig = targetObject.origin.deepCopy(); + JsonObject currentConfig = this.objectRef.origin; + JSONUtils.mergeObjects(currentConfig, targetConfig); + + // System.out.println("\n\n\tGENERATING REF WITH CONFIG: \n\t" + targetConfig); + + String factoryId = targetConfig.has(FIELDS.FACTORY_ID) + ?targetConfig.get(FIELDS.FACTORY_ID).getAsString() + :""; + + String factoryType = targetConfig.has(FIELDS.OBJECT_TYPE) + ?targetConfig.get(FIELDS.OBJECT_TYPE).getAsString() + :""; + + if (!CommonUtils.isValid(factoryId) || !CommonUtils.isValid(factoryType)) + throw new IllegalArgumentException("Factory not defined for object: [" + + this.objectRef.getTargetId() + + ":" + + this.objectRef.getTargetType() + + "]"); + + Map effectiveProperties = createEffectiveProperties(targetConfig, instructions); + this.generatedResult = producerService.getProducerForType(factoryType).getFactoryById(factoryId) + .generate(EntaxyFactory.CONFIGURATION.OUTPUTS.OUTPUT_TYPE_REF + , EntaxyFactory.SCOPE.PRIVATE.label + , effectiveProperties); + } } return true; diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateTask.java index dcda374..805a61a 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerateTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ package ru.entaxy.platform.core.producer.executor.generationmodel; import java.util.Base64; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -35,6 +36,7 @@ import ru.entaxy.platform.base.support.JSONUtils; import ru.entaxy.platform.base.objects.EntaxyObject.FIELDS; import ru.entaxy.platform.base.objects.EntaxyObject.HEADERS; import ru.entaxy.platform.base.objects.factory.EntaxyFactory; +import ru.entaxy.platform.base.objects.factory.EntaxyFactory.OutputInfo; import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; @@ -46,6 +48,8 @@ public class GenerateTask extends AbstractObjectTask { public static final String INSTRUCTIONS_FIELD = "##instructions"; public static final String GENERATION_PROPERTIES_FIELD = "##generation"; + public static final String SKIP_OBJECT_PUBLISHING_FIELD = "##SKIP_OBJECT_PUBLISHING"; + public static final String DIRECTIVE_SKIP_PUBLISH = "@SKIP_PUBLISH"; public String factoryId; public String factoryType; @@ -71,8 +75,8 @@ public class GenerateTask extends AbstractObjectTask { try { EntaxyFactory f = producerService.findFactoryById(factoryId); if (f != null) { - log.debug("Factory found by id [{}] with type [{}]", f.getFactoryId(), f.getFactoryType()); - factoryType = f.getFactoryType(); + log.debug("Factory found by id [{}] with type [{}]", f.getId(), f.getType()); + factoryType = f.getType(); } else throw new IllegalArgumentException("Factory not found: " + factoryId); } catch (Exception e) { @@ -80,7 +84,8 @@ public class GenerateTask extends AbstractObjectTask { } log.debug("Execute for type [{}] with factoryId [{}]", factoryType, factoryId); Map effectiveProperties = createEffectiveProperties(instructions); - this.generatedResult = producerService.getProducerForType(factoryType).getFactoryById(factoryId).generate(outputType, scope, effectiveProperties); + EntaxyFactory factory = producerService.getProducerForType(factoryType).getFactoryById(factoryId); + this.generatedResult = factory.generate(outputType, scope, effectiveProperties); // objectId could be changed by pre/post processor, so we update it // TODO move string to const String objectId = this.generatedResult.getProperties() @@ -89,21 +94,100 @@ public class GenerateTask extends AbstractObjectTask { log.debug("Changing objectId from [{}] to [{}]", origin.getObjectId(), objectId); origin.setObjectId(objectId); } + + boolean publishObject = !isSkipPublish(factory, this.outputType, this.scope); + + // check for old-style configuration + // TODO remove in next releases + if (publishObject) + if (effectiveProperties.containsKey(SKIP_OBJECT_PUBLISHING_FIELD)) { + try { + publishObject = !((Boolean)effectiveProperties.get(SKIP_OBJECT_PUBLISHING_FIELD)); + } catch (Exception e) { + // NOOP + } + } + GeneratedHeaders headers = GeneratedHeaders.getHeaders(this.generatedResult.getProperties()); - headers.set(HEADERS.MAIN_OBJECT, origin.getObjectId() + ":" + factoryType); - headers.append(HEADERS.GENERATED_OBJECTS, origin.getObjectId() + ":" + factoryType); - // headers.set(GeneratedHeaders.HEADER_MAIN_OBJECT_TYPE, factoryType); - // headers.set(GeneratedHeaders.HEADER_MAIN_OBJECT_FACTORY_ID, factoryId); - // headers.append(GeneratedHeaders.HEADER_OBJECT_ID, origin.getObjectId()); - // headers.append(GeneratedHeaders.HEADER_OBJECT_TYPE, factoryType); - headers.append(HEADERS.GENERATED_OBJECTS_CONFIG - , Base64.getEncoder().encodeToString(origin.origin.toString().getBytes())); + headers.set(HEADERS.ENTAXY_GENERATED, "true"); + if (publishObject) { + headers.set(HEADERS.MAIN_OBJECT, origin.getObjectId() + ":" + factoryType + ":" + scope); + headers.append(HEADERS.GENERATED_OBJECTS, origin.getObjectId() + ":" + factoryType + ":" + scope); + // headers.set(GeneratedHeaders.HEADER_MAIN_OBJECT_TYPE, factoryType); + // headers.set(GeneratedHeaders.HEADER_MAIN_OBJECT_FACTORY_ID, factoryId); + // headers.append(GeneratedHeaders.HEADER_OBJECT_ID, origin.getObjectId()); + // headers.append(GeneratedHeaders.HEADER_OBJECT_TYPE, factoryType); + headers.append(HEADERS.GENERATED_OBJECTS_CONFIG + , Base64.getEncoder().encodeToString( + getFilteredObjectData(origin.origin, factory) + .toString().getBytes())); + } this.generationProperties.clear(); this.generationProperties.putAll(effectiveProperties); this.generatedResult.getProperties().put(GENERATION_PROPERTIES_FIELD, new HashMap(this.generationProperties)); return true; } + protected JsonObject getFilteredObjectData(JsonObject originData, EntaxyFactory factory) { + JsonObject result = getFilteredObject(originData, factory); + if (result == null) + result = new JsonObject(); + return result; + } + + protected JsonObject getFilteredObject(JsonObject originObject, EntaxyFactory factory) { + JsonObject result = new JsonObject(); + for (Entry entry: originObject.entrySet()) { + String name = entry.getKey(); + if (FactoredObject.EMBEDDED_FIELD.equals(name) || FactoredObject.IGNORE_SECTION.equals(name)) + continue; + JsonElement je = entry.getValue(); + if (je.isJsonObject()) { + JsonObject jo = je.getAsJsonObject(); + if (jo.has(EntaxyFactory.CONFIGURATION.DIRECTIVES.INTERNAL)) { + boolean skip = true; + try { + skip = jo.get(EntaxyFactory.CONFIGURATION.DIRECTIVES.INTERNAL).getAsBoolean(); + } catch (Exception e) { + // NOOP + } + if (skip) + continue; + } + JsonObject filtered = getFilteredObject(jo, factory); + if (filtered != null) + result.add(name, filtered); + } else { + result.add(name, je); + } + } + return result; + } + + protected boolean isSkipPublish(EntaxyFactory factory, String outputType, String scope) { + OutputInfo info = factory.getOutputByType(outputType); + if (info == null) + return false; + Map config = info.getConfig(); + if (config == null) + return false; + if (config.containsKey(DIRECTIVE_SKIP_PUBLISH)) { + try { + // check scopes + Map data = (Map)config.get(DIRECTIVE_SKIP_PUBLISH); + if (data.containsKey(EntaxyFactory.CONFIGURATION.OUTPUTS.ATTRIBUTES.SCOPES)) { + List scopes = (List)data.get(EntaxyFactory.CONFIGURATION.OUTPUTS.ATTRIBUTES.SCOPES); + return scopes.contains(scope); + } else { + return true; + } + } catch (Exception e) { + return true; + } + } + return false; + } + protected Map createEffectiveProperties(Map instructions){ Map result = new HashMap<>(); result.put(INSTRUCTIONS_FIELD, instructions); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedHeaders.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedHeaders.java index 4dc60c4..68b58f5 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedHeaders.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedHeaders.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,7 @@ public class GeneratedHeaders { if (!(obj instanceof List)) { List list = new LinkedList(); list.add(obj); + headers.put(name, list); } } List list = (List)headers.get(name); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedList.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedList.java index 882fe90..cf870a6 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedList.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GeneratedList.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerationModel.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerationModel.java index 5beb4b8..19e83e2 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerationModel.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/GenerationModel.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,14 +98,15 @@ public class GenerationModel { List embeddedRefs = fo.embedded.stream().filter(f->(f instanceof FactoredObjectRef)) .map(f -> (FactoredObjectRef)f) .filter(f -> !f.isBackRef()) - .filter(f -> !f.isLink()) + .filter(f -> !f.isLink() || f.isResolveAlways()) .collect(Collectors.toList()); for (FactoredObjectRef embeddedRef: embeddedRefs) { - if (!embeddedRef.isLink()) { + if (!embeddedRef.isLink() || embeddedRef.isResolveAlways()) { localPreTasks.add(new ResolveRefTask(embeddedRef)); - if (!embeddedRef.isRefByValueOnly()) - localPreTasks.add(new GenerateRefTask(embeddedRef)); + if (!embeddedRef.isLink()) + if (!embeddedRef.isRefByValueOnly()) + localPreTasks.add(new GenerateRefTask(embeddedRef)); } } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/MergeTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/MergeTask.java index 4e9b3db..2f772d5 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/MergeTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/MergeTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import ru.entaxy.platform.core.producer.api.EntaxyProducerService; import ru.entaxy.platform.core.producer.api.ProducerResult; import ru.entaxy.platform.core.producer.api.ProducerResult.CommandResult; import ru.entaxy.platform.core.producer.executor.generationmodel.merge.MergeHelper; +import ru.entaxy.platform.core.producer.executor.support.EntaxyObjectPropertiesHelper; public class MergeTask extends AbstractTask { @@ -72,13 +73,16 @@ public class MergeTask extends AbstractTask { GeneratedHeaders sourceGeneratedHeaders = GeneratedHeaders.getHeaders(source.getProperties()); GeneratedHeaders targetGeneratedHeaders = GeneratedHeaders.getHeaders(target.getProperties()); - GeneratedHeaders resultGeneratedHeaders = GeneratedHeaders.getHeaders(this.generatedResult.getProperties()); + GeneratedHeaders resultGeneratedHeaders = GeneratedHeaders.getHeaders( + // this.generatedResult.getProperties() + EntaxyObjectPropertiesHelper.getMainObjectProperties(this.generatedResult.getProperties()) + ); for (String header: targetGeneratedHeaders.headers.keySet()) resultGeneratedHeaders.set(header, targetGeneratedHeaders.headers.get(header)); for (String header: sourceGeneratedHeaders.headers.keySet()) - if (EntaxyObject.HEADERS.MAIN_OBJECT.equals(header)) + if (EntaxyObject.HEADERS.MAIN_OBJECT.equals(header) || EntaxyObject.HEADERS.ENTAXY_GENERATED.equals(header)) continue; else resultGeneratedHeaders.append(header, sourceGeneratedHeaders.headers.get(header)); @@ -95,6 +99,9 @@ public class MergeTask extends AbstractTask { this.fromTask.setFinal(false); this.toTask.updateGenerated(generatedResult); + printOutput("\tMERGE RESULT ::"); + printOutput(generatedResult.getObject().toString()); + // prevent building result of this task this.generatedResult = null; diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectDataResolver.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectDataResolver.java index 519659e..21ccaf0 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectDataResolver.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectDataResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectResolveHelper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectResolveHelper.java index 6f8da6d..420279b 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectResolveHelper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ObjectResolveHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveObjectTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveObjectTask.java index a6c442c..ee83dad 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveObjectTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveObjectTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveRefTask.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveRefTask.java index c5f9dfc..f427b77 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveRefTask.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/ResolveRefTask.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/AbstractMergeProcessor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/AbstractMergeProcessor.java index ec947e6..2b2ba68 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/AbstractMergeProcessor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/AbstractMergeProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/BlueprintMergeProcessor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/BlueprintMergeProcessor.java index 4618cba..6cb62d4 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/BlueprintMergeProcessor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/BlueprintMergeProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,19 @@ */ package ru.entaxy.platform.core.producer.executor.generationmodel.merge; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import org.osgi.framework.Bundle; +import org.osgi.service.component.ComponentContext; +import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,24 +39,74 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + import ru.entaxy.esb.platform.runtime.base.connecting.generator.Generated; +import ru.entaxy.platform.base.support.CommonUtils; +import ru.entaxy.platform.base.support.JSONUtils; import ru.entaxy.platform.base.support.xml.CommonXMLUtils; import ru.entaxy.platform.core.producer.executor.generationmodel.merge.MergingMap.Mapping; +import ru.entaxy.platform.core.producer.executor.support.EntaxyObjectPropertiesHelper; @Component(service = MergeProcessor.class, immediate = true) @MergingMap(mappings = { - @Mapping(source = Generated.GENERATED_TYPE_BLUEPRINT_FRAGMENT, targets = {Generated.GENERATED_TYPE_BLUEPRINT}) + @Mapping(source = Generated.GENERATED_TYPE_BLUEPRINT_FRAGMENT + , targets = {Generated.GENERATED_TYPE_BLUEPRINT, Generated.GENERATED_TYPE_BLUEPRINT_FRAGMENT}) }) public class BlueprintMergeProcessor extends AbstractMergeProcessor { private static final Logger log = LoggerFactory.getLogger(BlueprintMergeProcessor.class); + public static final String FRAGMENT_NAME = "fragment"; + public static final String FRAGMENT_START = "<" + FRAGMENT_NAME + ">"; + public static final String FRAGMENT_END = ""; + + protected MergeProcessor defaultProcessor; + + @Activate + public void activate(ComponentContext componentContext) { + Bundle bundle = componentContext.getBundleContext().getBundle(); + URL url = bundle.getEntry("/config/BlueprintMergeProcessor.json"); + defaultProcessor = new MergeProcessor(); + try { + defaultProcessor.load(url.openStream()); + } catch (Exception e) { + log.error("Error loading configuration", e); + defaultProcessor.loadDefaults(); + } + } + @Override public Generated merge(Generated source, Generated target, Map config) { + MergeProcessor currentProcessor; + + String mergeConfig = config==null + ?"" + :config.getOrDefault("merge.config", "").toString(); + if (CommonUtils.isValid(mergeConfig)) { + currentProcessor = new MergeProcessor(); + try { + currentProcessor.load(mergeConfig); + } catch (Exception e) { + log.error("Invalid merge.config: \n" + mergeConfig, e); + currentProcessor = defaultProcessor.createCopy(); + } + } else { + currentProcessor = defaultProcessor.createCopy(); + } + NodeList sourceNodes = null; if (source.getType().equals(Generated.GENERATED_TYPE_BLUEPRINT_FRAGMENT)) { - String toParse = "" + source.getObject().toString() + ""; + // remove if present + String sourceValue = source.getObject().toString().trim(); + if (sourceValue.startsWith(""); + sourceValue = sourceValue.substring(index+2); + } + String toParse = FRAGMENT_START + sourceValue + FRAGMENT_END; try { Document sourceDoc = CommonXMLUtils.parseString(true, toParse); sourceNodes = sourceDoc.getFirstChild().getChildNodes(); @@ -60,52 +121,568 @@ public class BlueprintMergeProcessor extends AbstractMergeProcessor { if ((sourceNodes == null) || (sourceNodes.getLength()==0)) return target; + if (target.getType().equals(Generated.GENERATED_TYPE_BLUEPRINT)) { + return mergeToBlueprint(sourceNodes, source, target, currentProcessor); + } + + if (target.getType().equals(Generated.GENERATED_TYPE_BLUEPRINT_FRAGMENT)) { + return mergeToFragment(sourceNodes, source, target, currentProcessor); + } + + return null; + } + + protected Generated mergeToBlueprint(NodeList sourceNodes, Generated source, Generated target, MergeProcessor currentProcessor) { Document targetDoc = null; Node targetNode = null; Node targetNodeBefore = null; - if (target.getType().equals(Generated.GENERATED_TYPE_BLUEPRINT)) { - try { - targetDoc = CommonXMLUtils.parseString(true, target.getObject().toString()); - targetNode = targetDoc.getFirstChild(); - - NodeList manifests = targetDoc.getElementsByTagName("manifest"); - for (int i=0; i if present + String targetValue = target.getObject().toString().trim(); + if (targetValue.startsWith(""); + targetValue = targetValue.substring(index+2); + } + String toParse = FRAGMENT_START + targetValue + FRAGMENT_END; + + Document targetDoc = null; + + try { + targetDoc = CommonXMLUtils.parseString(true, toParse); + for (int i=0; i processedNodes = new ArrayList<>(); + + public void load(InputStream inputStream) throws IOException { + log.info("loading config"); + String text = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + inputStream.close(); + load(text); + } + + public void loadDefaults() { + load(DEFAULT_CONFIG); + } + + public void load(String jsonData) { + config.load(JSONUtils.getJsonRootObject(jsonData)); + } + + public MergeProcessor createCopy() { + MergeProcessor result = new MergeProcessor(); + result.config.load(this.config.config); + return result; + } + + public void reset() { + processedNodes.clear(); + } + + public Document getDocument() { + return document; + } + + public void setDocument(Document document) { + this.document = document; + + rootNode = this.document.getFirstChild(); + + NodeList manifests = this.document.getElementsByTagName("manifest"); + for (int i=0; i attributes = new HashMap<>(); + for (String attrName: mergeConfig.unique) { + Node attr = newNode.getAttributes().getNamedItem(attrName); + if (attr == null) + attributes.put(attrName, null); + else + attributes.put(attrName, attr.getNodeValue()); + } + + NodeConflict result = null; + + NodeList testNodes = targetContainerNode.getChildNodes(); + for (int i=0; i attributeEntry: attributes.entrySet()) { + String attrValue = attributeEntry.getValue(); + Node testAttr = item.getAttributes().getNamedItem(attributeEntry.getKey()); + if ((testAttr == null) && (attrValue!=null)) { + found = false; + break; + } + if ((testAttr != null) && (attrValue==null)) { + found = false; + break; + } + if ((testAttr != null) && (attrValue!=null)) { + String testValue = testAttr.getNodeValue(); + if (testValue==null) { + found = false; + break; + } + if (testValue.equalsIgnoreCase(attrValue)) { + found = true; + } + } + } + if (found) { + result = new NodeConflict(); + result.newNode = newNode; + result.oldNode = item; + result.conflictResolution = + CommonUtils.getValid(mergeConfig.conflict, MergeConfig.CONFLICT_INGORE); + break; + } + } + + return result; + } + + public List mergeNodes(NodeList sourceNodes){ + List result = new ArrayList<>(); + + mergeFilteredNodes(sourceNodes, result); + + return result; + } + + protected void mergeFilteredNodes(NodeList sourceNodes, List toReturn){ + for (int i=0; i unique = new ArrayList<>(); + String conflict; + + public String getTargetNodeName() { + return targetNodeName; + } + + public void setTargetNodeName(String targetNodeName) { + this.targetNodeName = targetNodeName; + } + + public boolean isCreateTargetNode() { + return createTargetNode; + } + + public void setCreateTargetNode(boolean createTargetNode) { + this.createTargetNode = createTargetNode; + } + + public String getTargetNodeXML() { + return targetNodeXML; + } + + public void setTargetNodXMLe(String targetNodeXML) { + this.targetNodeXML = targetNodeXML; + } + + public String getTargetNodeNamespace() { + return targetNodeNamespace; + } + + public void setTargetNodeNamespace(String targetNodeNamespace) { + this.targetNodeNamespace = targetNodeNamespace; + } + + public MERGE_POSITION getPosition() { + return MERGE_POSITION.valueOfLabel(position); + } + + public void setPosition(String position) { + this.position = position; + } + + public boolean isIgnore() { + return ignore; + } + + public void setIgnore(boolean ignore) { + this.ignore = ignore; + } + + public boolean isTransparent() { + return isTransparent; + } + + public void setTransparent(boolean isTransparent) { + this.isTransparent = isTransparent; + } + + public List getUnique() { + return unique; + } + + public void setUnique(List unique) { + this.unique = unique; + } + + public String getConflict() { + return conflict; + } + + public void setConflict(String conflict) { + this.conflict = conflict; + } + + } + } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeHelper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeHelper.java index dbccbb2..425b118 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeHelper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeProcessor.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeProcessor.java index 5a12f08..22f6208 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeProcessor.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergeProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergingMap.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergingMap.java index a2338a1..21c6243 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergingMap.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/generationmodel/merge/MergingMap.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractFactored.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractFactored.java index 12415fe..1050514 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractFactored.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractFactored.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractItem.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractItem.java index e1014ea..10d8869 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractItem.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/AbstractItem.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,18 +21,26 @@ package ru.entaxy.platform.core.producer.executor.objectmodel; import java.util.LinkedList; import java.util.Map; +import java.util.UUID; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import ru.entaxy.platform.base.support.JSONUtils.ObjectWrapper; public abstract class AbstractItem extends ObjectWrapper { + public static final String OBJECT_UUID = "__uuid__"; + public static final String FACTORED_CONTEXT_KEY = "factoredObjects"; + public String jsonPath = ""; public String relativePath = ""; public JsonObject origin; public FactoredObject definedIn = null; + + protected String uuid = null; + protected ObjectModel objectModel; protected AbstractItem(ObjectModel objectModel) { @@ -62,5 +70,23 @@ public abstract class AbstractItem extends ObjectWrapper { public void wrap(JsonObject object, Map context, String path) { this.origin = object; this.jsonPath = path; + if (this.origin.has(OBJECT_UUID)) { + JsonElement je = this.origin.get(OBJECT_UUID); + if (je.isJsonPrimitive()) + if (je.getAsJsonPrimitive().isString()) + this.uuid = je.getAsJsonPrimitive().getAsString(); + } + if (this.uuid == null) { + this.uuid = UUID.randomUUID().toString(); + this.origin.addProperty(OBJECT_UUID, this.uuid); + } } + + public String getUuid() { + return uuid; + } + + public void updateFromOrigin() { + + } } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/Calculation.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/Calculation.java index 641a26f..ceb4b1b 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/Calculation.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/Calculation.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,43 +26,80 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import ru.entaxy.platform.base.objects.factory.EntaxyFactory; +import ru.entaxy.platform.base.support.CommonUtils; import ru.entaxy.platform.base.support.JSONUtils; +import ru.entaxy.platform.base.support.osgi.OSGIUtils; +import ru.entaxy.platform.core.producer.api.EntaxyProducerService; public class Calculation extends AbstractItem { + private static final Logger log = LoggerFactory.getLogger(Calculation.class); + // TODO move const to EntaxyObject - public static final String FIELD_IS_CALCULATED = "isCalculated"; + public static final String FIELD_IS_CALCULATED = "isCalculated"; + + public static final String OWNER_PREFIX = "#OWNER"; + public static final String OWNER_OF_TYPE_PREFIX = "#OWNER_OF_TYPE"; + public static final String FACTORY_PREFIX = "#FACTORY"; + public static final String TYPE_DATA_PREFIX = "#TYPEINFO"; + + public static final String OWNER_TOKEN = "#OWNER#"; + public static final String FACTORY_TOKEN = "#FACTORY#"; + public static final String TYPE_DATA_TOKEN = "#TYPEINFO#"; public static final Object NOT_ENOUGH_DATA = new Object(); public static boolean isCalculated(JsonObject jsonObject) { - if (!jsonObject.has(FIELD_IS_CALCULATED)) - return false; - try { - return jsonObject.get(FIELD_IS_CALCULATED).getAsBoolean(); - } catch (Exception e) { - return false; + boolean result = false; + + // old-style calculated + if (jsonObject.has(FIELD_IS_CALCULATED)) + try { + result = jsonObject.get(FIELD_IS_CALCULATED).getAsBoolean(); + } catch (Exception e) { + // return false; + } + + // new-style calculated + if (jsonObject.has(EntaxyFactory.CONFIGURATION.DIRECTIVES.CALCULATED)) { + result = jsonObject.get(EntaxyFactory.CONFIGURATION.DIRECTIVES.CALCULATED).isJsonObject(); } + return result; } protected ExpressionCalculation expressionCalculation; + protected String targetPath; + protected boolean removeResolved = false; + + protected boolean lazy = true; + public Calculation(ObjectModel objectModel) { super(objectModel); } @Override public void wrap(JsonObject object, Map context, String path) { - if (!ExpressionCalculation.isExpressionCalculation(object)) + + JsonObject content = object; + if (object.has(EntaxyFactory.CONFIGURATION.DIRECTIVES.CALCULATED)) + content = object.get(EntaxyFactory.CONFIGURATION.DIRECTIVES.CALCULATED).getAsJsonObject(); + + if (!ExpressionCalculation.isExpressionCalculation(content)) return; super.wrap(object, context, path); + this.expressionCalculation = new ExpressionCalculation(); - this.expressionCalculation.init(object); + this.expressionCalculation.init(content); AbstractFactored contextOwner = AbstractFactored.getContextOwner(context); if (contextOwner instanceof FactoredObject) @@ -71,26 +108,98 @@ public class Calculation extends AbstractItem { contextOwner.addInternal(this); computeRelativePath(contextOwner.jsonPath); + + if (content.has("targetPath")) { + JsonElement tp = content.get("targetPath"); + if (tp.isJsonNull()) { + this.targetPath = this.relativePath; + } else { + this.targetPath = tp.getAsString(); + } + } else { + this.targetPath = this.relativePath; + } + + if (content.has("removeResolved")) + try { + this.removeResolved = content.get("removeResolved").getAsBoolean(); + } catch (Exception e) { + // NOOP + } + + if (content.has("lazy")) + try { + this.lazy = content.get("lazy").getAsBoolean(); + } catch (Exception e) { + // NOOP + } + + + // System.out.println("\n\n===>>>> [CALCULATION] CREATED [" + contextOwner.factoryId + "/" + this.relativePath + "]"); + } + public Object calculate(ObjectModel objectModel) { + if (this.definedIn == null) + return null; + return calculate(objectModel, this.definedIn); + } public Object calculate(ObjectModel objectModel, FactoredObject factoredObject) { return this.expressionCalculation.calculate(objectModel, factoredObject); } + public String getTargetPath() { + return targetPath; + } + + public boolean isRemoveResolved() { + return removeResolved; + } + + public boolean isLazy() { + return lazy; + } + public static class ExpressionCalculation { // TODO move const to EntaxyObject - public static final String ATTR_EXPRESSION = "expression"; + public static final String ATTR_EXPRESSION = "expression"; + + public static final String ATTR_RESULT_TYPE = "resultType"; + + public static final String ATTR_ALLOW_OBJECTS = "allowObjects"; + public static final String ATTR_ALLOW_ARRAYS = "allowArrays"; + public static final String ATTR_ALLOW_PRIMITIVES = "allowPrimitives"; + public static final String ATTR_ALLOW_NULLS = "allowNulls"; protected static final Object TOKEN_NOT_FOUND = new Object(); + protected static final Object RESULT_NOT_ALLOWED = new Object(); + + protected static final RESULT_TYPE DEFAULT_RESULT_TYPE = RESULT_TYPE.STRING; + + public enum RESULT_TYPE { + STRING, + LIST, + LIST_OR_SINGLE, + MAP; + } JsonObject jsonObject; String expression; + String resultTypeValue = "String"; + + boolean allowObjects = true; + boolean allowArrays = true; + boolean allowPrimitives = true; + boolean allowNulls = false; + List toResolve = new ArrayList<>(); Map resolved = new HashMap<>(); + protected RESULT_TYPE resultType = DEFAULT_RESULT_TYPE; + public static boolean isExpressionCalculation(JsonObject jsonObject) { return jsonObject.has(ATTR_EXPRESSION); } @@ -98,6 +207,33 @@ public class Calculation extends AbstractItem { public void init(JsonObject jsonObject) { this.jsonObject = jsonObject; this.expression = jsonObject.get(ATTR_EXPRESSION).getAsString(); + if (jsonObject.has(ATTR_RESULT_TYPE)) { + this.resultTypeValue = jsonObject.get(ATTR_RESULT_TYPE).getAsString(); + if (CommonUtils.isValid(resultTypeValue)) { + if (RESULT_TYPE.valueOf(this.resultTypeValue.toUpperCase()) != null) + this.resultType = RESULT_TYPE.valueOf(this.resultTypeValue.toUpperCase()); + } + } + try { + allowObjects = jsonObject.get(ATTR_ALLOW_OBJECTS).getAsBoolean(); + } catch (Exception e) { + // NOOP + } + try { + allowArrays = jsonObject.get(ATTR_ALLOW_ARRAYS).getAsBoolean(); + } catch (Exception e) { + // NOOP + } + try { + allowPrimitives = jsonObject.get(ATTR_ALLOW_PRIMITIVES).getAsBoolean(); + } catch (Exception e) { + // NOOP + } + try { + allowNulls = jsonObject.get(ATTR_ALLOW_NULLS).getAsBoolean(); + } catch (Exception e) { + // NOOP + } Pattern pattern = Pattern.compile("\\$\\{.+?\\}"); Matcher matcher = pattern.matcher(this.expression); while (matcher.find()) { @@ -111,7 +247,7 @@ public class Calculation extends AbstractItem { for (String expr: toResolve) { if (!resolved.containsKey(expr)) { Object result = resolve(expr, objectModel, factoredObject); - if (!TOKEN_NOT_FOUND.equals(result)) { + if (!TOKEN_NOT_FOUND.equals(result) && !RESULT_NOT_ALLOWED.equals(result)) { resolved.put(expr, result); } } @@ -124,28 +260,176 @@ public class Calculation extends AbstractItem { } public Object doCalculate() { - String result = expression; - for (Entry entry: resolved.entrySet()) { - Object value = entry.getValue(); - String val = value==null?"":value.toString(); - result = result.replace("${" + entry.getKey() + "}", val); + String expr = expression; + + Object result = null; + List list = new ArrayList<>(); + + switch (this.resultType) { + case LIST: + list.addAll(resolved.values()); + result = list; + break; + case LIST_OR_SINGLE: + list.addAll(resolved.values()); + result = list; + if (list.size()==1) + result = list.get(0); + break; + case MAP: + // TODO + break; + default: + for (Entry entry: resolved.entrySet()) { + Object value = entry.getValue(); + String val = value==null?"":value.toString(); + expr = expr.replace("${" + entry.getKey() + "}", val); + } + result = expr; + break; } - return result; - } - - public Object resolve(String token, ObjectModel objectModel, FactoredObject factoredObject) { - JsonElement result = findElement(factoredObject.origin, token); - if (result == null) - return TOKEN_NOT_FOUND; - return JSONUtils.element2object(result); - } - - public JsonElement findElement(JsonObject jsonObject, String pathFragment) { - JsonElement result = findElement(jsonObject, pathFragment, ""); return result; } + + protected boolean startsWithOwnerPrefix(String token) { + if (!CommonUtils.isValid(token)) + return false; + return token.startsWith(OWNER_PREFIX) + || token.startsWith(OWNER_OF_TYPE_PREFIX); + } + + public Object resolve(String token, ObjectModel objectModel, FactoredObject factoredObject) { + FactoredObject currentObject = factoredObject; + String currentToken = token; + + while (startsWithOwnerPrefix(currentToken) && currentObject!=null) { + int ind = currentToken.substring(1).indexOf("#."); + String subtoken; + if (ind < 0) { + subtoken = currentToken; + currentToken = ""; + } else { + subtoken = currentToken.substring(0, ind+2); + currentToken = currentToken.substring(ind+3); + } + if (Calculation.OWNER_TOKEN.equals(subtoken)) { + currentObject = currentObject.getOwnerObject(); + } else + if (subtoken.startsWith(Calculation.OWNER_OF_TYPE_PREFIX)) { + int i1 = subtoken.indexOf(':'); + if (i1<0) { + log.warn("Incorrect expression: [{}]", subtoken); + break; + } + String typeToFind = subtoken.substring(i1+1, subtoken.length()-1); + + while (currentObject != null) { + currentObject = currentObject.getOwnerObject(); + if (currentObject != null) + if (typeToFind.equals(currentObject.getObjectType())) + break; + } + + } else break; + } + if (currentObject == null) + return TOKEN_NOT_FOUND; + if (!CommonUtils.isValid(currentToken)) + return TOKEN_NOT_FOUND; + JsonObject jsonObject = currentObject.origin; + if (currentToken.startsWith(FACTORY_TOKEN)) { + String factoryId = currentObject.factoryId; + try { + EntaxyProducerService entaxyProducerService = OSGIUtils.services() + .ofClass(EntaxyProducerService.class).get(); + EntaxyFactory f = entaxyProducerService.findFactoryById(factoryId); + jsonObject = JSONUtils.getJsonRootObject(f.getJsonConfiguration()); + currentToken = currentToken.substring(Calculation.FACTORY_TOKEN.length()); + if (currentToken.startsWith(".")) + currentToken = currentToken.substring(1); + + if (currentToken.startsWith(TYPE_DATA_TOKEN)) { + JsonElement je = jsonObject.get(f.getType()); + if ((je != null) && je.isJsonObject() ) + jsonObject = je.getAsJsonObject(); + else + jsonObject = null; + + currentToken = currentToken.substring(Calculation.TYPE_DATA_TOKEN.length()); + if (currentToken.startsWith(".")) + currentToken = currentToken.substring(1); + } + + } catch (Exception e) { + return TOKEN_NOT_FOUND; + } + } + JsonElement result = null; + if (jsonObject != null) + if (CommonUtils.isValid(currentToken)) + result = findElement(jsonObject, currentToken); + else + result = jsonObject; + + if (result == null) + return TOKEN_NOT_FOUND; + if (!valueIsAllowed(result)) + return RESULT_NOT_ALLOWED; + + + return JSONUtils.element2object(result); + } + + protected boolean valueIsAllowed(JsonElement value) { + if (value.isJsonNull() && !allowNulls) + return false; + if (value.isJsonObject()) + if (!allowObjects) + return false; + else { + if (value.getAsJsonObject().has(EntaxyFactory.CONFIGURATION.DIRECTIVES.CALCULATED)) + return false; + } + if (value.isJsonArray() && !allowArrays) + return false; + if (value.isJsonPrimitive() && !allowPrimitives) + return false; + return true; + } + + public JsonElement findElement(JsonObject jsonObject, String pathFragment) { + JsonElement result = null; + if (pathFragment.startsWith("?.")) { + result = findElement(jsonObject, pathFragment.substring(2), ""); + } else { + result = getElement(jsonObject, pathFragment); + } + + return result; + } + public JsonElement getElement(JsonObject jsonObject, String pathFragment) { + int ind = pathFragment.indexOf("."); + String currentFragment; + String newFragment; + if (ind > 0) { + currentFragment = pathFragment.substring(0, ind); + newFragment = pathFragment.substring(ind+1); + } else { + currentFragment = pathFragment; + newFragment = null; + } + if (!jsonObject.has(currentFragment)) + return null; + JsonElement je = jsonObject.get(currentFragment); + if (newFragment == null) + return je; + if (!je.isJsonObject()) + return null; + return getElement(je.getAsJsonObject(), newFragment); + } + public JsonElement findElement(JsonObject jsonObject, String pathFragment, String parentPath) { for (Entry entry: jsonObject.entrySet()) { diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObject.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObject.java index 972208b..6b6fe2b 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObject.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObject.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +32,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import ru.entaxy.platform.base.objects.EntaxyObject; import ru.entaxy.platform.base.objects.EntaxyObject.FIELDS; @@ -39,7 +41,9 @@ public class FactoredObject extends AbstractFactored { private static final Logger log = LoggerFactory.getLogger(FactoredObject.class); public static String EMBEDDED_FIELD = "##embedded"; - + public static final String IGNORE_SECTION = "##ignore"; + + public static String IS_EMBEDDED_FIELD = "isEmbedded"; public List dependsOn = new ArrayList<>(); @@ -96,6 +100,11 @@ public class FactoredObject extends AbstractFactored { this.scope = fo.scope; fo.dependsOn(this); this.definedIn = fo; + if ("#OWNER#".equals(this.factoryId)) { + this.factoryId = fo.factoryId; + this.origin.remove(EntaxyObject.FIELDS.FACTORY_ID); + this.origin.addProperty(EntaxyObject.FIELDS.FACTORY_ID, this.factoryId); + } } log.debug("\t EFFECTIVE SCOPE :: " + this.scope); objectModel.addObject(this); @@ -158,4 +167,26 @@ public class FactoredObject extends AbstractFactored { this.origin.addProperty(IS_EMBEDDED_FIELD, isEmbedded); } + public FactoredObject getOwnerObject() { + if (this.definedIn != null) + return this.definedIn; + if (this.isEmbedded) { + List refs = this.objectModel.refs.stream() + .filter(r->r.isLink) + .filter(r->r.targetObject==this) + .collect(Collectors.toList()); + if (!refs.isEmpty()) + return refs.get(0).definedIn; + } + // try to find refs with 'isDefinitionOrigin' set to 'true' + List refs = this.objectModel.refs.stream() + .filter(r->r.isDefinitionOrigin()) + .filter(r->r.targetObject==this) + .collect(Collectors.toList()); + if (!refs.isEmpty()) + return refs.get(0).definedIn; + + return null; + } + } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectProxy.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectProxy.java index b14d0e2..264b807 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectProxy.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectProxy.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producer-core * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectRef.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectRef.java index bd19a1b..492dc16 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectRef.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoredObjectRef.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,14 +34,18 @@ public class FactoredObjectRef extends AbstractFactored { public static String IS_EXTERNAL_FIELD = "isExternal"; public static String TARGET_ID_FIELD = "targetId"; + public static String TARGET_UUID_FIELD = "targetUuid"; public static String TARGET_TYPE_FIELD = "targetType"; public static String TARGET_VALUE_FIELD = "targetValue"; public static String IS_RESOLVED_FIELD = "isResolved"; + public static String RESOLVE_ALWAYS_FIELD = "resolveAlways"; public static String IS_LINK = "isLink"; + public static String IS_DEFINITION_ORIGIN = "isDefinitionOrigin"; protected FactoredObject targetObject = null; protected String targetId = ""; + protected String targetUuid = ""; protected String targetType = ""; protected boolean isExternal = true; @@ -49,6 +53,8 @@ public class FactoredObjectRef extends AbstractFactored { protected boolean isBackRef = false; protected boolean refByValueOnly = false; protected boolean isLink = false; + protected boolean resolveAlways = false; + protected boolean isDefinitionOrigin = false; public FactoredObjectRef (ObjectModel objectModel) { super(objectModel); @@ -56,10 +62,12 @@ public class FactoredObjectRef extends AbstractFactored { this.origin.addProperty(FIELDS.IS_REF, true); this.origin.addProperty(IS_EXTERNAL_FIELD, false); this.origin.addProperty(TARGET_ID_FIELD, getTargetId()); + this.origin.addProperty(TARGET_UUID_FIELD, getTargetUuid()); this.origin.addProperty(TARGET_TYPE_FIELD, getTargetType()); this.origin.addProperty(FIELDS.FACTORY_ID, this.factoryId); this.origin.addProperty(FIELDS.SCOPE, this.scope); this.origin.addProperty(IS_RESOLVED_FIELD, this.isResolved); + this.origin.addProperty(RESOLVE_ALWAYS_FIELD, this.resolveAlways); this.origin.addProperty(FIELDS.IS_BACK_REF, this.isBackRef); this.origin.addProperty(IS_LINK, false); } @@ -81,10 +89,12 @@ public class FactoredObjectRef extends AbstractFactored { this.origin.addProperty(FIELDS.IS_REF, true); this.origin.addProperty(IS_EXTERNAL_FIELD, false); this.origin.addProperty(TARGET_ID_FIELD, getTargetId()); + this.origin.addProperty(TARGET_UUID_FIELD, getTargetUuid()); this.origin.addProperty(TARGET_TYPE_FIELD, getTargetType()); this.origin.addProperty(FIELDS.FACTORY_ID, this.factoryId); this.origin.addProperty(FIELDS.SCOPE, this.scope); this.origin.addProperty(IS_RESOLVED_FIELD, this.isResolved); + this.origin.addProperty(RESOLVE_ALWAYS_FIELD, this.resolveAlways); this.origin.addProperty(FIELDS.IS_BACK_REF, this.isBackRef); this.origin.addProperty(IS_LINK, this.isLink); @@ -116,12 +126,38 @@ public class FactoredObjectRef extends AbstractFactored { public void wrap(JsonObject object, Map context, String path) { super.wrap(object, context, path); + updateFromObject(object); + + AbstractFactored contextOwner = getContextOwner(context); + if ((contextOwner != null) && (contextOwner instanceof FactoredObject)) { + FactoredObject fo = (FactoredObject)contextOwner; + log.debug("\t IN CONTEXT :: " + fo.factoryId + "[" + fo.jsonPath + "]"); + computeRelativePath(fo.jsonPath); + if (null == this.ownScope || this.ownScope.isEmpty()) + this.scope = fo.scope; + this.definedIn = fo; + } + + + objectModel.addRef(this); + } + + @Override + public void updateFromOrigin() { + super.updateFromOrigin(); + updateFromObject(origin); + } + + protected void updateFromObject(JsonObject object) { if (object.has(TARGET_ID_FIELD)) this.targetId = object.get(TARGET_ID_FIELD).getAsString(); + if (object.has(TARGET_UUID_FIELD)) + this.targetUuid = object.get(TARGET_UUID_FIELD).getAsString(); +/* if (object.has(TARGET_VALUE_FIELD)) - this.targetId = object.get(TARGET_VALUE_FIELD).getAsString(); - + this.targetValue = object.get(TARGET_VALUE_FIELD).getAsString(); +*/ if (object.has(TARGET_TYPE_FIELD)) this.targetType = object.get(TARGET_TYPE_FIELD).getAsString(); @@ -139,6 +175,20 @@ public class FactoredObjectRef extends AbstractFactored { } + if (object.has(RESOLVE_ALWAYS_FIELD)) + try{ + this.resolveAlways = object.get(RESOLVE_ALWAYS_FIELD).getAsBoolean(); + } catch (Exception e) { + + } + + if (object.has(IS_DEFINITION_ORIGIN)) + try{ + this.isDefinitionOrigin = object.get(IS_DEFINITION_ORIGIN).getAsBoolean(); + } catch (Exception e) { + + } + if (object.has(FIELDS.IS_BACK_REF)) try{ this.isBackRef = object.get(FIELDS.IS_BACK_REF).getAsBoolean(); @@ -162,20 +212,8 @@ public class FactoredObjectRef extends AbstractFactored { } - AbstractFactored contextOwner = getContextOwner(context); - if ((contextOwner != null) && (contextOwner instanceof FactoredObject)) { - FactoredObject fo = (FactoredObject)contextOwner; - log.debug("\t IN CONTEXT :: " + fo.factoryId + "[" + fo.jsonPath + "]"); - computeRelativePath(fo.jsonPath); - if (null == this.ownScope || this.ownScope.isEmpty()) - this.scope = fo.scope; - this.definedIn = fo; - } - - - objectModel.addRef(this); } - + public boolean isBackRef() { return isBackRef; } @@ -194,6 +232,14 @@ public class FactoredObjectRef extends AbstractFactored { this.origin.addProperty(IS_RESOLVED_FIELD, this.isResolved); } + public boolean isResolveAlways() { + return resolveAlways; + } + + public void setResolveAlways(boolean resolveAlways) { + this.resolveAlways = resolveAlways; + } + public void setBackRef(boolean isBaskRef) { this.isBackRef = isBaskRef; this.origin.remove(FIELDS.IS_BACK_REF); @@ -216,6 +262,14 @@ public class FactoredObjectRef extends AbstractFactored { return isLink; } + public boolean isDefinitionOrigin() { + return isDefinitionOrigin; + } + + public void setDefinitionOrigin(boolean isDefinitionOrigin) { + this.isDefinitionOrigin = isDefinitionOrigin; + } + public boolean isRefByValueOnly() { return refByValueOnly; } @@ -230,6 +284,10 @@ public class FactoredObjectRef extends AbstractFactored { return targetObject.getObjectId(); } + public String getTargetUuid() { + return targetUuid; + } + public String getTargetType() { if (targetObject == null) return targetType; @@ -244,6 +302,7 @@ public class FactoredObjectRef extends AbstractFactored { if (this.targetObject != null) this.targetObject.references.remove(this); this.targetObject = targetObject; + this.targetUuid = this.targetObject.getUuid(); this.targetObject.references.add(this); if (this.origin == null) log.debug("ORIGIN IS NULL!!!"); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoryChecker.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoryChecker.java index 9e4e9eb..1c47ff7 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoryChecker.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/FactoryChecker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/ObjectModel.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/ObjectModel.java index a986da1..9287c5f 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/ObjectModel.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/objectmodel/ObjectModel.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ package ru.entaxy.platform.core.producer.executor.objectmodel; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import java.util.stream.Collectors; import org.slf4j.Logger; @@ -81,7 +82,9 @@ public class ObjectModel { .collect(Collectors.toList()); for (FactoredObjectRef ref: originRefs) { String targetId = ref.getTargetId(); - List fos = this.objects.stream().filter(fo -> fo.getObjectId().equals(targetId)) + String targetUuid = ref.getTargetUuid(); + List fos = this.objects.stream() + .filter(fo -> (fo.getObjectId().equals(targetId)) || fo.getUuid().equals(targetUuid)) .collect(Collectors.toList()); if (fos.isEmpty()) { @@ -225,6 +228,19 @@ public class ObjectModel { continue; } */ result.add(fo.origin); + + if (fo.origin.has("refConfig") && fo.origin.get("refConfig").isJsonObject()) { + JsonObject refConfig = fo.origin.get("refConfig").getAsJsonObject(); + for (Entry entry: refConfig.entrySet()) { + if (objectRef.origin.has(entry.getKey())) + objectRef.origin.remove(entry.getKey()); + objectRef.origin.add(entry.getKey(), entry.getValue().deepCopy()); + } + objectRef.updateFromOrigin(); + } + + objectRef.setTraverseMap(JSONUtils.element2map(objectRef.origin), null); + log.debug("REPLACING :: " + fo.getObjectId()); JSONUtils.replaceValue(factoredObject.origin, fo.relativePath, objectRef.origin); log.debug("TOTAL REFS :: " + refs.size()); @@ -234,6 +250,27 @@ public class ObjectModel { } else { FactoredObjectRef objectRef = new FactoredObjectRef(this, fo); result.add(fo.origin); + + // keep definedIn attribute in ref + if (fo.definedIn == factoredObject) { + if (objectRef.origin.has(FactoredObjectRef.IS_DEFINITION_ORIGIN)) + objectRef.origin.remove(FactoredObjectRef.IS_DEFINITION_ORIGIN); + objectRef.origin.addProperty(FactoredObjectRef.IS_DEFINITION_ORIGIN, true); + } else { + objectRef.origin.remove(FactoredObjectRef.IS_DEFINITION_ORIGIN); + } + + if (fo.origin.has("refConfig") && fo.origin.get("refConfig").isJsonObject()) { + JsonObject refConfig = fo.origin.get("refConfig").getAsJsonObject(); + for (Entry entry: refConfig.entrySet()) { + if (objectRef.origin.has(entry.getKey())) + objectRef.origin.remove(entry.getKey()); + objectRef.origin.add(entry.getKey(), entry.getValue().deepCopy()); + } + objectRef.updateFromOrigin(); + } + objectRef.setTraverseMap(JSONUtils.element2map(objectRef.origin), null); + JSONUtils.replaceValue(factoredObject.origin, fo.relativePath, objectRef.origin); rootObjects.add(fo); result.addAll(layoutObject(fo, rootObjects)); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactList.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactList.java deleted file mode 100644 index bf33745..0000000 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactList.java +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * ~~~~~~licensing~~~~~~ - * test-producers - * ========== - * Copyright (C) 2020 - 2022 EmDev LLC - * ========== - * Licensed 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. - * ~~~~~~/licensing~~~~~~ - */ -package ru.entaxy.platform.core.producer.executor.support; - -import java.util.Collections; - -import org.apache.commons.collections4.list.AbstractLinkedList; - -import ru.entaxy.platform.core.artifact.Artifact; - -public class ArtifactList extends AbstractLinkedList { - - public ArtifactList() { - super(Collections.emptyList()); - } -} diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactsHelper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactsHelper.java deleted file mode 100644 index 56b24be..0000000 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/ArtifactsHelper.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ~~~~~~licensing~~~~~~ - * test-producers - * ========== - * Copyright (C) 2020 - 2022 EmDev LLC - * ========== - * Licensed 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. - * ~~~~~~/licensing~~~~~~ - */ -package ru.entaxy.platform.core.producer.executor.support; - -import org.osgi.service.component.ComponentContext; -import org.osgi.service.component.annotations.Activate; -import org.osgi.service.component.annotations.CollectionType; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; -import org.osgi.service.component.annotations.ReferenceCardinality; - -import ru.entaxy.platform.core.artifact.service.ArtifactService; - -@Component(immediate = true) -public class ArtifactsHelper { - - protected static ArtifactsHelper instance = null; - - public static ArtifactsHelper getInstance() { - return ArtifactsHelper.instance; - } - - protected ArtifactService artifactService; - - @Activate - public void activate(ComponentContext componentContext) { - // Artifacts.registerSupport(Blueprint.class); - ArtifactsHelper.instance = this; - } - - public ArtifactService getArtifactService() { - return artifactService; - } - - @Reference(unbind = "removeArtifactService", cardinality = ReferenceCardinality.MANDATORY, collectionType = CollectionType.SERVICE) - public void setArtifactService(ArtifactService artifactService) { - this.artifactService = artifactService; - } - - public void removeArtifactService(ArtifactService artifactService) { - this.artifactService = null; - } - - -} diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/DeployedArtifactList.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/DeployedArtifactList.java deleted file mode 100644 index 087318b..0000000 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/DeployedArtifactList.java +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * ~~~~~~licensing~~~~~~ - * test-producers - * ========== - * Copyright (C) 2020 - 2022 EmDev LLC - * ========== - * Licensed 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. - * ~~~~~~/licensing~~~~~~ - */ -package ru.entaxy.platform.core.producer.executor.support; - -import java.util.Collections; - -import org.apache.commons.collections4.list.AbstractLinkedList; - -import ru.entaxy.platform.core.artifact.DeployedArtifact; - -public class DeployedArtifactList extends AbstractLinkedList { - - public DeployedArtifactList() { - super(Collections.emptyList()); - } - -} diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/InstallationResultList.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/InstallationResultList.java deleted file mode 100644 index b7ad3cc..0000000 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/support/InstallationResultList.java +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * ~~~~~~licensing~~~~~~ - * test-producers - * ========== - * Copyright (C) 2020 - 2022 EmDev LLC - * ========== - * Licensed 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. - * ~~~~~~/licensing~~~~~~ - */ -package ru.entaxy.platform.core.producer.executor.support; - -import java.util.Collections; - -import org.apache.commons.collections4.list.AbstractLinkedList; - -import ru.entaxy.platform.core.artifact.installer.builder.InstallationResult; - -public class InstallationResultList extends AbstractLinkedList { - - public InstallationResultList() { - super(Collections.emptyList()); - } - -} diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/CommonObjectProducer.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/CommonObjectProducer.java index f5e42b3..fa12dbf 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/CommonObjectProducer.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/CommonObjectProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,13 +46,14 @@ public class CommonObjectProducer extends DefaultProducer implements GenerationP @Override protected void addFields(AbstractFactoryWrapper factoryWrapper) { super.addFields(factoryWrapper); - factoryWrapper.addField( + /*factoryWrapper.addField( (new FieldInfoImpl()) .name(FIELDS.OBJECT_ID) .type("String") .required(true) .immutable(true) ); + */ } @Override @@ -64,6 +65,15 @@ public class CommonObjectProducer extends DefaultProducer implements GenerationP Map publishedFields = getFieldsToPublish(outputType, scope, objectType, objectId); Map dataToPublish = new HashMap<>(); + + if (parameters.containsKey(FIELDS.FIELDS_TO_PUBLISH)) { + Object obj = parameters.get(FIELDS.FIELDS_TO_PUBLISH); + if (obj instanceof Map) { + Map ownData = (Map)obj; + dataToPublish.putAll(ownData); + } + } + for (Entry entry: publishedFields.entrySet()) dataToPublish.put(entry.getKey(), generated.getProperties().get(entry.getValue())); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/DefaultProducer.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/DefaultProducer.java index 0d4549c..92f3cc8 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/DefaultProducer.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/DefaultProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerInfo.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerInfo.java index d654727..0e2efe2 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerInfo.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerInfo.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerServiceImpl.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerServiceImpl.java index 10ed486..5a7bc61 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerServiceImpl.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/EntaxyProducerServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ */ package ru.entaxy.platform.core.producer.impl; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,6 +61,14 @@ public class EntaxyProducerServiceImpl implements EntaxyProducerService { private static final Logger log = LoggerFactory.getLogger(EntaxyProducerServiceImpl.class); + private static final String LIFECYCLES_FILE_PATH = System.getProperty("karaf.etc") + + File.separator + + "producing.lifecycles.json"; + + protected JsonObject lifecycles = new JsonObject(); + + protected InstructionsHelper instructionsHelper; + protected List producers = new ArrayList<>(); protected Map commandExecutors = new HashMap<>(); @@ -88,6 +97,19 @@ public class EntaxyProducerServiceImpl implements EntaxyProducerService { registerCommand(new Install(this)); registerCommand(new Enrich(this)); registerCommand(new Store(this)); + initLifecycles(); + } + + protected void initLifecycles() { + File lc = new File(LIFECYCLES_FILE_PATH); + if (lc.exists() && lc.canRead()) { + try { + this.lifecycles = JSONUtils.getJsonRootObject(lc.toURI().toURL()); + } catch (Exception e) { + log.warn("Eror reading lifecycles config", e); + } + } + this.instructionsHelper = new InstructionsHelper(this.lifecycles); } @Override @@ -113,7 +135,10 @@ public class EntaxyProducerServiceImpl implements EntaxyProducerService { @Override public ProducerResult produce(JsonObject configuration, String instructions) { try { - return (new ProducingExecutor(configuration, instructions,this)).execute(); + return (new ProducingExecutor(configuration + , instructionsHelper.prepareInstructions(instructions) + ,this)) + .execute(); } catch (Exception e) { log.error("Produce failed", e); return ProducerResult.createFailed(e); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/FieldInfoImpl.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/FieldInfoImpl.java index a0b9870..e3a21e1 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/FieldInfoImpl.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/FieldInfoImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/RefFieldInfoImpl.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/RefFieldInfoImpl.java index 6a9039b..119aa6d 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/RefFieldInfoImpl.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/impl/RefFieldInfoImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/AbstractFactoryWrapper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/AbstractFactoryWrapper.java index 9ef38fe..ca27b5f 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/AbstractFactoryWrapper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/AbstractFactoryWrapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,9 @@ public abstract class AbstractFactoryWrapper implements EntaxyWrappedFactory { public static interface GenerationProcessor { + String PROP_PROCESSOR_ID = "generation.plugin.id"; + String PROP_FACTORY_TYPE = "generation.factory.type"; + public default void preGenerate(EntaxyWrappedFactory wrappedFactory, String outputType, String scope , String objectType, Map parameters) throws EntaxyFactoryException{ @@ -52,6 +55,7 @@ public abstract class AbstractFactoryWrapper implements EntaxyWrappedFactory { this.generationProcessor = generationProcessor; } + @Deprecated public abstract void addField(FieldInfo fieldInfo); public abstract void addField(String outputType, FieldInfo fieldInfo); diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/DefaultFactoryWrapper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/DefaultFactoryWrapper.java index 4fdf939..f62ed3c 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/DefaultFactoryWrapper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/DefaultFactoryWrapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory; import ru.entaxy.esb.platform.runtime.base.connecting.generator.Generated; import ru.entaxy.platform.base.objects.factory.EntaxyFactory; import ru.entaxy.platform.base.objects.factory.EntaxyFactoryException; +import ru.entaxy.platform.base.objects.factory.EntaxyFactoryUtils; import ru.entaxy.platform.core.producer.api.EntaxyWrappedFactory; public class DefaultFactoryWrapper extends AbstractFactoryWrapper implements EntaxyWrappedFactory { @@ -85,6 +86,11 @@ public class DefaultFactoryWrapper extends AbstractFactoryWrapper implements Ent return origin.getType(); } + @Override + public String getDisplayName() { + return origin.getDisplayName(); + } + @Override public String getDescription() { return origin.getDescription(); @@ -199,29 +205,30 @@ public class DefaultFactoryWrapper extends AbstractFactoryWrapper implements Ent BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); try { - ServiceReference[] refs = bundleContext.getAllServiceReferences( + List> refs = /*bundleContext.getAllServiceReferences( GenerationProcessor.class.getName() - , "(|(generation.factory.type~=*)(generation.factory.type~=" + getFactoryType() + "))"); + , "(|(generation.factory.type~=*)(generation.factory.type~=" + getFactoryType() + "))");*/ + GenerationProcessorService.getInstance().getProcessorsRefs(this); - log.debug("FOUND SERVICES: " + (refs==null?"0":refs.length)); + log.debug("FOUND SERVICES: " + (refs==null?"0":refs.size())); if (refs == null) return; - for (int i=0; i r: refs) { try { - GenerationProcessor processor = (GenerationProcessor)bundleContext.getService(refs[i]); + GenerationProcessor processor = (GenerationProcessor)bundleContext.getService(r); processor.preGenerate(this, outputType, scope, getFactoryType(), parameters); } catch (Exception e) { } finally { try { - bundleContext.ungetService(refs[i]); + bundleContext.ungetService(r); } catch (Exception e) { log.warn("Error ungetting service", e); } } } - } catch (InvalidSyntaxException e) { + } catch (Exception e) { log.error("Error getting services", e); } @@ -230,29 +237,30 @@ public class DefaultFactoryWrapper extends AbstractFactoryWrapper implements Ent protected void postGenerateWithPlugins(String outputType, String scope, Map parameters, Generated generated) { BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); try { - ServiceReference[] refs = bundleContext.getAllServiceReferences( + List> refs = /* bundleContext.getAllServiceReferences( GenerationProcessor.class.getName() - , "(|(generation.factory.type~=*)(generation.factory.type~=" + getFactoryType() + "))"); + , "(|(generation.factory.type~=*)(generation.factory.type~=" + getFactoryType() + "))"); */ + GenerationProcessorService.getInstance().getProcessorsRefs(this); - log.debug("FOUND SERVICES: " + (refs==null?"0":refs.length)); + log.debug("FOUND SERVICES: " + (refs==null?"0":refs.size())); if (refs == null) return; - for (int i=0; i r: refs) { try { - GenerationProcessor processor = (GenerationProcessor)bundleContext.getService(refs[i]); + GenerationProcessor processor = (GenerationProcessor)bundleContext.getService(r); processor.postGenerate(this, outputType, scope, getFactoryType(), parameters, generated); } catch (Exception e) { } finally { try { - bundleContext.ungetService(refs[i]); + bundleContext.ungetService(r); } catch (Exception e) { log.warn("Error ungetting service", e); } } } - } catch (InvalidSyntaxException e) { + } catch (Exception e) { log.error("Error getting services", e); } } @@ -262,5 +270,28 @@ public class DefaultFactoryWrapper extends AbstractFactoryWrapper implements Ent return this.origin; } + @Override + public Map getTypeInfo() { + return this.origin.getTypeInfo(); + } + + @Override + public String getJsonConfiguration() { + return EntaxyFactoryUtils.getEffectiveJson(this); + } + @Override + public String getParent() { + return this.origin.getParent(); + } + + @Override + public boolean isAbstract() { + return this.origin.isAbstract(); + } + + @Override + public boolean isDeprecated() { + return this.origin.isDeprecated(); + } } diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/FieldWrapper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/FieldWrapper.java index 671d73e..3440e2c 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/FieldWrapper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/FieldWrapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ package ru.entaxy.platform.core.producer.wrapper; import com.google.gson.JsonObject; import ru.entaxy.platform.base.objects.factory.EntaxyFactory.FieldInfo; +import ru.entaxy.platform.core.producer.impl.EntaxyFactoryDataProcessorService; public class FieldWrapper implements FieldInfo { @@ -63,7 +64,7 @@ public class FieldWrapper implements FieldInfo { @Override public Object getDefaultValue() { - return origin.getDefaultValue(); + return EntaxyFactoryDataProcessorService.getInstance().processDefaultValue(origin.getDefaultValue()); } @Override diff --git a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/RefFieldWrapper.java b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/RefFieldWrapper.java index 63f03eb..d2ac1e3 100644 --- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/RefFieldWrapper.java +++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/wrapper/RefFieldWrapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * test-producers * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/pom.xml b/platform/runtime/core/object-producing/object-producing-config-support/pom.xml index 1613c82..a403d79 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/pom.xml +++ b/platform/runtime/core/object-producing/object-producing-config-support/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime.core object-producing - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.core.object-producing object-producing-config-support diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/AddConfigCommand.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/AddConfigCommand.java index 6ccc9b5..e61e74f 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/AddConfigCommand.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/AddConfigCommand.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigObjectDataResolver.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigObjectDataResolver.java index fb1880a..2ac75d9 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigObjectDataResolver.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigObjectDataResolver.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProcessor.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProcessor.java index 0e0f596..b1dbc6a 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProcessor.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProducer.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProducer.java index 15bd26a..4c1f374 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProducer.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ConfigProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfig.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfig.java index 9aaf747..7a34abd 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfig.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfig.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ public class ObjectConfig { } FieldInfo field = fi.get(); boolean isConfigurable = true; - log.info("\n FIELDNAME:: " + fieldName + " -> " + field.getJsonOrigin()); + log.debug("\n FIELDNAME:: " + fieldName + " -> " + field.getJsonOrigin()); if (field.getJsonOrigin().has(CONFIGURABLE_ATTRIBUTE_NAME)) try { isConfigurable = field.getJsonOrigin().get(CONFIGURABLE_ATTRIBUTE_NAME).getAsBoolean(); diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfigHelper.java b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfigHelper.java index 4d5f08e..0ac9fdc 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfigHelper.java +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/java/ru/entaxy/platform/core/producer/config/ObjectConfigHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * object-producing-config-support * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,6 @@ */ package ru.entaxy.platform.core.producer.config; -import java.util.Optional; - import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; @@ -47,10 +45,7 @@ public class ObjectConfigHelper { } public EntaxyObject findObject(String objectId, String objectType) { - Optional object = entaxyObjectService.getObjects().stream() - .filter(obj -> (obj.getObjectId().equals(objectId) && obj.getObjectType().equals(objectType))) - .findFirst(); - return object.orElse(null); + return entaxyObjectService.findObject(objectId, objectType); } public boolean isDirectValueOnly(FactoredObjectRef ref) { diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/config-field.ftl b/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/config-field.ftl index e424408..cd0c5a7 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/config-field.ftl +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/config-field.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ object-producing-config-support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/init.ftl b/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/init.ftl index 0ec5df1..7f56f66 100644 --- a/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/init.ftl +++ b/platform/runtime/core/object-producing/object-producing-config-support/src/main/resources/ru/entaxy/templates/common-config/init.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ object-producing-config-support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ ~~~~~~/licensing~~~~~~ --] - + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${servicemix-saxon-version} + mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producer-api/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producer-core/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producing-shell/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producing-management/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producing-config-support/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.object-producing/object-producing-resources-support/${project.version} + + osgi.service;effective:=active;objectClass=ru.entaxy.platform.core.producer.resources.ResourceDataProcessor + + + osgi.service;effective:=active;objectClass=ru.entaxy.platform.core.producer.resources.StringFormatterService + - objects-base - entaxy-artifact-management - entaxy-object-producing + objects-base + entaxy-artifact-management + entaxy-object-producing entaxy-legacy-system-api + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.profile-implementation/profile-runtime/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.profile-implementation/profile-producing/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.profile-implementation/profile-storage/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.connection-implementation/standard-connections-pack/${project.version} mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.connection-implementation/connection-producing/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.connector-implementation/connector-producing/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.connector-implementation/standard-connectors-pack/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.connector-implementation/connector-storage/${project.version} + mvn:ru.entaxy.esb.platform.runtime.core.objects-implementations.route-implementation/route-producing/${project.version} @@ -100,7 +120,7 @@ - entaxy-init-manager + entaxy-init-manager @@ -202,25 +222,25 @@ cellar - entaxy-management + entaxy-management mvn:ru.entaxy.esb.platform.runtime.core.management/cluster-node-management/${project.version} entaxy-platform-base - entaxy-artifact-management - entaxy-legacy-system-api - entaxy-legacy-connectors - entaxy-legacy-profile-commons - entaxy-legacy-management-connectors - entaxy-legacy-management - entaxy-management + entaxy-artifact-management + entaxy-legacy-system-api + entaxy-legacy-connectors + entaxy-legacy-profile-commons + entaxy-legacy-management-connectors + entaxy-legacy-management + entaxy-management mvn:ru.entaxy.esb.platform.runtime.core.management/profile-management-service-adapters/${project.version} - entaxy-datasources-initializer - entaxy-legacy-basic-auth + entaxy-datasources-initializer + entaxy-legacy-basic-auth @@ -236,4 +256,4 @@ - \ No newline at end of file + diff --git a/platform/runtime/core/src/main/healthcheck/generated/fragments.xml b/platform/runtime/core/src/main/healthcheck/generated/fragments.xml index c9f0dcc..79f9ef1 100644 --- a/platform/runtime/core/src/main/healthcheck/generated/fragments.xml +++ b/platform/runtime/core/src/main/healthcheck/generated/fragments.xml @@ -1,9 +1,9 @@ - - mvn:ru.entaxy.esb.platform.runtime/core/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories + + mvn:ru.entaxy.esb.platform.runtime/core/1.8.3/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories - - mvn:ru.entaxy.esb.platform.runtime/core/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.ServicesCheck-connections + + mvn:ru.entaxy.esb.platform.runtime/core/1.8.3/cfg/org.apache.felix.hc.generalchecks.ServicesCheck-connections \ No newline at end of file diff --git a/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories.cfg b/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories.cfg index 5aeac77..a7811e7 100644 --- a/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories.cfg +++ b/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-repositories.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # core # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.ServicesCheck-connections.cfg b/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.ServicesCheck-connections.cfg index c8d2e50..acd5a44 100644 --- a/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.ServicesCheck-connections.cfg +++ b/platform/runtime/core/src/main/healthcheck/org.apache.felix.hc.generalchecks.ServicesCheck-connections.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # core # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/cxf-echo/pom.xml b/platform/runtime/modules/cxf-echo/pom.xml index dad9ae8..8e00054 100644 --- a/platform/runtime/modules/cxf-echo/pom.xml +++ b/platform/runtime/modules/cxf-echo/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime modules - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.modules cxf-echo diff --git a/platform/runtime/modules/cxf-echo/src/main/java/ru/entaxy/esb/platform/runtime/modules/echo/CxfEchoServer.java b/platform/runtime/modules/cxf-echo/src/main/java/ru/entaxy/esb/platform/runtime/modules/echo/CxfEchoServer.java index b6089d3..5c622f6 100644 --- a/platform/runtime/modules/cxf-echo/src/main/java/ru/entaxy/esb/platform/runtime/modules/echo/CxfEchoServer.java +++ b/platform/runtime/modules/cxf-echo/src/main/java/ru/entaxy/esb/platform/runtime/modules/echo/CxfEchoServer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * cxf-echo * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/cxf-echo/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/platform/runtime/modules/cxf-echo/src/main/resources/OSGI-INF/blueprint/camel-context.xml index b324091..96dc3d7 100644 --- a/platform/runtime/modules/cxf-echo/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/platform/runtime/modules/cxf-echo/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,14 +3,12 @@ ~~~~~~licensing~~~~~~ cxf-echo ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed 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. diff --git a/platform/runtime/modules/cxf-echo/src/main/resources/ftl/example.ftl b/platform/runtime/modules/cxf-echo/src/main/resources/ftl/example.ftl index 3f9a1bc..cd8f3a0 100644 --- a/platform/runtime/modules/cxf-echo/src/main/resources/ftl/example.ftl +++ b/platform/runtime/modules/cxf-echo/src/main/resources/ftl/example.ftl @@ -1,9 +1,10 @@ +[#ftl] [#-- ~~~~~~licensing~~~~~~ cxf-echo ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,25 +20,4 @@ ~~~~~~/licensing~~~~~~ --] -<#-- - ~~~~~~licensing~~~~~~ - cxf-echo - ========== - Copyright (C) 2020 - 2022 EmDev LLC - ========== - Licensed 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. - ~~~~~~/licensing~~~~~~ ---> -{ -"example": "${body}" -} +${body} diff --git a/platform/runtime/modules/cxf-echo/src/main/resources/xslt/example.xsl b/platform/runtime/modules/cxf-echo/src/main/resources/xslt/example.xsl index 96abf35..66daf16 100644 --- a/platform/runtime/modules/cxf-echo/src/main/resources/xslt/example.xsl +++ b/platform/runtime/modules/cxf-echo/src/main/resources/xslt/example.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ cxf-echo ========== - Copyright (C) 2020 - 2022 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,10 +29,10 @@ - - + + + - diff --git a/platform/runtime/modules/pom.xml b/platform/runtime/modules/pom.xml index 3cdc2f4..b27dd62 100644 --- a/platform/runtime/modules/pom.xml +++ b/platform/runtime/modules/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform runtime - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime modules diff --git a/platform/runtime/modules/src/main/features/features.xml b/platform/runtime/modules/src/main/features/features.xml index 376bdd0..641e672 100644 --- a/platform/runtime/modules/src/main/features/features.xml +++ b/platform/runtime/modules/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ modules ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ + camel-freemarker mvn:ru.entaxy.esb.platform.runtime.modules/cxf-echo/${project.version} diff --git a/platform/runtime/modules/uniform-service/connector/pom.xml b/platform/runtime/modules/uniform-service/connector/pom.xml index 3ea21e7..f1f4c05 100644 --- a/platform/runtime/modules/uniform-service/connector/pom.xml +++ b/platform/runtime/modules/uniform-service/connector/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.modules uniform-service - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/modules/uniform-service/connector/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/platform/runtime/modules/uniform-service/connector/src/main/resources/OSGI-INF/blueprint/camel-context.xml index cabe717..38ed48a 100644 --- a/platform/runtime/modules/uniform-service/connector/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/platform/runtime/modules/uniform-service/connector/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ connector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-in-connector.ftl b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-in-connector.ftl index 50bf75d..8917e96 100644 --- a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-in-connector.ftl +++ b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-in-connector.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ connector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-out-connector.ftl b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-out-connector.ftl index 92441ef..9eff5e2 100644 --- a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-out-connector.ftl +++ b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-active-out-connector.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ connector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-in-connector.ftl b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-in-connector.ftl index 734d919..78fb3f4 100644 --- a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-in-connector.ftl +++ b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-in-connector.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ connector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-out-connector.ftl b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-out-connector.ftl index e59ef0e..6bc443a 100644 --- a/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-out-connector.ftl +++ b/platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-passive-out-connector.ftl @@ -4,7 +4,7 @@ ~~~~~~licensing~~~~~~ connector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/pom.xml b/platform/runtime/modules/uniform-service/pom.xml index 9591fd8..4f11108 100644 --- a/platform/runtime/modules/uniform-service/pom.xml +++ b/platform/runtime/modules/uniform-service/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.platform.runtime modules - 1.8.2.2 + 1.8.3 ru.entaxy.esb.platform.runtime.modules uniform-service diff --git a/platform/runtime/modules/uniform-service/src/main/features/features.xml b/platform/runtime/modules/uniform-service/src/main/features/features.xml index cb0c5ac..7eddd1e 100644 --- a/platform/runtime/modules/uniform-service/src/main/features/features.xml +++ b/platform/runtime/modules/uniform-service/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ uniform-service ========== - Copyright (C) 2020 - 2022 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/src/main/healthcheck/generated/fragments.xml b/platform/runtime/modules/uniform-service/src/main/healthcheck/generated/fragments.xml index 68783a8..1e88bf4 100644 --- a/platform/runtime/modules/uniform-service/src/main/healthcheck/generated/fragments.xml +++ b/platform/runtime/modules/uniform-service/src/main/healthcheck/generated/fragments.xml @@ -1,5 +1,5 @@ - - mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service + + mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/1.8.3/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service \ No newline at end of file diff --git a/platform/runtime/modules/uniform-service/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg b/platform/runtime/modules/uniform-service/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg index 7f935bb..731f3ce 100644 --- a/platform/runtime/modules/uniform-service/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg +++ b/platform/runtime/modules/uniform-service/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # uniform-service # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ # ~~~~~~/licensing~~~~~~ ### requests = [ \ - "http://localhost:8181/cxf/uniform-exchange => 200", \ + "-u admin:admin http://localhost:8181/cxf/uniform-exchange?wsdl => 200", \ ] hc.name="Entaxy Uniform Service" hc.mbean.name="Entaxy.Uniform.Service" diff --git a/platform/runtime/modules/uniform-service/support/pom.xml b/platform/runtime/modules/uniform-service/support/pom.xml index a437720..ba56ab9 100644 --- a/platform/runtime/modules/uniform-service/support/pom.xml +++ b/platform/runtime/modules/uniform-service/support/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.modules uniform-service - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/platform/runtime/modules/uniform-service/support/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 70280ac..dcd6869 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketRequest.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketRequest.xsl index ca69d74..2d5ad50 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketRequest.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketRequest.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketResponse.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketResponse.xsl index 5a72386..8dfacc3 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketResponse.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/ConfirmGettingPacketResponse.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketRequest.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketRequest.xsl index d51d4b0..e4dcffc 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketRequest.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketRequest.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponse.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponse.xsl index 5a72386..8dfacc3 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponse.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponse.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponseTest.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponseTest.xsl index a2ba1f1..a1fabf6 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponseTest.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/GetPacketResponseTest.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketRequest.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketRequest.xsl index 8f21b1c..d21d5d8 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketRequest.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketRequest.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketResponse.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketResponse.xsl index 5a72386..8dfacc3 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketResponse.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/PutPacketResponse.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/address.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/address.xsl index 4271a9e..32e1e4d 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/address.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/address.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketInfos.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketInfos.xsl index 836f94c..d0e10b1 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketInfos.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketInfos.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketPart.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketPart.xsl index 7594d81..d3110f5 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketPart.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/bigPacketPart.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packet.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packet.xsl index 5147f7f..3060d4f 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packet.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packet.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ - + diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packets.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packets.xsl index 7e5bfcb..1ce3271 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packets.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/packets.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ - + diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/request.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/request.xsl index 5039339..5104d8f 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/request.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/request.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/response.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/response.xsl index c3a2539..23161d2 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/response.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/response.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/uuids.xsl b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/uuids.xsl index 09c83db..6dca5f1 100644 --- a/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/uuids.xsl +++ b/platform/runtime/modules/uniform-service/support/src/main/resources/ru/entaxy/esb/platform/runtime/modules/uniform-service/xslt/type/uuids.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ support ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/modules/uniform-service/uniform-service-endpoint/pom.xml b/platform/runtime/modules/uniform-service/uniform-service-endpoint/pom.xml index 960a111..fcb3886 100644 --- a/platform/runtime/modules/uniform-service/uniform-service-endpoint/pom.xml +++ b/platform/runtime/modules/uniform-service/uniform-service-endpoint/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.platform.runtime.modules uniform-service - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/runtime/modules/uniform-service/uniform-service-endpoint/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/platform/runtime/modules/uniform-service/uniform-service-endpoint/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 7dfed30..25c74d5 100644 --- a/platform/runtime/modules/uniform-service/uniform-service-endpoint/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/platform/runtime/modules/uniform-service/uniform-service-endpoint/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ uniform-service-exchange-endpoint ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform/runtime/pom.xml b/platform/runtime/pom.xml index a953f73..e9e59cd 100644 --- a/platform/runtime/pom.xml +++ b/platform/runtime/pom.xml @@ -1,11 +1,9 @@ - + platform ru.entaxy.esb - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/platform/src/main/features/features.xml b/platform/src/main/features/features.xml index a02ab52..1379a12 100644 --- a/platform/src/main/features/features.xml +++ b/platform/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ platform ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,11 +36,13 @@ - + mvn:ru.entaxy.esb.underlying/entaxy-underlying-features/${project.version}/xml/features - + + mvn:ru.entaxy.esb/platform/${project.version}/xml/basics - + + mvn:ru.entaxy.esb/platform/${project.version}/xml/legacy mvn:ru.entaxy.esb.system/system-parent/${project.version}/xml/features mvn:ru.entaxy.esb.platform.runtime/base/${project.version}/xml/features @@ -76,105 +78,12 @@ - - entaxy-underlying-configuration - wrap - - shell - feature - jaas - ssh - management - bundle - config - deployer - diagnostic - feature - instance - kar - log - package - service - system - - mvn:org.apache.felix/org.apache.felix.healthcheck.api/2.0.4 mvn:org.apache.felix/org.apache.felix.healthcheck.core/2.0.12 mvn:org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.14 - - entaxy-underlying-configuration - entaxy-karaf-basic - scheduler - eventadmin - aries-blueprint - - entaxy-karaf-healthcheck - - cellar - cellar-eventadmin - cxf - - - camel - camel-blueprint - camel-jaxb - camel-cxf - camel-amqp - camel-core - camel-http - - hibernate - jdbc - pax-jdbc-pool-dbcp2 - jndi - - camel-eventadmin - camel-quartz - camel-jsonpath - camel-gson - camel-ognl - - entaxy-karaf-commons-support - entaxy-karaf-liquibase-support - - entaxy-karaf-artemis-jms-support - artemis-jms-client - camel-jms - - - - spring - spring-tx - spring-jdbc - jpa - - - ignite-core - entaxy-karaf-ignite-support - camel-ignite - camel-sql - - entaxy-karaf-jaxb-support - - cave-repository - cave-repository-api - - wrapper - shell-compat - camel-jpa - camel-jaxb - camel-base64 - camel-zip-deflater - camel-zipfile - entaxy-freemarker-support - - entaxy-karaf-basic entaxy-karaf-runtime @@ -244,23 +153,4 @@ entaxy-platform-modules - - - - - entaxy-karaf-basic - entaxy-karaf-runtime - - mvn:ru.entaxy.esb.system/system-parent/${project.version}/cfg/ru.entaxy.esb - - entaxy-legacy-main - - - \ No newline at end of file + diff --git a/platform/src/main/healthcheck/generated/fragments.xml b/platform/src/main/healthcheck/generated/fragments.xml index 3b8838f..bcafb5e 100644 --- a/platform/src/main/healthcheck/generated/fragments.xml +++ b/platform/src/main/healthcheck/generated/fragments.xml @@ -1,5 +1,5 @@ - - mvn:ru.entaxy.esb/platform/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform + + mvn:ru.entaxy.esb/platform/1.8.3/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform \ No newline at end of file diff --git a/platform/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform.cfg b/platform/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform.cfg index 5ff141a..2a47c7c 100644 --- a/platform/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform.cfg +++ b/platform/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-platform.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # platform # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform/src/main/scripts/entaxy-platform.install b/platform/src/main/scripts/entaxy-platform.install index cf56c4f..7b423f7 100644 --- a/platform/src/main/scripts/entaxy-platform.install +++ b/platform/src/main/scripts/entaxy-platform.install @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # platform # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pom.xml b/pom.xml index 2a36209..1759921 100644 --- a/pom.xml +++ b/pom.xml @@ -3,47 +3,60 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + + ru.entaxy + entaxy-root + 1.0 + + ru.entaxy.esb root - 1.8.2.2 + 1.8.3 pom ENTAXY :: ESB :: ROOT ENTAXY :: ESB :: ROOT + + update-management + underlying system platform ui + + + update - - UTF-8 - UTF-8 + + + entaxy-public + https://nexus.entaxy.ru/nexus/repository/entaxy-public/ + + - 4.2.9 - 4.2.1 + 1.9.16 2.1.20 - 6.0.0 - 5.0.0 1.4.0 - 3.4.5 2.9.0 + + + 9.9.1-6_1 + 2.8.4 2.19.0 - 3.3.6 5.2.17.Final 2.1.0 1.1.0 - 4.2.1 5.2.5.RELEASE_1 5.2.5.RELEASE 1.3.1.Final @@ -71,7 +84,6 @@ 2.0.1 1.14 1.2.17 - 5.1.1 2.4.0-b180830.0438 2.3.1 2.3.2 @@ -86,26 +98,15 @@ * {local-packages} - - - - - + + + + + Karaf-Commands .* - - - - 2.22.2 - 2.5.2 - 2.8.2 - 3.3.0 - 3.0.0 - 3.1.0 - 3.1.2 - 3.2.0 - 3.3.2 + 2.14.1 @@ -114,12 +115,6 @@ - - org.osgi - osgi.core - ${osgi.version} - provided - org.osgi org.osgi.service.component.annotations @@ -244,12 +239,16 @@ ${liquibase.version} provided + + com.microsoft.sqlserver mssql-jdbc ${mssql.version} provided + + org.postgresql postgresql @@ -301,70 +300,17 @@ false + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.apache.maven.plugins - maven-install-plugin - ${maven-install-plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - - org.codehaus.mojo - license-maven-plugin - 2.0.0 - - - org.apache.karaf.tooling - karaf-services-maven-plugin - ${karaf.version} - - - com.soebes.maven.plugins - iterator-maven-plugin - 0.5.1 - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version}-ENTAXY + + org.apache.felix @@ -380,7 +326,7 @@ ${bundle.osgi.import.pkg} ${bundle.osgi.private.pkg} ${bundle.osgi.dynamicimport.pkg} - + ${bundle.osgi.embed.dependency} ${bundle.osgi.persistence} @@ -429,7 +375,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 11 @@ -511,6 +456,7 @@ + private-deploy @@ -584,101 +530,404 @@ release_plugins - - docker.reposilite - - - local-reposilte-releases - http://127.0.0.1:8081/releases - - - local-reposilte-snapshots - http://127.0.0.1:8081/snapshots - - - - - docker.file.repo - - - entaxy-maven-repo-file - file:./temp/entaxy-docker/karaf/repo - - - - - features - - - + + + + + + prepare-main-features-for-kars + + + mainKars + true + + + + maven-resources-plugin - copy-features - validate + copy-main-features-for-kars + generate-resources copy-resources - ${project.build.directory}/features - + ${project.build.directory}/kars/features + src/main/features true - **/features.xml + *.xml + + + + + + + + + + + + + prepare-update-features-for-kars + + + updateKars + true + + + + + + maven-resources-plugin + + + copy-update-features-for-kars + generate-resources + + copy-resources + + + ${project.build.directory}/kars/features + + + src/update/features + true + + *.xml - + - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-features - package - - attach-artifact - - - - - target/features/features.xml - xml - features - - - - - - - - - - - src/main/features/features.xml - - - + + + + + + + create-attach-kars + + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + define-install-skip + validate + + run + + + true + + + + + + + + + + + + + + + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + default-bundle + none + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + none + + compile + + + + default-testCompile + none + + + + + + maven-install-plugin + + ${install.skip} + + + + + org.apache.karaf.tooling + karaf-services-maven-plugin + + + service-metadata-generate + none + + service-metadata-generate + + + + + + maven-war-plugin + + + default-war + none + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.0 + + + none + + shade + + + + + ${install.skip} + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + collect-features-files-for-kars + process-resources + + run + + + true + + + + + + + + + + + + + ${kars.features.list.tmp} + + + + + + + + + + + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + iterate-features-files-for-kars + prepare-package + + iterator + + + ${iterator.skip} + ${kars.features.list} + ${path.separator} + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + + + + + @item@ + + filename.current=${filename.full} + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/kars/current-properties + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + true + + kar + + + ${project.artifactId}.${filename.current} + + + + + ${project.build.directory}/kars/resources/${filename.current} + resources/system/ + ${project.build.directory}/kars/features/${filename.current}.xml + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + attach-artifact + + + + target/${project.artifactId}.${filename.current}.kar + kar + ${filename.current} + + + + + + + + + + + + + + asciidoctor + org.asciidoctor asciidoctor-maven-plugin 2.2.1 @@ -700,7 +949,7 @@ true - + - true _styles @@ -726,8 +975,8 @@ - - + + @@ -765,13 +1014,18 @@ - + license - !skipLicense + processLicense + true @@ -788,7 +1042,7 @@ ~~~~~~licensing~~~~~~ ~~~~~~/licensing~~~~~~ ========== - + @@ -816,6 +1070,24 @@ + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + timestamp-property + + timestamp-property + + validate + + current.year + yyyy + + + + org.codehaus.mojo license-maven-plugin @@ -887,6 +1159,7 @@ ${license.projectName} ${license.copyrightOwners} ${license.licenseName} + true @@ -897,10 +1170,15 @@ **/*.json **/*.ftl + ${license.update.headers.exclude} properties +

properties

+ properties + properties + xml true @@ -917,7 +1195,6 @@ com.mycila license-maven-plugin - 4.1 update-ftl-header @@ -929,13 +1206,13 @@ EmDev LLC entaxy@entaxy.ru - 2021 + ${current.year} ~~~~~~licensing~~~~~~ -${license.projectName} +${project.artifactId} ========== Copyright (C) 2020 - ${year} ${owner} ========== @@ -976,6 +1253,10 @@ limitations under the License. aggregate.marker + + processLicense + true + @@ -1045,179 +1326,1456 @@ limitations under the License. + + + + + + disable-attaches + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + set-disable-attaches + validate + + run + + + true + + true + + + + + + + + - attach-healthchecks + prepare-attaches-main - - src/main/healthcheck - + + + !skipMainAttach + + + +default.artifact.extension=xml +default.file.folder= +fragments.generate=false +fragments.folder=src/main/features + + +default.artifact.extension=cfg +default.file.folder=etc +fragments.generate=true +fragments.folder=src/main/healthcheck + + +default.artifact.extension=script +default.file.folder=scripts +fragments.generate=true +fragments.folder=src/main/scripts + + maven-resources-plugin - copy-healthchecks - validate + copy-main-attaches + generate-resources copy-resources - ${project.build.directory}/healthcheck - + ${disable.attaches} + ${project.build.directory}/attach-resources/resources + - src/main/healthcheck + src/main true - *.* + features/*.xml + healthcheck/*.cfg + scripts/**/* + + */generated/* + + + + + + + + + + + + + prepare-attaches-update + + + updateAttach + true + + + + +default.artifact.extension=xml +default.file.folder= +fragments.generate=false +fragments.folder=src/update/features + + +default.artifact.extension=cfg +default.file.folder=etc +fragments.generate=true +fragments.folder=src/update/healthcheck + + +default.artifact.extension=script +default.file.folder=updates/${project.version} +fragments.generate=true +fragments.folder=src/update/scripts + + + + + + maven-resources-plugin + + + copy-update-attaches + generate-resources + + copy-resources + + + ${disable.attaches} + ${project.build.directory}/attach-resources/resources + + + src/update/features + true + + *.xml + + + generated/* + + ${project.build.directory}/attach-resources/resources/update.features + + + src/update/healthcheck + true + + *.cfg + + + generated/* + + ${project.build.directory}/attach-resources/resources/update.healthcheck + + + src/update/scripts + true + + **/* + + + generated/* + + ${project.build.directory}/attach-resources/resources/update.scripts - - org.apache.maven.plugins - maven-antrun-plugin - - - collect-healthckeck-configs - prepare-package - - run - - - true - - - - - - - - ${file.list.tmp} - - - - - - - - - + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + + prepare-attaches-lists + generate-resources - run + iterator - - Displaying value of 'file.list' property - [file.list] ${file.list} - + ${skip.attaches} + ${project.build.directory}/attach-resources/resources/ + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + --!!-- @item@ --!!-- + @item@ + + + + + + + + ${file.list.tmp} + + + ${current.defaults} + + + + + + - - - - - - com.soebes.maven.plugins - iterator-maven-plugin - - - iterate-healthcheck-configs - package - - iterator - - - ${file.list} - ${path.separator} - - - - org.apache.maven.plugins - maven-antrun-plugin - - run - - - @item@ - - filename.current=${filename.full} - - + + + + iterate-attaches + prepare-package + + iterator + + + ${skip.attaches} + ${attaches.list} + ${path.separator} + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + @item@ + CURRENT :: ${item.current.local} + + + + :: ${item.type.local} :: ${file.path.local} :: ${file.name.ext.local} + + + +${line.separator} +item.current=${item.current.local} +item.type=${item.type.local} +file.path=${file.path.local} +file.name.ext=${file.name.ext.local} + + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/attach-resources/current.defaults + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + + +LOADED DATA: + +default.artifact.extension=${default.artifact.extension} +default.file.folder=${default.file.folder} +fragments.generate=${fragments.generate} +fragments.folder=${fragments.folder} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + filename.current=${filename.full} +fileext.current=${file.ext} +target.current=${filename.target} +folder.current=${file.folder} +classifier.current=${artifact.classifier} +extension.current=${artifact.extension} +path.current=${item.current} + + + + + - - mvn:${project.groupId}/${project.artifactId}/${project.version}/cfg/${filename.full} + + mvn:${project.groupId}/${project.artifactId}/${project.version}/${artifact.extension}/${artifact.classifier} - ]]> - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - read-project-properties - - - ${project.build.directory}/tmp/properties - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - attach-artifact +]]> + + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/attach-resources/tmp/attach.properties + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + attach-artifact + + + + ${project.build.directory}/attach-resources/resources/${path.current} + ${extension.current} + ${classifier.current} + + + + + + + + + + + + + + + + + + + + + process-update-descriptor + + + src/update/descriptor/descriptor.xml + + + !skipUpdateDescriptor + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + prepare-update-xslt + validate + + copy + + + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + version-list + true + ${project.build.directory}/update/support + version-list.xslt + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + install-plan + true + ${project.build.directory}/update/support + install-plan.xslt + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + component-config + true + ${project.build.directory}/update/support + component-config.xslt + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + component-name + true + ${project.build.directory}/update/support + component-name.xslt + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + components-list + true + ${project.build.directory}/update/support + components-list.xslt + + + ru.entaxy.esb.update-management + update-management-support + ${project.version} + xslt + repositories-list + true + ${project.build.directory}/update/support + repositories-list.xslt + + + + + + + + maven-resources-plugin + + + copy-update-desciptor + validate + + copy-resources + + + ${disable.attaches} + ${project.build.directory}/update/descriptor + + + src/update/descriptor + true + + descriptor.xml + + + + + + + + + + org.codehaus.mojo + xml-maven-plugin + 1.0.2 + + + generate-version-component-repo-list + validate + + transform + + + true + + + ${project.build.directory}/update/descriptor + ${project.build.directory}/update/support/version-list.xslt + ${project.build.directory}/update/descriptor-processed + + + .versions + + + + + ${project.build.directory}/update/descriptor + ${project.build.directory}/update/support/components-list.xslt + ${project.build.directory}/update/descriptor-processed + + + .components + + + + + ${project.build.directory}/update/descriptor + ${project.build.directory}/update/support/repositories-list.xslt + ${project.build.directory}/update/repositories/current + + + .repositories + + + + + + + + + + net.sf.saxon + saxon + 8.7 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + true + + + load-versions-list + validate + + run + + + true + + + + + + + true + + + + false + + + skip.update.versions :: ${skip.update.versions} + + + + + load-components-list + validate + + run + + + true + + + + + + + true + + + + false + + + +skip.update.versions :: ${skip.update.versions} +skip.update.components :: ${skip.update.components} + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + + generate-versions-plans + validate + + iterator + + + ${skip.update.versions} + ${update.versions.list} + ; + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + @item@ + ::${current.item}:: + + + + + + + + + + + + +current.version=${current.item}${line.separator} +current.suffix=${current.suf} +current.folder=${current.fold} + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/update/current.version + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + +current.version=${current.version} +current.suffix=${current.suffix} +current.folder=${current.folder} + + + + + + + org.codehaus.mojo + xml-maven-plugin + + transform + + true + + + ${project.build.directory}/update/descriptor + ${project.build.directory}/update/support/install-plan.xslt + + + currentVersion + ${current.version} + + + ${project.build.directory}/update/descriptor-processed/versions/${current.folder} + + + .plan + + + + + net.sf.saxon.TransformerFactoryImpl + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + true + + + + + + + + +--- +${platform.plan} +--- +${platform.1.8.2.plan} + + + + + + + + + + download-prepare-components-descriptors + validate + + iterator + + + ${skip.update.components} + ${update.components.list} + ; + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + @item@ + +current.component=${current.component} + + + + + +component.groupId=${current.comp.groupId} +component.artifactId=${current.comp.artifactId} +component.version=${current.comp.version} +component.folder=${current.comp.groupId}.${current.comp.artifactId} + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/update/current.component + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + +component.groupId=[${component.groupId}] +component.artifactId=[${component.artifactId}] +component.version=[${component.version}] +component.folder=[${component.folder}] + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + copy + + + + ${component.groupId} + ${component.artifactId} + ${component.version} + xml + update-descriptor + true + ${project.build.directory}/update/components/${component.folder} + descriptor.xml + + + + + + + org.codehaus.mojo + xml-maven-plugin + + transform + + true + + + ${project.build.directory}/update/components/${component.folder} + + descriptor.xml + + ${project.build.directory}/update/support/component-name.xslt + ${project.build.directory}/update/components/${component.folder} + + + .name + + + + + ${project.build.directory}/update/components/${component.folder} + + descriptor.xml + + ${project.build.directory}/update/support/component-config.xslt + ${project.build.directory}/update/components/${component.folder} + + + .config + + + + + ${project.build.directory}/update/components/${component.folder} + + descriptor.xml + + ${project.build.directory}/update/support/repositories-list.xslt + ${project.build.directory}/update/repositories/${component.folder} + + + .repositories + + + + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + prepare-generate-update-config + validate + + iterator + + + ${skip.update.components} + ${project.build.directory}/update/components/ + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + +-- :: @item@ :: -- + + @item@ + + ${component.name}, + + ${component.config} + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-update-config + run + generate-sources + + true + + + + + + + components= + + + + + + +CONFIG CONTENT :: +${update.config.content} + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-update-descriptor + + attach-artifact + + prepare-package - src/main/healthcheck/${filename.current}.cfg - cfg - ${filename.current} + ${project.build.directory}/update/descriptor/descriptor.xml + xml + update-descriptor - - - - - - - - - + + + - + + + + + + + + + create-attach-update-kars + + + + org.apache.maven.plugins + maven-antrun-plugin + + + define-update-kar-skip + process-resources + + run + + + true + + + + + + + + + + + + + + + true + + + + + + + + prepare-resulting-repo-list + process-resources + + run + + + true + ${skip.update.kar} + + + + + + + + + + + assembly-final-kar + prepare-package + + run + + + ${skip.update.kar} + true + + + + + + + false + + + true + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + download-unpack-kars + process-classes + + iterator + + + ${skip.update.kar} + ${update.repo.list} + ; + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + @item@ + + + + + + +repo.groupId=${current.repo.groupId} +repo.artifactId=${current.repo.artifactId} +repo.version=${current.repo.version} +repo.type=${current.repo.type} +repo.classifier=${current.repo.classifier} + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/update/current.repo + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + copy + + + + ${repo.groupId} + ${repo.artifactId} + ${repo.version} + ${repo.type} + ${repo.classifier} + true + ${project.build.directory}/update/final-kar + current.kar + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + false + + + + === !!! UNPACK !!! === +${repo.groupId}/${repo.artifactId}/${repo.version}/${repo.type}/${repo.classifier} + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-result-kar + + attach-artifact + + package + + ${skip.attach.kar.final} + + + ${project.build.directory}/update/final-kar/result.kar + kar + final + + + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + default-bundle + none + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + none + + compile + + + + default-testCompile + none + + + + + + maven-install-plugin + + ${skip.attach.kar.final} + + + + + org.apache.karaf.tooling + karaf-services-maven-plugin + + + service-metadata-generate + none + + service-metadata-generate + + + + + + maven-war-plugin + + + default-war + none + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.0 + + + none + + shade + + + + + true + + + + + + + + + + setVersion @@ -1342,7 +2900,7 @@ limitations under the License. set - true + false true false @@ -1383,83 +2941,626 @@ limitations under the License. - + + + + + + + + docker.reposilite + + + local-reposilte-releases + http://127.0.0.1:8081/releases + + + local-reposilte-snapshots + http://127.0.0.1:8081/snapshots + + + + + + docker.file.repo + + + entaxy-maven-repo-file + file:./temp/entaxy-docker/karaf/repo + + + + + + + features + + + src/main/features/features.xml.___ + + + + + + + maven-resources-plugin + + + copy-features + validate + + copy-resources + + + ${project.build.directory}/features + + + src/main/features + true + + **/features.xml + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-features + package + + attach-artifact + + + + + target/features/features.xml + xml + features + + + + + + + + + + + + + + attach-features + + + src/main/features_ + + + + + + maven-resources-plugin + + + copy-features + process-resources + + copy-resources + + + ${project.build.directory}/features + + + src/main/features + true + + *.xml + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + collect-features-files + prepare-package + + run + + + true + + + + + + + + ${features.list.tmp} + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + iterate-features-files + package + + iterator + + + ${features.list} + ${path.separator} + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + + @item@ + + filename.current=${filename.full} + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/tmp/features-properties + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + attach-artifact + + + + target/features/${filename.current}.xml + xml + ${filename.current} + + + + + + + + + + + + + + + + attach-healthchecks + + + src/main/healthcheck_ + + + + + + maven-resources-plugin + + + copy-healthchecks + validate + + copy-resources + + + ${project.build.directory}/healthcheck + + + src/main/healthcheck + true + + *.* + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + collect-healthckeck-configs + prepare-package + + run + + + true + + + + + + + + ${file.list.tmp} + + + + + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + + iterate-healthcheck-configs + package + + iterator + + + ${file.list} + ${path.separator} + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + + @item@ + + filename.current=${filename.full} + + + + mvn:${project.groupId}/${project.artifactId}/${project.version}/cfg/${filename.full} + + + ]]> + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/tmp/properties + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + attach-artifact + + + + src/main/healthcheck/${filename.current}.cfg + cfg + ${filename.current} + + + + + + + + + + + + + + + + attach-scripts + + + src/main/scripts_ + + + + + + maven-resources-plugin + + + copy-scripts + validate + + copy-resources + + + ${project.build.directory}/scripts + + + src/main/scripts + true + + **/* + generated/* + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + collect-scripts + prepare-package + + run + + + true + + + + + + + + + + ${scripts.list.tmp} + + + + + + + + + + com.soebes.maven.plugins + iterator-maven-plugin + + false + + + + iterate-scripts + package + + iterator + + + ${scripts.list} + ${path.separator} + + + + org.apache.maven.plugins + maven-antrun-plugin + + run + + + + @item@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + filename.current=${filename.full} +fileext.current=${filename.ext} +target.current=${filename.target} +folder.current=${file.folder} +classifier.current=${artifact.classifier} +extension.current=${artifact.extension} +path.current=${item.current} + + + + + mvn:${project.groupId}/${project.artifactId}/${project.version}/${artifact.extension}/${artifact.classifier} + + + ]]> + + + + + + + org.codehaus.mojo + properties-maven-plugin + + read-project-properties + + + ${project.build.directory}/tmp/scripts.properties + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + attach-artifact + + + + ${project.build.directory}/scripts/${path.current} + ${extension.current} + ${classifier.current} + + + + + + + + + + + + + + + + + - - - http://www.emdev.ru - EmDev - - - Jenkins - http://build.emdev.ru/jenkins/ - + scm:git:https://git.emdev.ru/entaxy/entaxy-framework - - - - - entaxy-public - entaxy-public - - https://nexus.entaxy.ru/nexus/repository/entaxy-public/ - default - - true - warn - never - - - false - - - - - - entaxy-private - entaxy-private - - https://nexus.entaxy.ru/nexus/repository/entaxy-private/ - default - - true - warn - never - - - true - warn - never - - - - - - - - entaxy-public - entaxy-public - - https://nexus.entaxy.ru/nexus/repository/entaxy-public/ - default - - true - warn - never - - - false - - - - diff --git a/src/documentation/assembly/assembly.xml b/src/documentation/assembly/assembly.xml index 1827b15..c991631 100644 --- a/src/documentation/assembly/assembly.xml +++ b/src/documentation/assembly/assembly.xml @@ -1,9 +1,8 @@ - - - - documentation - entaxy-documentation-${project.version} - - zip - - - - ${project.build.directory}/documentation - - **/* - - / - - - diff --git a/system/auth/basic-auth/basic-auth-api/pom.xml b/system/auth/basic-auth/basic-auth-api/pom.xml index 70d9f39..380173a 100644 --- a/system/auth/basic-auth/basic-auth-api/pom.xml +++ b/system/auth/basic-auth/basic-auth-api/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system.auth.basic basic-auth - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.auth.basic.api diff --git a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/BasicAuthService.java b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/BasicAuthService.java index 145861b..0e5bcd4 100644 --- a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/BasicAuthService.java +++ b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/BasicAuthService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/BasicAuthAccount.java b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/BasicAuthAccount.java index 19fac0e..dcabe86 100644 --- a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/BasicAuthAccount.java +++ b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/BasicAuthAccount.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithm.java b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithm.java index b2707c7..f49645f 100644 --- a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithm.java +++ b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithm.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithmAttributeConverter.java b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithmAttributeConverter.java index 63d936b..87bdd05 100644 --- a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithmAttributeConverter.java +++ b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/entity/field/EncryptionAlgorithmAttributeConverter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/exception/BadPasswordException.java b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/exception/BadPasswordException.java index 0a5f65c..6229bd4 100644 --- a/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/exception/BadPasswordException.java +++ b/system/auth/basic-auth/basic-auth-api/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/api/exception/BadPasswordException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/pom.xml b/system/auth/basic-auth/basic-auth-impl/pom.xml index 44a1963..f862455 100644 --- a/system/auth/basic-auth/basic-auth-impl/pom.xml +++ b/system/auth/basic-auth/basic-auth-impl/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system.auth.basic basic-auth - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.auth.basic.impl diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/AuthenticationInterceptor.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/AuthenticationInterceptor.java index 3a87ab6..d268513 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/AuthenticationInterceptor.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/AuthenticationInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/SystemInterceptor.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/SystemInterceptor.java index 5411c18..a660e89 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/SystemInterceptor.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/interceptor/SystemInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java index bd64a78..3c7a5ea 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/BasicAuthPostEventListener.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/BasicAuthPostEventListener.java index 64e9864..74cbc61 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/BasicAuthPostEventListener.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/BasicAuthPostEventListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/EntityEventListenerRegistry.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/EntityEventListenerRegistry.java index 02731bd..30bc35f 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/EntityEventListenerRegistry.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/listener/EntityEventListenerRegistry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/util/EncryptionHelper.java b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/util/EncryptionHelper.java index 3e8da07..8d5181e 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/util/EncryptionHelper.java +++ b/system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/util/EncryptionHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * basic-auth-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 3d9fafc..2f63096 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ basic-auth-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/resources/hibernate.cfg.xml b/system/auth/basic-auth/basic-auth-impl/src/main/resources/hibernate.cfg.xml index c26ebf5..8e8965a 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/resources/hibernate.cfg.xml +++ b/system/auth/basic-auth/basic-auth-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ basic-auth-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-impl/src/main/resources/log4j2.properties b/system/auth/basic-auth/basic-auth-impl/src/main/resources/log4j2.properties index 56ebd1f..6227d18 100644 --- a/system/auth/basic-auth/basic-auth-impl/src/main/resources/log4j2.properties +++ b/system/auth/basic-auth/basic-auth-impl/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # basic-auth-impl # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/basic-auth-soap/pom.xml b/system/auth/basic-auth/basic-auth-soap/pom.xml index 74f669d..1fda423 100644 --- a/system/auth/basic-auth/basic-auth-soap/pom.xml +++ b/system/auth/basic-auth/basic-auth-soap/pom.xml @@ -1,11 +1,9 @@ - + basic-auth ru.entaxy.esb.system.auth.basic - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/auth/basic-auth/basic-auth-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/auth/basic-auth/basic-auth-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 2af40ae..4c9ba2b 100644 --- a/system/auth/basic-auth/basic-auth-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/auth/basic-auth/basic-auth-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ basic-auth-soap ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/pom.xml b/system/auth/basic-auth/htpasswd/pom.xml index e58f8a0..e9e063d 100644 --- a/system/auth/basic-auth/htpasswd/pom.xml +++ b/system/auth/basic-auth/htpasswd/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system.auth.basic basic-auth - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.auth.basic.htpasswd diff --git a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/HtpasswdGenerator.java b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/HtpasswdGenerator.java index 3a161dc..e94ab00 100644 --- a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/HtpasswdGenerator.java +++ b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/HtpasswdGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * htpasswd * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/Htpasswd.java b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/Htpasswd.java index 9ca93ea..5f57466 100644 --- a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/Htpasswd.java +++ b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/Htpasswd.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * htpasswd * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/HtpasswdEntry.java b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/HtpasswdEntry.java index 37c211f..d80554d 100644 --- a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/HtpasswdEntry.java +++ b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/entity/HtpasswdEntry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * htpasswd * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/rest/HtpasswdService.java b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/rest/HtpasswdService.java index 7ca93a3..87c9230 100644 --- a/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/rest/HtpasswdService.java +++ b/system/auth/basic-auth/htpasswd/src/main/java/ru/entaxy/esb/system/auth/basic/htpasswd/rest/HtpasswdService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * htpasswd * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/src/main/resources/OSGI-INF/blueprint/htpasswd-context.xml b/system/auth/basic-auth/htpasswd/src/main/resources/OSGI-INF/blueprint/htpasswd-context.xml index 3e75315..c7007fb 100644 --- a/system/auth/basic-auth/htpasswd/src/main/resources/OSGI-INF/blueprint/htpasswd-context.xml +++ b/system/auth/basic-auth/htpasswd/src/main/resources/OSGI-INF/blueprint/htpasswd-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ htpasswd ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/htpasswd/src/main/resources/script/htpasswd-checker.sh b/system/auth/basic-auth/htpasswd/src/main/resources/script/htpasswd-checker.sh index 1829c36..593c043 100644 --- a/system/auth/basic-auth/htpasswd/src/main/resources/script/htpasswd-checker.sh +++ b/system/auth/basic-auth/htpasswd/src/main/resources/script/htpasswd-checker.sh @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # htpasswd # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/auth/basic-auth/pom.xml b/system/auth/basic-auth/pom.xml index eded072..196606a 100644 --- a/system/auth/basic-auth/pom.xml +++ b/system/auth/basic-auth/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.auth system-auth - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.auth.basic diff --git a/system/auth/pom.xml b/system/auth/pom.xml index 180691f..8567242 100644 --- a/system/auth/pom.xml +++ b/system/auth/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system system-parent - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.auth diff --git a/system/commons/pom.xml b/system/commons/pom.xml index 3836e50..9915b2d 100644 --- a/system/commons/pom.xml +++ b/system/commons/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system system-parent - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.commons diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/HeaderMergeAggregatorImpl.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/HeaderMergeAggregatorImpl.java index 6deb149..0c3f336 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/HeaderMergeAggregatorImpl.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/HeaderMergeAggregatorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/TimeoutAwareAggregationStrategyImpl.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/TimeoutAwareAggregationStrategyImpl.java index 8cd7abf..ba9f7da 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/TimeoutAwareAggregationStrategyImpl.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/TimeoutAwareAggregationStrategyImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/hazelcast/DisconnectedMembershipListener.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/hazelcast/DisconnectedMembershipListener.java index 8dca725..f2151a0 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/hazelcast/DisconnectedMembershipListener.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/hazelcast/DisconnectedMembershipListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/IgniteAggregationRepository.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/IgniteAggregationRepository.java index 914f60d..e0d40d0 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/IgniteAggregationRepository.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/IgniteAggregationRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/JdbcAggregationRepository.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/JdbcAggregationRepository.java index acb19d5..bfbb238 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/JdbcAggregationRepository.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/JdbcAggregationRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/PostgresAggregationRepository.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/PostgresAggregationRepository.java index e751b27..2bb6739 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/PostgresAggregationRepository.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/aggregation/repo/PostgresAggregationRepository.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/BundleNotFound.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/BundleNotFound.java index 5f8a489..44700cc 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/BundleNotFound.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/BundleNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ConnectorNotFound.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ConnectorNotFound.java index b150880..0b2f5ce 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ConnectorNotFound.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ConnectorNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/EsbNotFound.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/EsbNotFound.java index a64c0ac..4624168 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/EsbNotFound.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/EsbNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ProfileNotFound.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ProfileNotFound.java index 5760c71..5501993 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ProfileNotFound.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/ProfileNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/TemplateNotFound.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/TemplateNotFound.java index 470068c..1daade2 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/TemplateNotFound.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/exception/TemplateNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/interceptor/SoapHeaderInterceptor.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/interceptor/SoapHeaderInterceptor.java index 1f77300..95192d4 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/interceptor/SoapHeaderInterceptor.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/interceptor/SoapHeaderInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/BundleMarkerService.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/BundleMarkerService.java index b3f396d..dd65cd5 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/BundleMarkerService.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/BundleMarkerService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/NamedReferenceListener.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/NamedReferenceListener.java index c177d71..c0169e0 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/NamedReferenceListener.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/NamedReferenceListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/OSGIUtils.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/OSGIUtils.java index c11ea0c..aaf8327 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/OSGIUtils.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/OSGIUtils.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/ReferenceListener.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/ReferenceListener.java index 8a25039..7a4db44 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/ReferenceListener.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/ReferenceListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/UniformBundleTracker.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/UniformBundleTracker.java index 5c26066..c61dc38 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/UniformBundleTracker.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/UniformBundleTracker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/BundleMarkerServiceImpl.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/BundleMarkerServiceImpl.java index e0a534c..d066089 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/BundleMarkerServiceImpl.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/BundleMarkerServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonNamedReferenceListener.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonNamedReferenceListener.java index ab6a886..1fa3a68 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonNamedReferenceListener.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonNamedReferenceListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonReferenceListener.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonReferenceListener.java index 148c200..e7e4e92 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonReferenceListener.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/osgi/impl/CommonReferenceListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/CustomHeader.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/CustomHeader.java index 9db0143..bbe754c 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/CustomHeader.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/CustomHeader.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/HeadersConverter.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/HeadersConverter.java index 757dc89..5667b85 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/HeadersConverter.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/HeadersConverter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/PropertiesHelper.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/PropertiesHelper.java index ad82851..e999d2b 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/PropertiesHelper.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/PropertiesHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SimpleOutHeaderFilterStrategy.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SimpleOutHeaderFilterStrategy.java index 85b811c..ff293ab 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SimpleOutHeaderFilterStrategy.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SimpleOutHeaderFilterStrategy.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SystemHeadersConstants.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SystemHeadersConstants.java index 2812fdc..d0e007a 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SystemHeadersConstants.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/util/SystemHeadersConstants.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/ValidateInterceptor.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/ValidateInterceptor.java index 18410d1..52d0a33 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/ValidateInterceptor.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/ValidateInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/XmlParser.java b/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/XmlParser.java index 76f5ec2..7ccf71f 100644 --- a/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/XmlParser.java +++ b/system/commons/src/main/java/ru/entaxy/esb/system/common/validator/XmlParser.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/commons/src/main/resources/OSGI-INF/blueprint/blueprint.xml index e847141..43e0b51 100644 --- a/system/commons/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/commons/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-commons ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/commons/src/main/resources/config/bus.commons.cfg b/system/commons/src/main/resources/config/bus.commons.cfg index df365ef..ba8ae19 100644 --- a/system/commons/src/main/resources/config/bus.commons.cfg +++ b/system/commons/src/main/resources/config/bus.commons.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-commons # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/core/dispatcher/pom.xml b/system/core/dispatcher/pom.xml index 1e0174b..1ce35e7 100644 --- a/system/core/dispatcher/pom.xml +++ b/system/core/dispatcher/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.core system-core - 1.8.2.2 + 1.8.3 ../../core/pom.xml diff --git a/system/core/dispatcher/src/main/java/ru/entaxy/esb/system/core/dispatcher/Addressable.java b/system/core/dispatcher/src/main/java/ru/entaxy/esb/system/core/dispatcher/Addressable.java index 36709f7..2e5c844 100644 --- a/system/core/dispatcher/src/main/java/ru/entaxy/esb/system/core/dispatcher/Addressable.java +++ b/system/core/dispatcher/src/main/java/ru/entaxy/esb/system/core/dispatcher/Addressable.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * dispatcher * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/pom.xml b/system/core/error-handler/pom.xml index a8253d8..18309ef 100644 --- a/system/core/error-handler/pom.xml +++ b/system/core/error-handler/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.core system-core - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/interceptor/HandleOutFaultInterceptor.java b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/interceptor/HandleOutFaultInterceptor.java index 70aca86..3b44f43 100644 --- a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/interceptor/HandleOutFaultInterceptor.java +++ b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/interceptor/HandleOutFaultInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * error-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/processor/ErrorProcessor.java b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/processor/ErrorProcessor.java index ce698bf..09d736a 100644 --- a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/processor/ErrorProcessor.java +++ b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/processor/ErrorProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * error-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/util/Timestamp.java b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/util/Timestamp.java index 9b778a7..ca9d73a 100644 --- a/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/util/Timestamp.java +++ b/system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/util/Timestamp.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * error-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/OSGI-INF/blueprint/common-error-handler-context.xml b/system/core/error-handler/src/main/resources/OSGI-INF/blueprint/common-error-handler-context.xml index 8a9815c..f7c69b9 100644 --- a/system/core/error-handler/src/main/resources/OSGI-INF/blueprint/common-error-handler-context.xml +++ b/system/core/error-handler/src/main/resources/OSGI-INF/blueprint/common-error-handler-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/DefaultResponse.xsl b/system/core/error-handler/src/main/resources/xslt/DefaultResponse.xsl index bb85464..0368a93 100644 --- a/system/core/error-handler/src/main/resources/xslt/DefaultResponse.xsl +++ b/system/core/error-handler/src/main/resources/xslt/DefaultResponse.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/UniversalErrorPacket.xsl b/system/core/error-handler/src/main/resources/xslt/UniversalErrorPacket.xsl index c8caf22..424fbff 100644 --- a/system/core/error-handler/src/main/resources/xslt/UniversalErrorPacket.xsl +++ b/system/core/error-handler/src/main/resources/xslt/UniversalErrorPacket.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/WrapSoapEnvelope.xsl b/system/core/error-handler/src/main/resources/xslt/WrapSoapEnvelope.xsl index 7057ed6..ecbc167 100644 --- a/system/core/error-handler/src/main/resources/xslt/WrapSoapEnvelope.xsl +++ b/system/core/error-handler/src/main/resources/xslt/WrapSoapEnvelope.xsl @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/ConfirmGettingPackets.xsl b/system/core/error-handler/src/main/resources/xslt/operation/ConfirmGettingPackets.xsl index f4ceab0..cb8bf21 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/ConfirmGettingPackets.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/ConfirmGettingPackets.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/GetPackets.xsl b/system/core/error-handler/src/main/resources/xslt/operation/GetPackets.xsl index f4ceab0..cb8bf21 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/GetPackets.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/GetPackets.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/PutPackets.xsl b/system/core/error-handler/src/main/resources/xslt/operation/PutPackets.xsl index f4ceab0..cb8bf21 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/PutPackets.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/PutPackets.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/sendAcknowledge.xsl b/system/core/error-handler/src/main/resources/xslt/operation/sendAcknowledge.xsl index 7a6ac05..19c4c21 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/sendAcknowledge.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/sendAcknowledge.xsl @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/sendToJMS.xsl b/system/core/error-handler/src/main/resources/xslt/operation/sendToJMS.xsl index 7a6ac05..19c4c21 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/sendToJMS.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/sendToJMS.xsl @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/error-handler/src/main/resources/xslt/operation/type/response.xsl b/system/core/error-handler/src/main/resources/xslt/operation/type/response.xsl index 3184345..3cccc58 100644 --- a/system/core/error-handler/src/main/resources/xslt/operation/type/response.xsl +++ b/system/core/error-handler/src/main/resources/xslt/operation/type/response.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ error-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/events-api/pom.xml b/system/core/events/events-api/pom.xml index 555d1c0..dc4ff37 100644 --- a/system/core/events/events-api/pom.xml +++ b/system/core/events/events-api/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.events events - 1.8.2.2 + 1.8.3 ../../events/pom.xml diff --git a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/EventTopicService.java b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/EventTopicService.java index 9a40f80..bf34916 100644 --- a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/EventTopicService.java +++ b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/EventTopicService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/SystemSubscriptionService.java b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/SystemSubscriptionService.java index 2e397da..d0a14c1 100644 --- a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/SystemSubscriptionService.java +++ b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/SystemSubscriptionService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/EventTopic.java b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/EventTopic.java index 7170e5d..0971f09 100644 --- a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/EventTopic.java +++ b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/EventTopic.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/SystemSubscription.java b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/SystemSubscription.java index fb9c275..86eefac 100644 --- a/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/SystemSubscription.java +++ b/system/core/events/events-api/src/main/java/ru/entaxy/esb/system/core/events/jpa/entity/SystemSubscription.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-common/pom.xml b/system/core/events/events-common/pom.xml index 534c510..3d39f74 100644 --- a/system/core/events/events-common/pom.xml +++ b/system/core/events/events-common/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.events events - 1.8.2.2 + 1.8.3 ../../events/pom.xml diff --git a/system/core/events/events-common/src/main/java/ru/entaxy/esb/system/core/events/common/SubscriptionType.java b/system/core/events/events-common/src/main/java/ru/entaxy/esb/system/core/events/common/SubscriptionType.java index d469056..068c298 100644 --- a/system/core/events/events-common/src/main/java/ru/entaxy/esb/system/core/events/common/SubscriptionType.java +++ b/system/core/events/events-common/src/main/java/ru/entaxy/esb/system/core/events/common/SubscriptionType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-common * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/events/events-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2744d9b..73accd2 100644 --- a/system/core/events/events-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/events/events-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ events-common ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/pom.xml b/system/core/events/events-handler/pom.xml index c431cfb..0173d9d 100644 --- a/system/core/events/events-handler/pom.xml +++ b/system/core/events/events-handler/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.events events - 1.8.2.2 + 1.8.3 ../../events/pom.xml diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionProcessingGenerator.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionProcessingGenerator.java index a392b2c..46a36f2 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionProcessingGenerator.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionProcessingGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionRouteGenerator.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionRouteGenerator.java index 9f0f4a2..0d9460f 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionRouteGenerator.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/SubscriptionRouteGenerator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventAdminHelper.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventAdminHelper.java index 201aea4..0c2c9c6 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventAdminHelper.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventAdminHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHandlerConstant.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHandlerConstant.java index 290a274..7a5cf86 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHandlerConstant.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHandlerConstant.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHelper.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHelper.java index 00ba075..c224e1c 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHelper.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/EventHelper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/GsonDataFormatInitializer.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/GsonDataFormatInitializer.java index 79e474c..688841e 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/GsonDataFormatInitializer.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/GsonDataFormatInitializer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/HibernateProxyTypeAdapter.java b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/HibernateProxyTypeAdapter.java index fa7eefc..7dd4861 100644 --- a/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/HibernateProxyTypeAdapter.java +++ b/system/core/events/events-handler/src/main/java/ru/entaxy/esb/system/core/events/handler/util/HibernateProxyTypeAdapter.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml index e9bdcc9..3b808bd 100644 --- a/system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ events-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/events-impl/pom.xml b/system/core/events/events-impl/pom.xml index a1f392a..1bded7f 100644 --- a/system/core/events/events-impl/pom.xml +++ b/system/core/events/events-impl/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.events events - 1.8.2.2 + 1.8.3 ../../events/pom.xml diff --git a/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/EventTopicServiceImpl.java b/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/EventTopicServiceImpl.java index 5635e46..a502707 100644 --- a/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/EventTopicServiceImpl.java +++ b/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/EventTopicServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/SystemSubscriptionServiceImpl.java b/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/SystemSubscriptionServiceImpl.java index 1f0122d..b4ce013 100644 --- a/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/SystemSubscriptionServiceImpl.java +++ b/system/core/events/events-impl/src/main/java/ru/entaxy/esb/system/core/events/jpa/impl/SystemSubscriptionServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/events/events-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 0556ae6..52e676f 100644 --- a/system/core/events/events-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/events/events-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ events-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/events-impl/src/main/resources/hibernate.cfg.xml b/system/core/events/events-impl/src/main/resources/hibernate.cfg.xml index 0a4a1b5..318ef54 100644 --- a/system/core/events/events-impl/src/main/resources/hibernate.cfg.xml +++ b/system/core/events/events-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ events-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/pom.xml b/system/core/events/events-rest/pom.xml index 573daaf..65c2b9e 100644 --- a/system/core/events/events-rest/pom.xml +++ b/system/core/events/events-rest/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.events events - 1.8.2.2 + 1.8.3 ../../events/pom.xml diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/ManagementService.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/ManagementService.java index 25532a7..c1fce34 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/ManagementService.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/ManagementService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/SubscriptionService.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/SubscriptionService.java index 8d9c887..da18b1c 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/SubscriptionService.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/SubscriptionService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/TopicProcessor.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/TopicProcessor.java index 3fcbff7..e0ebccf 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/TopicProcessor.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/TopicProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/aggregation/ResponseAggregator.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/aggregation/ResponseAggregator.java index ff841df..11d62f7 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/aggregation/ResponseAggregator.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/aggregation/ResponseAggregator.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionNotFound.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionNotFound.java index 724dd7a..8390822 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionNotFound.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionTypeModificationException.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionTypeModificationException.java index 7ad874a..56305ae 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionTypeModificationException.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SubscriptionTypeModificationException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SystemNotFound.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SystemNotFound.java index 33a32a3..da19486 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SystemNotFound.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/SystemNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicAlreadyExist.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicAlreadyExist.java index 97a57b7..6da5a3c 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicAlreadyExist.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicAlreadyExist.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicNotFound.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicNotFound.java index cd68257..833cbbe 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicNotFound.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/TopicNotFound.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/UnknownSubscriptionType.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/UnknownSubscriptionType.java index ea515ab..30cb944 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/UnknownSubscriptionType.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/exception/UnknownSubscriptionType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CleanResponse.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CleanResponse.java index c9a96ac..435bcb0 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CleanResponse.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CleanResponse.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CreateTopicResponse.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CreateTopicResponse.java index 87b88e2..02b719e 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CreateTopicResponse.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/CreateTopicResponse.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonErrorResponse.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonErrorResponse.java index e97f63b..30989fb 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonErrorResponse.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonErrorResponse.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonSuccessResponse.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonSuccessResponse.java index 14f970c..54f41f5 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonSuccessResponse.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/JsonSuccessResponse.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/Response.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/Response.java index bab62b9..7171aef 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/Response.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/Response.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/SubscriptionResponse.java b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/SubscriptionResponse.java index d24cd8c..22e948c 100644 --- a/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/SubscriptionResponse.java +++ b/system/core/events/events-rest/src/main/java/ru/entaxy/esb/system/core/events/rest/response/SubscriptionResponse.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * events-rest * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c0ca21d..a4d97b8 100644 --- a/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ events-rest ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/events/pom.xml b/system/core/events/pom.xml index 25dc4d2..8c1e5ab 100644 --- a/system/core/events/pom.xml +++ b/system/core/events/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.core system-core - 1.8.2.2 + 1.8.3 ../../core/pom.xml diff --git a/system/core/pom.xml b/system/core/pom.xml index 6c67d6e..837697b 100644 --- a/system/core/pom.xml +++ b/system/core/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system system-parent - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.core diff --git a/system/core/security/permission-api/pom.xml b/system/core/security/permission-api/pom.xml index 487361d..f049f57 100644 --- a/system/core/security/permission-api/pom.xml +++ b/system/core/security/permission-api/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 ../../security/pom.xml diff --git a/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/PermissionService.java b/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/PermissionService.java index 5dc1810..379bd1e 100644 --- a/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/PermissionService.java +++ b/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/PermissionService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/entity/Permission.java b/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/entity/Permission.java index f370afe..96db1b2 100644 --- a/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/entity/Permission.java +++ b/system/core/security/permission-api/src/main/java/ru/entaxy/esb/system/core/permission/jpa/entity/Permission.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-common/pom.xml b/system/core/security/permission-common/pom.xml index 5c6cd6c..f1df86c 100644 --- a/system/core/security/permission-common/pom.xml +++ b/system/core/security/permission-common/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 ../../security/pom.xml diff --git a/system/core/security/permission-common/src/main/java/ru/entaxy/esb/system/core/permission/common/PermissionConstants.java b/system/core/security/permission-common/src/main/java/ru/entaxy/esb/system/core/permission/common/PermissionConstants.java index e556ab6..c95e06e 100644 --- a/system/core/security/permission-common/src/main/java/ru/entaxy/esb/system/core/permission/common/PermissionConstants.java +++ b/system/core/security/permission-common/src/main/java/ru/entaxy/esb/system/core/permission/common/PermissionConstants.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-common * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/security/permission-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml index ae03f92..be8ea3c 100644 --- a/system/core/security/permission-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/security/permission-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-common ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/pom.xml b/system/core/security/permission-component/pom.xml index 34f729c..a09e106 100644 --- a/system/core/security/permission-component/pom.xml +++ b/system/core/security/permission-component/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 ../../security/pom.xml diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionComponent.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionComponent.java index 9c02e5e..55b4283 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionComponent.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionComponent.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionEndpoint.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionEndpoint.java index 2dfb62c..0a450d2 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionEndpoint.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionEndpoint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionProducer.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionProducer.java index 73cba64..b400f10 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionProducer.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/PermissionProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/exception/UnknownOperationException.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/exception/UnknownOperationException.java index cfd745a..260e001 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/exception/UnknownOperationException.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/exception/UnknownOperationException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BaseOperation.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BaseOperation.java index daea307..b45cc9e 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BaseOperation.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BaseOperation.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BulkCreate.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BulkCreate.java index a7e31cb..64c2b7d 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BulkCreate.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/BulkCreate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Check.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Check.java index 449145e..23b33cc 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Check.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Check.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccess.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccess.java index b55e1d2..c4497b6 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccess.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccess.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccessWithException.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccessWithException.java index 84ca917..1a8a0c0 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccessWithException.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckSystemAccessWithException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckWithException.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckWithException.java index 16dba40..7d70c16 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckWithException.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/CheckWithException.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Create.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Create.java index 8001230..df52a13 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Create.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Create.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Delete.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Delete.java index 0dff21a..5ca8e74 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Delete.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Delete.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Get.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Get.java index 53e1fe8..441e87c 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Get.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Get.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/GetByAllParams.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/GetByAllParams.java index 7eee680..09a191e 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/GetByAllParams.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/GetByAllParams.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Operation.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Operation.java index c7aa3a8..5c3e939 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Operation.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Operation.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/OperationFactory.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/OperationFactory.java index 09c1c18..021a0a2 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/OperationFactory.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/OperationFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Update.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Update.java index 589bf71..336224f 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Update.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/operation/Update.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/util/PermissionComponentConstants.java b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/util/PermissionComponentConstants.java index 8f0c1c5..8b61e10 100644 --- a/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/util/PermissionComponentConstants.java +++ b/system/core/security/permission-component/src/main/java/ru/entaxy/esb/system/core/permission/component/util/PermissionComponentConstants.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-component/src/main/resources/log4j2.properties b/system/core/security/permission-component/src/main/resources/log4j2.properties index 2be713d..ed2a352 100644 --- a/system/core/security/permission-component/src/main/resources/log4j2.properties +++ b/system/core/security/permission-component/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # permission-component # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-handler/pom.xml b/system/core/security/permission-handler/pom.xml index 6a8b038..6dfa413 100644 --- a/system/core/security/permission-handler/pom.xml +++ b/system/core/security/permission-handler/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 ../../security/pom.xml diff --git a/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionChecker.java b/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionChecker.java index c176701..15d71c9 100644 --- a/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionChecker.java +++ b/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionChecker.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionCheckerImpl.java b/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionCheckerImpl.java index 3474268..b323e78 100644 --- a/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionCheckerImpl.java +++ b/system/core/security/permission-handler/src/main/java/ru/entaxy/esb/system/core/permission/handler/PermissionCheckerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-handler * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml index df9007f..ec5f80f 100644 --- a/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-handler ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-impl/pom.xml b/system/core/security/permission-impl/pom.xml index 88dde4f..5e98f6b 100644 --- a/system/core/security/permission-impl/pom.xml +++ b/system/core/security/permission-impl/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 ../../security/pom.xml diff --git a/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/interceptor/ServiceInterceptor.java b/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/interceptor/ServiceInterceptor.java index 10ed16f..8bbb8c6 100644 --- a/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/interceptor/ServiceInterceptor.java +++ b/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/interceptor/ServiceInterceptor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java b/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java index 9472c68..d3c6329 100644 --- a/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java +++ b/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/core/security/permission-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 466e768..3478800 100644 --- a/system/core/security/permission-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/core/security/permission-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-impl/src/main/resources/hibernate.cfg.xml b/system/core/security/permission-impl/src/main/resources/hibernate.cfg.xml index 32dc589..0423376 100644 --- a/system/core/security/permission-impl/src/main/resources/hibernate.cfg.xml +++ b/system/core/security/permission-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-soap/pom.xml b/system/core/security/permission-soap/pom.xml index 7c31437..b637bc1 100644 --- a/system/core/security/permission-soap/pom.xml +++ b/system/core/security/permission-soap/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system.core.permission permission - 1.8.2.2 + 1.8.3 permission-soap diff --git a/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml index d6e90e2..da333c3 100644 --- a/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-soap ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-soap/src/main/resources/ru/entaxy/esb/system/core/permission/template/permission.xsl b/system/core/security/permission-soap/src/main/resources/ru/entaxy/esb/system/core/permission/template/permission.xsl index 843c3ef..d81b265 100644 --- a/system/core/security/permission-soap/src/main/resources/ru/entaxy/esb/system/core/permission/template/permission.xsl +++ b/system/core/security/permission-soap/src/main/resources/ru/entaxy/esb/system/core/permission/template/permission.xsl @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ permission-soap ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/permission-soap/src/main/resources/types/permission.ftl b/system/core/security/permission-soap/src/main/resources/types/permission.ftl index a7f8dd5..bf2d583 100644 --- a/system/core/security/permission-soap/src/main/resources/types/permission.ftl +++ b/system/core/security/permission-soap/src/main/resources/types/permission.ftl @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-soap ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/core/security/pom.xml b/system/core/security/pom.xml index 970bbc3..78ceac9 100644 --- a/system/core/security/pom.xml +++ b/system/core/security/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.core system-core - 1.8.2.2 + 1.8.3 ../../core/pom.xml diff --git a/system/core/template/pom.xml b/system/core/template/pom.xml index 60d9e08..d12795e 100644 --- a/system/core/template/pom.xml +++ b/system/core/template/pom.xml @@ -1,11 +1,9 @@ - + system-core ru.entaxy.esb.system.core - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/Template.java b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/Template.java index c0dd25a..b3b499f 100644 --- a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/Template.java +++ b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/Template.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateCollector.java b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateCollector.java index 01302e6..e83dbdc 100644 --- a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateCollector.java +++ b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateImpl.java b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateImpl.java index b964cba..db5fe2e 100644 --- a/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateImpl.java +++ b/system/core/template/src/main/java/ru/entaxy/esb/system/core/template/TemplateImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * template * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/pom.xml b/system/pom.xml index 8556a47..21da4d2 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb root - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system @@ -141,6 +140,77 @@ + + + features-basics + + + + + maven-resources-plugin + + + copy-features-bsics + validate + + copy-resources + + + ${project.build.directory}/features + + + src/main/features + true + + **/basics.xml + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-features-basics + package + + attach-artifact + + + + + target/features/basics.xml + xml + basics + + + + + + + + + + + src/main/features/basics.xml + + + + + diff --git a/system/registry/connectors/connector-api/pom.xml b/system/registry/connectors/connector-api/pom.xml index f9b6f36..cafa23a 100644 --- a/system/registry/connectors/connector-api/pom.xml +++ b/system/registry/connectors/connector-api/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.system.registry.connector connectors - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/Connector.java b/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/Connector.java index 6d9a107..cfae6ba 100644 --- a/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/Connector.java +++ b/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/Connector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/ConnectorParam.java b/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/ConnectorParam.java index c902469..046750b 100644 --- a/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/ConnectorParam.java +++ b/system/registry/connectors/connector-api/src/main/java/ru/entaxy/esb/system/connector/entity/ConnectorParam.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/connectors/connector-impl/pom.xml b/system/registry/connectors/connector-impl/pom.xml index ad6a80f..53f26d6 100644 --- a/system/registry/connectors/connector-impl/pom.xml +++ b/system/registry/connectors/connector-impl/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.system.registry.connector connectors - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorService.java b/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorService.java index f860d03..92a30a8 100644 --- a/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorService.java +++ b/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,5 +40,7 @@ public interface ConnectorService { Connector addConnector(System system, Connector connector); + Connector addNewConnector(System system, Connector connector); + Connector setBundleEntity(Connector connector, BundleEntity bundleEntity); } diff --git a/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java b/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java index 838c252..e21fbc2 100644 --- a/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java +++ b/system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -139,6 +139,21 @@ public class ConnectorServiceImpl implements ConnectorService { return connectorEntity; } + @Override + public Connector addNewConnector(System system, Connector connector) { + Connector connectorEntity = getNewConnector(system, connector.getName()); + if (connectorEntity == null) { + connectorEntity = connector; + connectorEntity.setSystemId(system.getId()); + system.getConnectors().add(connectorEntity); + } else { + connectorEntity.setEditDate(connector.getCreateDate()); + connectorEntity.setEditedBy(connector.getCreatedBy()); + } + this.saveOrUpdate(system); + return connectorEntity; + } + @Override public Connector setBundleEntity(Connector connector, BundleEntity bundleEntity) { bundleEntity.setVersion(connector.getVersion()); @@ -177,4 +192,12 @@ public class ConnectorServiceImpl implements ConnectorService { } return null; } + + private Connector getNewConnector(System system, String name) { + for (Connector connector : system.getConnectors()) { + if (name.equals(connector.getName())) + return connector; + } + return null; + } } diff --git a/system/registry/connectors/connector-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/registry/connectors/connector-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 03b0ce5..3fc3811 100644 --- a/system/registry/connectors/connector-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/registry/connectors/connector-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ connector-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/connectors/connector-impl/src/main/resources/hibernate.cfg.xml b/system/registry/connectors/connector-impl/src/main/resources/hibernate.cfg.xml index dd49927..d20a064 100644 --- a/system/registry/connectors/connector-impl/src/main/resources/hibernate.cfg.xml +++ b/system/registry/connectors/connector-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ connector-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/connectors/pom.xml b/system/registry/connectors/pom.xml index bfb8e40..527f429 100644 --- a/system/registry/connectors/pom.xml +++ b/system/registry/connectors/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.system.registry registry - 1.8.2.2 + 1.8.3 ../../registry/pom.xml 4.0.0 diff --git a/system/registry/pom.xml b/system/registry/pom.xml index 4eb1ab6..e62b038 100644 --- a/system/registry/pom.xml +++ b/system/registry/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system system-parent - 1.8.2.2 + 1.8.3 ru.entaxy.esb.system.registry diff --git a/system/registry/processes/pom.xml b/system/registry/processes/pom.xml index 1b094eb..1c1b3d4 100644 --- a/system/registry/processes/pom.xml +++ b/system/registry/processes/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.registry registry - 1.8.2.2 + 1.8.3 ../../registry/pom.xml diff --git a/system/registry/processes/src/main/java/ru/entaxy/esb/system/registry/processes/EntryPoint.java b/system/registry/processes/src/main/java/ru/entaxy/esb/system/registry/processes/EntryPoint.java index 7fe0205..b8b3b53 100644 --- a/system/registry/processes/src/main/java/ru/entaxy/esb/system/registry/processes/EntryPoint.java +++ b/system/registry/processes/src/main/java/ru/entaxy/esb/system/registry/processes/EntryPoint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * processes * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/pom.xml b/system/registry/profile-commons/pom.xml index deca66e..b7e9e0a 100644 --- a/system/registry/profile-commons/pom.xml +++ b/system/registry/profile-commons/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.registry registry - 1.8.2.2 + 1.8.3 ../../registry/pom.xml diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/CommonProfile.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/CommonProfile.java index 2f77e0c..81119d2 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/CommonProfile.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/CommonProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/ConnectorRegistry.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/ConnectorRegistry.java index db1759d..ac2a61d 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/ConnectorRegistry.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/ConnectorRegistry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/InConnectorCollector.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/InConnectorCollector.java index 44e3a90..dcaee01 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/InConnectorCollector.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/InConnectorCollector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/Profile.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/Profile.java index 5aba51c..6f48da2 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/Profile.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/Profile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/CommonConnector.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/CommonConnector.java index 8f2cc9f..f2bb755 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/CommonConnector.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/CommonConnector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java index 0615aaa..5cd6d72 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java index 581789e..e9f80b2 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/InConnector.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/InConnector.java index c35862b..4ca5ef5 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/InConnector.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/InConnector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/DirectVMOutConnectorImpl.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/DirectVMOutConnectorImpl.java index dc0368a..8ecdef9 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/DirectVMOutConnectorImpl.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/DirectVMOutConnectorImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/OutConnector.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/OutConnector.java index b274c9d..10d3fe5 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/OutConnector.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/out/OutConnector.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java index 40d06e3..fcbb870 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java index 45d6248..9632b40 100644 --- a/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java +++ b/system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-commons * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/profile-commons/src/main/resources/log4j2.properties b/system/registry/profile-commons/src/main/resources/log4j2.properties index eb9c134..5cb5e29 100644 --- a/system/registry/profile-commons/src/main/resources/log4j2.properties +++ b/system/registry/profile-commons/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # profile-commons # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/pom.xml b/system/registry/system-groups/pom.xml index 0cf418a..58f6270 100644 --- a/system/registry/system-groups/pom.xml +++ b/system/registry/system-groups/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system.registry registry - 1.8.2.2 + 1.8.3 ../../registry/pom.xml diff --git a/system/registry/system-groups/system-group-api/pom.xml b/system/registry/system-groups/system-group-api/pom.xml index f70bad1..5154139 100644 --- a/system/registry/system-groups/system-group-api/pom.xml +++ b/system/registry/system-groups/system-group-api/pom.xml @@ -1,11 +1,9 @@ - + system-groups ru.entaxy.esb.system.registry.system-groups - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/SystemGroupRegistryService.java b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/SystemGroupRegistryService.java index 400dd67..0b980a6 100644 --- a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/SystemGroupRegistryService.java +++ b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/SystemGroupRegistryService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupMethodRegistry.java b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupMethodRegistry.java index 3300cb4..613acfc 100644 --- a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupMethodRegistry.java +++ b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupMethodRegistry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupRegistry.java b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupRegistry.java index 3df173d..4e385b2 100644 --- a/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupRegistry.java +++ b/system/registry/system-groups/system-group-api/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/entity/SystemGroupRegistry.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/pom.xml b/system/registry/system-groups/system-group-component/pom.xml index 76dd27a..011d46d 100644 --- a/system/registry/system-groups/system-group-component/pom.xml +++ b/system/registry/system-groups/system-group-component/pom.xml @@ -1,11 +1,9 @@ - + system-groups ru.entaxy.esb.system.registry.system-groups - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupComponent.java b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupComponent.java index 19cd8d0..6f39791 100644 --- a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupComponent.java +++ b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupComponent.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupConsumer.java b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupConsumer.java index 232d17f..f4dd473 100644 --- a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupConsumer.java +++ b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupConsumer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupEndpoint.java b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupEndpoint.java index ee1dbfe..0cbbe37 100644 --- a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupEndpoint.java +++ b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupEndpoint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupProducer.java b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupProducer.java index 214e12e..6bf7aa2 100644 --- a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupProducer.java +++ b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/SystemGroupProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/util/SystemGroupConstants.java b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/util/SystemGroupConstants.java index 5f71219..e16c5f3 100644 --- a/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/util/SystemGroupConstants.java +++ b/system/registry/system-groups/system-group-component/src/main/java/ru/entaxy/esb/system/groups/component/util/SystemGroupConstants.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-component/src/main/resources/log4j2.properties b/system/registry/system-groups/system-group-component/src/main/resources/log4j2.properties index e2fb9bc..75c788f 100644 --- a/system/registry/system-groups/system-group-component/src/main/resources/log4j2.properties +++ b/system/registry/system-groups/system-group-component/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-group-component # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-impl/pom.xml b/system/registry/system-groups/system-group-impl/pom.xml index ec9b79f..fa86531 100644 --- a/system/registry/system-groups/system-group-impl/pom.xml +++ b/system/registry/system-groups/system-group-impl/pom.xml @@ -1,11 +1,9 @@ - + system-groups ru.entaxy.esb.system.registry.system-groups - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/registry/system-groups/system-group-impl/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/impl/SystemGroupRegistryServiceImpl.java b/system/registry/system-groups/system-group-impl/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/impl/SystemGroupRegistryServiceImpl.java index 654cd77..d7a0831 100644 --- a/system/registry/system-groups/system-group-impl/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/impl/SystemGroupRegistryServiceImpl.java +++ b/system/registry/system-groups/system-group-impl/src/main/java/ru/entaxy/esb/system/groups/registry/jpa/impl/SystemGroupRegistryServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/registry/system-groups/system-group-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a4a08e0..eb90c3d 100644 --- a/system/registry/system-groups/system-group-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/registry/system-groups/system-group-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-group-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-impl/src/main/resources/hibernate.cfg.xml b/system/registry/system-groups/system-group-impl/src/main/resources/hibernate.cfg.xml index 3ef5a94..8847676 100644 --- a/system/registry/system-groups/system-group-impl/src/main/resources/hibernate.cfg.xml +++ b/system/registry/system-groups/system-group-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-group-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/pom.xml b/system/registry/system-groups/system-group-profile/pom.xml index 4a5e2e1..1328e2a 100644 --- a/system/registry/system-groups/system-group-profile/pom.xml +++ b/system/registry/system-groups/system-group-profile/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.system.registry.system-groups system-groups - 1.8.2.2 + 1.8.3 ../../system-groups/pom.xml diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-api/pom.xml b/system/registry/system-groups/system-group-profile/system-group-profile-api/pom.xml index 8c44d5c..f8287c2 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-api/pom.xml +++ b/system/registry/system-groups/system-group-profile/system-group-profile-api/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.system-groups.profile system-group-profile - 1.8.2.2 + 1.8.3 ../../system-group-profile/pom.xml diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupCollectorListener.java b/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupCollectorListener.java index 9ae008e..ec451aa 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupCollectorListener.java +++ b/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupCollectorListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-profile-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupProfile.java b/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupProfile.java index 02faa1b..2799798 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupProfile.java +++ b/system/registry/system-groups/system-group-profile/system-group-profile-api/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/SystemGroupProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-profile-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-collector/pom.xml b/system/registry/system-groups/system-group-profile/system-group-profile-collector/pom.xml index 81e517b..bea554e 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-collector/pom.xml +++ b/system/registry/system-groups/system-group-profile/system-group-profile-collector/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.system-groups.profile system-group-profile - 1.8.2.2 + 1.8.3 ../../system-group-profile/pom.xml diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/collector/SystemGroupProfileNamedListener.java b/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/collector/SystemGroupProfileNamedListener.java index 2ce8498..cc38152 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/collector/SystemGroupProfileNamedListener.java +++ b/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/collector/SystemGroupProfileNamedListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-profile-collector * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c7886b6..57a260c 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/registry/system-groups/system-group-profile/system-group-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-group-profile-collector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/pom.xml b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/pom.xml index 559bdd3..4bc0262 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/pom.xml +++ b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.system-groups.profile system-group-profile - 1.8.2.2 + 1.8.3 ../../system-group-profile/pom.xml diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/impl/defaults/DefaultSystemGroupProfile.java b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/impl/defaults/DefaultSystemGroupProfile.java index 0318505..c68f39e 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/impl/defaults/DefaultSystemGroupProfile.java +++ b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/java/ru/entaxy/esb/system/groups/registry/system/groups/profile/impl/defaults/DefaultSystemGroupProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-group-profile-impl-default * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/resources/log4j2.properties b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/resources/log4j2.properties index d49e7eb..126168d 100644 --- a/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/resources/log4j2.properties +++ b/system/registry/system-groups/system-group-profile/system-group-profile-impl-default/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-group-profile-impl-default # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/registry/systems/pom.xml b/system/registry/systems/pom.xml index e8ff0ac..d422882 100644 --- a/system/registry/systems/pom.xml +++ b/system/registry/systems/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.registry registry - 1.8.2.2 + 1.8.3 ../../registry/pom.xml diff --git a/system/registry/systems/system-api/pom.xml b/system/registry/systems/system-api/pom.xml index 04a4fbe..a044166 100644 --- a/system/registry/systems/system-api/pom.xml +++ b/system/registry/systems/system-api/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.systems systems - 1.8.2.2 + 1.8.3 ../../systems/pom.xml diff --git a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/SystemService.java b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/SystemService.java index 60a8755..cc5cf66 100644 --- a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/SystemService.java +++ b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/SystemService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/ExportAllowed.java b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/ExportAllowed.java index d754bff..de5b3d5 100644 --- a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/ExportAllowed.java +++ b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/ExportAllowed.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java index 3ed5e8b..0e9a295 100644 --- a/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java +++ b/system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/pom.xml b/system/registry/systems/system-component/pom.xml index 37578d7..51e3e77 100644 --- a/system/registry/systems/system-component/pom.xml +++ b/system/registry/systems/system-component/pom.xml @@ -1,14 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.registry.systems systems - 1.8.2.2 + 1.8.3 ../../systems/pom.xml diff --git a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemComponent.java b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemComponent.java index 388bd3d..503b404 100644 --- a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemComponent.java +++ b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemComponent.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemConsumer.java b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemConsumer.java index d4cd8f5..04ae4cf 100644 --- a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemConsumer.java +++ b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemConsumer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemEndpoint.java b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemEndpoint.java index dcec752..5ff64c6 100644 --- a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemEndpoint.java +++ b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemEndpoint.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemProducer.java b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemProducer.java index 01b6aa3..986f850 100644 --- a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemProducer.java +++ b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/SystemProducer.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/util/SystemConstants.java b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/util/SystemConstants.java index ad31000..035f7b5 100644 --- a/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/util/SystemConstants.java +++ b/system/registry/systems/system-component/src/main/java/ru/entaxy/esb/system/component/util/SystemConstants.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/main/resources/log4j2.properties b/system/registry/systems/system-component/src/main/resources/log4j2.properties index 7a3c3d8..fccd358 100644 --- a/system/registry/systems/system-component/src/main/resources/log4j2.properties +++ b/system/registry/systems/system-component/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-component # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/test/java/ru/entaxy/esb/system/SystemComponentTest.java b/system/registry/systems/system-component/src/test/java/ru/entaxy/esb/system/SystemComponentTest.java index ebb04a9..77a8f84 100644 --- a/system/registry/systems/system-component/src/test/java/ru/entaxy/esb/system/SystemComponentTest.java +++ b/system/registry/systems/system-component/src/test/java/ru/entaxy/esb/system/SystemComponentTest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-component * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-component/src/test/resources/log4j2.properties b/system/registry/systems/system-component/src/test/resources/log4j2.properties index e7135b3..000a0f9 100644 --- a/system/registry/systems/system-component/src/test/resources/log4j2.properties +++ b/system/registry/systems/system-component/src/test/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-component # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-impl/pom.xml b/system/registry/systems/system-impl/pom.xml index 98a1801..1cd5ab8 100644 --- a/system/registry/systems/system-impl/pom.xml +++ b/system/registry/systems/system-impl/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.systems systems - 1.8.2.2 + 1.8.3 ../../systems/pom.xml diff --git a/system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java b/system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java index 0107ca1..e4932df 100644 --- a/system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java +++ b/system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-impl * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml index b0fe5cd..9494933 100644 --- a/system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-impl/src/main/resources/hibernate.cfg.xml b/system/registry/systems/system-impl/src/main/resources/hibernate.cfg.xml index 8b64e21..2f6a845 100644 --- a/system/registry/systems/system-impl/src/main/resources/hibernate.cfg.xml +++ b/system/registry/systems/system-impl/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-impl ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-profile/pom.xml b/system/registry/systems/system-profile/pom.xml index b908b24..6115dca 100644 --- a/system/registry/systems/system-profile/pom.xml +++ b/system/registry/systems/system-profile/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system.registry.systems systems - 1.8.2.2 + 1.8.3 ../../systems/pom.xml diff --git a/system/registry/systems/system-profile/system-profile-api/pom.xml b/system/registry/systems/system-profile/system-profile-api/pom.xml index bbf4726..8922282 100644 --- a/system/registry/systems/system-profile/system-profile-api/pom.xml +++ b/system/registry/systems/system-profile/system-profile-api/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.systems.profile system-profile - 1.8.2.2 + 1.8.3 ../../system-profile/pom.xml diff --git a/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemCollectorListener.java b/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemCollectorListener.java index c49b907..3b87ccd 100644 --- a/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemCollectorListener.java +++ b/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemCollectorListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-profile-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemProfile.java b/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemProfile.java index 2ebe32d..4ec7f08 100644 --- a/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemProfile.java +++ b/system/registry/systems/system-profile/system-profile-api/src/main/java/ru/entaxy/esb/system/registry/systems/profile/SystemProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-profile-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-profile/system-profile-collector/pom.xml b/system/registry/systems/system-profile/system-profile-collector/pom.xml index 1a7cf40..894b70a 100644 --- a/system/registry/systems/system-profile/system-profile-collector/pom.xml +++ b/system/registry/systems/system-profile/system-profile-collector/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.systems.profile system-profile - 1.8.2.2 + 1.8.3 ../../system-profile/pom.xml diff --git a/system/registry/systems/system-profile/system-profile-collector/src/main/java/ru/entaxy/esb/system/registry/systems/profile/collector/SystemProfileNamedListener.java b/system/registry/systems/system-profile/system-profile-collector/src/main/java/ru/entaxy/esb/system/registry/systems/profile/collector/SystemProfileNamedListener.java index c80065c..726de4e 100644 --- a/system/registry/systems/system-profile/system-profile-collector/src/main/java/ru/entaxy/esb/system/registry/systems/profile/collector/SystemProfileNamedListener.java +++ b/system/registry/systems/system-profile/system-profile-collector/src/main/java/ru/entaxy/esb/system/registry/systems/profile/collector/SystemProfileNamedListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-profile-collector * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-profile/system-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/registry/systems/system-profile/system-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml index b7333e9..75f4ce3 100644 --- a/system/registry/systems/system-profile/system-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/registry/systems/system-profile/system-profile-collector/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-profile-collector ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/registry/systems/system-profile/system-profile-impl-default/pom.xml b/system/registry/systems/system-profile/system-profile-impl-default/pom.xml index e2d1fde..cfaa3e7 100644 --- a/system/registry/systems/system-profile/system-profile-impl-default/pom.xml +++ b/system/registry/systems/system-profile/system-profile-impl-default/pom.xml @@ -1,12 +1,10 @@ - + ru.entaxy.esb.system.registry.systems.profile system-profile - 1.8.2.2 + 1.8.3 ../../system-profile/pom.xml diff --git a/system/registry/systems/system-profile/system-profile-impl-default/src/main/java/ru/entaxy/esb/system/registry/systems/profile/impl/defaults/DefaultSystemProfile.java b/system/registry/systems/system-profile/system-profile-impl-default/src/main/java/ru/entaxy/esb/system/registry/systems/profile/impl/defaults/DefaultSystemProfile.java index 43164a3..3d968cf 100644 --- a/system/registry/systems/system-profile/system-profile-impl-default/src/main/java/ru/entaxy/esb/system/registry/systems/profile/impl/defaults/DefaultSystemProfile.java +++ b/system/registry/systems/system-profile/system-profile-impl-default/src/main/java/ru/entaxy/esb/system/registry/systems/profile/impl/defaults/DefaultSystemProfile.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-profile-impl-default * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.cfg b/system/src/main/cfg/ru.entaxy.esb.cfg index babd4a2..cab9700 100644 --- a/system/src/main/cfg/ru.entaxy.esb.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.deployer.cellar.cfg b/system/src/main/cfg/ru.entaxy.esb.deployer.cellar.cfg index 01ba023..380cec4 100644 --- a/system/src/main/cfg/ru.entaxy.esb.deployer.cellar.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.deployer.cellar.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.deployer.file.system.cfg b/system/src/main/cfg/ru.entaxy.esb.deployer.file.system.cfg index 6e9da9c..26d871f 100644 --- a/system/src/main/cfg/ru.entaxy.esb.deployer.file.system.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.deployer.file.system.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.deployer.nexus.cfg b/system/src/main/cfg/ru.entaxy.esb.deployer.nexus.cfg index 8b6a5e7..9b842ae 100644 --- a/system/src/main/cfg/ru.entaxy.esb.deployer.nexus.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.deployer.nexus.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.error.cfg b/system/src/main/cfg/ru.entaxy.esb.error.cfg index 5bfc235..86b3f55 100644 --- a/system/src/main/cfg/ru.entaxy.esb.error.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.error.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.error.code.cfg b/system/src/main/cfg/ru.entaxy.esb.error.code.cfg index e673734..ae061ae 100644 --- a/system/src/main/cfg/ru.entaxy.esb.error.code.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.error.code.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.error.text.cfg b/system/src/main/cfg/ru.entaxy.esb.error.text.cfg index b807a38..071c17e 100644 --- a/system/src/main/cfg/ru.entaxy.esb.error.text.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.error.text.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.cfg b/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.cfg index 7e2793b..1b3b3b0 100644 --- a/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.htpasswd.cfg b/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.htpasswd.cfg index 3182be7..5a05340 100644 --- a/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.htpasswd.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.system.basic_auth.htpasswd.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.system.event.handler.cfg b/system/src/main/cfg/ru.entaxy.esb.system.event.handler.cfg index cff5775..80242e6 100644 --- a/system/src/main/cfg/ru.entaxy.esb.system.event.handler.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.system.event.handler.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.system.event.rest.cfg b/system/src/main/cfg/ru.entaxy.esb.system.event.rest.cfg index 7b6ba9b..949b1e8 100644 --- a/system/src/main/cfg/ru.entaxy.esb.system.event.rest.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.system.event.rest.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/cfg/ru.entaxy.esb.system.management.cfg b/system/src/main/cfg/ru.entaxy.esb.system.management.cfg index e239830..8fc3616 100644 --- a/system/src/main/cfg/ru.entaxy.esb.system.management.cfg +++ b/system/src/main/cfg/ru.entaxy.esb.system.management.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # karaf-features # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/src/main/features/features.xml b/system/src/main/features/features.xml index fb23ace..ae405ca 100644 --- a/system/src/main/features/features.xml +++ b/system/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ platform ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -41,15 +41,15 @@ mvn:ru.entaxy.esb.platform.runtime/core/${project.version}/xml/features - entaxy-legacy-bridge-profiles - entaxy-legacy-permissions + entaxy-legacy-bridge-profiles + entaxy-legacy-permissions mvn:ru.entaxy.esb.system.management.profile.manager/profile-manager/${project.version} mvn:ru.entaxy.esb.system.management.route.manager/route-manager/${project.version} - entaxy-legacy-management-connectors + entaxy-legacy-management-connectors mvn:ru.entaxy.esb.system.management.bridge.profile.manager/bridge-profile-manager/${project.version} osgi.service;effective:=active;objectClass=org.apache.camel.Component;connection.name=entaxy-broker @@ -63,71 +63,17 @@ entaxy-platform-base - entaxy-artifact-management - entaxy-blueprint-generator - entaxy-legacy-profile-commons - entaxy-legacy-connectors + entaxy-artifact-management + entaxy-blueprint-generator + entaxy-legacy-profile-commons + entaxy-legacy-connectors mvn:ru.entaxy.esb.system.management.bundle.manager/bundle-manager/${project.version} mvn:ru.entaxy.esb.system.management.connector.manager/connector-manager/${project.version} - - entaxy-karaf-basic - entaxy-karaf-runtime - entaxy-legacy-system - - - - - - - - - - - - entaxy-karaf-basic - entaxy-karaf-runtime - entaxy-legacy-esb-config - - mvn:ru.entaxy.esb.system/system-parent/${project.version}/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system - - mvn:ru.entaxy.esb.system.commons/system-commons/${project.version} - mvn:ru.entaxy.esb.system.core/template/${project.version} - - - - - mvn:ru.entaxy.esb.system/system-parent/${project.version}/cfg/ru.entaxy.esb - - - - - - entaxy-legacy-connector-api - entaxy-datasources-initializer + entaxy-legacy-connector-api + entaxy-datasources-initializer mvn:ru.entaxy.esb.system.registry.systems/system-api/${project.version} mvn:ru.entaxy.esb.system.registry.systems/system-impl/${project.version} @@ -206,9 +152,9 @@ - entaxy-legacy-system-api - entaxy-legacy-permissions-api - entaxy-legacy-permissions-pre-basic-auth + entaxy-legacy-system-api + entaxy-legacy-permissions-api + entaxy-legacy-permissions-pre-basic-auth mvn:ru.entaxy.esb.system/system-parent/${project.version}/cfg/ru.entaxy.esb.system.basic_auth @@ -224,15 +170,15 @@ - entaxy-legacy-system-api - entaxy-datasources-initializer - entaxy-storage-initializer + entaxy-legacy-system-api + entaxy-datasources-initializer + entaxy-storage-initializer mvn:ru.entaxy.esb.system.auth.basic.impl/basic-auth-impl/${project.version} mvn:ru.entaxy.esb.system.auth.basic.htpasswd/htpasswd/${project.version} - enatxy-legacy-basic-auth-impl + enatxy-legacy-basic-auth-impl mvn:ru.entaxy.esb.system.auth.basic/basic-auth-soap/${project.version} @@ -276,7 +222,7 @@ - entaxy-legacy-system + entaxy-legacy-system mvn:ru.entaxy.esb.system.core.dispatcher/dispatcher/${project.version} mvn:org.freemarker/freemarker/${freemarker.version} @@ -287,12 +233,12 @@ - entaxy-legacy-bundle-service + entaxy-legacy-bundle-service mvn:ru.entaxy.esb.system.registry.connector/connector-api/${project.version} - entaxy-legacy-connector-api + entaxy-legacy-connector-api mvn:ru.entaxy.esb.system.registry.connector/connector-impl/${project.version} @@ -327,7 +273,7 @@ - entaxy-legacy-permissions-api + entaxy-legacy-permissions-api mvn:ru.entaxy.esb.system.core.permission/permission-handler/${project.version} mvn:ru.entaxy.esb.system.core.permission/permission-component/${project.version} @@ -336,9 +282,9 @@ - entaxy-legacy-permissions-api + entaxy-legacy-permissions-api - entaxy-legacy-permissions-pre-basic-auth + entaxy-legacy-permissions-pre-basic-auth entaxy-legacy-basic-auth @@ -347,4 +293,4 @@ - \ No newline at end of file + diff --git a/system/src/main/healthcheck/generated/fragments.xml b/system/src/main/healthcheck/generated/fragments.xml index 9dcbdea..98d9a22 100644 --- a/system/src/main/healthcheck/generated/fragments.xml +++ b/system/src/main/healthcheck/generated/fragments.xml @@ -1,5 +1,5 @@ - - mvn:ru.entaxy.esb.system/system-parent/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system + + mvn:ru.entaxy.esb.system/system-parent/1.8.3/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system \ No newline at end of file diff --git a/system/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system.cfg b/system/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system.cfg index 3785458..c7a95f8 100644 --- a/system/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system.cfg +++ b/system/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-parent # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/pom.xml b/system/system-management/bridge-profile-manager/pom.xml index 68199af..a3a5c5c 100644 --- a/system/system-management/bridge-profile-manager/pom.xml +++ b/system/system-management/bridge-profile-manager/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManager.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManager.java index e7b2354..98723c3 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManager.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManagerImpl.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManagerImpl.java index 1dfc57a..5c8a3b0 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManagerImpl.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/BridgeProfileManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/dto/BridgeProfileDto.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/dto/BridgeProfileDto.java index 440ac2a..b5186ff 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/dto/BridgeProfileDto.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/dto/BridgeProfileDto.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/mapper/BridgeProfileMapper.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/mapper/BridgeProfileMapper.java index 3aebcbd..cebfe5a 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/mapper/BridgeProfileMapper.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/mapper/BridgeProfileMapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManager.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManager.java index 9fafc69..90aed49 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManager.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManagerImpl.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManagerImpl.java index 3e32fda..43f802f 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManagerImpl.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSender.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSender.java index 2bc355a..e86d0b4 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSender.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSender.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSenderImpl.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSenderImpl.java index 396d541..9875914 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSenderImpl.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileSenderImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileType.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileType.java index cd331db..5fc7371 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileType.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/sender/BridgeProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/service/BridgeService.java b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/service/BridgeService.java index 6fd5dd2..896dbb4 100644 --- a/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/service/BridgeService.java +++ b/system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/service/BridgeService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bridge-profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bridge-profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/bridge-profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 452b978..86611ba 100644 --- a/system/system-management/bridge-profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/bridge-profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ bridge-profile-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-manager/pom.xml b/system/system-management/bundle-manager/pom.xml index 2b03ac8..54d825b 100644 --- a/system/system-management/bundle-manager/pom.xml +++ b/system/system-management/bundle-manager/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManager.java b/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManager.java index 42a1f1a..cc31374 100644 --- a/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManager.java +++ b/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManagerImpl.java b/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManagerImpl.java index c240557..ad64166 100644 --- a/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManagerImpl.java +++ b/system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/bundle-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 54931be..c96282c 100644 --- a/system/system-management/bundle-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/bundle-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ bundle-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/pom.xml b/system/system-management/bundle-service/pom.xml index 263b847..d6afccf 100644 --- a/system/system-management/bundle-service/pom.xml +++ b/system/system-management/bundle-service/pom.xml @@ -1,11 +1,9 @@ - + management ru.entaxy.esb.system - 1.8.2.2 + 1.8.3 ../pom.xml 4.0.0 diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleService.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleService.java index e4a1cc2..7de4692 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleService.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleServiceImpl.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleServiceImpl.java index 1fcf55e..11d5214 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleServiceImpl.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/BundleServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleDto.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleDto.java index 1610aea..6bad512 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleDto.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleDto.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleStatus.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleStatus.java index fcedb25..2f0b1d3 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleStatus.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/dto/BundleStatus.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleEntity.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleEntity.java index a20dc31..be30606 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleEntity.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleEntity.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleType.java b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleType.java index d09a3d0..dfd18c4 100644 --- a/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleType.java +++ b/system/system-management/bundle-service/src/main/java/ru/entaxy/esb/system/management/bundle/jpa/entity/BundleType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * bundle-service * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/system-management/bundle-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 72016f7..ae003f3 100644 --- a/system/system-management/bundle-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/system-management/bundle-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ bundle-service ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/bundle-service/src/main/resources/hibernate.cfg.xml b/system/system-management/bundle-service/src/main/resources/hibernate.cfg.xml index e052302..a09cca9 100644 --- a/system/system-management/bundle-service/src/main/resources/hibernate.cfg.xml +++ b/system/system-management/bundle-service/src/main/resources/hibernate.cfg.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ bundle-service ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/connector-manager/pom.xml b/system/system-management/connector-manager/pom.xml index 653e0ee..72c8558 100644 --- a/system/system-management/connector-manager/pom.xml +++ b/system/system-management/connector-manager/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManager.java b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManager.java index 5cb2c0d..2c835b6 100644 --- a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManager.java +++ b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManagerImpl.java b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManagerImpl.java index ca620e0..d87d6b2 100644 --- a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManagerImpl.java +++ b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/ConnectorManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/dto/ConnectorDto.java b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/dto/ConnectorDto.java index 3f6cd8d..3f3ae2c 100644 --- a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/dto/ConnectorDto.java +++ b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/dto/ConnectorDto.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/mapper/ConnectorMapper.java b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/mapper/ConnectorMapper.java index 1c18a66..ca8c813 100644 --- a/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/mapper/ConnectorMapper.java +++ b/system/system-management/connector-manager/src/main/java/ru/entaxy/esb/system/management/connector/manager/mapper/ConnectorMapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * connector-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/connector-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/connector-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 8e8944b..8469ef9 100644 --- a/system/system-management/connector-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/connector-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ connector-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/file-upload/pom.xml b/system/system-management/file-upload/pom.xml index 731789f..82479fb 100644 --- a/system/system-management/file-upload/pom.xml +++ b/system/system-management/file-upload/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadProcessor.java b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadProcessor.java index 4482daf..9ac8d08 100644 --- a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadProcessor.java +++ b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadProcessor.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * file-upload * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadService.java b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadService.java index a10afe4..28c0318 100644 --- a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadService.java +++ b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * file-upload * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadServiceImpl.java b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadServiceImpl.java index e1fa0d8..a27bd55 100644 --- a/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadServiceImpl.java +++ b/system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * file-upload * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/file-upload/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/file-upload/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 8428efa..d725a24 100644 --- a/system/system-management/file-upload/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/file-upload/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,14 +3,12 @@ ~~~~~~licensing~~~~~~ events-rest ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed 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. diff --git a/system/system-management/permission-manager/pom.xml b/system/system-management/permission-manager/pom.xml index 5098b5b..8caa06d 100644 --- a/system/system-management/permission-manager/pom.xml +++ b/system/system-management/permission-manager/pom.xml @@ -1,11 +1,9 @@ - + ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml 4.0.0 diff --git a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManager.java b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManager.java index 0d294e0..70c73df 100644 --- a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManager.java +++ b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManagerImpl.java b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManagerImpl.java index 28b0672..c253ad0 100644 --- a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManagerImpl.java +++ b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/PermissionManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/dto/PermissionDto.java b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/dto/PermissionDto.java index 38b8a71..724b628 100644 --- a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/dto/PermissionDto.java +++ b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/dto/PermissionDto.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/mapper/PermissionMapper.java b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/mapper/PermissionMapper.java index 76e3b14..14ba762 100644 --- a/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/mapper/PermissionMapper.java +++ b/system/system-management/permission-manager/src/main/java/ru/entaxy/esb/system/management/permission/manager/mapper/PermissionMapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * permission-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/permission-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/system/system-management/permission-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 4f2590b..b78997d 100644 --- a/system/system-management/permission-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/system/system-management/permission-manager/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ permission-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/pom.xml b/system/system-management/pom.xml index 17191ca..31d6aed 100644 --- a/system/system-management/pom.xml +++ b/system/system-management/pom.xml @@ -1,11 +1,9 @@ - + system-parent ru.entaxy.esb.system - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/system-management/profile-manager/pom.xml b/system/system-management/profile-manager/pom.xml index a93d01a..84d1bb1 100644 --- a/system/system-management/profile-manager/pom.xml +++ b/system/system-management/profile-manager/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManager.java b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManager.java index 5be4ef8..82a5160 100644 --- a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManager.java +++ b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java index 63a8704..665a08c 100644 --- a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java +++ b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,6 +178,7 @@ public class ProfileManagerImpl implements ProfileManager { } permissionManager.removeAllPermission(system.getId()); routeManager.uninstallDefaultRoute(system.getName()); + routeManager.uninstallDefaultRoute(system.getName() + "-default-route"); // fixme temporary solution } public void setProfileMapper(ProfileMapper profileMapper) { diff --git a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java index f7bb3d3..818bba3 100644 --- a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java +++ b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java index ec114bb..c67e973 100644 --- a/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java +++ b/system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * profile-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml index 10189a9..888869b 100644 --- a/system/system-management/profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/profile-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ profile-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/route-manager/pom.xml b/system/system-management/route-manager/pom.xml index 9be5404..655ca24 100644 --- a/system/system-management/route-manager/pom.xml +++ b/system/system-management/route-manager/pom.xml @@ -1,11 +1,9 @@ - + management ru.entaxy.esb.system - 1.8.2.2 + 1.8.3 4.0.0 diff --git a/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManager.java b/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManager.java index 5bb0471..80fc5ec 100644 --- a/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManager.java +++ b/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManager.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * route-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManagerImpl.java b/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManagerImpl.java index 193f0c3..f096c96 100644 --- a/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManagerImpl.java +++ b/system/system-management/route-manager/src/main/java/ru/entaxy/esb/system/management/route/manager/RouteManagerImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * route-manager * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/route-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/route-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml index c9c621f..73c39e6 100644 --- a/system/system-management/route-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/route-manager/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ route-manager ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/pom.xml b/system/system-management/system-management-api/pom.xml index 2203c06..d6beb0e 100644 --- a/system/system-management/system-management-api/pom.xml +++ b/system/system-management/system-management-api/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 ru.entaxy.esb.system management - 1.8.2.2 + 1.8.3 ../pom.xml diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/SystemManagementServiceImpl.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/SystemManagementServiceImpl.java index a14a10b..a83c952 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/SystemManagementServiceImpl.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/SystemManagementServiceImpl.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/mapper/Mapper.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/mapper/Mapper.java index 812bed4..af5a819 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/mapper/Mapper.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/mapper/Mapper.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/BridgeProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/BridgeProfileType.java index 750b554..8f28354 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/BridgeProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/BridgeProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ConnectorType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ConnectorType.java index f2a2841..1a8df97 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ConnectorType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ConnectorType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateConnectorType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateConnectorType.java index 6fe8e4a..dab782d 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateConnectorType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateConnectorType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateProfileType.java index f5a2898..2527372 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/CreateProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ExportAllowedType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ExportAllowedType.java index 5610456..d2a182f 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ExportAllowedType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ExportAllowedType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullBridgeProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullBridgeProfileType.java index e02f4f3..b5a04ab 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullBridgeProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullBridgeProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullProfileType.java index 2dc059c..121d4ad 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/FullProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetBridgeProfilesRequest.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetBridgeProfilesRequest.java index c994bd4..c8d7dfe 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetBridgeProfilesRequest.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetBridgeProfilesRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetConnectorType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetConnectorType.java index 3b24c1e..28f55c4 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetConnectorType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetConnectorType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetTemplate.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetTemplate.java index 7c121e9..a3d29fe 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetTemplate.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/GetTemplate.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListBridgeProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListBridgeProfileType.java index afd952d..69e0c14 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListBridgeProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListBridgeProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorRequest.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorRequest.java index 3e98654..ce5ad81 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorRequest.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorType.java index 2111b92..5ddfd07 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListConnectorType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbRequest.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbRequest.java index 168e2c9..7fb22ba 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbRequest.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbType.java index 44dff47..97a6bec 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListEsbType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListFullProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListFullProfileType.java index a8904d3..e48a4c0 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListFullProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListFullProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileRequest.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileRequest.java index 60b1948..144a5ec 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileRequest.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileType.java index 3c837ed..178db73 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateRequest.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateRequest.java index d2d3756..8c7c8f2 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateRequest.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateRequest.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateType.java index 6e17aaa..45d2660 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ListTemplateType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ObjectFactory.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ObjectFactory.java index 45a4362..9d38079 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ObjectFactory.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ObjectFactory.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamListType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamListType.java index 8df52de..6be12d9 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamListType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamListType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamType.java index e9266de..781c869 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ParamType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForObjectType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForObjectType.java index 8bd8331..074d4e7 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForObjectType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForObjectType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForSubjectType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForSubjectType.java index f4a7941..d69ec83 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForSubjectType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionForSubjectType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionType.java index 0075fec..1f9583a 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/PermissionType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ProfileType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ProfileType.java index 96ec0fe..406b6ff 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ProfileType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/ProfileType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService.java index efb3f69..46c103f 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService_Service.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService_Service.java index 10f2cd3..989d6e7 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService_Service.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/SystemManagementService_Service.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/TemplateType.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/TemplateType.java index 0c750c5..bf101dd 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/TemplateType.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/TemplateType.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/package-info.java b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/package-info.java index aae7da4..b3d608e 100644 --- a/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/package-info.java +++ b/system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/soap/package-info.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * system-management-api * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/resources/OSGI-INF/blueprint/camel-context.xml b/system/system-management/system-management-api/src/main/resources/OSGI-INF/blueprint/camel-context.xml index a0def39..32c4c69 100644 --- a/system/system-management/system-management-api/src/main/resources/OSGI-INF/blueprint/camel-context.xml +++ b/system/system-management/system-management-api/src/main/resources/OSGI-INF/blueprint/camel-context.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ system-management-api ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/system/system-management/system-management-api/src/main/resources/log4j2.properties b/system/system-management/system-management-api/src/main/resources/log4j2.properties index 440d0b7..d1806f0 100644 --- a/system/system-management/system-management-api/src/main/resources/log4j2.properties +++ b/system/system-management/system-management-api/src/main/resources/log4j2.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # system-management-api # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/pom.xml b/ui/entaxy-hawtio/artemis-plugin-entaxy/pom.xml index 1e499d0..7b61079 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/pom.xml +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.ui entaxy-hawtio - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui.hawtio artemis-plugin-entaxy diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/java/org/apache/activemq/hawtio/plugin/PluginContextListener.java b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/java/org/apache/activemq/hawtio/plugin/PluginContextListener.java index be5f070..94270db 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/java/org/apache/activemq/hawtio/plugin/PluginContextListener.java +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/java/org/apache/activemq/hawtio/plugin/PluginContextListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/WEB-INF/web.xml b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/WEB-INF/web.xml index c9c6c16..bd0f410 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/WEB-INF/web.xml +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/WEB-INF/web.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ artemis-plugin-entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/log4j.properties b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/log4j.properties index 9073c8a..eae5543 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/log4j.properties +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/resources/log4j.properties @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # artemis-plugin-entaxy # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/index.html b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/index.html index 341d2ba..145fcd0 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/index.html +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/index.html @@ -20,7 +20,7 @@ ~~~~~~licensing~~~~~~ artemis-plugin-entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/preferences.html b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/preferences.html index d248d27..0edb3ed 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/preferences.html +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/preferences.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ artemis-plugin-entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/content.html b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/content.html index 81d60aa..b86e06b 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/content.html +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/content.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ artemis-plugin-entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/header.html b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/header.html index c247ccf..f445465 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/header.html +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/html/tree/header.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ artemis-plugin-entaxy ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisHelpers.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisHelpers.js index 0ed9d1f..3e07fa2 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisHelpers.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisHelpers.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisPlugin.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisPlugin.js index eee07b5..01ec51e 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisPlugin.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/artemisPlugin.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addressSendMessage.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addressSendMessage.js index b8289a6..2c0d0ab 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addressSendMessage.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addressSendMessage.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addresses.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addresses.js index 218696c..c50afbd 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addresses.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/addresses.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/browse.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/browse.js index 79ab265..3ddc6d4 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/browse.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/browse.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/connections.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/connections.js index 4b34082..48845f9 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/connections.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/connections.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/consumers.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/consumers.js index 54902ec..c953a8e 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/consumers.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/consumers.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createAddress.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createAddress.js index 8f34db4..2b74c98 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createAddress.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createAddress.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createQueue.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createQueue.js index 8ae5f06..09c2832 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createQueue.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/createQueue.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteAddress.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteAddress.js index 8f880ed..5c06784 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteAddress.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteAddress.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteQueue.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteQueue.js index 4bdc332..882699d 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteQueue.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/deleteQueue.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/diagram.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/diagram.js index 4d0dcc9..3936df7 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/diagram.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/diagram.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/help.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/help.js index 05bbba2..738dafb 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/help.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/help.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/navigation.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/navigation.js index 358b581..328fc71 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/navigation.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/navigation.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/preferences.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/preferences.js index eac8c19..0354e86 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/preferences.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/preferences.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/producers.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/producers.js index f9fb888..f6944b1 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/producers.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/producers.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/queues.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/queues.js index 010b4fc..7e944a6 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/queues.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/queues.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sendMessage.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sendMessage.js index a28c6b3..93a5e26 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sendMessage.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sendMessage.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sessions.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sessions.js index 085f397..0d31836 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sessions.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/sessions.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/status.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/status.js index 05ffca8..c13088f 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/status.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/status.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/tree.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/tree.js index 89aed53..ac921da 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/tree.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/components/tree.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/pagination.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/pagination.js index 3421a32..820ce21 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/pagination.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/pagination.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/resource.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/resource.js index 8751d27..682634c 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/resource.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/resource.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/sendMessageService.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/sendMessageService.js index 5e1c774..89b3e7e 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/sendMessageService.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/sendMessageService.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/toolbar.js b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/toolbar.js index 3eae7b3..8052bec 100644 --- a/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/toolbar.js +++ b/ui/entaxy-hawtio/artemis-plugin-entaxy/src/main/webapp/plugin/js/services/toolbar.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * artemis-plugin-entaxy * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/pom.xml b/ui/entaxy-hawtio/entaxy-branding-plugin/pom.xml index c9b0914..a665f85 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/pom.xml +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.ui entaxy-hawtio - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui.hawtio entaxy-branding-plugin diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/java/ru/entaxy/ui/hawtio/branding/PluginContextListener.java b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/java/ru/entaxy/ui/hawtio/branding/PluginContextListener.java index 94494df..baafacc 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/java/ru/entaxy/ui/hawtio/branding/PluginContextListener.java +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/java/ru/entaxy/ui/hawtio/branding/PluginContextListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-branding-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/resources/WEB-INF/web.xml b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/resources/WEB-INF/web.xml index f29bccc..4fd39a9 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/resources/WEB-INF/web.xml +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/resources/WEB-INF/web.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-branding-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/index.html b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/index.html index 2959370..c3edff4 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/index.html +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/index.html @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-branding-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/css/entaxy.css b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/css/entaxy.css index c7b0a02..1fac556 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/css/entaxy.css +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/css/entaxy.css @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-branding-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,101 +18,60 @@ * ~~~~~~/licensing~~~~~~ */ -/* jmx tree icon */ -/*.ru-entaxy-esb span.node-icon::before,*/ -.node-entaxytree span.node-icon::before /* BUT this way icons aren't present in JMX */ -/*.ru-entaxy-esb-0-0-0-0-folder span.node-icon::before, -.ru-entaxy-esb-platform-folder span.node-icon::before, -.ru-entaxy-esb-adapters-folder span.node-icon::before, -.ru-entaxy-esb-artemis-adapter-1-folder span.node-icon::before, -.ru-entaxy-esb-artemis-amqp-adapter-1-folder span.node-icon::before, -.ru-entaxy-esb-file-adapter-1-folder span.node-icon::before, -.ru-entaxy-esb-h2-adapter-1-4-199-folder span.node-icon::before, -.ru-entaxy-esb-postgresql-adapter-42-2-9-folder span.node-icon::before, -.ru-entaxy-esb-rabbitmq-amqp-adapter-1-folder span.node-icon::before*/ - { - display: inline-block; - background: url(../img/entaxy.svg); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +/* jmx tree icons */ + +.entaxy-node-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-node-icon.png"); } -/*.ru-entaxy-esb-adapters-folder span.node-icon::before*/ -/*.ru-entaxy-esb-artemis-adapter-1-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/artemis.png); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +.entaxy-connectors-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-connectors-icon.png"); } -.ru-entaxy-esb-artemis-amqp-adapter-1-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/activemq.png); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +.entaxy-connections-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-connections-icon.png"); } -.ru-entaxy-esb-file-adapter-1-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/jesus.jpg); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +.entaxy-adapter-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-adapter-icon.png"); } -.ru-entaxy-esb-h2-adapter-1-4-199-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/h2.png); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +.entaxy-routes-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-routes-icon.png"); } -.ru-entaxy-esb-postgresql-adapter-42-2-9-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/postgresql.png); - min-width: 16px; - min-height: 16px; - background-size: 16px 16px; - background-position: -1px center; - background-repeat: no-repeat; - content: "" !important; - vertical-align: middle; +.entaxy-profiles-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-profiles-icon.png"); } -.ru-entaxy-esb-rabbitmq-amqp-adapter-1-folder span.node-icon::before -{ - display: inline-block; - background: url(../img/rabbitmq.svg); - min-width: 16px; +.entaxy-factories-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-factories-icon.png"); +} + +.entaxy-platform-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-platform-icon.png"); +} + +.entaxy-runtime-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-runtime-icon.png"); +} + +.entaxy-resource-icon span.node-icon::before { + background: url("../img/icons/cranberry-red/entaxy-resource-icon.png"); +} + +.entaxy-node-icon span.node-icon::before, +.entaxy-connectors-icon span.node-icon::before, +.entaxy-connections-icon span.node-icon::before, +.entaxy-adapter-icon span.node-icon::before, +.entaxy-routes-icon span.node-icon::before, +.entaxy-profiles-icon span.node-icon::before, +.entaxy-factories-icon span.node-icon::before, +.entaxy-platform-icon span.node-icon::before, +.entaxy-runtime-icon span.node-icon::before, +.entaxy-resource-icon span.node-icon::before { + display: inline-block; + min-width: 16px; min-height: 16px; background-size: 16px 16px; background-position: -1px center; @@ -120,11 +79,9 @@ content: "" !important; vertical-align: middle; } -*/ /* fonts */ - /* You can customise the styles of your application here. */ @font-face { font-family: 'PatternFlyIcons-webfont'; @@ -315,9 +272,10 @@ tbody>tr:hover { color: #fff!important; } -/*.list-group.list-view-pf.list-view-pf-view { - margin-top: -30px; -}*/ +.toast-pf-content { + max-height: calc(100vh - 150px); + overflow-y: auto; +} .entaxy-result-table { width: 300px; @@ -350,24 +308,39 @@ table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc { /* CSSs for entaxy modal window are below */ .modal-xl { width: 70%; + min-width: 900px; } .modal-body-header { height: 70px; max-height: 70px; - margin-bottom: 15px; padding-top: 5px; padding-left: 15px; padding-right: 15px; - border-bottom: 1px #f5f5f5 solid; + background-color: whitesmoke; + border-bottom: 1px #bbbbbb solid; + border-top: 1px #bbbbbb solid; } .entaxy-modal-container .modal-body { - height: calc(100vh - 300px); - max-height: calc(100vh - 300px); + height: calc(100vh - 270px); + max-height: calc(100vh - 270px); padding: 0px; } +.entaxy-modal-container .modal-body-without-header { + height: calc(100vh - 230px); + max-height: calc(100vh - 230px); + padding: 0px; + margin-top:15px; +} + +.entaxy-modal-container .modal-footer { + background-color: whitesmoke; + border-top: 1px #bbbbbb solid; + margin-top: 0px; +} + .modal-list-container { display: flex; flex-direction: column; @@ -379,12 +352,38 @@ table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc { padding-right: 20px; } +.group-list .modal-list-toolbar-container .toolbar-pf { + background-color: #cfcdcd; + border-bottom: 1px solid #ffffff; + padding-top: 15px; +} + +.modal-list-toolbar-container .toolbar-pf .form-group { + border-right: none; +} + +.group-list .modal-list-toolbar-container .toolbar-pf-results { + border-top: none; +} + .modal-list-list-container { min-height:200px; overflow-y:auto; flex:initial; } +.modal-list-list-container .list-view-pf .list-group-item { + border-color: #ededed; +} + +.modal-list-list-container .list-view-pf-view { + margin-top: 0; +} + +.modal-list-list-container .list-group { + margin-bottom: 0; +} + /* This changes the size of the list-view item */ /*.list-group-item*/ .modal-list-list-container .list-view-pf-main-info { @@ -393,20 +392,62 @@ table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc { padding-bottom: 10px; } -.modal-group-fields-container { +.group-list .modal-list-list-container .blank-slate-pf { + background-color: #cfcdcd; + border: none; +} + +.modal-group-fields-container, +.modal-list-with-description-container { height: 100%; max-height: 100%; display: flex; flex-direction: row; } +.modal-list-with-description-list-container { + width: 50%; + border-right: #d1d1d1 solid 1px; +} + +.modal-description-container { + width: 50%; +} + +.modal-description-title { + height: 47px; + padding: 15px; + border-bottom: #d1d1d1 solid 1px; +} + +.modal-description-body { + padding: 15px; +} + .modal-groups-list-container { width: 335px; + padding-bottom: 15px; + background-color: #cfcdcd; +} + +.modal-groups-list-container .list-group-item { + background-color: #cfcdcd; + border-width: 0px; +} + +.modal-groups-list-container .list-group-item:first-child { + border-top: 0px; +} + +.modal-groups-list-container .list-group-item.active { + background-color: #ffffff; } .modal-group-fields-form-container { overflow-y: auto; flex: auto; + padding-top: 15px; + padding-bottom: 15px; } .modal-group-fields-form-container .form-group { @@ -444,6 +485,118 @@ table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc { -o-transform: translateY(-50%) !important;*/ } +/* Styles for labels and popovers in modal */ + +.label-col { + text-align: right; +} + +.label-col .control-label { + display: unset; +} + +.form-group .popover { + width: max-content; + max-width: 200%; +} + +.label-description-popover { + padding: 2px 0px 2px 2px; +} + +.label-description-popover:focus { + outline: none; +} + +.label-description-popover:active:focus { + outline: none; +} + +/*These are for custom forms*/ + +.entaxy-xml-form { + width: 100%; + height: 26px; +} + +.custom-select .caret { + float: right; + margin-top: 6px; +} + +.btn-select { + font-size: 13.5px; + border-radius: 0; + text-align: left; + vertical-align: middle; + padding: 0px 6px; +} + +.btn-select:focus, +.btn-select:active:focus { + outline: none; +} + +.custom-select .dropdown-menu { + font-size: 13.5px; + max-height: 100px; + overflow-y: auto; + left: auto; + width: calc(100% - 40px); +} + +.custom-select .dropdown-menu li { + line-height:26px !important; +} + +.dropdown-option-new { + background-color: whitesmoke; +} + +.dropdown-option-new span { + margin-right: 5px; +} + +select.form-control { + font-size: 13.5px; +} + +/*Margin for health checks*/ +.health-checks-status { + margin-right: 10px; +} + +/* Fixes artemis preferences form margin */ +.artemis-preferences-form { + margin-top: 20px; +} + +.route-source-header-container { + display: flex; +} + +.route-source-header-container h2 { + display: inline-block; +} + +.route-source-error-message { + font-size: 13.5px; + color: #c00; + padding-left: 10px; + margin-top: 22.5px; +} + +.xml-route-source-container { + padding-bottom: 15px; +} + +.properties-container { + height: calc(100vh - 320px); + border-top: 1px #bbb solid; + border-bottom: 1px #bbb solid; + margin-bottom: 15px; +} + /*This is the original css from HawtIO 1,leaving as is as somemay be used*/ * { font-family: "Open Sans"; @@ -596,6 +749,57 @@ ul.dynatree-container li { border: 1px solid #d4d4d4; } +.xml-editor-container { + margin-left: 20px; + margin-right: 20px; +} + +.xml-editor-container .editor-autoresize .CodeMirror-scroll { + height: calc(100vh - 240px); +} + +.xml-route-source-container .editor-autoresize .CodeMirror-scroll { + height: calc(100vh - 320px); +} + +.CodeMirror-hints { + position: absolute; + z-index: 2000; + overflow: hidden; + list-style: none; + + margin: 0; + padding: 2px; + + -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + box-shadow: 2px 3px 5px rgba(0,0,0,.2); + border-radius: 3px; + border: 1px solid silver; + + background: white; + font-size: 90%; + font-family: monospace; + + max-height: 20em; + overflow-y: auto; + box-sizing: border-box; +} + +.CodeMirror-hint { + margin: 0; + padding: 0 4px; + border-radius: 2px; + white-space: pre; + color: black; + cursor: pointer; +} + +li.CodeMirror-hint-active { + background: #08f; + color: white; +} + i.expandable-indicator { color: #666; } diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/camel.svg b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/camel.svg index 49f932b..e056482 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/camel.svg +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/camel.svg @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-branding-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/entaxy.svg b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/entaxy.svg index 887877a..6979f5d 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/entaxy.svg +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/img/entaxy.svg @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-branding-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/js/brandingPlugin.js b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/js/brandingPlugin.js index d96c817..d951ef5 100644 --- a/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/js/brandingPlugin.js +++ b/ui/entaxy-hawtio/entaxy-branding-plugin/src/main/webapp/plugin/js/brandingPlugin.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-branding-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/pom.xml b/ui/entaxy-hawtio/entaxy-h2-plugin/pom.xml index 21aedfc..6938cb6 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/pom.xml +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.ui entaxy-hawtio - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui.hawtio entaxy-h2-plugin diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/java/ru/entaxy/ui/hawtio/h2/PluginContextListener.java b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/java/ru/entaxy/ui/hawtio/h2/PluginContextListener.java index ee6e382..9e0750f 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/java/ru/entaxy/ui/hawtio/h2/PluginContextListener.java +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/java/ru/entaxy/ui/hawtio/h2/PluginContextListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/resources/WEB-INF/web.xml b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/resources/WEB-INF/web.xml index 0a034bf..bff9e7c 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/resources/WEB-INF/web.xml +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/resources/WEB-INF/web.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/index.html b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/index.html index 34e0ea6..41834e2 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/index.html +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/index.html @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/preferences.html b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/preferences.html index e22dab8..4252c91 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/preferences.html +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/preferences.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/content.html b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/content.html index d378eb1..1827cc8 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/content.html +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/content.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/header.html b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/header.html index 7ac2f73..b08f618 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/header.html +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/html/tree/header.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/h2Console.js b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/h2Console.js index ea3badf..a398205 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/h2Console.js +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/h2Console.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-h2-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/navigation.js b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/navigation.js index 37586bc..b6ee586 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/navigation.js +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/navigation.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/tree.js b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/tree.js index c017e01..3e49c10 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/tree.js +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/components/tree.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/entaxyH2Plugin.js b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/entaxyH2Plugin.js index 671291f..b3d3093 100644 --- a/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/entaxyH2Plugin.js +++ b/ui/entaxy-hawtio/entaxy-h2-plugin/src/main/webapp/plugin/js/entaxyH2Plugin.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/pom.xml b/ui/entaxy-hawtio/entaxy-management-plugin/pom.xml index 6679a18..e1620ea 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/pom.xml +++ b/ui/entaxy-hawtio/entaxy-management-plugin/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb.ui entaxy-hawtio - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui.hawtio entaxy-management-plugin diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/java/ru/entaxy/ui/hawtio/management/PluginContextListener.java b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/java/ru/entaxy/ui/hawtio/management/PluginContextListener.java index 6b6d45f..fe074db 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/java/ru/entaxy/ui/hawtio/management/PluginContextListener.java +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/java/ru/entaxy/ui/hawtio/management/PluginContextListener.java @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/resources/WEB-INF/web.xml b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/resources/WEB-INF/web.xml index 64815a6..05ba0e8 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/resources/WEB-INF/web.xml +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/resources/WEB-INF/web.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/index.html b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/index.html index 584dd91..c628b71 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/index.html +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/index.html @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/preferences.html b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/preferences.html index e22dab8..4252c91 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/preferences.html +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/preferences.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/content.html b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/content.html index 9883498..5646b4f 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/content.html +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/content.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/header.html b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/header.html index 7ac2f73..b08f618 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/header.html +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/html/tree/header.html @@ -2,7 +2,7 @@ ~~~~~~licensing~~~~~~ entaxy-management-plugin ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/addConnectorModal.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/addConnectorModal.js index e2bff85..f43fe06 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/addConnectorModal.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/addConnectorModal.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -26,48 +26,38 @@ var Entaxy; }, template: ` +
-

Add Connector

+

Add Connector to {{$ctrl.profileName}}

-
-
-
-

Choose connector template

-
-
-
- -
+
+
+

Choose connector template

-
- -
-
- {{item.name}} -
-
- +
+
+ ng-disabled="!$ctrl.selectedItem">Next
-
-
-
+ +
+

Fill in connector template parameters

-
-
- +
+
- - + {{$ctrl.errors[formField.name]}}
@@ -76,6 +66,7 @@ var Entaxy;
+
`, controller: EntaxyAddConnectorModalController }) @@ -86,53 +77,20 @@ var Entaxy; var ctrl = this; -// ctrl.errors = null; - - Entaxy.log.info('MODAL???'); - ctrl.$onInit = function() { - Entaxy.log.info('MODAL!!!'); - ctrl.connector = ctrl.resolve.connector ? ctrl.resolve.connector : null; // FIXME ctrl.step1 = true; ctrl.step2 = false; -// ctrl.formFields = ctrl.resolve.args.map(arg => { -// let formField = { -// label: arg.name, -// type: Entaxy.convertToHtmlInputType(arg.type) -// }; -// return formField; -// }); -// Entaxy.log.info('FORM FIELDS ' + JSON.stringify(ctrl.formFields)); - let templates = Entaxy.getConnectorTemplates(); - ctrl.templates = templates.map(template => { return { name: template }}); -// Entaxy.log.info('TEMPLATES ' + JSON.stringify(templates)); -// Entaxy.log.info('TEMPLATES ' + JSON.stringify(ctrl.templates)); - ctrl.viewedTemplates = ctrl.templates; - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedTemplates.length; - } - ctrl.toolbarConfig = { - filterConfig: { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - filterType: 'text' - } - ], - resultCount: ctrl.viewedTemplates ? ctrl.viewedTemplates.length : 0, - appliedFilters: [], - onFilterChange: filterChange - }, - actionsConfig: {}, -// isTableView: true - }; + let templates = Entaxy.getConnectorTemplates(); + ctrl.templates = templates.map(template => { return { name: template, displayName: template }}); + ctrl.viewedTemplates = ctrl.templates; + + ctrl.profileName = ctrl.resolve.profileName; + } ctrl.listConfig = { selectionMatchProp: 'name', selectItems: true, -// selectedItems: [], showSelectBox: false, dlbClick: true, onDblClick: function(item, event){ @@ -141,98 +99,71 @@ var Entaxy; } } - function filterChange(filters) { - applyFilters(filters); - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedTemplates.length; - }; - - function applyFilters(filters) { - ctrl.viewedTemplates = []; - if (filters && filters.length > 0) { - ctrl.templates.forEach(function (template) { - if (matchesFilters(template, filters)) { - ctrl.viewedTemplates.push(template); - } - }); - } else { - ctrl.viewedTemplates = ctrl.templates; + ctrl.changeSelection = function(item, isDblClicked) { + ctrl.selectedItem = item; + if (isDblClicked) { + ctrl.next(); } - }; - - function matchesFilters(item, filters) { - var matches = true; - filters.forEach(function(filter) { - if (!matchesFilter(item, filter)) { - matches = false; - return false; - } - }); - return matches; - }; - - function matchesFilter(item, filter) { - var match = true; - if (filter.id === 'name') { - match = item.name.match(filter.value) !== null; - } - return match; - }; + } ctrl.next = function() { ctrl.step1 = false; ctrl.step2 = true; - Entaxy.log.info('Selected item ' + JSON.stringify(ctrl.listConfig.selectedItems)); - - if (!ctrl.formFields || ctrl.listConfig.selectedItems[0].name !== ctrl.formFields[0].value) { - ctrl.formFields = Entaxy.getConnectorTemplateParams(ctrl.listConfig.selectedItems[0].name); //ctrl.listConfig.selectedItems[0] + if (!ctrl.formFields || ctrl.selectedItem.name !== ctrl.formFields[0].value) { + ctrl.formFields = Entaxy.getConnectorTemplateParams(ctrl.selectedItem.name); ctrl.formFields.unshift({ label: 'templateName', + displayName: 'Template Name', type: 'java.lang.String', helpText: null, - value: ctrl.listConfig.selectedItems[0].name, + value: ctrl.selectedItem.name, isReadOnly: true }); - ctrl.formFields.forEach(formField => formField.type = Entaxy.convertToHtmlInputType(formField.type)); + ctrl.formFields.forEach(formField => { + formField.name = formField.label; + if (formField.displayName) { + formField.label = formField.displayName; + } + formField.type = Entaxy.convertToHtmlInputType(formField.type); + }); } } ctrl.back = function() { ctrl.step1 = true; ctrl.step2 = false; - -// ctrl.formFields = null; } ctrl.cancel = function() { - Entaxy.log.info('QUIT MODAL'); ctrl.modalInstance.dismiss(); } -// - ctrl.saveConnector = function(connector) { // FIXME - Entaxy.log.info('SAVE CONNECTOR: ' + JSON.stringify(connector)); - ctrl.errors = validateFields(connector); // FIXME - Entaxy.log.info('ERRORS ' + JSON.stringify(ctrl.errors)); + + ctrl.saveConnector = function(fields) { + ctrl.errors = validateFields(fields); if (Object.keys(ctrl.errors).length === 0) { - // TODO let connectorArgs = { connectorTemplateName: ctrl.formFields.shift().value, - connectorFields: ctrl.formFields.map(formField => { return { label: formField.label, value: formField.value }; }) + connectorFields: ctrl.formFields.map(formField => { return { label: formField.name, value: formField.value }; }) }; ctrl.modalInstance.close(connectorArgs); } } - function validateFields(connector) { - Entaxy.log.info('VALIDATION START'); + function validateFields(fields) { let errors = {}; - Entaxy.log.info('VALIDATION END'); + _.forEach(fields, (field) => { + if (field.isRequired && (!field.value || (field.type !== 'checkbox' ? field.value.toString().trim().length === 0 : false))) { + errors[field.name] = 'Please fill out this field'; + } + }); + return errors; } } EntaxyAddConnectorModalController.$inject = ['workspace']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connections.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connections.js index b5e94da..5867b04 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connections.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connections.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -33,4 +33,4 @@ var Entaxy; ` }) .name; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connectors.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connectors.js index e561477..495ab65 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connectors.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/connectors.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -19,166 +19,51 @@ */ var Entaxy; (function (Entaxy) { - Entaxy._module.component('entaxyConnectors', { + Entaxy._module + .component('entaxyConnectors', { + bindings: { + pageTitle: '@' + }, template: `

- Connectors + {{$ctrl.pageTitle}}

- - - + + `, controller: EntaxyConnectorsController }) .name; - function EntaxyConnectorsController(workspace, $uibModal, operationsService, jolokiaService) { + function EntaxyConnectorsController(workspace, $scope, $uibModal, operationsService, jolokiaService) { 'ngInject'; var ctrl = this; ctrl.workspace = workspace; var entaxyJmxDomain = localStorage['entaxyJmxDomain'] || "ru.entaxy.esb"; - let filterValues = Entaxy.getAllBundleStates(); - - ctrl.tableConfig = { - selectionMatchProp: 'name', - showCheckboxes: false - }; - - ctrl.toolbarConfig = { - filterConfig: { - fields: [ - { - id: 'name', - title: 'Name', - placeholder: 'Filter by Name...', - filterType: 'text' - }, - { - id: 'status', - title: 'Status', - placeholder: 'Filter by Status...', - filterType: 'select', // actually text has it rights to be - filterValues: filterValues - } - ], - resultCount: ctrl.viewedConnectors ? ctrl.viewedConnectors.length : 0, - appliedFilters: [], - onFilterChange: filterChange - }, - actionsConfig: { - primaryActions: [ - { name: 'Add connector', actionFn: () => ctrl.showAddConnectorModal() }, -// { name: 'Show Modal', actionFn: () => ctrl.showModal() } - ] - }, - isTableView: true - }; - - ctrl.columnDefs = [ - { field: 'name', displayName: 'Connector Name' }, - { field: 'status', displayName: 'Status' } - ]; - - ctrl.tableColumns = [ - { header: 'Connector Name', itemField: 'name' }, - { header: 'Status', itemField: 'status' } - ]; - - ctrl.tableActionButtons = [ - { name: 'Start', title: 'Start Connector', actionFn: startConnector }, - { name: 'Stop', title: 'Stop Connector', actionFn: stopConnector }, -// { name: 'Edit', title: 'Edit Connector', actionFn: editConnector }, - { name: 'Remove', title: 'Remove Connector', actionFn: removeConnector } - ]; - - ctrl.pageConfig = { - pageNumber: 1, - pageSize: 10, - pageSizeIncrements: [5, 10, 20, 50, 100] - }; - - function filterChange(filters) { - applyFilters(filters); - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedConnectors.length; - }; - - function applyFilters(filters) { - ctrl.viewedConnectors = []; - if (filters && filters.length > 0) { - ctrl.connectors.forEach(function (connector) { - if (matchesFilters(connector, filters)) { - ctrl.viewedConnectors.push(connector); - } - }); - } else { - ctrl.viewedConnectors = ctrl.connectors; - } - }; - - function matchesFilters(item, filters) { - var matches = true; - filters.forEach(function(filter) { - if (!matchesFilter(item, filter)) { - matches = false; - return false; - } - }); - return matches; - }; - - function matchesFilter(item, filter) { - var match = true; - if (filter.id === 'name') { - match = item.name.match(filter.value) !== null; - } else if (filter.id === 'status') { - match = item.status === filter.value; - } - return match; - }; + let primaryActions = [ { name: 'Add Legacy Connector', actionFn: () => ctrl.showAddConnectorModal() } ]; + ctrl.config = { + primaryActions: primaryActions, + isTableUpdateNeeded: true + } ctrl.connectors = []; ctrl.viewedConnectors = []; - ctrl.$onInit = function() { - populateTable(); - } - - function populateTable() { - ctrl.folderName = 'Коннекторы'; - ctrl.statusName = 'BundleState'; - - let connectors = []; - let count = 0; // FIXME CRUTCH - - let connectorsFolder = workspace.getSelectedMBean().get(ctrl.folderName); - if (connectorsFolder) { - connectorsFolder.children.forEach((child) => { - jolokiaService.getAttributes(child.objectName, [ctrl.statusName]) - .then((response) => { - connectors.push({name: child.title, status: response[ctrl.statusName], mbeanName: child.objectName}); - }); - count++; // FIXME CRUTCH - }); - - ctrl.connectors = connectors; - ctrl.viewedConnectors = connectors; - ctrl.toolbarConfig.filterConfig.resultsCount = count; // FIXME CRUTCH - } - } - ctrl.showAddConnectorModal = function() { + let selectedMBean = workspace.getSelectedMBean(); + $uibModal.open({ component: 'entaxyAddConnectorModal', resolve: { - connector: null + connector: null, + profileName: () => selectedMBean.title }, size: 'lg', backdrop: 'static' @@ -188,28 +73,6 @@ var Entaxy; }); } - ctrl.templates = Entaxy.getConnectorTemplates(); - - ctrl.showModal = function() { - $uibModal.open({ - component: 'entaxyModal', - resolve: { - modalTitle: () => 'Add Connector', - firstStepTitle: () => 'Choose connector template', - secondStepTitle: () => 'Fill in connector template parameters', -// profile: null, -// profileNames: () => ctrl.profiles.map(profile => profile.name), -// profileIds: () => ctrl.profiles.map(profile => profile.id) - templates: () => ctrl.templates.map(template => { return { name: template }}) - }, - size: 'lg', - backdrop: 'static' - }) - .result.then(args => { -// addConnector(args); - }); - } - function addConnector(connectorArgs) { let args = []; @@ -228,53 +91,9 @@ var Entaxy; operationsService.executeOperation(mbeanName, { name: 'addConnector' }, args) .then(result => { -// // FIXME FIXME FIXME FIXME FIXME FIXME - setTimeout(() => populateTable(), 5000); - - ctrl.viewedConnectors = ctrl.connectors; - ctrl.toolbarConfig.filterConfig.appliedFilters = []; - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedConnectors.length; - - Core.notification('success', result, 3000); - }).catch(error => { - Core.notification('danger', error, 5000); - }); - } - - function startConnector(action, connector) { - let mbeanName = workspace.getSelectedMBeanName(); - operationsService.executeOperation(mbeanName, { name: 'startConnector' }, [ connector.name ]) - .then(result => { - // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - setTimeout(() => populateTable(), 100); - - Core.notification('success', result, 3000); - }).catch(error => { - Core.notification('danger', error, 5000); - }); - } - - function stopConnector(action, connector) { - let mbeanName = workspace.getSelectedMBeanName(); - operationsService.executeOperation(mbeanName, { name: 'stopConnector' }, [ connector.name ]) - .then(result => { - // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - setTimeout(() => populateTable(), 100); - - Core.notification('success', result, 3000); - }).catch(error => { - Core.notification('danger', error, 5000); - }); - } - - function removeConnector(action, connector) { - let mbeanName = workspace.getSelectedMBeanName(); - operationsService.executeOperation(mbeanName, { name: 'removeConnector' }, [ connector.name ]) - .then(result => { - ctrl.connectors.splice(ctrl.connectors.indexOf(connector), 1); - ctrl.viewedConnectors = ctrl.connectors; - ctrl.toolbarConfig.filterConfig.appliedFilters = []; - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedConnectors.length; + if (ctrl.config.isTableUpdateNeeded && ctrl.config.updateTableFn) { + $scope.$on(Jmx.TreeEvent.Updated, ctrl.config.updateTableFn); + } Core.notification('success', result, 3000); }).catch(error => { @@ -285,6 +104,6 @@ var Entaxy; ctrl.dismissAlert = () => ctrl.alert = null; } - EntaxyConnectorsController.$inject = ['workspace', '$uibModal', 'operationsService', 'jolokiaService']; + EntaxyConnectorsController.$inject = ['workspace', '$scope', '$uibModal', 'operationsService', 'jolokiaService']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modal.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modal.js index c305244..fff8f93 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modal.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modal.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -39,8 +39,8 @@ var Entaxy;

{{$ctrl.firstStepTitle}}

- +
- +
@@ -67,54 +67,74 @@ var Entaxy; }) .name; - function entaxyModalController(workspace, operationsService) { + function entaxyModalController(operationsService, entaxyService) { 'ngInject'; var ctrl = this; ctrl.$onInit = function() { - ctrl.modalTitle = ctrl.resolve.modalTitle ? ctrl.resolve.modalTitle : 'Modal'; // fixme do required - ctrl.firstStepTitle = ctrl.resolve.firstStepTitle ? ctrl.resolve.firstStepTitle : ctrl.modalTitle; - ctrl.secondStepTitle = ctrl.resolve.secondStepTitle ? ctrl.resolve.secondStepTitle : ctrl.modalTitle; + ctrl.mode = ctrl.resolve.mode; - ctrl.templates = ctrl.resolve.templates ? ctrl.resolve.templates : null; + if (!ctrl.mode) { + ctrl.cancel('Mode is not defined'); + } - // fixme it was only if (ctrl.templates) - if (ctrl.templates && ctrl.templates.length !== 0) { // fixme or maybe if ctrl.templates.length === 1 and then factoryId = ctrl.templates[0] - if (ctrl.templates.length > 1) { + ctrl.itemType = ctrl.resolve.itemType ? ctrl.resolve.itemType : 'Item'; + + let extraToTitle = ctrl.resolve.parentName ? (' to ' + ctrl.resolve.parentName) : ''; + + ctrl.modalTitle = ctrl.mode + ' ' + ctrl.itemType + extraToTitle; + + ctrl.submitBtnTitle = Entaxy.getButtonTitleByMode(ctrl.mode); + + let itemName = ctrl.resolve.itemName; + + ctrl.firstStepTitle = ctrl.resolve.firstStepTitle ? ctrl.resolve.firstStepTitle : 'Choose factory'; + + ctrl.secondStepTitle = itemName ? ctrl.mode + ' properties for ' + itemName + : ctrl.resolve.secondStepTitle ? ctrl.resolve.secondStepTitle : 'Fill in fields'; + + if (ctrl.mode !== Entaxy.MODAL_MODES.ADD) { + let properties = Object.entries(ctrl.resolve.info.properties); + ctrl.properties = properties.map(property => { return { name: property[0], value: property[1] }; }); + } + + ctrl.factories = ctrl.resolve.factories ? ctrl.resolve.factories : null; + + if (ctrl.factories && ctrl.factories.length !== 0) { + if (ctrl.factories.length > 1) { + ctrl.factories.sort(Entaxy.compareBy('displayName')); ctrl.step1 = true; ctrl.step2 = false; ctrl.hasSteps = true; - } else if (ctrl.templates.length === 1) { + } else if (ctrl.factories.length === 1) { ctrl.hasSteps = false; ctrl.next(); } } else { - ctrl.cancel('Templates are not found'); + ctrl.cancel('Factories are not found'); } } ctrl.next = function() { -// ctrl.step1 = false; -// ctrl.step2 = true; - // fixme this if perhaps is needed only if hasSteps is true if (!ctrl.formFields || ctrl.selectedItem.name !== ctrl.formFields[0].value) { ctrl.formFields = []; ctrl.formFields.push({ - label: 'factoryId', + label: 'Factory Id', + name: 'factoryId', type: 'java.lang.String', helpText: null, - value: ctrl.hasSteps ? ctrl.selectedItem.name : ctrl.templates[0].name, + value: ctrl.hasSteps ? ctrl.selectedItem.name : ctrl.factories[0].name, readOnly: true, - required: true, + required: ctrl.mode === Entaxy.MODAL_MODES.VIEW ? false : true, group: 'general' }); - let mbeanName = ctrl.hasSteps ? ctrl.selectedItem.mbeanName : ctrl.templates[0].mbeanName; + let mbeanName = ctrl.hasSteps ? ctrl.selectedItem.mbeanName : ctrl.factories[0].mbeanName; operationsService.executeOperation(mbeanName, { name: 'getFields' }, [ 'init' ]) .then((response) => { @@ -123,26 +143,20 @@ var Entaxy; groups.add('general'); _.forEach(JSON.parse(response), (field) => { - let formField = { - label: field.displayName ? field.displayName : field.name, - type: field.type, - description: field.description, - immutable: field.immutable, - required: field.required, - value: field.defaultValue, - conditional: field.conditional, - isRef: field.isRef, - isBackRef: field.isBackRef, - group: field.group ? field.group : 'general', -// tag: field.label - }; + + let objectId = undefined; + if (ctrl.mode !== Entaxy.MODAL_MODES.ADD) { + objectId = ctrl.resolve.info['objectId']; + } + let formField = entaxyService.makeFormField(field, objectId, ctrl.properties, ctrl.mode); + ctrl.formFields.push(formField); groups.add(formField.group); }); ctrl.formFields.forEach(formField => formField.type = Entaxy.convertToHtmlInputType(formField.type)); - ctrl.groups = Array.from(groups).map((group) => { return { name: group }; }); + ctrl.groups = Array.from(groups).map((group) => { return { name: group, displayName: group }; }); ctrl.step1 = false; ctrl.step2 = true; @@ -162,40 +176,32 @@ var Entaxy; ctrl.modalInstance.dismiss(reason); } - ctrl.changeSelection = function(item) { + ctrl.changeSelection = function(item, isDblClicked) { ctrl.selectedItem = item; - } - - ctrl.save = function(item) { - // fixme maybe forEach here - ctrl.errors = validateFields(ctrl.formFields); - - if (Object.keys(ctrl.errors).length === 0) { - let factoryIdName = ctrl.formFields.shift().value; - - args = { - factoryId: ctrl.templates.find((template) => template.name === factoryIdName), - fields: ctrl.formFields.map(formField => { return { label: formField.label, value : (formField.nestedValue ? formField.nestedValue : formField.value) }; }) - }; - - ctrl.modalInstance.close(args); + if (isDblClicked) { + ctrl.next(); } } - function validateFields(fields) { - let errors = {}; + ctrl.save = function(fields) { - _.forEach(fields, (field) => { - if (field.required && !field.isBackRef) { - if (!field.value || (field.type !== 'checkbox' ? field.value.trim().length === 0 : false)) { - errors[field.label] = 'Please fill out this field'; - } + if (ctrl.mode === Entaxy.MODAL_MODES.VIEW) { + ctrl.cancel(); + } + + let selectedFactory = ctrl.selectedItem ? ctrl.selectedItem : ctrl.factories[0]; + + entaxyService.validateFields(fields, selectedFactory, ctrl.itemType) + .then(errors => { + ctrl.errors = errors; + + if (Object.keys(ctrl.errors).length === 0) { + let args = entaxyService.getArguments(fields, ctrl.factories); + ctrl.modalInstance.close(args); } }); - - return errors; } } - entaxyModalController.$inject = ['workspace', 'operationsService']; + entaxyModalController.$inject = ['operationsService', 'entaxyService']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalGroupFields.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalGroupFields.js index fa6aa99..9c57784 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalGroupFields.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalGroupFields.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -24,24 +24,38 @@ var Entaxy; bindings: { groups: '<', fields: '<', - errors: '<' + errors: '<', + mode: '<' }, template: `
- +
-
- +
+
+ + +
- - {{$ctrl.errors[formField.label]}} + + + + + {{$ctrl.errors[formField.name]}}
@@ -52,12 +66,30 @@ var Entaxy; }) .name; - function entaxyModalGroupFieldsController() { + function entaxyModalGroupFieldsController(operationsService) { + 'ngInject'; var ctrl = this; + ctrl.$onInit = function() { + ctrl.localMode = ctrl.mode === Entaxy.MODAL_MODES.ADD ? Entaxy.MODAL_MODES.EDIT : ctrl.mode; + + ctrl.selectedGroup = ctrl.groups[0]; + } + + ctrl.$onChanges = function(changes) { + if (changes.errors && changes.errors.currentValue) { + let errorKeys = Object.keys(changes.errors.currentValue); + if (errorKeys.length > 0) { + let errorField = ctrl.fields.find(field => field.name === errorKeys[0]); + ctrl.selectedGroup = ctrl.groups.find(group => group.name === errorField.group); + } + } + } + ctrl.change = function(group) { ctrl.viewedFormFields = ctrl.fields.filter((formField) => formField.group === group.name); + ctrl.selectedGroup = group; } ctrl.matchesFilter = function(group, filter) { @@ -65,17 +97,60 @@ var Entaxy; _.forEach(ctrl.fields.filter((formField) => formField.group === group.name), (field) => { if (field.tag && field.tag.length !== 0) { - _.forEach(field.tag, (tag) => { - if (tag.match(filter.value) !== null) { - match = true; - return match; - } - }); + if (field.tag.toLowerCase().match(filter.value.toLowerCase()) !== null) { + match = true; + return match; + } } }); + match = group.displayName.toLowerCase().match(filter.value.toLowerCase()) !== null; return match; }; - } -})(Entaxy || (Entaxy = {})); \ No newline at end of file + ctrl.updateFieldsAfterSelectionChange = function (oldItem, newItem, itemType) { + + if (oldItem) { + changeFieldsFromSelected(oldItem, itemType, true); + } + + changeFieldsFromSelected(newItem, itemType, false); + } + + function changeFieldsFromSelected(item, itemType, toDefaults) { + if (item.mbeanName) { + operationsService + .executeOperation(item.mbeanName, { name: 'get' + itemType + 'Config' }, [ item.name ]) + .then(result => { + let itemInfo = JSON.parse(result); + let properties = itemInfo.properties; + + changeFieldsValuesFromProperties(properties, toDefaults); + + }).catch(error => { + Core.notification('danger', error, 5000); + Entaxy.log.error(error); + }); + } else if (item.value) { + let properties = item.value.properties; + + changeFieldsValuesFromProperties(properties, toDefaults); + } + } + + function changeFieldsValuesFromProperties(properties, toDefaults) { + if (properties && Object.keys(properties).length > 0) { + let keys = Object.keys(properties); + + keys.forEach(key => { + let field = ctrl.fields.find(field => field.name === key); + if (field && !field.isHidden) { + field.value = toDefaults ? field.defaultValue : properties[key]; + } + }); + } + } + } + entaxyModalGroupFieldsController.$inject = ['operationsService']; + +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalList.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalList.js index a98c1c4..20beb9c 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalList.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/modalList.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -23,6 +23,9 @@ var Entaxy; .component('entaxyModalList', { bindings: { items: '<', + itemsLabel: '@', + itemsLabelPlural: '@', + enableDblClick: '<', selected: '<', changeSelection: '<', filter: '<' @@ -37,7 +40,12 @@ var Entaxy;
- {{item.name}} + {{item.displayName}} +
+
+
+
+ {{info}}
@@ -54,22 +62,30 @@ var Entaxy; ctrl.$onInit = function() { ctrl.viewedItems = ctrl.items; + ctrl.toolbarConfig.filterConfig.itemsLabel = ctrl.itemsLabel ? ctrl.itemsLabel : 'Result'; + ctrl.toolbarConfig.filterConfig.itemsLabelPlural = ctrl.itemsLabelPlural ? ctrl.itemsLabelPlural : 'Results'; ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedItems.length; - // FIXME i don't like invoking of changeSelection somehow if (ctrl.selected) { ctrl.listConfig.selectedItems = [ ctrl.selected ]; changeSelection(); } } + ctrl.$onChanges = function(changes) { + if (changes.selected.previousValue && changes.selected.currentValue && changes.selected.currentValue.name !== changes.selected.previousValue.name) { + ctrl.listConfig.selectedItems = [ ctrl.selected ]; + changeSelection(); + } + } + ctrl.toolbarConfig = { filterConfig: { fields: [ { - id: 'name', + id: 'displayName', title: 'Name', - placeholder: 'Filter by Name...', + placeholder: 'Search...', filterType: 'text' } ], @@ -113,8 +129,8 @@ var Entaxy; return ctrl.filter(item, filter); } else { var match = true; - if (filter.id === 'name') { - match = item.name.match(filter.value) !== null; + if (filter.id === 'displayName') { + match = item.displayName.toLowerCase().match(filter.value.toLowerCase()) !== null; } return match; } @@ -124,12 +140,25 @@ var Entaxy; selectionMatchProp: 'name', selectItems: true, showSelectBox: false, - onSelectionChange: changeSelection + onSelectionChange: changeSelection, + dlbClick: true, + onDblClick: (item) => changeSelectionOnDblClick(item) } function changeSelection() { - ctrl.changeSelection(ctrl.listConfig.selectedItems[0]); + if (ctrl.selected && !ctrl.listConfig.selectedItems[0]) { + ctrl.listConfig.selectedItems[0] = ctrl.selected; + } else { + ctrl.selected = ctrl.listConfig.selectedItems[0]; + ctrl.changeSelection(ctrl.listConfig.selectedItems[0], false); + } + } + + function changeSelectionOnDblClick(item) { + if (ctrl.enableDblClick === true) { + ctrl.changeSelection(item, true); + } } } -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/navigation.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/navigation.js index 3747596..a06b1d3 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/navigation.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/navigation.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,6 +70,9 @@ var Entaxy; // todo smth like goto/$location.search ? } else if (shouldShowConnectorsTab()) { tabs.unshift(new Nav.HawtioTab(TAB_CONFIG.connectors.title, TAB_CONFIG.connectors.route)); + tabs.unshift(new Nav.HawtioTab(TAB_CONFIG.properties.title, TAB_CONFIG.properties.route)); + } else if (shouldShowSourceTab()) { + tabs.unshift(new Nav.HawtioTab(TAB_CONFIG.source.title, TAB_CONFIG.source.route)); } else { let mbeanName = workspace.getSelectedMBeanName(); let parsedMbean = Core.parseMBean(mbeanName); @@ -108,7 +111,15 @@ var Entaxy; parsedMbean.attributes.profile && !parsedMbean.attributes.section; } -// global event for entaxy extras + + function shouldShowSourceTab() { + let mbeanName = workspace.getSelectedMBeanName(); + let parsedMbean = Core.parseMBean(mbeanName); + return workspace.hasDomainAndProperties(entaxyJmxDomain, {'category': 'profiles'}) && + parsedMbean.attributes.profile && + parsedMbean.attributes.route; + } +// global event for entaxy extras $rootScope.$emit('entaxyNavigationInited', $scope); } EntaxyNavigationController.$inject = ['$scope', '$location', 'workspace', 'localStorage', 'jolokia', '$rootScope'] @@ -121,7 +132,9 @@ var Entaxy; when('/entaxy/test', { template: '' }). when('/entaxy/connections', { template: '' }). when('/entaxy/profiles', { template: '' }). - when('/entaxy/connectors', { template: '' }); + when('/entaxy/properties', { template: '' }). + when('/entaxy/connectors', { template: '' }). + when('/entaxy/route/source', { template: '' }); } configureRoutes.$inject = ['$routeProvider']; @@ -152,8 +165,16 @@ var TAB_CONFIG = { title: 'Profiles', route: '/entaxy/profiles' }, + properties: { + title: 'Properties', + route: 'entaxy/properties' + }, connectors: { title: 'Connectors', route: '/entaxy/connectors' + }, + source: { + title: 'Source', + route: '/entaxy/route/source' } }; diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/profiles.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/profiles.js index 349a524..d73dc1a 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/profiles.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/profiles.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -36,4 +36,4 @@ var Entaxy; ` }) .name; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/table.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/table.js index 60746be..b0d9c03 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/table.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/table.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -25,7 +25,9 @@ var Entaxy; itemName: '@', folderName: '@', statusName: '@', - objectName: '@' + objectName: '@', + isParentDependent: '<', + extraPrimaryActionsConfig: '<' }, template: ` @@ -33,6 +35,7 @@ var Entaxy; @@ -41,7 +44,7 @@ var Entaxy; }) .name; - function EntaxyTableController(workspace, $location, $uibModal, operationsService, jolokiaService) { + function EntaxyTableController(workspace, $location, $scope, $q, jolokia, jolokiaService, $uibModal, operationsService) { 'ngInject'; var ctrl = this; @@ -72,36 +75,17 @@ var Entaxy; filterValues: filterValues } ], -// resultsCount: ctrl.viewedItems ? ctrl.viewedItems.length : 0, -// totalCount: ctrl.items ? ctrl.items.length : 0, appliedFilters: [], onFilterChange: filterChange }, -// actionsConfig: { -// primaryActions: [ -// { name: 'Add ' + ctrl.itemName, actionFn: () => ctrl.showModal() } -// ] -// }, isTableView: true }; - ctrl.columnDefs = [ - { field: 'name', displayName: 'Name' }, - { field: 'status', displayName: 'Status' } - ]; - ctrl.tableColumns = [ { header: 'Name', itemField: 'name' }, { header: 'Status', itemField: 'status' } ]; -// ctrl.tableActionButtons = [ -// { name: 'Start', title: 'Start ' + ctrl.itemName, actionFn: startItem }, -// { name: 'Stop', title: 'Stop ' + ctrl.itemName, actionFn: stopItem }, -//// { name: 'Edit', title: 'Edit ' + ctrl.itemName, actionFn: editItem }, -// { name: 'Uninstall', title: 'Uninstall ' + ctrl.itemName, actionFn: uninstallItem } -// ]; - ctrl.pageConfig = { pageNumber: 1, pageSize: 10, @@ -153,159 +137,219 @@ var Entaxy; ctrl.$onInit = function() { populateTable(); + let primaryActions = [ { name: 'Add ' + ctrl.itemName, actionFn: () => ctrl.showModal(Entaxy.MODAL_MODES.ADD) } ]; + + if (ctrl.extraPrimaryActionsConfig) { + let extraPrimaryActions = ctrl.extraPrimaryActionsConfig.primaryActions; + primaryActions = primaryActions.concat(extraPrimaryActions); + + if (ctrl.extraPrimaryActionsConfig.isTableUpdateNeeded) { + ctrl.extraPrimaryActionsConfig.updateTableFn = populateTable; + } + } + ctrl.toolbarConfig.actionsConfig = { - primaryActions: [ - { name: 'Add ' + ctrl.itemName, actionFn: () => ctrl.showModal() } - ] + primaryActions: primaryActions }; ctrl.tableActionButtons = [ { name: 'Start', title: 'Start ' + ctrl.itemName, actionFn: startItem }, { name: 'Stop', title: 'Stop ' + ctrl.itemName, actionFn: stopItem }, -// { name: 'Edit', title: 'Edit ' + ctrl.itemName, actionFn: editItem }, { name: 'Uninstall', title: 'Uninstall ' + ctrl.itemName, actionFn: uninstallItem } ]; + + ctrl.menuActions = [ + { name: 'View Properties', title: 'View ' + ctrl.itemName + ' Properties', actionFn: showPropertiesModal }, + { name: 'Edit Properties', title: 'Edit ' + ctrl.itemName + ' Properties', actionFn: showPropertiesModal } + ]; + } + + function showPropertiesModal(action, item) { + if (action.name === 'View Properties') { + ctrl.showModal(Entaxy.MODAL_MODES.VIEW, item); + } else if (action.name === 'Edit Properties') { + ctrl.showModal(Entaxy.MODAL_MODES.EDIT, item); + } } function populateTable() { let items = []; - let count = 0; // FIXME if you can - let children = workspace.tree.findDescendant(child => child.title === ctrl.folderName).children; - if (children) { - children.forEach((child) => { - jolokiaService.getAttributes(child.objectName, [ctrl.statusName]) - .then((response) => { - items.push({name: child.title, status: response[ctrl.statusName], mbeanName: child.objectName}); - }); - count++; // FIXME - }); + let selectedMBean = workspace.getSelectedMBean(); + if (selectedMBean && selectedMBean.isFolder) { + let currentFolder = selectedMBean; + if (selectedMBean.text !== ctrl.folderName) { + currentFolder = selectedMBean.get(ctrl.folderName); + } - ctrl.items = items; - ctrl.viewedItems = items; - ctrl.toolbarConfig.filterConfig.resultsCount = count; // FIXME + if (currentFolder) { + let children = currentFolder.children; + if (children) { + children.forEach((child) => { + jolokiaService.getAttributes(child.objectName, [ctrl.statusName]) + .then((response) => { + items.push({name: child.title, status: response[ctrl.statusName], mbeanName: child.objectName}); + }); + }); + + ctrl.items = items; + ctrl.viewedItems = items; + ctrl.toolbarConfig.filterConfig.resultsCount = children.length; + } + } } } - ctrl.showModal = function() { - let templates = workspace.tree.findDescendant(child => child.title === 'entaxy.runtime.' + ctrl.itemName.toLowerCase()) - .children.map((child) => { - let template = { - name: child.title, - mbeanName: child.objectName - }; - return template; - }); + ctrl.showModal = function(mode, item) { + let factories = []; + let promises = []; + + let factoryFolder = workspace.tree.findDescendant(child => child.title === 'entaxy.runtime.' + ctrl.itemName.toLowerCase()); + + if (factoryFolder && factoryFolder.children) { + factoryFolder.children.forEach((child) => { + promises.push(jolokiaService.getAttributes(child.objectName, ['Abstract', 'DisplayName', 'Label', 'Description', 'Deprecated']) + .then((result) => { + if (!result['Abstract']) { + factories.push({ + name: child.title, + displayName: result['DisplayName'] ? result['DisplayName'] : child.title, + label: result['Label'], + mbeanName: child.objectName, + description: result['Description'] ? result['Description'] : 'There is no description for this factory.', + additionalInfo: result['Deprecated'] ? ['[DEPRECATED]'] : undefined + }); + } + })); + }); + + $q.all(promises).then(() => { + if (mode === Entaxy.MODAL_MODES.ADD) { + + let parentName; + if (ctrl.isParentDependent === true) { + let selectedMbean = workspace.getSelectedMBean(); + parentName = selectedMbean.title; + } + + openEntaxyModal({ + mode: () => mode, + itemType: () => ctrl.itemName, + parentName: () => parentName, + factories: () => factories + }, mode); + } else { + let mbeanName = workspace.getSelectedMBeanName(); + + operationsService + .executeOperation(mbeanName, { name: 'get' + ctrl.itemName + 'Config' }, [ item.name ]) + .then(result => { + let itemInfo = JSON.parse(result); + + let factory = factories.find(factory => factory.name === itemInfo.factoryId); + + openEntaxyModal({ + itemName: () => item.name, + itemType: () => ctrl.itemName, + mode: () => mode, + info: () => itemInfo, + factories: () => [ factory ] + }, mode); + }).catch(error => { + Core.notification('danger', 'Unable to view configuration of selected item.', 5000); + Entaxy.log.error(error); + }); + } + }); + } + } + + function openEntaxyModal(resolve, mode) { $uibModal.open({ component: 'entaxyModal', - resolve: { - modalTitle: () => 'Add ' + ctrl.itemName, - templates: () => templates - }, + resolve: resolve, size: 'xl', backdrop: 'static' }) .result.then(args => { - addItem(args) + addItem(args, mode) + }, + reason => { + if (reason) { + Core.notification('danger', reason, 5000); + } }); } - function addItem(args) { - let objectId = args.fields.find((field) => field.label === 'objectId').value; + function addItem(args, mode) { - let fields; - if (objectId) { - fields = args.fields.filter((field) => field.label !== 'objectId'); - } + let objectId = args.fields.find((field) => field.name === 'objectId').value; + + let fields = objectId ? args.fields.filter((field) => field.name !== 'objectId') : args.fields; let mbeanName = args.factoryId.mbeanName; - let properties = fields.reduce((obj, cur) => ({ ...obj, [cur.label] : cur.value }), {}); + let properties = fields.reduce((obj, cur) => ({ ...obj, [cur.name] : cur.value }), {}); + let instructions = {"@LIFECYCLE":["general"]}; - operationsService.executeOperation(mbeanName, { name: 'createObject' }, [ objectId, 'public', properties ] ) + operationsService.executeOperation(mbeanName, { name: 'createObjectByInstructions' }, [ objectId, 'public', instructions, properties ] ) .then(result => { - setTimeout(() => populateTable(), 200); + let tableHtml = Entaxy.createTableFromResponse(result); + Entaxy.notification('success', tableHtml, 10000); - let tableHtml = ``; - tableHtml += - ` - - - - - - `; - _.forEach(JSON.parse(result), (step) => { - let iconName = step['Step result'] === 'OK' ? 'ok' : 'error-circle-o'; - tableHtml += ``; - tableHtml += ``; - }); - tableHtml += `
StepStep nameStep result
` + step['Step'] + `` + step['Step name'] + `
`; - - Entaxy.notification('success', tableHtml, 8000); - - changeLocation(properties[ctrl.objectName]); + if (ctrl.isParentDependent || mode === Entaxy.MODAL_MODES.EDIT) { + $scope.$on(Jmx.TreeEvent.Updated, () => populateTable()); + } else { + changeLocation(properties[ctrl.objectName] ? properties[ctrl.objectName] : objectId); + } }).catch(error => { Core.notification('danger', error, 5000); + Entaxy.log.error(error); }); } function changeLocation(itemName) { let currentLocation = $location.search(); - $location.search('nid', currentLocation.nid + '-' + itemName); // FIXME FIXME FIXME + $location.search('nid', currentLocation.nid + '-' + itemName); } function startItem(action, item) { - let mbeanName = workspace.getSelectedMBeanName(); - - operationsService.executeOperation(mbeanName, { name: 'start' + ctrl.itemName }, [ item.name ]) - .then(result => { - // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - - setTimeout(() => populateTable(), 100); - - Core.notification('success', result, 3000); - }).catch(error => { - Core.notification('danger', error, 5000); - }); + if (item.status !== 'Active') { + processOperation('start', item.name); + } else { + Core.notification('info', ctrl.itemName + ' has been already started'); + } } function stopItem(action, item) { - let mbeanName = workspace.getSelectedMBeanName(); - - operationsService.executeOperation(mbeanName, { name: 'stop' + ctrl.itemName }, [ item.name ]) - .then(result => { - // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME -// jolokiaService.getAttribute(item.mbeanName, 'BundleState') -// .then((response) => item.status = response); - - setTimeout(() => populateTable(), 100); - - Core.notification('success', result, 3000); - }).catch(error => { - Core.notification('danger', error, 5000); - }); + if (item.status !== 'Resolved') { + processOperation('stop', item.name); + } else { + Core.notification('info', ctrl.itemName + ' has been already stopped'); + } } function uninstallItem(action, item) { + let operationName = ctrl.isParentDependent ? 'remove' : 'uninstall'; + processOperation(operationName, item.name); + } + + function processOperation(operationName, selectedItemName) { let mbeanName = workspace.getSelectedMBeanName(); - operationsService.executeOperation(mbeanName, { name: 'uninstall' + ctrl.itemName }, [ item.name ]) + operationsService.executeOperation(mbeanName, { name: operationName + ctrl.itemName }, [ selectedItemName ]) .then(result => { - ctrl.items.splice(ctrl.items.indexOf(item), 1); - ctrl.viewedItems = ctrl.items; - ctrl.toolbarConfig.filterConfig.appliedFilters = []; - ctrl.toolbarConfig.filterConfig.resultsCount = ctrl.viewedItems.length; - Core.notification('success', result, 3000); + $scope.$on(Jmx.TreeEvent.Updated, () => populateTable()); }).catch(error => { Core.notification('danger', error, 5000); + Entaxy.log.error(error); }); } ctrl.dismissAlert = () => ctrl.alert = null; } - EntaxyTableController.$inject = ['workspace', '$location', '$uibModal', 'operationsService', 'jolokiaService']; + EntaxyTableController.$inject = ['workspace', '$location', '$scope', '$q', 'jolokia', 'jolokiaService', '$uibModal', 'operationsService']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/tree.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/tree.js index 55c706c..235d177 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/tree.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/components/tree.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ var Entaxy; $element.addClass('tree-nav-sidebar-header'); EntaxyTreeHeaderController.prototype.$onInit = function () { - Entaxy.log.debug("EntaxyTreeHeaderController init"); + Entaxy.log.debug("EntaxyTreeHeaderController init"); var _this = this; this.$scope.$watch(angular.bind(this, function () { return _this.filter; }), function (filter, previous) { if (filter !== previous) { @@ -82,7 +82,7 @@ var Entaxy; }; EntaxyTreeHeaderController.prototype.search = function (filter) { - Entaxy.log.debug("EntaxyTreeHeaderController search"); + Entaxy.log.debug("EntaxyTreeHeaderController search"); var _this = this; var doSearch = function (filter) { var result = _this.tree().search(filter, { @@ -99,18 +99,18 @@ var Entaxy; }; EntaxyTreeHeaderController.prototype.tree = function () { - Entaxy.log.debug("EntaxyTreeHeaderController tree"); + Entaxy.log.debug("EntaxyTreeHeaderController tree"); return $(entaxyTreeElementId).treeview(true); }; EntaxyTreeHeaderController.prototype.expandAll = function () { - Entaxy.log.debug("EntaxyTreeHeaderController expand"); + Entaxy.log.debug("EntaxyTreeHeaderController expand"); return this.tree() .expandNode(this.tree().getNodes(), { levels: HawtioTree.getMaxTreeLevel(this.tree()), silent: true }); }; EntaxyTreeHeaderController.prototype.contractAll = function () { - Entaxy.log.debug("EntaxyTreeHeaderController contract"); + Entaxy.log.debug("EntaxyTreeHeaderController contract"); return this.tree() .collapseNode(this.tree().getNodes(), { ignoreChildren: true, silent: true }); }; @@ -128,7 +128,7 @@ var Entaxy; Entaxy.log.debug("EntaxyTreeController "); var entaxyJmxDomain = localStorage['entaxyJmxDomain'] || "ru.entaxy.esb"; EntaxyTreeController.prototype.$onInit = function () { - Entaxy.log.debug("EntaxyTreeController onInit"); + Entaxy.log.debug("EntaxyTreeController onInit"); var _this = this; this.$scope.$on('$destroy', function () { return _this.removeTree(); }); this.$scope.$on('$routeChangeStart', function () { return Jmx.updateTreeSelectionFromURL(_this.$location, $(entaxyTreeElementId)); }); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyHelpers.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyHelpers.js index 5df1ed8..73461bf 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyHelpers.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyHelpers.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -20,16 +20,75 @@ var Entaxy; (function (Entaxy) { + const MODAL_MODES = { + VIEW: 'View', + EDIT: 'Edit', + ADD: 'Add' + }; + Entaxy.MODAL_MODES = MODAL_MODES; + + function getButtonTitleByMode(mode) { + switch (mode) { + case MODAL_MODES.ADD: + return 'Add'; + case MODAL_MODES.EDIT: + return 'Save'; + case MODAL_MODES.VIEW: + return 'Ok'; + } + } + Entaxy.getButtonTitleByMode = getButtonTitleByMode; + + function capitalize(string) { + return string.charAt(0).toUpperCase() + string.slice(1); + } + Entaxy.capitalize = capitalize; + + function uncapitalize(string) { + return string.charAt(0).toLowerCase() + string.slice(1); + } + Entaxy.uncapitalize = uncapitalize; + + function getChildrenRecursive(folder) { + let children = folder.children; + if (children) { + folder.children.forEach(child => { + if (child.children) { + children = children.concat(getChildrenRecursive(child)); + } + }); + } + return children; + } + Entaxy.getChildrenRecursive = getChildrenRecursive; + + function compareBy(fieldName) { + return function(a, b) { + let valueA = a[fieldName].toLowerCase(); + let valueB = b[fieldName].toLowerCase(); + if (valueA < valueB) { + return -1; + } + if (valueA > valueB) { + return 1; + } + return 0; + } + } + Entaxy.compareBy = compareBy; + function convertToHtmlInputType(javaType) { if (!javaType || javaType.startsWith('entaxy.runtime')) { - // fixme maybe return javaType; } switch (javaType) { + case 'xml:route': + return javaType; case 'boolean': case 'Boolean': case 'java.lang.Boolean': return 'checkbox'; + case 'number': case 'int': case 'long': case 'java.lang.Integer': @@ -41,6 +100,26 @@ var Entaxy; } Entaxy.convertToHtmlInputType = convertToHtmlInputType; + function createTableFromResponse(response) { + let tableHtml = ``; + tableHtml += + ` + + + + + + `; + _.forEach(JSON.parse(response), (step) => { + let iconName = step['Step result'] === 'OK' ? 'ok' : 'error-circle-o'; + tableHtml += ``; + tableHtml += ``; + }); + tableHtml += `
StepStep nameStep result
` + step['Step'] + `` + step['Step name'] + `
`; + return tableHtml; + } + Entaxy.createTableFromResponse = createTableFromResponse; + function notification(type, message, duration) { let visibleToastElem = null; @@ -52,7 +131,9 @@ var Entaxy; - ${message} +
+ ${message} +
`; diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyJsonHelpers.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyJsonHelpers.js index 95134a6..dee827b 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyJsonHelpers.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyJsonHelpers.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -39,36 +39,42 @@ var Entaxy; let connectorTemplateParams = '{"uniform-service-active-in-connector":[' + '{' + '"label":"period",' + + '"displayName":"Period",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":"1m"' + '},' + '{' + '"label":"username",' + + '"displayName":"Username",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":"admin"' + '},' + '{' + '"label":"password",' + + '"displayName":"Password",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"endpointUrl",' + + '"displayName":"Endpoint URL",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"connectionTimeout",' + + '"displayName":"Connection Timeout",' + '"type":"int",' + '"helpText":null,' + '"value":3000' + '},' + '{' + '"label":"connectionMaxThreads",' + + '"displayName":"Connection Max Threads",' + '"type":"int",' + '"helpText":null,' + '"value":1' + @@ -77,30 +83,35 @@ var Entaxy; '"uniform-service-active-out-connector":[' + '{' + '"label":"username",' + + '"displayName":"Username",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":"admin"' + '},' + '{' + '"label":"password",' + + '"displayName":"Password",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"endpointUrl",' + + '"displayName":"Endpoint URL",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"connectionTimeout",' + + '"displayName":"Connection Timeout",' + '"type":"int",' + '"helpText":null,' + '"value":3000' + '},' + '{' + '"label":"connectionMaxThreads",' + + '"displayName":"Connection Max Threads",' + '"type":"int",' + '"helpText":null,' + '"value":1' + @@ -112,36 +123,42 @@ var Entaxy; '"sql-out-connector":[' + '{' + '"label":"serverName",' + + '"displayName":"Server Name",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"portNumber",' + + '"displayName":"Port Number",' + '"type":"java.lang.Integer",' + '"helpText":null,' + '"value":5432' + '},' + '{' + '"label":"databaseName",' + + '"displayName":"Database Name",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"user",' + + '"displayName":"User",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"password",' + + '"displayName":"Password",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":""' + '},' + '{' + '"label":"dataSourceClass",' + + '"displayName":"Data Source Class",' + '"type":"java.lang.String",' + '"helpText":null,' + '"value":"org.postgresql.ds.PGSimpleDataSource"' + diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyPlugin.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyPlugin.js index 78d0d66..28222b6 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyPlugin.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/entaxyPlugin.js @@ -2,7 +2,7 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ var Entaxy = (function (Entaxy) { }) .run(configurePlugin); - function configurePlugin(mainNavService, workspace, helpRegistry, preferencesRegistry, localStorage, preLogoutTasks, documentBase, $templateCache, $rootScope) { + function configurePlugin(mainNavService, workspace, helpRegistry, preferencesRegistry, localStorage, preLogoutTasks, documentBase, $templateCache, $rootScope) { var entaxyJmxDomain = localStorage['entaxyJmxDomain'] || "ru.entaxy.esb"; mainNavService.addItem({ title: 'Entaxy', @@ -67,6 +67,67 @@ var Entaxy = (function (Entaxy) { isValid: function () { return workspace.treeContainsDomainAndProperties(entaxyJmxDomain); } }); + workspace.addNamedTreePostProcessor('addIconClass', (tree) => { + if (tree) { + let domain = tree.get(entaxyJmxDomain); + + if (domain) { + angular.forEach(domain.children, (node) => { + node.class = 'entaxy-node-icon'; + + angular.forEach(['platform', 'runtime', 'resource'], (folderName) => { + let folder = domain.findDescendant(child => child.title === folderName); + if (folder) { + folder.class = createClassName(folderName); + } + }); + + angular.forEach(['adapter', 'factories', 'connections'], (folderName) => { + addClassRecursive( + domain.findDescendant(child => child.title === folderName), + createClassName(folderName) + ); + }); + + addClassToParentAndItsChildren(domain, 'profiles'); + }); + } + } + }); + + function addClassRecursive(folder, className) { + if (folder) { + folder.class = className; + angular.forEach(folder.children, (child) => { + if (child.children && child.children.length > 0) { + addClassRecursive(child, className); + } else { + child.class = className; + } + }); + } + } + + function addClassToParentAndItsChildren(domain, parentName) { + let className = createClassName(parentName); + let parent = domain.findDescendant(child => child.title === parentName); + + if (parent) { + parent.class = className; + angular.forEach(parent.children, (child) => { + child.class = className; + + angular.forEach(child.children, (grandChild) => { + addClassRecursive(grandChild, createClassName(grandChild.title)); + }) + }); + } + } + + function createClassName(folderName) { + return 'entaxy-' + folderName + '-icon'; + } + function mBeansTreeLocalization(children) { if (children && children.length >0) { for (var i=0; i { - if (tree) { - let domain = tree.get(entaxyJmxDomain); - if (domain) { - console.log('domain '); - console.log(domain.children); - mBeansTreeLocalization(domain.children); - } - } + if (tree) { + let domain = tree.get(entaxyJmxDomain); + if (domain) { + console.log('domain '); + console.log(domain.children); + mBeansTreeLocalization(domain.children); + } + } }); // clean up local storage upon logout @@ -104,7 +165,7 @@ var Entaxy = (function (Entaxy) { } configurePlugin.$inject = ['mainNavService', 'workspace', 'helpRegistry', 'preferencesRegistry', 'localStorage', 'preLogoutTasks', 'documentBase', '$templateCache','$rootScope']; - return Entaxy; + return Entaxy; })(Entaxy || {}); @@ -113,12 +174,13 @@ var Entaxy = (function (Entaxy) { hawtioPluginLoader.addModule(Entaxy.pluginName); var L10N = { - platform: 'Платформа', - adapters: 'Адаптеры', - factories: 'Фабрики', - runtime:'Состояние', - connections:'Коннекции', - profiles:'Профили', - connectors:'Коннекторы', - routes:'Маршруты' - }; + platform: 'Платформа', + adapter: 'Адаптеры', + factories: 'Фабрики', + runtime:'Состояние', + connections:'Коннекции', + profiles:'Профили', + connectors:'Коннекторы', + routes:'Маршруты', + resource: 'Ресурсы' +}; diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/connectorsService.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/connectorsService.js index a0f041d..5890291 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/connectorsService.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/connectorsService.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/firstStepModalTest.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/firstStepModalTest.js index f83477e..ce5874a 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/firstStepModalTest.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/firstStepModalTest.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -139,4 +139,4 @@ var Entaxy; } firstStepModalTestController.$inject = []; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/restService.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/restService.js index 4f4e4e1..a3c5b80 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/restService.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/restService.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2022 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/secondStepModalTest.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/secondStepModalTest.js index 3d261a7..7c2f724 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/secondStepModalTest.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/secondStepModalTest.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -96,4 +96,4 @@ function secondStepModalTestController() { } secondStepModalTestController.$inject = []; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/test.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/test.js index 4e831c9..a8dea10 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/test.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/test.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal.js index 77b2d0e..35cd2b0 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -300,4 +300,4 @@ var Entaxy; } testModalController.$inject = ['workspace', '$uibModal']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal2.js b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal2.js index a7c9f61..172b029 100644 --- a/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal2.js +++ b/ui/entaxy-hawtio/entaxy-management-plugin/src/main/webapp/plugin/js/toDeletion/testModal2.js @@ -2,14 +2,14 @@ * ~~~~~~licensing~~~~~~ * entaxy-management-plugin * ========== - * Copyright (C) 2020 - 2021 EmDev LLC + * Copyright (C) 2020 - 2023 EmDev LLC * ========== * Licensed 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. @@ -241,4 +241,4 @@ var Entaxy; } testModal2Controller.$inject = ['workspace', '$uibModal']; -})(Entaxy || (Entaxy = {})); \ No newline at end of file +})(Entaxy || (Entaxy = {})); diff --git a/ui/entaxy-hawtio/pom.xml b/ui/entaxy-hawtio/pom.xml index 77983ae..626902a 100644 --- a/ui/entaxy-hawtio/pom.xml +++ b/ui/entaxy-hawtio/pom.xml @@ -4,7 +4,7 @@ ru.entaxy.esb ui - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui entaxy-hawtio @@ -46,42 +46,130 @@ - - - org.codehaus.mojo - license-maven-plugin - - - update-file-header - - update-file-header - - process-sources - - - - **/org.apache.karaf.features.repos.cfg - **/*.cfg - **/*.json1 - - **/*.ftl - - - - - - + + + + attach-cfg + + + src/main/resources/etc/org.apache.karaf.features.repos.cfg + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-cfg-hawtio + package + + attach-artifact + + + false + + + target/classes/etc/org.apache.karaf.features.repos.cfg + cfg + org.apache.karaf.features.repos + + + + + + + + + + + + entaxy-hawtio-license + + + processLicense + true + + + + + + org.codehaus.mojo + license-maven-plugin + + + update-file-header-entaxy-hawtio + + update-file-header + + process-sources + + ${license.organizationName} + ${license.inceptionYear} + ${license.projectName} + ${license.copyrightOwners} + ${license.licenseName} + + + false + false + + + + + properties + + + true + true + + ${license.processStartTag} + ${license.processEndTag} + ${license.sectionDelimiter} + + + + update-file-header + + update-file-header + + process-sources + + + + **/org.apache.karaf.features.repos.cfg + **/*.cfg + **/*.json1 + + **/*.ftl + + + + + + + + + + install-hawtio-script + false - src/main/scripts/entaxy-hawtio.install + src/main/scripts/entaxy-hawtio.install_1 diff --git a/ui/entaxy-hawtio/src/main/features/features.xml b/ui/entaxy-hawtio/src/main/features/features.xml index 30d18ba..734c695 100644 --- a/ui/entaxy-hawtio/src/main/features/features.xml +++ b/ui/entaxy-hawtio/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ entaxy-hawtio ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/entaxy-hawtio/src/main/resources/etc/org.apache.karaf.features.repos.cfg b/ui/entaxy-hawtio/src/main/resources/etc/org.apache.karaf.features.repos.cfg index 73b2978..817567f 100644 --- a/ui/entaxy-hawtio/src/main/resources/etc/org.apache.karaf.features.repos.cfg +++ b/ui/entaxy-hawtio/src/main/resources/etc/org.apache.karaf.features.repos.cfg @@ -1,3 +1,22 @@ +### +# ~~~~~~licensing~~~~~~ +# entaxy-hawtio +# ========== +# Copyright (C) 2020 - 2023 EmDev LLC +# ========== +# Licensed 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. +# ~~~~~~/licensing~~~~~~ +### # # This file describes the features repository URL # for Entaxy Hawtio-based UI diff --git a/ui/entaxy-hawtio/src/main/scripts/entaxy-hawtio.install b/ui/entaxy-hawtio/src/main/scripts/entaxy-hawtio.install index d4736a7..8e694d8 100644 --- a/ui/entaxy-hawtio/src/main/scripts/entaxy-hawtio.install +++ b/ui/entaxy-hawtio/src/main/scripts/entaxy-hawtio.install @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # entaxy-hawtio # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/h2-console/pom.xml b/ui/h2-console/pom.xml index 6972c36..94bf01c 100644 --- a/ui/h2-console/pom.xml +++ b/ui/h2-console/pom.xml @@ -3,7 +3,7 @@ ru.entaxy.esb ui - 1.8.2.2 + 1.8.3 ru.entaxy.esb.ui h2-console diff --git a/ui/h2-console/src/main/resources/WEB-INF/web.xml b/ui/h2-console/src/main/resources/WEB-INF/web.xml index 106eb51..6e4edb9 100644 --- a/ui/h2-console/src/main/resources/WEB-INF/web.xml +++ b/ui/h2-console/src/main/resources/WEB-INF/web.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ h2-console ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/h2-console/src/main/resources/console.html b/ui/h2-console/src/main/resources/console.html index 72714d3..de5ade7 100644 --- a/ui/h2-console/src/main/resources/console.html +++ b/ui/h2-console/src/main/resources/console.html @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ h2-console ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/pom.xml b/ui/pom.xml index d90f8a0..c2c81e6 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -4,7 +4,7 @@ ru.entaxy.esb root - 1.8.2.2 + 1.8.3 ui pom @@ -16,11 +16,69 @@ + + install-script-ui-license + + + processLicense + true + + + + + + org.codehaus.mojo + license-maven-plugin + + + update-file-header + + update-file-header + + process-sources + + ${license.organizationName} + ${license.inceptionYear} + ${license.projectName} + ${license.copyrightOwners} + ${license.licenseName} + + + false + false + + + + + properties + + + true + true + + ${license.processStartTag} + ${license.processEndTag} + ${license.sectionDelimiter} + + + + + + + + + install-script-ui + false - src/main/scripts/entaxy-ui.install + src/main/scripts/entaxy-ui.install_ diff --git a/ui/src/main/features/features.xml b/ui/src/main/features/features.xml index ba093c0..292d534 100644 --- a/ui/src/main/features/features.xml +++ b/ui/src/main/features/features.xml @@ -3,7 +3,7 @@ ~~~~~~licensing~~~~~~ ui ========== - Copyright (C) 2020 - 2021 EmDev LLC + Copyright (C) 2020 - 2023 EmDev LLC ========== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ui/src/main/healthcheck/generated/fragments.xml b/ui/src/main/healthcheck/generated/fragments.xml index 36c64ab..74a1aef 100644 --- a/ui/src/main/healthcheck/generated/fragments.xml +++ b/ui/src/main/healthcheck/generated/fragments.xml @@ -1,5 +1,5 @@ - - mvn:ru.entaxy.esb/ui/1.8.2.2/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui + + mvn:ru.entaxy.esb/ui/1.8.3/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui \ No newline at end of file diff --git a/ui/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui.cfg b/ui/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui.cfg index e8d6119..57ad6d6 100644 --- a/ui/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui.cfg +++ b/ui/src/main/healthcheck/org.apache.felix.hc.generalchecks.BundlesStartedCheck-ui.cfg @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # ui # ========== -# Copyright (C) 2020 - 2022 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/src/main/scripts/entaxy-ui.install b/ui/src/main/scripts/entaxy-ui.install index e1fedf3..bee0589 100644 --- a/ui/src/main/scripts/entaxy-ui.install +++ b/ui/src/main/scripts/entaxy-ui.install @@ -2,7 +2,7 @@ # ~~~~~~licensing~~~~~~ # entaxy-hawtio # ========== -# Copyright (C) 2020 - 2021 EmDev LLC +# Copyright (C) 2020 - 2023 EmDev LLC # ========== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/underlying/artemis.entaxy/artemis-server-osgi/pom.xml b/underlying/artemis.entaxy/artemis-server-osgi/pom.xml deleted file mode 100644 index 41dd57a..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - 4.0.0 - - - org.apache.activemq - artemis-pom - 2.19.0-ENTAXY - - - artemis-server-osgi - bundle - ActiveMQ Artemis Server OSGi ENTAXY - - - Combines the commons, core-client and server jars as they contain too many duplicate packages - to be deployed separately. - - - - - - - - - org.apache.activemq - artemis-commons - ${activemq.version} - - - org.apache.activemq - artemis-core-client - ${activemq.version} - - - org.apache.activemq - artemis-server - ${activemq.version} - - - org.apache.activemq - artemis-jms-client - ${activemq.version} - - - org.apache.activemq - artemis-jms-server - ${activemq.version} - - - org.apache.activemq - artemis-jdbc-store - ${activemq.version} - - - org.apache.activemq - artemis-journal - ${activemq.version} - - - org.apache.activemq - artemis-selector - ${activemq.version} - - - org.apache.activemq - artemis-service-extensions - ${activemq.version} - - - org.jboss.logmanager - jboss-logmanager - true - provided - - - org.wildfly.common - wildfly-common - provided - true - - - org.jboss.logging - jboss-logging-processor - provided - true - - - org.jboss.logging - jboss-logging-annotations - provided - true - - - com.google.errorprone - error_prone_core - - - org.jboss.logging - jboss-logging - - - xalan - xalan - true - provided - - - junit - junit - test - - - org.easymock - easymock - test - - - org.osgi - org.osgi.core - provided - - - org.osgi - osgi.cmpn - provided - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - *;scope=compile|runtime;groupId=org.apache.activemq - - org.postgresql*;resolution:=optional, - io.netty.buffer;io.netty.*;version="[4.1,5)", - org.apache.johnzon.core, - * - - <_exportcontents>org.apache.activemq.artemis.*;-noimport:=true - - - - - - - diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java b/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java deleted file mode 100644 index a169457..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.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.activemq.artemis.osgi; - -import org.jboss.logging.BasicLogger; -import org.jboss.logging.Logger; -import org.jboss.logging.annotations.Cause; -import org.jboss.logging.annotations.LogMessage; -import org.jboss.logging.annotations.Message; -import org.jboss.logging.annotations.MessageLogger; - -/** - * Logger code 58 - * - * each message id must be 6 digits long starting with 58, the 3rd digit donates the level so - * - * INF0 1 - * WARN 2 - * DEBUG 3 - * ERROR 4 - * TRACE 5 - * FATAL 6 - * - * so an INFO message would be 581000 to 581999 - */ -@MessageLogger(projectCode = "AMQ") -public interface ActiveMQOsgiLogger extends BasicLogger { - - /** - * * The default logger. - */ - ActiveMQOsgiLogger LOGGER = Logger.getMessageLogger(ActiveMQOsgiLogger.class, ActiveMQOsgiLogger.class.getPackage().getName()); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 581000, value = "Broker config {0} found. Tracking protocols {1}", format = Message.Format.MESSAGE_FORMAT) - void brokerConfigFound(String name, String protocols); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 581001, value = "Required protocol {0} was added for broker {1}. {2}", format = Message.Format.MESSAGE_FORMAT) - void protocolWasAddedForBroker(String protocol, String name, String message); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 581002, value = "Required protocol {0} was removed for broker {1}. {2}", format = Message.Format.MESSAGE_FORMAT) - void protocolWasRemovedForBroker(String protocol, String name, String message); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 582000, value = "Error starting broker: {0}", format = Message.Format.MESSAGE_FORMAT) - void errorStartingBroker(@Cause Exception e, String name); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 582001, value = "Error stopping broker: {0}", format = Message.Format.MESSAGE_FORMAT) - void errorStoppingBroker(@Cause Exception e, String name); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 582002, value = "Error getting dataSource provider infos.", format = Message.Format.MESSAGE_FORMAT) - void errorGettingDataSourceProviderInfo(@Cause Exception e); - -} - diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java b/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java deleted file mode 100644 index bfc7362..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java +++ /dev/null @@ -1,76 +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.activemq.artemis.osgi; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.SQLException; - -import org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfiguration; -import org.apache.activemq.artemis.jdbc.store.drivers.JDBCUtils; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTrackerCustomizer; - -public class DataSourceTracker implements ServiceTrackerCustomizer { - - private final String name; - private final BundleContext context; - private final DatabaseStorageConfiguration dsc; - private final ServerTrackerCallBack callback; - - public DataSourceTracker(String name, BundleContext context, DatabaseStorageConfiguration dsc, - ServerTrackerCallBack callback) { - this.name = name; - this.context = context; - this.dsc = dsc; - this.callback = callback; - } - - @Override - public DataSource addingService(ServiceReference reference) { - DataSource dataSource = context.getService(reference); - dsc.setDataSource(dataSource); - try (Connection conn = dataSource.getConnection()) { - dsc.setSqlProvider(JDBCUtils.getSQLProviderFactory(conn.getMetaData().getURL())); - } catch (SQLException ex) { - ActiveMQOsgiLogger.LOGGER.errorGettingDataSourceProviderInfo(ex); - } - callback.setDataSourceDependency(false); - try { - callback.start(); - } catch (Exception ex) { - ActiveMQOsgiLogger.LOGGER.errorStartingBroker(ex, name); - } - return dataSource; - } - - @Override - public void modifiedService(ServiceReference reference, DataSource service) { - // not supported - } - - @Override - public void removedService(ServiceReference reference, DataSource service) { - callback.setDataSourceDependency(true); - try { - callback.stop(); - } catch (Exception ex) { - ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(ex, name); - } - } -} diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java b/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java deleted file mode 100644 index 20f671a..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.artemis.osgi; - -import java.io.File; -import java.lang.management.ManagementFactory; -import java.util.ArrayList; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.activemq.artemis.api.core.Interceptor; -import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; -import org.apache.activemq.artemis.core.config.FileDeploymentManager; -import org.apache.activemq.artemis.core.config.StoreConfiguration; -import org.apache.activemq.artemis.core.config.StoreConfiguration.StoreType; -import org.apache.activemq.artemis.core.config.impl.FileConfiguration; -import org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfiguration; -import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.artemis.core.server.ActiveMQComponent; -import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.management.ArtemisMBeanServerBuilder; -import org.apache.activemq.artemis.core.server.management.ArtemisMBeanServerGuard; -import org.apache.activemq.artemis.core.server.management.HawtioSecurityControl; -import org.apache.activemq.artemis.core.server.management.JMXAccessControlList; -import org.apache.activemq.artemis.core.server.management.impl.HawtioSecurityControlImpl; -import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; -import org.osgi.service.component.ComponentContext; -import org.osgi.service.component.annotations.Activate; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.ConfigurationPolicy; -import org.osgi.service.component.annotations.Deactivate; -import org.osgi.util.tracker.ServiceTracker; - -import javax.management.ObjectName; - -@SuppressWarnings({"unchecked", "rawtypes"}) -@Component(configurationPid = "org.apache.activemq.artemis", configurationPolicy = ConfigurationPolicy.REQUIRE) -public class OsgiBroker { - - private String name; - private String configurationUrl; - private String rolePrincipalClass; - private Map components; - private Map> registrations; - private ServiceTracker tracker; - private ServiceTracker dataSourceTracker; - - @Activate - public void activate(ComponentContext cctx) throws Exception { - final BundleContext context = cctx.getBundleContext(); - final Dictionary properties = cctx.getProperties(); - configurationUrl = getMandatory(properties, "config"); - name = getMandatory(properties, "name"); - rolePrincipalClass = (String) properties.get("rolePrincipalClass"); - String domain = getMandatory(properties, "domain"); - ActiveMQJAASSecurityManager security = new ActiveMQJAASSecurityManager(domain); - if (rolePrincipalClass != null) { - security.setRolePrincipalClass(rolePrincipalClass); - } - String brokerInstance = null; - - String artemisDataDir = System.getProperty("artemis.data"); - if (artemisDataDir != null) { - brokerInstance = artemisDataDir + "/artemis/" + name; - } else { - String karafDataDir = System.getProperty("karaf.data"); - if (karafDataDir != null) { - brokerInstance = karafDataDir + "/artemis/" + name; - } - } - - - // todo if we start to pullout more configs from the main config then we - // should pull out the configuration objects from factories if available - FileConfiguration configuration = new FileConfiguration(); - if (brokerInstance != null) { - configuration.setBrokerInstance(new File(brokerInstance)); - } - FileJMSConfiguration jmsConfiguration = new FileJMSConfiguration(); - - FileDeploymentManager fileDeploymentManager = new FileDeploymentManager(configurationUrl); - fileDeploymentManager.addDeployable(configuration).addDeployable(jmsConfiguration).readConfiguration(); - - components = fileDeploymentManager.buildService(security, ManagementFactory.getPlatformMBeanServer(), null); - - final ActiveMQServer server = (ActiveMQServer) components.get("core"); - - String[] requiredProtocols = getRequiredProtocols(server.getConfiguration().getAcceptorConfigurations()); - ServerTrackerCallBack callback = new ServerTrackerCallBackImpl(server, context, properties); - - StoreConfiguration storeConfiguration = server.getConfiguration().getStoreConfiguration(); - String dataSourceName = String.class.cast(properties.get("dataSourceName")); - - if (storeConfiguration != null && - storeConfiguration.getStoreType() == StoreType.DATABASE && dataSourceName != null && - !dataSourceName.isEmpty()) { - callback.setDataSourceDependency(true); - String filter = "(&(objectClass=javax.sql.DataSource)(osgi.jndi.service.name=" + dataSourceName + "))"; - DataSourceTracker trackerCust = - new DataSourceTracker(name, context, DatabaseStorageConfiguration.class.cast(storeConfiguration), - (ServerTrackerCallBack) callback); - dataSourceTracker = new ServiceTracker(context, context.createFilter(filter), trackerCust); - dataSourceTracker.open(); - } - - registerMBean(); - - ProtocolTracker trackerCust = new ProtocolTracker(name, context, requiredProtocols, callback); - tracker = new ServiceTracker(context, ProtocolManagerFactory.class, trackerCust); - tracker.open(); - } - - private void registerMBean() throws Exception { - ArtemisMBeanServerGuard artemisMBeanServerGuard = createArtemisMBeanServerGuard(); - - HawtioSecurityControl control = new HawtioSecurityControlImpl(artemisMBeanServerGuard, null); - ObjectName objectName = new ObjectName("artemis:area=jmx,name=ArtemisJMXSecurity,type=security"); - if (!ManagementFactory.getPlatformMBeanServer().isRegistered(objectName)) { - ManagementFactory.getPlatformMBeanServer().registerMBean(control, objectName); - } - } - - public ArtemisMBeanServerGuard createArtemisMBeanServerGuard() throws Exception { - JMXAccessControlList accessControlList = createJMXAccessControlList(); - ArtemisMBeanServerGuard guardHandler = new ArtemisMBeanServerGuard(); - guardHandler.setJMXAccessControlList(accessControlList); - ArtemisMBeanServerBuilder.setGuard(guardHandler); - return guardHandler; - } - - private JMXAccessControlList createJMXAccessControlList() { - JMXAccessControlList accessControlList = new JMXAccessControlList(); - accessControlList.addToAllowList("org.apache.activemq.artemis", null); - return accessControlList; - } - - private String getMandatory(Dictionary properties, String key) { - String value = (String) properties.get(key); - if (value == null) { - throw new IllegalStateException("Property " + key + " must be set"); - } - return value; - } - - private String[] getRequiredProtocols(Set acceptors) { - ArrayList protocols = new ArrayList<>(); - for (TransportConfiguration acceptor : acceptors) { - Object protocolsFromAcceptor = acceptor.getParams().get(TransportConstants.PROTOCOLS_PROP_NAME); - if (protocolsFromAcceptor != null) { - String[] protocolsSplit = protocolsFromAcceptor.toString().split(","); - for (String protocol : protocolsSplit) { - if (!protocols.contains(protocol)) { - protocols.add(protocol); - } - } - } - } - return protocols.toArray(new String[protocols.size()]); - } - - @Deactivate - public void stop() throws Exception { - tracker.close(); - if (dataSourceTracker != null) { - dataSourceTracker.close(); - } - } - - public Map getComponents() { - return components; - } - - /* - * this makes sure the components are started in the correct order. Its - * simple at the mo as e only have core and jms but will need impproving if - * we get more. - */ - public ArrayList getComponentsByStartOrder(Map components) { - ArrayList activeMQComponents = new ArrayList<>(); - ActiveMQComponent jmsComponent = components.get("jms"); - if (jmsComponent != null) { - activeMQComponents.add(jmsComponent); - } - activeMQComponents.add(components.get("core")); - return activeMQComponents; - } - - public void register(BundleContext context, Dictionary properties) { - registrations = new HashMap<>(); - for (Map.Entry component : getComponents().entrySet()) { - String[] classes = getInterfaces(component.getValue()); - Hashtable props = new Hashtable<>(); - for (Enumeration keyEnum = properties.keys(); keyEnum.hasMoreElements(); ) { - String key = keyEnum.nextElement(); - Object val = properties.get(key); - props.put(key, val); - } - ServiceRegistration registration = context.registerService(classes, component.getValue(), props); - registrations.put(component.getKey(), registration); - } - } - - private String[] getInterfaces(ActiveMQComponent value) { - Set interfaces = new HashSet<>(); - getInterfaces(value.getClass(), interfaces); - return interfaces.toArray(new String[interfaces.size()]); - } - - private void getInterfaces(Class clazz, Set interfaces) { - for (Class itf : clazz.getInterfaces()) { - if (interfaces.add(itf.getName())) { - getInterfaces(itf, interfaces); - } - } - if (clazz.getSuperclass() != null) { - getInterfaces(clazz.getSuperclass(), interfaces); - } - } - - public void unregister() { - if (registrations != null) { - for (ServiceRegistration reg : registrations.values()) { - reg.unregister(); - } - } - } - - private class ServerTrackerCallBackImpl implements ServerTrackerCallBack { - - private volatile boolean dataSourceDependency = false; - - private final ActiveMQServer server; - private final BundleContext context; - private final Dictionary properties; - - ServerTrackerCallBackImpl(ActiveMQServer server, BundleContext context, - Dictionary properties) { - this.server = server; - this.context = context; - this.properties = properties; - } - - @Override - public void addFactory(ProtocolManagerFactory pmf) { - server.addProtocolManagerFactory(pmf); - } - - @Override - public void removeFactory(ProtocolManagerFactory pmf) { - server.removeProtocolManagerFactory(pmf); - } - - @Override - public void stop() throws Exception { - ActiveMQComponent[] mqComponents = new ActiveMQComponent[components.size()]; - components.values().toArray(mqComponents); - for (int i = mqComponents.length - 1; i >= 0; i--) { - mqComponents[i].stop(); - } - unregister(); - } - - @Override - public void start() throws Exception { - if (!dataSourceDependency) { - List componentsByStartOrder = getComponentsByStartOrder(components); - for (ActiveMQComponent component : componentsByStartOrder) { - component.start(); - } - register(context, properties); - } - } - - @Override - public boolean isStarted() { - return server.isStarted(); - } - - - - @Override - public void setDataSourceDependency(boolean dataSourceDependency) { - this.dataSourceDependency = dataSourceDependency; - } - - - } - -} diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java b/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java deleted file mode 100644 index 8e09129..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java +++ /dev/null @@ -1,142 +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.activemq.artemis.osgi; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.activemq.artemis.api.core.Interceptor; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; -import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTrackerCustomizer; - -/** - * Tracks the available ProtocolManagerFactory services as well as the required protocols. - * When a new service appears the factory is added to the server. - * When all needed protocols are present the server is started. - * When required a service disappears the server is stopped. - */ -@SuppressWarnings("rawtypes") -public class ProtocolTracker implements ServiceTrackerCustomizer, ProtocolManagerFactory> { - - private String name; - private BundleContext context; - private Map protocols; - private ServerTrackerCallBack callback; - - public ProtocolTracker(String name, - BundleContext context, - String[] requiredProtocols, - ServerTrackerCallBack callback) { - this.name = name; - this.context = context; - this.callback = callback; - this.protocols = new HashMap<>(); - for (String requiredProtocol : requiredProtocols) { - this.protocols.put(requiredProtocol, false); - } - ActiveMQOsgiLogger.LOGGER.brokerConfigFound(name, Arrays.asList(requiredProtocols).toString()); - - //CORE is always registered as a protocol in RemoteServiceImpl - this.protocols.put(ActiveMQClient.DEFAULT_CORE_PROTOCOL, true); - - //if no protocols are specified we need to start artemis - List missing = getMissing(); - if (missing.isEmpty()) { - try { - callback.start(); - } catch (Exception e) { - ActiveMQOsgiLogger.LOGGER.errorStartingBroker(e, name); - } - } - } - - @Override - public ProtocolManagerFactory addingService(ServiceReference> reference) { - ProtocolManagerFactory pmf = context.getService(reference); - callback.addFactory(pmf); - for (String protocol : pmf.getProtocols()) { - protocolAdded(protocol); - } - - return pmf; - } - - @Override - public void modifiedService(ServiceReference> reference, - ProtocolManagerFactory pmf) { - // Not supported - } - - @Override - public void removedService(ServiceReference> reference, - ProtocolManagerFactory pmf) { - for (String protocol : pmf.getProtocols()) { - protocolRemoved(protocol); - } - callback.removeFactory(pmf); - } - - private void protocolAdded(String protocol) { - Boolean present = this.protocols.get(protocol); - if (present != null && !present) { - this.protocols.put(protocol, true); - List missing = getMissing(); - ActiveMQOsgiLogger.LOGGER.protocolWasAddedForBroker(protocol, name, (missing.isEmpty() ? "Starting broker." : "Still waiting for " + missing)); - if (missing.isEmpty()) { - try { - callback.start(); - } catch (Exception e) { - ActiveMQOsgiLogger.LOGGER.errorStartingBroker(e, name); - } - } - } - } - - private void protocolRemoved(String protocol) { - Boolean present = this.protocols.get(protocol); - if (present != null && present) { - List missing = getMissing(); - ActiveMQOsgiLogger.LOGGER.protocolWasRemovedForBroker(protocol, name, (missing.isEmpty() ? "Stopping broker. " : "")); - if (missing.isEmpty()) { - try { - callback.stop(); - } catch (Exception e) { - ActiveMQOsgiLogger.LOGGER.errorStoppingBroker(e, name); - } - } - this.protocols.put(protocol, false); - } - } - - private List getMissing() { - List missing = new ArrayList<>(); - for (String protocol : protocols.keySet()) { - Boolean present = protocols.get(protocol); - if (!present) { - missing.add(protocol); - } - } - return missing; - } - -} diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ServerTrackerCallBack.java b/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ServerTrackerCallBack.java deleted file mode 100644 index 5087a77..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ServerTrackerCallBack.java +++ /dev/null @@ -1,31 +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.activemq.artemis.osgi; - -import org.apache.activemq.artemis.api.core.Interceptor; -import org.apache.activemq.artemis.core.server.ActiveMQComponent; -import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; - -public interface ServerTrackerCallBack extends ActiveMQComponent { - - void addFactory(ProtocolManagerFactory pmf); - - void removeFactory(ProtocolManagerFactory pmf); - - void setDataSourceDependency(boolean dataSourceDependency); - -} diff --git a/underlying/artemis.entaxy/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java b/underlying/artemis.entaxy/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java deleted file mode 100644 index 97ee3ad..0000000 --- a/underlying/artemis.entaxy/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java +++ /dev/null @@ -1,76 +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.activemq.artemis.osgi; - -import org.apache.activemq.artemis.api.core.Interceptor; -import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; -import org.easymock.EasyMock; -import org.easymock.IMocksControl; -import org.junit.Test; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -import static org.easymock.EasyMock.expect; - -@SuppressWarnings({"rawtypes", "unchecked"}) -public class ProtocolTrackerTest { - - @Test - public void testLifecycle() throws Exception { - IMocksControl c = EasyMock.createControl(); - BundleContext context = c.createMock(BundleContext.class); - String[] requiredProtocols = {"a", "b"}; - ServerTrackerCallBack callback = c.createMock(ServerTrackerCallBack.class); - - RefFact protA = new RefFact(c, context, new String[]{"a"}); - RefFact protB = new RefFact(c, context, new String[]{"b"}); - - callback.addFactory(protA.factory); - EasyMock.expectLastCall(); - - callback.addFactory(protB.factory); - EasyMock.expectLastCall(); - callback.start(); - EasyMock.expectLastCall(); - - callback.removeFactory(protA.factory); - EasyMock.expectLastCall(); - callback.stop(); - EasyMock.expectLastCall(); - - c.replay(); - ProtocolTracker tracker = new ProtocolTracker("test", context, requiredProtocols, callback); - tracker.addingService(protA.ref); - tracker.addingService(protB.ref); - tracker.removedService(protA.ref, protA.factory); - c.verify(); - } - - class RefFact { - - ServiceReference> ref; - ProtocolManagerFactory factory; - - RefFact(IMocksControl c, BundleContext context, String[] protocols) { - ref = c.createMock(ServiceReference.class); - factory = c.createMock(ProtocolManagerFactory.class); - expect(factory.getProtocols()).andReturn(protocols).atLeastOnce(); - expect(context.getService(ref)).andReturn(factory).atLeastOnce(); - } - } - -} diff --git a/underlying/artemis.entaxy/pom.xml b/underlying/artemis.entaxy/pom.xml deleted file mode 100644 index c031379..0000000 --- a/underlying/artemis.entaxy/pom.xml +++ /dev/null @@ -1,1988 +0,0 @@ - - - - 4.0.0 - org.apache.activemq - artemis-pom - pom - 2.19.0-ENTAXY - - - org.apache - apache - 23 - org.apache:apache - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - artemis-server-osgi - - - - - - - - - - ActiveMQ Artemis Parent - https://activemq.apache.org/components/artemis/ - - - - 9+181-r4173-1 - - scp://people.apache.org/x1/www/activemq.apache.org - - false - logging.properties - - 1.0.2 - 4.3.3 - 4.13.4 - 2.7 - 3.12.0 - 5.16.0 - 10.11.1.1 - 1.9.4 - 2.7.0 - 2.7.0 - 3.2.2 - 1.8 - 2.10.0 - 1.15 - 1.16 - 30.1-jre - 3.4.2.Final - 9.4.43.v20210629 - 3.6.13.Final - 2.9.0 - 3.0.0-M3 - 5.1.2 - 3.1.1 - 1.39.0 - 8.43 - 3.12.4 - 2.1.2 - 4.1.73.Final - 5.2.0 - 3.6.3 - - - 2.0.46.Final - 0.33.10 - 3.15.0.Final - 1.7.21 - 0.59.0 - 0.9.5 - 1.11 - 2.1.10.Final - 1.0.4.GA - 1.5.2.Final - 0.8 - 1.2.2 - 1.3.5 - 3.2.6 - 2.0.2 - 1.0.3 - 2.0.3 - 1.1.6 - 1.1.4 - 1.7.4 - 1.1.3 - 1.3.3 - 2.1.6 - 2.3.3 - 2.4.0.Final - 2.0.0.Beta3 - 1.7.0 - 1.1.11.Final - 2.9.0 - 0.8.6 - 0.8.6 - 1.6.3 - 2.1 - 4.13.2 - 2.22.2 - 2.3.3 - 1.2.5 - - 1.0.10.Final - - - 2.5.10 - 3.9.4 - - 6.1.0 - 5.1.7.RELEASE - - 2.19.0 - ${activemq.version} - 1 - 0 - 0 - 131,130,129,128,127,126,125,124,123,122 - ${activemq.version} - ${activemq.version}(${activemq.version.incrementingVersion}) - - true - true - true - true - true - true - true - true - true - true - true - true - true - - UTF-8 - UTF-8 - - false - - - - -Dorg.apache.commons.logging.Log=org.apache.activemq.artemis.logs.JBossLoggingApacheLoggerBridge -Dorg.apache.activemq.artemis.utils.RetryRule.retry=${retryTests} -Dbrokerconfig.maxDiskUsage=100 -Dorg.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_QUIET_PERIOD=0 -Dorg.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_SHUTDOWN_TIMEOUT=0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager - -Dlogging.configuration="file:${activemq.basedir}/tests/config/${logging.config}" - -Djava.library.path="${activemq.basedir}/target/bin/lib/linux-x86_64:${activemq.basedir}/target/bin/lib/linux-i686" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost - -Djava.net.preferIPv4Stack=true -Dbasedir=${basedir} - - ${project.basedir} - true - - 2.0.0.AM25 - 2.0.0-M1 - 1.69 - - linux-x86_64 - osx-x86_64 - - - true - false - - - - scm:git:https://gitbox.apache.org/repos/asf/activemq-artemis.git - scm:git:https://gitbox.apache.org/repos/asf/activemq-artemis.git - https://github.com/apache/activemq-artemis - 2.19.0 - - - - - - activemq-website - - ${staging.siteURL}/maven/${activemq.version} - - - - - - JIRA - https://issues.apache.org/jira/browse/ARTEMIS - - - - The Apache ActiveMQ Team - dev@activemq.apache.org - http://activemq.apache.org - Apache Software Foundation - http://apache.org/ - - - - - User List - users-subscribe@activemq.apache.org - users-unsubscribe@activemq.apache.org - users@activemq.apache.org - - - Development List - dev-subscribe@activemq.apache.org - dev-unsubscribe@activemq.apache.org - dev@activemq.apache.org - - - - - - - - junit - junit - ${junit.version} - test - - - - org.easymock - easymock - 3.2 - test - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - ${paho.client.mqttv3.version} - - - org.fusesource.mqtt-client - mqtt-client - ${fuse.mqtt.client.version} - - - - org.apache.derby - derby - ${apache.derby.version} - test - - - org.eclipse.paho - mqtt-client - 0.4.0 - test - - - - - org.postgresql - postgresql - 42.2.19 - provided - - - - - commons-collections - commons-collections-testframework - ${commons.collections.version} - - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - org.apache.kerby - token-provider - test - - - com.nimbusds - nimbus-jose-jwt - - - - - - org.bouncycastle - bcprov-jdk15on - ${bcprov-jdk15on-version} - - - - - - - - org.jboss.logging - jboss-logging-processor - 2.2.0.Final - true - - - - org.jboss.logging - jboss-logging-annotations - 2.2.0.Final - provided - true - - - - com.google.errorprone - error_prone_core - ${errorprone.version} - provided - true - - - org.springframework - spring-core - ${spring.version} - compile - - - - org.springframework - spring-beans - ${spring.version} - compile - - - - org.springframework - spring-context - ${spring.version} - compile - - - - org.springframework - spring-jms - ${spring.version} - compile - - - - - - org.owasp - dependency-check-core - ${owasp.version} - - - - org.owasp - dependency-check-utils - ${owasp.version} - - - - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject-api.version} - - - - org.fusesource.hawtbuf - hawtbuf - ${hawtbuff.version} - - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - - - - org.jboss.logmanager - jboss-logmanager - ${jb.logmanager.version} - - - - org.jboss.slf4j - slf4j-jboss-logmanager - ${jb.slf4j-jboss-logmanager.version} - - - - org.wildfly.common - wildfly-common - ${version.org.wildfly.common.wildfly-common} - - - - net.java.dev.javacc - javacc - 4.0 - - - - jakarta.jms - jakarta.jms-api - ${jakarta.jms-api.version} - - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - - jakarta.json - jakarta.json-api - ${jakarta.json-api.version} - - - - jakarta.ejb - jakarta.ejb-api - ${jakarta.ejb-api.version} - - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation-api.version} - - - - jakarta.resource - jakarta.resource-api - ${jakarta.resource-api.version} - - - - commons-collections - commons-collections - ${commons.collections.version} - - - - org.apache.commons - commons-configuration2 - ${commons.config.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - - - - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - org.slf4j - slf4j-nop - ${slf4j.version} - - - - - - org.jgroups - jgroups - ${jgroups.version} - - - - io.airlift - airline - ${airlift.version} - - - javax.inject - javax.inject - - - - - - - org.jctools - jctools-core - ${jctools.version} - - - - io.netty - netty-buffer - ${netty.version} - - - - io.netty - netty-transport - ${netty.version} - - - - io.netty - netty-handler - ${netty.version} - - - - io.netty - netty-handler-proxy - ${netty.version} - - - - io.netty - netty-codec - ${netty.version} - - - - io.netty - netty-codec-http - ${netty.version} - - - - io.netty - netty-codec-mqtt - ${netty.version} - - - - io.netty - netty-codec-socks - ${netty.version} - - - - io.netty - netty-common - ${netty.version} - - - - io.netty - netty-resolver - ${netty.version} - - - - io.netty - netty-transport-native-unix-common - ${netty.version} - - - - io.netty - netty-transport-classes-epoll - ${netty.version} - - - - io.netty - netty-transport-native-epoll - ${netty.version} - ${netty-transport-native-epoll-classifier} - - - - io.netty - netty-transport-classes-kqueue - ${netty.version} - - - - io.netty - netty-transport-native-kqueue - ${netty.version} - ${netty-transport-native-kqueue-classifier} - - - - org.apache.qpid - proton-j - ${proton.version} - - - - org.apache.qpid - qpid-jms-client - ${qpid.jms.version} - - - org.apache.activemq - activemq-client - ${activemq5-version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - - - - - - org.apache.activemq - activemq-openwire-legacy - ${activemq5-version} - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - - org.apache.johnzon - johnzon-core - ${johnzon.version} - - - - - org.jboss.resteasy - resteasy-jaxrs - ${resteasy.version} - - - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.version} - - - - org.jboss.resteasy - resteasy-jackson2-provider - ${resteasy.version} - - - - org.jboss.resteasy - tjws - ${resteasy.version} - - - - commons-codec - commons-codec - ${commons.codec.version} - - - - - - org.eclipse.jetty.aggregate - jetty-all - ${jetty.version} - jar - uber - - - - org.apache.tomcat - tomcat-servlet-api - 8.5.5 - - - - - - commons-beanutils - commons-beanutils - ${commons.beanutils.version} - - - - - - commons-logging - commons-logging - 1.2 - - - - - - xml-apis - xml-apis - 2.0.2 - - - xalan - xalan - 2.7.2 - - - commons-io - commons-io - ${commons.io.version} - - - - - org.apache.commons - commons-dbcp2 - ${commons.dbcp2.version} - - - - - org.apache.commons - commons-pool2 - ${commons.pool2.version} - - runtime - - - - - io.micrometer - micrometer-core - ${version.micrometer} - true - - - - - org.apache.openwebbeans - openwebbeans-impl - ${owb.version} - test - - - org.apache.openwebbeans - openwebbeans-spi - ${owb.version} - test - - - org.apache.openwebbeans - openwebbeans-resource - ${owb.version} - test - - - org.apache.openwebbeans.arquillian - owb-arquillian-standalone - ${owb.version} - test - - - org.jboss.weld.se - weld-se - ${weld.version} - test - - - org.jboss.arquillian.container - arquillian-weld-embedded - ${arquillian-weld-embedded.version} - test - - - org.jboss.arquillian.junit - arquillian-junit-container - ${arquillian.version} - test - - - org.jboss.arquillian.junit - arquillian-junit-core - ${arquillian.version} - test - - - org.jacoco - org.jacoco.ant - ${version.org.jacoco} - test - - - org.jacoco - org.jacoco.core - ${version.org.jacoco} - test - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi-api.version} - provided - - - - org.osgi - org.osgi.core - 6.0.0 - provided - - - - org.osgi - osgi.cmpn - 6.0.0 - provided - - - - com.google.guava - guava - ${guava.version} - - - - jakarta.security.auth.message - jakarta.security.auth.message-api - ${jakarta.security.auth.message-api.version} - - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - io.netty - netty-transport-native-epoll - - - - - org.apache.zookeeper - zookeeper-jute - ${zookeeper.version} - - - - - - - - M2E - - - m2e.version - - - - javac - - - - - - ibm-jdk8 - - 1.8 - - java.vendor - IBM Corporation - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - true - - - - - - - - jdk8 - - 1.8 - - - 1.8 - 1.8 - - - - jdk8-errorprone - - 1.8 - - errorprone - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - -XDcompilePolicy=simple - -J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar - -Xplugin:ErrorProne -Xep:MissingOverride:ERROR -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR -XepExcludedPaths:.*/generated-sources/.* - - - - - - - - jdk11on - - [11,) - - - 1.8 - 11 - --add-modules java.sql,jdk.unsupported - - - - jdk11to15-errorprone - - [11,16) - - errorprone - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - -Xdiags:verbose - --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED - -XDcompilePolicy=simple - -Xplugin:ErrorProne -Xep:MissingOverride:ERROR -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR -XepExcludedPaths:.*/generated-sources/.* - - - - - - - - jdk16on-errorprone - - - [16,) - - errorprone - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - -Xdiags:verbose - --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED - -XDcompilePolicy=simple - -Xplugin:ErrorProne -Xep:MissingOverride:WARN -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR -XepExcludedPaths:.*/generated-sources/.* - -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED - -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED - -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED - - - - - - - - owasp - - false - - - - dev - - - - org.apache.rat - apache-rat-plugin - - - compile - - check - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - compile - - check - - - - - - - - - release - - examples - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java-version - - enforce - - - - - [1.8, 9) - JDK 8 is required when building the release - - - - - - - - org.apache.rat - apache-rat-plugin - - - compile - - check - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - compile - - check - - - - - - - - - - apache-release - - - - maven-assembly-plugin - - - source-release-assembly - - true - - - - - - - - - - tests-retry - - true - - - - - tests-CI - - - logging-CI.properties - - - - - tests - - false - false - false - false - false - false - true - false - true - true - true - false - - - - - fast-tests - - true - false - false - false - false - false - - false - - - - examples - - examples - - - true - - - - - jacoco - - - org.jacoco - org.jacoco.core - - - - - - - - -Djava.util.logging.manager=org.jboss.logmanager.LogManager - -Dlogging.configuration="file:${activemq.basedir}/tests/config/logging.properties" - -Djava.library.path="${activemq.basedir}/activemq-artemis-native/bin" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost - -Djava.net.preferIPv4Stack=true -Dbasedir=${basedir} - @{jacoco.agent} -Djacoco.agent=@{jacoco.agent} - - - - - - org.jacoco - jacoco-maven-plugin - - - jacoco-prepare - validate - - prepare-agent - - - ${project.build.directory}/jacoco.exec - - jacoco.agent - - - - merge - none - - merge - - - - - - - ${activemq.basedir} - - **/*.exec - - - - - - - - - - - jacoco-generate-report - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - copy - - process-test-resources - false - - - - org.jacoco - org.jacoco.ant - ${version.org.jacoco.plugin} - - - true - ${project.build.directory}/jacoco-jars - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - post-integration-test - run - false - - - - - - - Creating JaCoCo ActiveMQ Artemis test coverage reports... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.jacoco - org.jacoco.ant - ${version.org.jacoco.plugin} - - - - - - - - public-deploy - - false - - - - entaxy-public-entaxy - entaxy-public-entaxy - false - default - https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/ - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.rat - apache-rat-plugin - [0.12,) - - check - - - - - - - - - - org.apache.servicemix.tooling - - - depends-maven-plugin - - - [1.2,) - - - - generate-depends-file - - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin.version} - - - org.codehaus.mojo - javacc-maven-plugin - 2.6 - - - javacc - - javacc - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - - - org.apache.maven.plugins - maven-rar-plugin - 2.3 - - - net.sf.maven-sar - maven-sar-plugin - 1.0 - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - org.wildfly.extras.batavia - transformer-tools-mvn - ${version.batavia} - - - - true - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - once - ${testFailureIgnore} - alphabetical - ${maven.test.redirectTestOutputToFile} - ${activemq-surefire-argline} - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.6 - - true - 100 - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - org.codehaus.mojo - xml-maven-plugin - 1.0 - - - - org.apache.activemq - artemis-maven-plugin - ${activemq.version} - - - org.jacoco - jacoco-maven-plugin - ${version.org.jacoco.plugin} - - - org.apache.maven.plugins - maven-war-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - - com.github.sevntu-checkstyle - sevntu-checks - ${sevntu.checks.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - ${activemq.basedir}/etc/checkstyle.xml - ${activemq.basedir}/etc/checkstyle-suppressions.xml - false - true - true - true - - - - org.apache.rat - apache-rat-plugin - - ${activemq.basedir}/ratReport.txt - - **/src/main/webapp/hawtconfig.json - .repository/** - .travis.yml - .github/workflows/* - **/footer.html - **/*.txt - **/*.md - etc/ide-settings/** - **/*.json - docs/**/*.json - docs/**/_book/ - docs/**/_layouts/ - **/target/ - **/META-INF/services/* - **/META-INF/MANIFEST.MF - **/*.iml - **/*.jceks - **/*.jks - **/*.p12 - **/xml.xsd - **/org/apache/activemq/artemis/utils/json/** - **/org/apache/activemq/artemis/utils/Base64.java - **/.settings/** - **/.project - **/.classpath - **/.editorconfig - **/.checkstyle - **/.factorypath - **/org.apache.activemq.artemis.cfg - **/nb-configuration.xml - **/nbactions-tests.xml - **/.vscode/settings.json - - **/*.data - **/*.bin - **/src/test/resources/keystore - **/src/test/java/org/apache/activemq/security/*.ts - **/*.log - **/*.redo - - - **/node/** - **/node_modules/** - **/package.json - **/npm-shrinkwrap.json - - - **/overlays/** - - - **/CMakeFiles/ - **/Makefile - **/cmake_install.cmake - activemq-artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h - **/dependency-reduced-pom.xml - - - **/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker - - - examples/protocols/amqp/dotnet/**/obj/**/* - examples/protocols/amqp/dotnet/**/bin/**/* - examples/protocols/amqp/dotnet/**/readme.md - examples/protocols/amqp/**/readme.md - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java-version - - enforce - - - - - [1.8, 9),[11,) - You must use either JDK 8 or JDK 11+ when building - - - - - - enforce-maven-version - - enforce - - - - - 3.5.0 - You must use Maven 3.5.0+ to build - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - maven-source-plugin - - - org.apache.maven.plugins - maven-help-plugin - 2.2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - ${user.dir}/etc/findbugs-exclude.xml - true - true - Max - false - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - true - - - org.owasp - dependency-check-maven - ${owasp.version} - - ${skipOWASP} - - - - - - check - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-sources - - unpack - - - - - - - org.apache.activemq - activemq-artemis-native - ${activemq-artemis-native-version} - jar - false - ${project.build.directory}/bin - **/*.so - - - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - ${activemq.basedir}/etc/checkstyle.xml - ${activemq.basedir}/etc/checkstyle-suppressions.xml - false - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - ${user.dir}/etc/findbugs-exclude.xml - Max - false - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 128m - 1024m - false - - true - com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.* - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.14.1 - - - org.owasp - dependency-check-maven - ${owasp.version} - - - - aggregate - - - - - - - - - - - - - - entaxy-public - entaxy-public - - https://nexus.entaxy.ru/nexus/repository/entaxy-public/ - default - - true - warn - never - - - false - - - - - - entaxy-private - entaxy-private - - https://nexus.entaxy.ru/nexus/repository/entaxy-private/ - default - - true - warn - never - - - true - warn - never - - - - - - - - entaxy-public - entaxy-public - - https://nexus.entaxy.ru/nexus/repository/entaxy-public/ - default - - true - warn - never - - - false - - - - - diff --git a/underlying/camel.entaxy/core/camel-base/pom.xml b/underlying/camel.entaxy/core/camel-base/pom.xml deleted file mode 100644 index 1ad4f11..0000000 --- a/underlying/camel.entaxy/core/camel-base/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - 4.0.0 - - - org.apache.camel - core - 3.4.5-ENTAXY - .. - - - camel-base - jar - - Camel :: Base :: Entaxy - The Base Camel Framework - - - - - - org.apache.camel - camel-api - ${camel.version} - - - org.apache.camel - camel-management-api - ${camel.version} - - - org.apache.camel - camel-support - ${camel.version} - - - org.apache.camel - camel-util - ${camel.version} - - - org.apache.camel - camel-jms - ${camel.version} - - - - - - - - - - org.slf4j - slf4j-api - ${slf4j-api-version} - - - - - \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CamelConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CamelConverterLoader.java deleted file mode 100644 index b1ca2c5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CamelConverterLoader.java +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class CamelConverterLoader implements TypeConverterLoader { - - public CamelConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, org.apache.camel.Processor.class, org.apache.camel.Expression.class, false, - (type, exchange, value) -> org.apache.camel.converter.CamelConverter.toProcessor((org.apache.camel.Expression) value)); - addTypeConverter(registry, org.apache.camel.Processor.class, org.apache.camel.Predicate.class, false, - (type, exchange, value) -> org.apache.camel.converter.CamelConverter.toProcessor((org.apache.camel.Predicate) 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CollectionConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CollectionConverterLoader.java deleted file mode 100644 index a7883a9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/CollectionConverterLoader.java +++ /dev/null @@ -1,56 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class CollectionConverterLoader implements TypeConverterLoader { - - public CollectionConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.lang.Object[].class, java.util.Collection.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toArray((java.util.Collection) value)); - addTypeConverter(registry, java.util.ArrayList.class, java.util.Iterator.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toArrayList((java.util.Iterator) value)); - addTypeConverter(registry, java.util.HashMap.class, java.util.Map.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toHashMap((java.util.Map) value)); - addTypeConverter(registry, java.util.Hashtable.class, java.util.Map.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toHashtable((java.util.Map) value)); - addTypeConverter(registry, java.util.List.class, java.lang.Iterable.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toList((java.lang.Iterable) value)); - addTypeConverter(registry, java.util.List.class, java.lang.Object[].class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toList((java.lang.Object[]) value)); - addTypeConverter(registry, java.util.List.class, java.util.Collection.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toList((java.util.Collection) value)); - addTypeConverter(registry, java.util.Properties.class, java.util.Map.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toProperties((java.util.Map) value)); - addTypeConverter(registry, java.util.Set.class, java.lang.Object[].class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toSet((java.lang.Object[]) value)); - addTypeConverter(registry, java.util.Set.class, java.util.Collection.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toSet((java.util.Collection) value)); - addTypeConverter(registry, java.util.Set.class, java.util.Map.class, false, - (type, exchange, value) -> org.apache.camel.converter.CollectionConverter.toSet((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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DateTimeConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DateTimeConverterLoader.java deleted file mode 100644 index 0108316..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DateTimeConverterLoader.java +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class DateTimeConverterLoader implements TypeConverterLoader { - - public DateTimeConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.lang.Long.class, java.util.Date.class, false, - (type, exchange, value) -> org.apache.camel.converter.DateTimeConverter.toLong((java.util.Date) value)); - addTypeConverter(registry, java.util.Date.class, java.lang.Long.class, false, - (type, exchange, value) -> org.apache.camel.converter.DateTimeConverter.toDate((java.lang.Long) value)); - addTypeConverter(registry, java.util.TimeZone.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.DateTimeConverter.toTimeZone((java.lang.String) 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DurationConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DurationConverterLoader.java deleted file mode 100644 index ad8208f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/DurationConverterLoader.java +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class DurationConverterLoader implements TypeConverterLoader { - - public DurationConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.lang.Long.class, java.time.Duration.class, false, - (type, exchange, value) -> org.apache.camel.converter.DurationConverter.toMilliSeconds((java.time.Duration) value)); - addTypeConverter(registry, java.lang.String.class, java.time.Duration.class, false, - (type, exchange, value) -> org.apache.camel.converter.DurationConverter.toString((java.time.Duration) value)); - addTypeConverter(registry, java.time.Duration.class, java.lang.Long.class, false, - (type, exchange, value) -> org.apache.camel.converter.DurationConverter.toDuration((java.lang.Long) value)); - addTypeConverter(registry, java.time.Duration.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.DurationConverter.toDuration((java.lang.String) 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/IOConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/IOConverterLoader.java deleted file mode 100644 index 02966ba..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/IOConverterLoader.java +++ /dev/null @@ -1,106 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class IOConverterLoader implements TypeConverterLoader { - - public IOConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, byte[].class, java.io.BufferedReader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toByteArray((java.io.BufferedReader) value, exchange)); - addTypeConverter(registry, byte[].class, java.io.ByteArrayOutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toByteArray((java.io.ByteArrayOutputStream) value)); - addTypeConverter(registry, byte[].class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toByteArray((java.io.File) value)); - addTypeConverter(registry, byte[].class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toBytes((java.io.InputStream) value)); - addTypeConverter(registry, byte[].class, java.io.Reader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toByteArray((java.io.Reader) value, exchange)); - addTypeConverter(registry, byte[].class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toByteArray((java.lang.String) value, exchange)); - addTypeConverter(registry, java.io.BufferedReader.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toReader((java.io.File) value, exchange)); - addTypeConverter(registry, java.io.BufferedWriter.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toWriter((java.io.File) value, exchange)); - addTypeConverter(registry, java.io.File.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toFile((java.lang.String) value)); - addTypeConverter(registry, java.io.InputStream.class, byte[].class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((byte[]) value)); - addTypeConverter(registry, java.io.InputStream.class, java.io.BufferedReader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.io.BufferedReader) value, exchange)); - addTypeConverter(registry, java.io.InputStream.class, java.io.ByteArrayOutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.io.ByteArrayOutputStream) value)); - addTypeConverter(registry, java.io.InputStream.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.io.File) value)); - addTypeConverter(registry, java.io.InputStream.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.lang.String) value, exchange)); - addTypeConverter(registry, java.io.InputStream.class, java.lang.StringBuffer.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.lang.StringBuffer) value, exchange)); - addTypeConverter(registry, java.io.InputStream.class, java.lang.StringBuilder.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.lang.StringBuilder) value, exchange)); - addTypeConverter(registry, java.io.InputStream.class, java.net.URL.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.net.URL) value)); - addTypeConverter(registry, java.io.InputStream.class, java.util.stream.Stream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toInputStream((java.util.stream.Stream) value, exchange)); - addTypeConverter(registry, java.io.ObjectInput.class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toObjectInput((java.io.InputStream) value, exchange)); - addTypeConverter(registry, java.io.ObjectOutput.class, java.io.OutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toObjectOutput((java.io.OutputStream) value)); - addTypeConverter(registry, java.io.OutputStream.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toOutputStream((java.io.File) value)); - addTypeConverter(registry, java.io.Reader.class, byte[].class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toReader((byte[]) value, exchange)); - addTypeConverter(registry, java.io.Reader.class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toReader((java.io.InputStream) value, exchange)); - addTypeConverter(registry, java.io.StringReader.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toReader((java.lang.String) value)); - addTypeConverter(registry, java.io.Writer.class, java.io.OutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toWriter((java.io.OutputStream) value, exchange)); - addTypeConverter(registry, java.lang.String.class, byte[].class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((byte[]) value, exchange)); - addTypeConverter(registry, java.lang.String.class, java.io.BufferedReader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.io.BufferedReader) value)); - addTypeConverter(registry, java.lang.String.class, java.io.ByteArrayOutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.io.ByteArrayOutputStream) value, exchange)); - addTypeConverter(registry, java.lang.String.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.io.File) value, exchange)); - addTypeConverter(registry, java.lang.String.class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.io.InputStream) value, exchange)); - addTypeConverter(registry, java.lang.String.class, java.io.Reader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.io.Reader) value)); - addTypeConverter(registry, java.lang.String.class, java.net.URL.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toString((java.net.URL) value, exchange)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.covertToByteBuffer((java.io.InputStream) value)); - addTypeConverter(registry, java.util.Properties.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toProperties((java.io.File) value)); - addTypeConverter(registry, java.util.Properties.class, java.io.InputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toProperties((java.io.InputStream) value)); - addTypeConverter(registry, java.util.Properties.class, java.io.Reader.class, false, - (type, exchange, value) -> org.apache.camel.converter.IOConverter.toProperties((java.io.Reader) 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/NIOConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/NIOConverterLoader.java deleted file mode 100644 index 70e4f16..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/NIOConverterLoader.java +++ /dev/null @@ -1,58 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class NIOConverterLoader implements TypeConverterLoader { - - public NIOConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, byte[].class, java.nio.ByteBuffer.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteArray((java.nio.ByteBuffer) value)); - addTypeConverter(registry, java.io.InputStream.class, java.nio.ByteBuffer.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toInputStream((java.nio.ByteBuffer) value)); - addTypeConverter(registry, java.lang.String.class, java.nio.ByteBuffer.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toString((java.nio.ByteBuffer) value, exchange)); - addTypeConverter(registry, java.nio.ByteBuffer.class, byte[].class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((byte[]) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.io.ByteArrayOutputStream.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.io.ByteArrayOutputStream) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.io.File.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.io.File) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Double.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.Double) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Float.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.Float) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Integer.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.Integer) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Long.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.Long) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.Short.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.Short) value)); - addTypeConverter(registry, java.nio.ByteBuffer.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.NIOConverter.toByteBuffer((java.lang.String) value, exchange)); - } - - 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/ObjectConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/ObjectConverterLoader.java deleted file mode 100644 index f3f3cb1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/ObjectConverterLoader.java +++ /dev/null @@ -1,90 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class ObjectConverterLoader implements TypeConverterLoader { - - public ObjectConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, boolean.class, java.lang.Object.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toBool(value)); - addTypeConverter(registry, char.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toChar((java.lang.String) value)); - addTypeConverter(registry, char[].class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toCharArray((java.lang.String) value)); - addTypeConverter(registry, java.lang.Boolean.class, java.lang.Object.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toBoolean(value)); - addTypeConverter(registry, java.lang.Boolean.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toBoolean((java.lang.String) value)); - addTypeConverter(registry, java.lang.Byte.class, java.lang.Number.class, true, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toByte((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Byte.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toByte((java.lang.String) value)); - addTypeConverter(registry, java.lang.Character.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toCharacter((java.lang.String) value)); - addTypeConverter(registry, java.lang.Class.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toClass((java.lang.String) value, exchange)); - addTypeConverter(registry, java.lang.Double.class, java.lang.Number.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toDouble((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Double.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toDouble((java.lang.String) value)); - addTypeConverter(registry, java.lang.Float.class, java.lang.Number.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toFloat((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Float.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toFloat((java.lang.String) value)); - addTypeConverter(registry, java.lang.Integer.class, java.lang.Number.class, true, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toInteger((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Integer.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toInteger((java.lang.String) value)); - addTypeConverter(registry, java.lang.Iterable.class, java.lang.Object.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.iterable(value)); - addTypeConverter(registry, java.lang.Long.class, java.lang.Number.class, true, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toLong((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Long.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toLong((java.lang.String) value)); - addTypeConverter(registry, java.lang.Short.class, java.lang.Number.class, true, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toShort((java.lang.Number) value)); - addTypeConverter(registry, java.lang.Short.class, java.lang.String.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toShort((java.lang.String) value)); - addTypeConverter(registry, java.lang.String.class, char[].class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.fromCharArray((char[]) value)); - addTypeConverter(registry, java.lang.String.class, java.lang.Boolean.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toString((java.lang.Boolean) value)); - addTypeConverter(registry, java.lang.String.class, java.lang.Integer.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toString((java.lang.Integer) value)); - addTypeConverter(registry, java.lang.String.class, java.lang.Long.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toString((java.lang.Long) value)); - addTypeConverter(registry, java.lang.String.class, java.lang.StringBuffer.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toString((java.lang.StringBuffer) value)); - addTypeConverter(registry, java.lang.String.class, java.lang.StringBuilder.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toString((java.lang.StringBuilder) value)); - addTypeConverter(registry, java.math.BigInteger.class, java.lang.Object.class, true, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.toBigInteger(value)); - addTypeConverter(registry, java.util.Iterator.class, java.lang.Object.class, false, - (type, exchange, value) -> org.apache.camel.converter.ObjectConverter.iterator(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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/SQLConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/SQLConverterLoader.java deleted file mode 100644 index c0c4fce..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/converter/SQLConverterLoader.java +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.converter; - -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") -public final class SQLConverterLoader implements TypeConverterLoader { - - public SQLConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.lang.Long.class, java.sql.Timestamp.class, false, - (type, exchange, value) -> org.apache.camel.converter.SQLConverter.toLong((java.sql.Timestamp) value)); - addTypeConverter(registry, java.sql.Timestamp.class, java.lang.Long.class, false, - (type, exchange, value) -> org.apache.camel.converter.SQLConverter.toTimestamp((java.lang.Long) 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/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/impl/converter/UriTypeConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/impl/converter/UriTypeConverterLoader.java deleted file mode 100644 index 588c961..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/java/org/apache/camel/impl/converter/UriTypeConverterLoader.java +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.impl.converter; - -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") -public final class UriTypeConverterLoader implements TypeConverterLoader { - - public UriTypeConverterLoader() { - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - registerConverters(registry); - } - - private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.lang.CharSequence.class, java.net.URI.class, false, - (type, exchange, value) -> org.apache.camel.impl.converter.UriTypeConverter.toCharSequence((java.net.URI) value)); - addTypeConverter(registry, java.net.URI.class, java.lang.CharSequence.class, false, - (type, exchange, value) -> org.apache.camel.impl.converter.UriTypeConverter.toUri((java.lang.CharSequence) 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/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader deleted file mode 100644 index a16a584..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -org.apache.camel.converter.CamelConverterLoader -org.apache.camel.converter.CollectionConverterLoader -org.apache.camel.converter.DateTimeConverterLoader -org.apache.camel.converter.DurationConverterLoader -org.apache.camel.converter.IOConverterLoader -org.apache.camel.converter.NIOConverterLoader -org.apache.camel.converter.ObjectConverterLoader -org.apache.camel.converter.SQLConverterLoader -org.apache.camel.impl.converter.UriTypeConverterLoader diff --git a/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/properties-component-factory b/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/properties-component-factory deleted file mode 100644 index 106f5da..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/properties-component-factory +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.properties.PropertiesComponent diff --git a/underlying/camel.entaxy/core/camel-base/src/main/docs/properties-component.adoc b/underlying/camel.entaxy/core/camel-base/src/main/docs/properties-component.adoc deleted file mode 100644 index f3f0488..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/docs/properties-component.adoc +++ /dev/null @@ -1,843 +0,0 @@ -[[properties-component]] -= Properties Component -//Written by hand, not generated. -:docTitle: Properties -:artifactId: camel-base -:description: The properties component is used for property placeholders in your Camel application, such as endpoint URIs. -:since: 2.3 -:supportLevel: Stable - -*Since Camel {since}* - -The properties component is used for property placeholders in your Camel application, such as endpoint URIs. -It is *not* a regular Camel component with producer and consumer for routing messages. However for historical -reasons it was named `PropertiesComponent` and this name is commonly known and therfore we keep using it. - -== Spring Boot Auto-Configuration - -The component supports 10 options, which are listed below. - - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *camel.component.properties.auto-discover-properties-sources* | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | Boolean -| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean -| *camel.component.properties.encoding* | Encoding to use when loading properties file from the file system or classpath. If no encoding has been set, then the properties files is loaded using ISO-8859-1 encoding (latin-1) as documented by java.util.Properties#load(java.io.InputStream) | | String -| *camel.component.properties.environment-variable-mode* | Sets the OS environment variables mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use OS environment variables if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer -| *camel.component.properties.ignore-missing-location* | Whether to silently ignore if a location cannot be located, such as a properties file not found. | false | Boolean -| *camel.component.properties.initial-properties* | Sets initial properties which will be used before any locations are resolved. The option is a java.util.Properties type. | | String -| *camel.component.properties.location* | A list of locations to load properties. You can use comma to separate multiple locations. This option will override any default locations and only use the locations from this option. | | String -| *camel.component.properties.override-properties* | Sets a special list of override properties that take precedence and will use first, if a property exist. The option is a java.util.Properties type. | | String -| *camel.component.properties.properties-parser* | To use a custom PropertiesParser. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String -| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer -|=== - -[TIP] -**Resolving property from Java code** + -You can use the method `resolvePropertyPlaceholders` on the -`CamelContext` to resolve a property from any Java code. - -== Using PropertyPlaceholder - -Camel now provides a new `PropertiesComponent` in *camel-core* which -allows you to use property placeholders when defining Camel -Endpoint URIs. - -This works much like you would do if using Spring's -`` tag. However Spring have a limitation which -prevents 3rd party frameworks to leverage Spring property placeholders -to the fullest. See more at -xref:manual:faq:how-do-i-use-spring-property-placeholder-with-camel-xml.adoc[How do -I use Spring Property Placeholder with Camel XML]. - -[TIP] -**Bridging Spring and Camel property placeholders** + -You can bridge the Spring property placeholder -with Camel, see further below for more details. - -The property placeholder is generally in use when doing: - -* lookup or creating endpoints -* lookup of beans in the Registry -* additional supported in Spring XML (see below in examples) -* using Blueprint PropertyPlaceholder with Camel -xref:properties-component.adoc[Properties] component -* using `@PropertyInject` to inject a property in a POJO -* Using default value if a property does not exists -* Include out of the box functions, to lookup property -values from OS environment variables, JVM system properties, or the -service idiom. -* Using custom functions, which can be plugged into the -property component. - -== Syntax - -The syntax to use Camel's property placeholder is to use `{\{key\}}` for -example `{{file.uri}}` where `file.uri` is the property key. - -You can use property placeholders in parts of the endpoint URI's which -for example you can use placeholders for parameters in the URIs. - -You can specify a default value to use if -a property with the key does not exists, eg `file.url:/some/path` where -the default value is the text after the colon (eg /some/path). - -[NOTE] -==== -Do not use colon in the property key. The colon is used as a separator -token when you are providing a default value. -==== - -== Defining location - -The properties component need to know a location(s) where to resolve the -properties. You can define 1 to many locations. If you define the -location in a single String property you can separate multiple locations -with comma such as: - -[source,java] ----- -pc.setLocation("com/mycompany/myprop.properties,com/mycompany/other.properties"); ----- - -You can set which location can be discarded if missing by by setting the ``optional`` attribute, which is false by default, i.e: - -[source,java] ----- -pc.setLocations( - "com/mycompany/override.properties;optional=true" - "com/mycompany/defaults.properties"); ----- - -== Using system and environment variables in locations - -The location now supports using placeholders for JVM system properties -and OS environments variables. - -For example: - -[source] ----- -location=file:${karaf.home}/etc/foo.properties ----- - -In the location above we defined a location using the file scheme using -the JVM system property with key `karaf.home`. - -To use an OS environment variable instead you would have to prefix with -env: - -[source] ----- -location=file:${env:APP_HOME}/etc/foo.properties ----- - -Where `APP_HOME` is an OS environment. - -[NOTE] -==== -Some OS'es (such as Linux) do not support dashes in environment variable names, -so here we are using `APP_HOME`. But if you specify `APP-HOME` then Camel 3 will automatic lookup -the value as `APP_HOME` (with underscore) as fallback. -==== - -You can have multiple placeholders in the same location, such as: - -[source] ----- -location=file:${env:APP_HOME}/etc/${prop.name}.properties ----- - -== Configuring in Java DSL - -You have to create and register the `PropertiesComponent` under the name -`properties` such as: - -[source,java] ----- -PropertiesComponent pc = camelContext.getPropertiesComponent(); -pc.setLocation("classpath:com/mycompany/myprop.properties"); ----- - -== Configuring in Spring XML - -Spring XML offers two variations to configure. You can define a spring -bean as a `PropertiesComponent` which resembles the way done in Java -DSL. Or you can use the `` tag. - -[source,xml] ----- - - - ----- - -Using the `` tag makes the configuration a bit more -fresh such as: - -[source,xml] ----- - - - ----- - -Setting the properties location through the location tag works just fine but sometime you have a number of resources to take into account and starting from *Camel 2.19.0* you can set the properties location with a dedicated propertiesLocation: - -[source,xml] ----- - - - - - - - ----- - -[TIP] -**Specifying the cache option inside XML** + -Camel supports specifying a value for the cache option both -inside the Spring as well as the Blueprint XML. - -== Using a Properties from the Registry - -For example in OSGi you may want to expose a service which returns the -properties as a `java.util.Properties` object. - -Then you could setup the xref:properties-component.adoc[Properties] component as -follows: - -[source,xml] ----- - ----- - -Where `myProperties` is the id to use for lookup in the OSGi registry. -Notice we use the `ref:` prefix to tell Camel that it should lookup the -properties for the Registry. - -== Examples using properties component - -When using property placeholders in the endpoint URIs you can either use -the `properties:` component or define the placeholders directly in the -URI. We will show example of both cases, starting with the former. - -[source,java] ----- -// properties -cool.end=mock:result - -// route -from("direct:start").to("{{cool.end}}"); ----- - -You can also use placeholders as a part of the endpoint uri: - -[source,java] ----- -// properties -cool.foo=result - -// route -from("direct:start").to("mock:{{cool.foo}}"); ----- - -In the example above the to endpoint will be resolved to `mock:result`. - -You can also have properties with refer to each other such as: - -[source,java] ----- -// properties -cool.foo=result -cool.concat=mock:{{cool.foo}} - -// route -from("direct:start").to("mock:{{cool.concat}}"); ----- - -Notice how `cool.concat` refer to another property. - -And you can use placeholders several times: - -[source,java] ----- -// properties -cool.start=direct:start -cool.showid=true -cool.result=result - -// route -from("{{cool.start}}") - .to("log:{{cool.start}}?showBodyType=false&showExchangeId={{cool.showid}}") - .to("mock:{{cool.result}}"); ----- - -You can also your property placeholders when using -ProducerTemplate for example: - -[source,java] ----- -template.sendBody("{{cool.start}}", "Hello World"); ----- - -== Example with xref:languages:simple-language.adoc[Simple] language - -The xref:languages:simple-language.adoc[Simple] language now also support using property -placeholders, for example in the route below: - -[source,java] ----- -// properties -cheese.quote=Camel rocks - -// route -from("direct:start") - .transform().simple("Hi ${body} do you think ${properties:cheese.quote}?"); ----- - -== Additional property placeholder supported in Spring XML - -The property placeholders is also supported in many of the Camel Spring -XML tags such as -`, , , , , , ` -and the others. - -The example below has property placeholder in the `` tag: - -You can also define property placeholders in the various attributes on -the `` tag such as `trace` as shown here: - -== Using JVM system properties or Environment variables as override or fallback values - -The properties components supports using JVM system properties and also OS environment variables -as values which can either be used as override or fallback values. - -The default mode is that both of them are in override mode, and they are check in the following order: - -1. OS environment variable (override mode) -2. JVM system property (override mode) -3. Property files and other locations -4. OS environment variable (fallback mode) -5. JVM system property (fallback mode) - -The check stops at first found property value for the key. - -You can control these modes using the `systemPropertiesMode` and `environmentVariableMode` -options on the properties component. - -== Using property placeholders for any kind of attribute in the XML DSL - -In the example below we use the `prop` prefix for the namespace -camel.apache.org/schema/placeholder by which we can use the -`prop` prefix in the attributes in the XML DSLs. Notice how we use that -in the Multicast to indicate that the option -`stopOnException` should be the value of the placeholder with the key -"stop". - -In our properties file we have the value defined as - -[source] ----- -stop=true ----- - -== Using Blueprint property placeholder with Camel routes - -Camel supports Blueprint -which also offers a property placeholder service. Camel supports -convention over configuration, so all you have to do is to define the -OSGi Blueprint property placeholder in the XML file as shown below: - -[source,xml] ----- - - - - - - - - - - - - - - - - - - - ----- - -=== Using OSGi blueprint property placeholders in Camel routes - -By default Camel detects and uses OSGi blueprint property placeholder -service. You can disable this by setting the attribute -`useBlueprintPropertyResolver` to false on the `` -definition. - -=== About placeholder syntax - -Notice how we can use the Camel syntax for placeholders `{{` and `}}` in the -Camel route, which will lookup the value from OSGi blueprint. - -The blueprint syntax for placeholders is `${ }`. So outside the -`` you must use the `${ }` syntax. Where as inside -`` you must use `{{` and `}}` syntax. - -OSGi blueprint allows you to configure the syntax, so you can actually -align those if you want. - -You can also explicit refer to a specific OSGi blueprint property -placeholder by its id. For that you need to use the Camel's -`` as shown in the example below: - -[source,xml] ----- - - - - - - - - - - - - - - - - - - - - - - ----- - - -== Explicit referring to a OSGi blueprint placeholder in Camel - -Notice how we use the `blueprint` scheme to refer to the OSGi blueprint -placeholder by its id. This allows you to mix and match, for example you -can also have additional schemes in the location. For example to load a -file from the classpath you can do: - -[source] ----- -location="blueprint:myblueprint.placeholder,classpath:myproperties.properties" ----- - -Each location is separated by comma. - -== Overriding Blueprint property placeholders outside CamelContext - -When using Blueprint property placeholder in the Blueprint XML file, you -can declare the properties directly in the XML file as shown below: - -Notice that we have a `` which refers to one of the properties. And -in the Camel route we refer to the other using the `{{` and `}}` notation. - -Now if you want to override these Blueprint properties from an unit -test, you can do this as shown below: - -To do this we override and implement the -`useOverridePropertiesWithConfigAdmin` method. We can then put the -properties we want to override on the given props parameter. And the -return value *must* be the `persistence-id` of the -`` tag, which you define in the blueprint XML -file. - -== Using .cfg or .properties file for Blueprint property placeholders - -When using Blueprint property placeholder in the Blueprint XML file, you -can declare the properties in a `.properties` or `.cfg` file. If you use -Apache ServieMix / Karaf then this container has a convention that it -loads the properties from a file in the etc directory with the naming -`etc/pid.cfg`, where `pid` is the `persistence-id`. - -For example in the blueprint XML file we have the -`persistence-id="stuff"`, which mean it will load the configuration file -as `etc/stuff.cfg`. - -Now if you want to unit test this blueprint XML file, then you can -override the `loadConfigAdminConfigurationFile` and tell Camel which -file to load as shown below: - -Notice that this method requires to return a `String[]` with 2 values. The -1st value is the path for the configuration file to load. -The 2nd value is the `persistence-id` of the `` -tag. - -The `stuff.cfg` file is just a plain properties file with the property -placeholders such as: - -[source] ----- -== this is a comment -greeting=Bye ----- - -== Using .cfg file and overriding properties for Blueprint property placeholders - -You can do both as well. Here is a complete example. First we have the -Blueprint XML file: - -And in the unit test class we do as follows: - -And the `etc/stuff.cfg` configuration file contains - -[source] ----- -greeting=Bye -echo=Yay -destination=mock:result ----- - -== Bridging Spring and Camel property placeholders - -The Spring Framework does not allow 3rd party frameworks such as Apache -Camel to seamless hook into the Spring property placeholder mechanism. -However you can easily bridge Spring and Camel by declaring a Spring -bean with the type -`org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer`, which -is a Spring -`org.springframework.beans.factory.config.PropertyPlaceholderConfigurer` -type. - -To bridge Spring and Camel you must define a single bean as shown below: - -*Bridging Spring and Camel property placeholders* - -You *must not* use the spring namespace -at the same time; this is not possible. - -After declaring this bean, you can define property placeholders using -both the Spring style, and the Camel style within the tag -as shown below: - -*Using bridge property placeholders* - -Notice how the hello bean is using pure Spring property placeholders -using the `${ }` notation. And in the Camel routes we use the Camel -placeholder notation with `{{` and `}}`. - -== Clashing Spring property placeholders with Camels Simple language - -Take notice when using Spring bridging placeholder then the spring `${ }` -syntax clashes with the xref:languages:simple-language.adoc[Simple] in Camel, and therefore -take care. For example: - -[source,xml] ----- - - {{file.rootdir}}/${in.header.CamelFileName} - ----- - -clashes with Spring property placeholders, and you should use `$simple{ }` -to indicate using the xref:languages:simple-language.adoc[Simple] language in Camel. - -[source,xml] ----- - - {{file.rootdir}}/$simple{in.header.CamelFileName} - ----- - -An alternative is to configure the `PropertyPlaceholderConfigurer` with -`ignoreUnresolvablePlaceholders` option to `true`. - -== Overriding properties from Camel test kit - -When Testing with Camel and using the -xref:properties-component.adoc[Properties] component, you may want to be able to -provide the properties to be used from directly within the unit test -source code. + -Camel test kits, eg `CamelTestSupport` class offers the following methods - -* `useOverridePropertiesWithPropertiesComponent` -* `ignoreMissingLocationWithPropertiesComponent` - -So for example in your unit test classes, you can override the -`useOverridePropertiesWithPropertiesComponent` method and return a -`java.util.Properties` that contains the properties which should be -preferred to be used. - -=== Providing properties from within unit test source - -This can be done from any of the Camel Test kits, such as camel-test, -camel-test-spring, and camel-test-blueprint. - -The `ignoreMissingLocationWithPropertiesComponent` can be used to -instruct Camel to ignore any locations which was not discoverable, for -example if you run the unit test, in an environment that does not have -access to the location of the properties. - -== Using @PropertyInject - -Camel allows to inject property placeholders in POJOs using the -`@PropertyInject` annotation which can be set on fields and setter -methods. - -For example you can use that with `RouteBuilder` classes, such as shown -below: - -[source,java] ----- -public class MyRouteBuilder extends RouteBuilder { - - @PropertyInject("hello") - private String greeting; - - @Override - public void configure() throws Exception { - from("direct:start") - .transform().constant(greeting) - .to("{{result}}"); - } - -} ----- - -Notice we have annotated the greeting field with `@PropertyInject` and -define it to use the key `"hello"`. Camel will then lookup the property -with this key and inject its value, converted to a String type. - -You can also use multiple placeholders and text in the key, for example -we can do: - -[source,java] ----- -@PropertyInject("Hello {{name}} how are you?") -private String greeting; ----- - -This will lookup the placeholder with they key `"name"`. - -You can also add a default value if the key does not exists, such as: - -[source,java] ----- -@PropertyInject(value = "myTimeout", defaultValue = "5000") -private int timeout; ----- - -== Using out of the box functions - -The xref:properties-component.adoc[Properties] component includes the following -functions out of the box - -* `env` - A function to lookup the property from OS environment variables -* `sys` - A function to lookup the property from Java JVM system -properties -* `service` - A function to lookup the property from OS environment -variables using the service naming idiom -* `service.name` - A function to lookup the -property from OS environment variables using the service naming idiom -returning the hostname part only -* `service.port` - A function to lookup the -property from OS environment variables using the service naming idiom -returning the port part only - -As you can see these functions is intended to make it easy to lookup -values from the environment. As they are provided out of the box, they -can easily be used as shown below: - -[source,xml] ----- - - - - - - - ----- - -You can use default values as well, so if the property does not exists, -you can define a default value as shown below, where the default value -is a `log:foo` and `log:bar` value. - -[source,xml] ----- - - - - - - - ----- - -The service function is for looking up a service which is defined using -OS environment variables using the service naming idiom, to refer to a -service location using `hostname : port` - -* __NAME__**_SERVICE_HOST** -* __NAME__**_SERVICE_PORT** - -in other words the service uses `_SERVICE_HOST` and `_SERVICE_PORT` as -prefix. So if the service is named FOO, then the OS environment -variables should be set as - -[source] ----- -export $FOO_SERVICE_HOST=myserver -export $FOO_SERVICE_PORT=8888 ----- - -For example if the FOO service a remote HTTP service, then we can refer -to the service in the Camel endpoint uri, and use -the HTTP component to make the HTTP call: - -[source,xml] ----- - - - - - - ----- - -And we can use default values if the service has not been defined, for -example to call a service on localhost, maybe for unit testing etc - -[source,xml] ----- - - - - - - ----- - -== Using custom functions (advanced) - -The xref:properties-component.adoc[Properties] component allow to plugin 3rd party -functions which can be used during parsing of the property placeholders. -These functions are then able to do custom logic to resolve the -placeholders, such as looking up in databases, do custom computations, -or whatnot. The name of the function becomes the prefix used in the -placeholder. This is best illustrated in the example code below - -[source,xml] ----- - - - - - - - - - - - - - ----- - -[NOTE] -==== -The location attribute (on propertyPlaceholder tag) is not mandatory -==== - -Here we have a Camel XML route where we have defined the -`` to use a custom function, which we refer to be the -bean id - eg the `beerFunction`. As the beer function uses `"beer"` as its -name, then the placeholder syntax can trigger the beer function by -starting with `beer:value`. - -The implementation of the function is only two methods as shown below: - -[source,java] ----- -public static final class MyBeerFunction implements PropertiesFunction { - - @Override - public String getName() { - return "beer"; - } - - @Override - public String apply(String remainder) { - return "mock:" + remainder.toLowerCase(); - } -} ----- - -The function must implement -the `org.apache.camel.component.properties.PropertiesFunction` -interface. The method `getName` is the name of the function, eg beer. -And the `apply` method is where we implement the custom logic to do. As -the sample code is from an unit test, it just returns a value to refer -to a mock endpoint. - -To register a custom function from Java code is as shown below: - -[source,java] ----- -PropertiesComponent pc = (org.apache.camel.componennt.properties.PropertiesComponent) context.getPropertiesComponent(); -pc.addFunction(new MyBeerFunction()); ----- - - -== Using 3rd-party properties sources - -The properties component allows to plugin 3rd party sources to load and lookup properties via the `PropertySource` -API from camel-api. For example the `camel-microprofile-config` component is implemented using this. -The 3rd-party `PropertySource` can automatic be discoverd from classpath when Camel is starting up. -This is done by include the file `META-INF/services/org/apache/camel/property-source-factory` file -which refers to the fully qualified class name of the `PropertySource` implementation. -See the `camel-microprofile-config` for an example. - -You can also register 3rd-part property sources via Java API - -[source,java] ----- -PropertiesComponent pc = ... -pc.addPropertySource(myPropertySource); ----- - -=== LoadablePropertySource - -A `PropertySource` can define that it supports loading all its properties from the source at once, -for example from file system. This allows Camel properties component to load these properties at once -during startup. - -=== PropertySource - -The regular `PropertySource` will lookup the property on-demand, for example to lookup -values from a backend source such as a database or HashiCorp Vault etc. - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java deleted file mode 100644 index c8c110f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java +++ /dev/null @@ -1,123 +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.properties; - -import org.apache.camel.spi.LoadablePropertiesSource; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.OrderedProperties; - -import java.util.Map; -import java.util.Properties; -import java.util.function.Predicate; - -/** - * Base class for {@link LoadablePropertiesSource} which can load properties from a source such as classpath or file system. - */ -public abstract class AbstractLocationPropertiesSource extends ServiceSupport implements LoadablePropertiesSource, LocationPropertiesSource { - - private final Properties properties = new OrderedProperties(); - private final org.apache.camel.component.properties.PropertiesComponent propertiesComponent; - private final org.apache.camel.component.properties.PropertiesLocation location; - - protected AbstractLocationPropertiesSource(org.apache.camel.component.properties.PropertiesComponent propertiesComponent, org.apache.camel.component.properties.PropertiesLocation location) { - this.propertiesComponent = propertiesComponent; - this.location = location; - } - - abstract Properties loadPropertiesFromLocation(PropertiesComponent propertiesComponent, org.apache.camel.component.properties.PropertiesLocation location); - - @Override - public PropertiesLocation getLocation() { - return location; - } - - @Override - public Properties loadProperties() { - return properties; - } - - @Override - public Properties loadProperties(Predicate filter) { - Properties answer = new OrderedProperties(); - - for (String name: properties.stringPropertyNames()) { - if (filter.test(name)) { - answer.put(name, properties.get(name)); - } - } - - return answer; - } - - @Override - public String getProperty(String name) { - return properties.getProperty(name); - } - - @Override - protected void doInit() throws Exception { - super.doInit(); - - Properties prop = loadPropertiesFromLocation(propertiesComponent, location); - if (prop != null) { - prop = prepareLoadedProperties(prop); - properties.putAll(prop); - } - } - - /** - * Strategy to prepare loaded properties before being used by Camel. - *

- * This implementation will ensure values are trimmed, as loading properties from - * a file with values having trailing spaces is not automatic trimmed by the Properties API - * from the JDK. - * - * @param properties the properties - * @return the prepared properties - */ - protected static Properties prepareLoadedProperties(Properties properties) { - Properties answer = new OrderedProperties(); - for (Map.Entry entry : properties.entrySet()) { - Object key = entry.getKey(); - Object value = entry.getValue(); - if (value instanceof String) { - String s = (String) value; - - // trim any trailing spaces which can be a problem when loading from - // a properties file, note that java.util.Properties does already this - // for any potential leading spaces so there's nothing to do there - value = trimTrailingWhitespaces(s); - } - answer.put(key, value); - } - return answer; - } - - private static String trimTrailingWhitespaces(String s) { - int endIndex = s.length(); - for (int index = s.length() - 1; index >= 0; index--) { - if (s.charAt(index) == ' ') { - endIndex = index; - } else { - break; - } - } - String answer = s.substring(0, endIndex); - return answer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java deleted file mode 100644 index 97f7374..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.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.properties; - -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.OrderedProperties; - -import java.io.*; -import java.util.Properties; - -public class ClasspathPropertiesSource extends AbstractLocationPropertiesSource { - - public ClasspathPropertiesSource(org.apache.camel.component.properties.PropertiesComponent propertiesComponent, org.apache.camel.component.properties.PropertiesLocation location) { - super(propertiesComponent, location); - } - - @Override - public String getName() { - return "ClasspathPropertiesSource[" + getLocation().getPath() + "]"; - } - - @Override - protected Properties loadPropertiesFromLocation(PropertiesComponent propertiesComponent, PropertiesLocation location) { - Properties answer = new OrderedProperties(); - String path = location.getPath(); - - InputStream is = propertiesComponent.getCamelContext().getClassResolver().loadResourceAsStream(path); - Reader reader = null; - if (is == null) { - if (!propertiesComponent.isIgnoreMissingLocation() && !location.isOptional()) { - throw RuntimeCamelException.wrapRuntimeCamelException(new FileNotFoundException("Properties file " + path + " not found in classpath")); - } - } else { - try { - if (propertiesComponent.getEncoding() != null) { - reader = new BufferedReader(new InputStreamReader(is, propertiesComponent.getEncoding())); - answer.load(reader); - } else { - answer.load(is); - } - } catch (IOException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } finally { - IOHelper.close(reader, is); - } - } - return answer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java deleted file mode 100644 index 60b7c9e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java +++ /dev/null @@ -1,74 +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.properties; - -import org.apache.camel.NoTypeConversionAvailableException; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.PropertiesSource; - -import java.util.Iterator; - -/** - * Default {@link PropertiesLookup} which lookup properties from a {@link java.util.Properties} with all existing properties. - */ -public class DefaultPropertiesLookup implements PropertiesLookup { - - private final org.apache.camel.component.properties.PropertiesComponent component; - - public DefaultPropertiesLookup(PropertiesComponent component) { - this.component = component; - } - - @Override - public String lookup(String name) { - try { - return doLookup(name); - } catch (NoTypeConversionAvailableException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - private String doLookup(String name) throws NoTypeConversionAvailableException { - String answer = null; - - // override takes precedence - if (component.getOverrideProperties() != null) { - // use get as the value can potentially be stored as a non string value - Object value = component.getOverrideProperties().get(name); - if (value != null) { - answer = component.getCamelContext().getTypeConverter().mandatoryConvertTo(String.class, value); - } - } - if (answer == null) { - // try till first found source - Iterator it2 = component.getSources().iterator(); - while (answer == null && it2.hasNext()) { - answer = it2.next().getProperty(name); - } - } - // initial properties are last - if (answer == null && component.getInitialProperties() != null) { - // use get as the value can potentially be stored as a non string value - Object value = component.getInitialProperties().get(name); - if (value != null) { - answer = component.getCamelContext().getTypeConverter().mandatoryConvertTo(String.class, value); - } - } - - return answer; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java deleted file mode 100644 index a75c455..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java +++ /dev/null @@ -1,348 +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.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashSet; -import java.util.Set; - -import static org.apache.camel.spi.PropertiesComponent.PREFIX_TOKEN; -import static org.apache.camel.spi.PropertiesComponent.SUFFIX_TOKEN; -import static org.apache.camel.util.IOHelper.lookupEnvironmentVariable; - -/** - * A parser to parse a string which contains property placeholders. - */ -public class DefaultPropertiesParser implements PropertiesParser { - private static final String GET_OR_ELSE_TOKEN = ":"; - - protected final Logger log = LoggerFactory.getLogger(getClass()); - - private org.apache.camel.component.properties.PropertiesComponent propertiesComponent; - - public DefaultPropertiesParser() { - } - - public DefaultPropertiesParser(org.apache.camel.component.properties.PropertiesComponent propertiesComponent) { - this.propertiesComponent = propertiesComponent; - } - - public org.apache.camel.component.properties.PropertiesComponent getPropertiesComponent() { - return propertiesComponent; - } - - public void setPropertiesComponent(org.apache.camel.component.properties.PropertiesComponent propertiesComponent) { - this.propertiesComponent = propertiesComponent; - } - - @Override - public String parseUri(String text, org.apache.camel.component.properties.PropertiesLookup properties, boolean defaultFallbackEnabled) throws IllegalArgumentException { - ParsingContext context = new ParsingContext(properties, defaultFallbackEnabled); - return context.parse(text); - } - - @Override - public String parseProperty(String key, String value, org.apache.camel.component.properties.PropertiesLookup properties) { - return value; - } - - /** - * This inner class helps replacing properties. - */ - private final class ParsingContext { - private final org.apache.camel.component.properties.PropertiesLookup properties; - private final boolean defaultFallbackEnabled; - - ParsingContext(PropertiesLookup properties, boolean defaultFallbackEnabled) { - this.properties = properties; - this.defaultFallbackEnabled = defaultFallbackEnabled; - } - - /** - * Parses the given input string and replaces all properties - * - * @param input Input string - * @return Evaluated string - */ - public String parse(String input) { - return doParse(input, new HashSet()); - } - - /** - * Recursively parses the given input string and replaces all properties - * - * @param input Input string - * @param replacedPropertyKeys Already replaced property keys used for tracking circular references - * @return Evaluated string - */ - private String doParse(String input, Set replacedPropertyKeys) { - if (input == null) { - return null; - } - String answer = input; - Property property; - while ((property = readProperty(answer)) != null) { - // Check for circular references - if (replacedPropertyKeys.contains(property.getKey())) { - throw new IllegalArgumentException("Circular reference detected with key [" + property.getKey() + "] from text: " + input); - } - - Set newReplaced = new HashSet<>(replacedPropertyKeys); - newReplaced.add(property.getKey()); - - String before = answer.substring(0, property.getBeginIndex()); - String after = answer.substring(property.getEndIndex()); - answer = before + doParse(property.getValue(), newReplaced) + after; - } - return answer; - } - - /** - * Finds a property in the given string. It returns {@code null} if there's no property defined. - * - * @param input Input string - * @return A property in the given string or {@code null} if not found - */ - private Property readProperty(String input) { - // Find the index of the first valid suffix token - int suffix = getSuffixIndex(input); - - // If not found, ensure that there is no valid prefix token in the string - if (suffix == -1) { - if (getMatchingPrefixIndex(input, input.length()) != -1) { - throw new IllegalArgumentException(String.format("Missing %s from the text: %s", SUFFIX_TOKEN, input)); - } - return null; - } - - // Find the index of the prefix token that matches the suffix token - int prefix = getMatchingPrefixIndex(input, suffix); - if (prefix == -1) { - throw new IllegalArgumentException(String.format("Missing %s from the text: %s", PREFIX_TOKEN, input)); - } - - String key = input.substring(prefix + PREFIX_TOKEN.length(), suffix); - String value = getPropertyValue(key, input); - return new Property(prefix, suffix + SUFFIX_TOKEN.length(), key, value); - } - - /** - * Gets the first index of the suffix token that is not surrounded by quotes - * - * @param input Input string - * @return First index of the suffix token that is not surrounded by quotes - */ - private int getSuffixIndex(String input) { - int index = -1; - do { - index = input.indexOf(SUFFIX_TOKEN, index + 1); - } while (index != -1 && isQuoted(input, index, SUFFIX_TOKEN)); - return index; - } - - /** - * Gets the index of the prefix token that matches the suffix at the given index and that is not surrounded by quotes - * - * @param input Input string - * @param suffixIndex Index of the suffix token - * @return Index of the prefix token that matches the suffix at the given index and that is not surrounded by quotes - */ - private int getMatchingPrefixIndex(String input, int suffixIndex) { - int index = suffixIndex; - do { - index = input.lastIndexOf(PREFIX_TOKEN, index - 1); - } while (index != -1 && isQuoted(input, index, PREFIX_TOKEN)); - return index; - } - - /** - * Indicates whether or not the token at the given index is surrounded by single or double quotes - * - * @param input Input string - * @param index Index of the token - * @param token Token - * @return {@code true} - */ - private boolean isQuoted(String input, int index, String token) { - int beforeIndex = index - 1; - int afterIndex = index + token.length(); - if (beforeIndex >= 0 && afterIndex < input.length()) { - char before = input.charAt(beforeIndex); - char after = input.charAt(afterIndex); - return (before == after) && (before == '\'' || before == '"'); - } - return false; - } - - /** - * Gets the value of the property with given key - * - * @param key Key of the property - * @param input Input string (used for exception message if value not found) - * @return Value of the property with the given key - */ - private String getPropertyValue(String key, String input) { - - // the key may be a function, so lets check this first - if (propertiesComponent != null) { - for (PropertiesFunction function : propertiesComponent.getFunctions().values()) { - String token = function.getName() + ":"; - if (key.startsWith(token)) { - String remainder = key.substring(token.length()); - log.debug("Property with key [{}] is applied by function [{}]", key, function.getName()); - String value = function.apply(remainder); - if (value == null) { - throw new IllegalArgumentException("Property with key [" + key + "] using function [" + function.getName() + "]" - + " returned null value which is not allowed, from input: " + input); - } else { - if (log.isDebugEnabled()) { - log.debug("Property with key [{}] applied by function [{}] -> {}", key, function.getName(), value); - } - return value; - } - } - } - } - - // they key may have a get or else expression - String defaultValue = null; - if (defaultFallbackEnabled && key.contains(GET_OR_ELSE_TOKEN)) { - defaultValue = StringHelper.after(key, GET_OR_ELSE_TOKEN); - key = StringHelper.before(key, GET_OR_ELSE_TOKEN); - } - - String value = doGetPropertyValue(key); - if (value == null && defaultValue != null) { - log.debug("Property with key [{}] not found, using default value: {}", key, defaultValue); - value = defaultValue; - } - - if (value == null) { - StringBuilder esb = new StringBuilder(); - esb.append("Property with key [").append(key).append("] "); - esb.append("not found in properties from text: ").append(input); - throw new IllegalArgumentException(esb.toString()); - } - - return value; - } - - /** - * Gets the property with the given key, it returns {@code null} if the property is not found - * - * @param key Key of the property - * @return Value of the property or {@code null} if not found - */ - private String doGetPropertyValue(String key) { - if (ObjectHelper.isEmpty(key)) { - return parseProperty(key, null, properties); - } - - String value = null; - - // override is the default mode for ENV - int envMode = propertiesComponent != null ? propertiesComponent.getEnvironmentVariableMode() : org.apache.camel.component.properties.PropertiesComponent.ENVIRONMENT_VARIABLES_MODE_FALLBACK; - // override is the default mode for SYS - int sysMode = propertiesComponent != null ? propertiesComponent.getSystemPropertiesMode() : org.apache.camel.component.properties.PropertiesComponent.SYSTEM_PROPERTIES_MODE_OVERRIDE; - - if (envMode == org.apache.camel.component.properties.PropertiesComponent.ENVIRONMENT_VARIABLES_MODE_OVERRIDE) { - value = lookupEnvironmentVariable(key); - if (value != null) { - log.debug("Found an OS environment property: {} with value: {} to be used.", key, value); - } - } - if (value == null && sysMode == org.apache.camel.component.properties.PropertiesComponent.SYSTEM_PROPERTIES_MODE_OVERRIDE) { - value = System.getProperty(key); - if (value != null) { - log.debug("Found a JVM system property: {} with value: {} to be used.", key, value); - } - } - - if (value == null && properties != null) { - value = properties.lookup(key); - if (value != null) { - log.debug("Found property: {} with value: {} to be used.", key, value); - } - } - - if (value == null && envMode == org.apache.camel.component.properties.PropertiesComponent.ENVIRONMENT_VARIABLES_MODE_FALLBACK) { - value = lookupEnvironmentVariable(key); - if (value != null) { - log.debug("Found an OS environment property: {} with value: {} to be used.", key, value); - } - } - if (value == null && sysMode == PropertiesComponent.SYSTEM_PROPERTIES_MODE_FALLBACK) { - value = System.getProperty(key); - if (value != null) { - log.debug("Found a JVM system property: {} with value: {} to be used.", key, value); - } - } - - return parseProperty(key, value, properties); - } - } - - /** - * This inner class is the definition of a property used in a string - */ - private static final class Property { - private final int beginIndex; - private final int endIndex; - private final String key; - private final String value; - - private Property(int beginIndex, int endIndex, String key, String value) { - this.beginIndex = beginIndex; - this.endIndex = endIndex; - this.key = key; - this.value = value; - } - - /** - * Gets the begin index of the property (including the prefix token). - */ - public int getBeginIndex() { - return beginIndex; - } - - /** - * Gets the end index of the property (including the suffix token). - */ - public int getEndIndex() { - return endIndex; - } - - /** - * Gets the key of the property. - */ - public String getKey() { - return key; - } - - /** - * Gets the value of the property. - */ - public String getValue() { - return value; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java deleted file mode 100644 index 905c9e4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.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.component.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.StringHelper; - -/** - * A {@link PropertiesFunction} that lookup the property value from - * OS environment variables. - */ -public class EnvPropertiesFunction implements PropertiesFunction { - - @Override - public String getName() { - return "env"; - } - - @Override - public String apply(String remainder) { - String key = remainder; - String defaultValue = null; - - if (remainder.contains(":")) { - key = StringHelper.before(remainder, ":"); - defaultValue = StringHelper.after(remainder, ":"); - } - - // lookup OS environment variable using upper case key - key = key.toUpperCase(); - - String value = System.getenv(key); - // some OS do not support dashes in keys, so replace with underscore - if (value == null) { - String noDashKey = key.replace('-', '_'); - value = System.getenv(noDashKey); - } - return value != null ? value : defaultValue; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java deleted file mode 100644 index 01699c3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.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.properties; - -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.OrderedProperties; - -import java.io.*; -import java.util.Properties; - -public class FilePropertiesSource extends AbstractLocationPropertiesSource { - - protected FilePropertiesSource(org.apache.camel.component.properties.PropertiesComponent propertiesComponent, PropertiesLocation location) { - super(propertiesComponent, location); - } - - @Override - public String getName() { - return "FilePropertiesSource[" + getLocation().getPath() + "]"; - } - - @Override - protected Properties loadPropertiesFromLocation(PropertiesComponent propertiesComponent, PropertiesLocation location) { - Properties answer = new OrderedProperties(); - String path = location.getPath(); - - InputStream is = null; - Reader reader = null; - try { - is = new FileInputStream(path); - if (propertiesComponent.getEncoding() != null) { - reader = new BufferedReader(new InputStreamReader(is, propertiesComponent.getEncoding())); - answer.load(reader); - } else { - answer.load(is); - } - } catch (FileNotFoundException e) { - if (!propertiesComponent.isIgnoreMissingLocation() && !location.isOptional()) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } catch (IOException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } finally { - IOHelper.close(reader, is); - } - - return answer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java deleted file mode 100644 index 0ddd9ab..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java +++ /dev/null @@ -1,30 +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.properties; - -import org.apache.camel.spi.PropertiesSource; - -/** - * A {@link PropertiesSource} which was created from a {@link PropertiesLocation}. - */ -public interface LocationPropertiesSource extends PropertiesSource { - - /** - * Gets the location of the properties - */ - PropertiesLocation getLocation(); -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java deleted file mode 100644 index 3c04128..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ /dev/null @@ -1,634 +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.properties; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.StaticService; -import org.apache.camel.api.management.ManagedAttribute; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.LoadablePropertiesSource; -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.spi.PropertiesSource; -import org.apache.camel.spi.annotations.JdkService; -import org.apache.camel.support.OrderedComparator; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.FilePathResolver; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.OrderedProperties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * The properties component allows you to use property placeholders in Camel. - */ -@ManagedResource(description = "Managed PropertiesComponent") -@JdkService(org.apache.camel.spi.PropertiesComponent.FACTORY) -public class PropertiesComponent extends ServiceSupport implements org.apache.camel.spi.PropertiesComponent, StaticService, CamelContextAware { - - /** - * Never check system properties. - */ - public static final int SYSTEM_PROPERTIES_MODE_NEVER = 0; - - /** - * Check system properties if not resolvable in the specified properties. - */ - public static final int SYSTEM_PROPERTIES_MODE_FALLBACK = 1; - - /** - * Check system properties variables) first, before trying the specified properties. - * This allows system properties to override any other property source - * (environment variable and then system properties takes precedence). - *

- * This is the default. - */ - public static final int SYSTEM_PROPERTIES_MODE_OVERRIDE = 2; - - /** - * Never check OS environment variables. - */ - public static final int ENVIRONMENT_VARIABLES_MODE_NEVER = 0; - - /** - * Check OS environment variables if not resolvable in the specified properties. - *

- * This is the default. - */ - public static final int ENVIRONMENT_VARIABLES_MODE_FALLBACK = 1; - - /** - * Check OS environment variables first, before trying the specified properties. - * This allows environment variables to override any other property source - * (environment variable and then system properties takes precedence). - */ - public static final int ENVIRONMENT_VARIABLES_MODE_OVERRIDE = 2; - - /** - * Key for stores special override properties that containers such as OSGi can store - * in the OSGi service registry - */ - public static final String OVERRIDE_PROPERTIES = PropertiesComponent.class.getName() + ".OverrideProperties"; - - private static final Logger LOG = LoggerFactory.getLogger(PropertiesComponent.class); - - private CamelContext camelContext; - private final Map functions = new LinkedHashMap<>(); - private PropertiesParser propertiesParser = new DefaultPropertiesParser(this); - private final PropertiesLookup propertiesLookup = new DefaultPropertiesLookup(this); - private final List sources = new ArrayList<>(); - private List locations = new ArrayList<>(); - private String location; - private boolean ignoreMissingLocation; - private String encoding; - private boolean defaultFallbackEnabled = true; - private Properties initialProperties; - private Properties overrideProperties; - private int systemPropertiesMode = SYSTEM_PROPERTIES_MODE_OVERRIDE; - private int environmentVariableMode = ENVIRONMENT_VARIABLES_MODE_OVERRIDE; - private boolean autoDiscoverPropertiesSources = true; - - public PropertiesComponent() { - // include out of the box functions - addPropertiesFunction(new EnvPropertiesFunction()); - addPropertiesFunction(new SysPropertiesFunction()); - addPropertiesFunction(new ServicePropertiesFunction()); - addPropertiesFunction(new ServiceHostPropertiesFunction()); - addPropertiesFunction(new ServicePortPropertiesFunction()); - } - - /** - * A list of locations to load properties. You can use comma to separate multiple locations. - */ - public PropertiesComponent(String location) { - this(); - setLocation(location); - } - - /** - * A list of locations to load properties. - */ - public PropertiesComponent(String... locations) { - this(); - setLocations(locations); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String parseUri(String uri) { - return parseUri(uri, propertiesLookup); - } - - @Override - public Optional resolveProperty(String key) { - try { - String value = parseUri(key, propertiesLookup); - return Optional.of(value); - } catch (IllegalArgumentException e) { - // property not found - return Optional.empty(); - } - } - - @Override - public Properties loadProperties() { - // this method may be replaced by loadProperties(k -> true) but the underlying sources - // may have some optimization for bulk load so let's keep it - - Properties prop = new OrderedProperties(); - - // use initial properties - if (initialProperties != null) { - prop.putAll(initialProperties); - } - - if (!sources.isEmpty()) { - // sources are ordered according to {@link org.apache.camel.support.OrderComparator} so - // it is needed to iterate them in reverse order otherwise lower priority sources may - // override properties from higher priority ones - for (int i = sources.size(); i-- > 0;) { - PropertiesSource ps = sources.get(i); - if (ps instanceof LoadablePropertiesSource) { - LoadablePropertiesSource lps = (LoadablePropertiesSource) ps; - Properties p = lps.loadProperties(); - prop.putAll(p); - } - } - } - - // use override properties - if (overrideProperties != null) { - // make a copy to avoid affecting the original properties - Properties override = new OrderedProperties(); - override.putAll(prop); - override.putAll(overrideProperties); - prop = override; - } - - return prop; - } - - @Override - public Properties loadProperties(Predicate filter) { - Properties prop = new OrderedProperties(); - - // use initial properties - if (initialProperties != null) { - for (String name: initialProperties.stringPropertyNames()) { - if (filter.test(name)) { - prop.put(name, initialProperties.get(name)); - } - } - } - - if (!sources.isEmpty()) { - // sources are ordered according to {@link org.apache.camel.support.OrderComparator} so - // it is needed to iterate them in reverse order otherwise lower priority sources may - // override properties from higher priority ones - for (int i = sources.size(); i-- > 0;) { - PropertiesSource ps = sources.get(i); - if (ps instanceof LoadablePropertiesSource) { - LoadablePropertiesSource lps = (LoadablePropertiesSource) ps; - Properties p = lps.loadProperties(filter); - prop.putAll(p); - } - } - } - - // use override properties - if (overrideProperties != null) { - for (String name: overrideProperties.stringPropertyNames()) { - if (filter.test(name)) { - prop.put(name, overrideProperties.get(name)); - } - } - } - - return prop; - } - - protected String parseUri(String uri, PropertiesLookup properties) { - // enclose tokens if missing - if (!uri.contains(PREFIX_TOKEN) && !uri.startsWith(PREFIX_TOKEN)) { - uri = PREFIX_TOKEN + uri; - } - if (!uri.contains(SUFFIX_TOKEN) && !uri.endsWith(SUFFIX_TOKEN)) { - uri = uri + SUFFIX_TOKEN; - } - - LOG.trace("Parsing uri {}", uri); - return propertiesParser.parseUri(uri, properties, defaultFallbackEnabled); - } - - @Override - @SuppressWarnings("unchecked") - public List getLocations() { - if (locations.isEmpty()) { - return Collections.EMPTY_LIST; - } else { - return locations.stream().map(PropertiesLocation::toString).collect(Collectors.toList()); - } - } - - /** - * A list of locations to load properties. - * This option will override any default locations and only use the locations from this option. - */ - public void setLocations(List locations) { - // reset locations - locations = parseLocations(locations); - this.locations = Collections.unmodifiableList(locations); - - // we need to re-create the property sources which may have already been created from locations - this.sources.removeIf(s -> s instanceof LocationPropertiesSource); - for (PropertiesLocation loc : locations) { - addPropertiesLocationsAsPropertiesSource(loc); - } - } - - /** - * A list of locations to load properties. - * This option will override any default locations and only use the locations from this option. - */ - public void setLocations(String[] locationStrings) { - List locations = new ArrayList<>(); - if (locationStrings != null) { - for (String locationString : locationStrings) { - locations.add(new PropertiesLocation(locationString)); - } - } - - setLocations(locations); - } - - /** - * A list of locations to load properties. - * This option will override any default locations and only use the locations from this option. - */ - public void setLocations(Collection locationStrings) { - List locations = new ArrayList<>(); - if (locationStrings != null) { - for (String locationString : locationStrings) { - locations.add(new PropertiesLocation(locationString)); - } - } - - setLocations(locations); - } - - public void addLocation(PropertiesLocation location) { - this.locations.add(location); - } - - @Override - public void addLocation(String location) { - if (location != null) { - List newLocations = new ArrayList<>(); - for (String loc : location.split(",")) { - newLocations.add(new PropertiesLocation(loc)); - } - List current = locations; - if (!current.isEmpty()) { - newLocations.addAll(0, current); - } - setLocations(newLocations); - } - } - - /** - * A list of locations to load properties. You can use comma to separate multiple locations. - * This option will override any default locations and only use the locations from this option. - */ - @Override - public void setLocation(String location) { - this.location = location; - if (location != null) { - setLocations(location.split(",")); - } - } - - public String getLocation() { - return location; - } - - @ManagedAttribute(description = "Encoding to use when loading properties file from the file system or classpath") - public String getEncoding() { - return encoding; - } - - /** - * Encoding to use when loading properties file from the file system or classpath. - *

- * If no encoding has been set, then the properties files is loaded using ISO-8859-1 encoding (latin-1) - * as documented by {@link Properties#load(java.io.InputStream)} - */ - @Override - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - public PropertiesParser getPropertiesParser() { - return propertiesParser; - } - - /** - * To use a custom PropertiesParser - */ - public void setPropertiesParser(PropertiesParser propertiesParser) { - this.propertiesParser = propertiesParser; - } - - @ManagedAttribute(description = "Whether to support using fallback values if a property cannot be found") - public boolean isDefaultFallbackEnabled() { - return defaultFallbackEnabled; - } - - /** - * If false, the component does not attempt to find a default for the key by looking after the colon separator. - */ - public void setDefaultFallbackEnabled(boolean defaultFallbackEnabled) { - this.defaultFallbackEnabled = defaultFallbackEnabled; - } - - @ManagedAttribute(description = "Ignore missing location") - public boolean isIgnoreMissingLocation() { - return ignoreMissingLocation; - } - - /** - * Whether to silently ignore if a location cannot be located, such as a properties file not found. - */ - @Override - public void setIgnoreMissingLocation(boolean ignoreMissingLocation) { - this.ignoreMissingLocation = ignoreMissingLocation; - } - - /** - * @return a list of properties which will be used before any locations are resolved (can't be null). - */ - public Properties getInitialProperties() { - if (initialProperties == null) { - initialProperties = new Properties(); - } - - return initialProperties; - } - - /** - * Sets initial properties which will be used before any locations are resolved. - */ - @Override - public void setInitialProperties(Properties initialProperties) { - this.initialProperties = initialProperties; - } - - /** - * @return a list of properties that take precedence and will use first, if a property exist (can't be null). - */ - public Properties getOverrideProperties() { - if (overrideProperties == null) { - overrideProperties = new Properties(); - } - - return overrideProperties; - } - - /** - * Sets a special list of override properties that take precedence - * and will use first, if a property exist. - */ - @Override - public void setOverrideProperties(Properties overrideProperties) { - this.overrideProperties = overrideProperties; - } - - /** - * Gets the functions registered in this properties component. - */ - public Map getFunctions() { - return functions; - } - - /** - * Registers the {@link PropertiesFunction} as a function to this component. - */ - public void addPropertiesFunction(PropertiesFunction function) { - this.functions.put(function.getName(), function); - } - - /** - * Is there a {@link PropertiesFunction} with the given name? - */ - public boolean hasFunction(String name) { - return functions.containsKey(name); - } - - @ManagedAttribute(description = "System properties mode") - public int getSystemPropertiesMode() { - return systemPropertiesMode; - } - - /** - * Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). - * - * The default mode (override) is to use system properties if present, - * and override any existing properties. - * - * OS environment variable mode is checked before JVM system property mode - * - * @see #SYSTEM_PROPERTIES_MODE_NEVER - * @see #SYSTEM_PROPERTIES_MODE_FALLBACK - * @see #SYSTEM_PROPERTIES_MODE_OVERRIDE - */ - public void setSystemPropertiesMode(int systemPropertiesMode) { - this.systemPropertiesMode = systemPropertiesMode; - } - - @ManagedAttribute(description = "Environment variable mode") - public int getEnvironmentVariableMode() { - return environmentVariableMode; - } - - /** - * Sets the OS environment variables mode (0 = never, 1 = fallback, 2 = override). - * - * The default mode (override) is to use OS environment variables if present, - * and override any existing properties. - * - * OS environment variable mode is checked before JVM system property mode - * - * @see #ENVIRONMENT_VARIABLES_MODE_NEVER - * @see #ENVIRONMENT_VARIABLES_MODE_FALLBACK - * @see #ENVIRONMENT_VARIABLES_MODE_OVERRIDE - */ - public void setEnvironmentVariableMode(int environmentVariableMode) { - this.environmentVariableMode = environmentVariableMode; - } - - public boolean isAutoDiscoverPropertiesSources() { - return autoDiscoverPropertiesSources; - } - - /** - * Whether to automatically discovery instances of {@link PropertiesSource} from registry and service factory. - */ - public void setAutoDiscoverPropertiesSources(boolean autoDiscoverPropertiesSources) { - this.autoDiscoverPropertiesSources = autoDiscoverPropertiesSources; - } - - @Override - public void addPropertiesSource(PropertiesSource propertiesSource) { - if (propertiesSource instanceof CamelContextAware) { - ((CamelContextAware) propertiesSource).setCamelContext(getCamelContext()); - } - synchronized (lock) { - sources.add(propertiesSource); - if (!isNew()) { - // if we have already initialized or started then we should also init the source - ServiceHelper.initService(propertiesSource); - } - if (isStarted()) { - ServiceHelper.startService(propertiesSource); - } - } - } - - public List getSources() { - return sources; - } - - @Override - protected void doInit() throws Exception { - super.doInit(); - - ObjectHelper.notNull(camelContext, "CamelContext", this); - - if (systemPropertiesMode != SYSTEM_PROPERTIES_MODE_NEVER - && systemPropertiesMode != SYSTEM_PROPERTIES_MODE_FALLBACK - && systemPropertiesMode != SYSTEM_PROPERTIES_MODE_OVERRIDE) { - throw new IllegalArgumentException("Option systemPropertiesMode has invalid value: " + systemPropertiesMode); - } - if (environmentVariableMode != ENVIRONMENT_VARIABLES_MODE_NEVER - && environmentVariableMode != ENVIRONMENT_VARIABLES_MODE_FALLBACK - && environmentVariableMode != ENVIRONMENT_VARIABLES_MODE_OVERRIDE) { - throw new IllegalArgumentException("Option environmentVariableMode has invalid value: " + environmentVariableMode); - } - - // inject the component to the parser - if (propertiesParser instanceof DefaultPropertiesParser) { - ((DefaultPropertiesParser) propertiesParser).setPropertiesComponent(this); - } - - if (isAutoDiscoverPropertiesSources()) { - // discover any 3rd party properties sources - try { - for (PropertiesSource source : getCamelContext().getRegistry().findByType(PropertiesSource.class)) { - addPropertiesSource(source); - LOG.info("PropertiesComponent added custom PropertiesSource (registry): {}", source); - } - - FactoryFinder factoryFinder = getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder("META-INF/services/org/apache/camel/"); - Class type = factoryFinder.findClass("properties-source-factory").orElse(null); - if (type != null) { - Object obj = getCamelContext().getInjector().newInstance(type, false); - if (obj instanceof PropertiesSource) { - PropertiesSource ps = (PropertiesSource) obj; - addPropertiesSource(ps); - LOG.info("PropertiesComponent added custom PropertiesSource (factory): {}", ps); - } else if (obj != null) { - LOG.warn("PropertiesComponent cannot add custom PropertiesSource as the type is not a org.apache.camel.component.properties.PropertiesSource but: " + type.getName()); - } - } - } catch (Exception e) { - LOG.debug("Error discovering and using custom PropertiesSource due to " + e.getMessage() + ". This exception is ignored", e); - } - } - - sources.sort(OrderedComparator.get()); - ServiceHelper.initService(sources); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(sources); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(sources); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(sources); - } - - private void addPropertiesLocationsAsPropertiesSource(PropertiesLocation location) { - if ("ref".equals(location.getResolver())) { - addPropertiesSource(new RefPropertiesSource(this, location)); - } else if ("file".equals(location.getResolver())) { - addPropertiesSource(new FilePropertiesSource(this, location)); - } else if ("classpath".equals(location.getResolver())) { - addPropertiesSource(new ClasspathPropertiesSource(this, location)); - } - } - private List parseLocations(List locations) { - List answer = new ArrayList<>(); - - for (PropertiesLocation location : locations) { - LOG.trace("Parsing location: {}", location); - - try { - String path = FilePathResolver.resolvePath(location.getPath()); - LOG.debug("Parsed location: {}", path); - if (ObjectHelper.isNotEmpty(path)) { - answer.add(new PropertiesLocation( - location.getResolver(), - path, - location.isOptional()) - ); - } - } catch (IllegalArgumentException e) { - if (!ignoreMissingLocation && !location.isOptional()) { - throw e; - } else { - LOG.debug("Ignored missing location: {}", location); - } - } - } - - // must return a not-null answer - return answer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java deleted file mode 100644 index 06e3f86..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.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.properties; - -import org.apache.camel.util.StringHelper; - -public final class PropertiesLocation { - private final String resolver; - private final String path; - private final boolean optional; - - public PropertiesLocation(String location) { - // make sure to trim as people may use new lines when configuring using XML - // and do this in the setter as Spring/Blueprint resolves placeholders before - // Camel is being started - location = location.trim(); - - int idx = location.indexOf(':'); - if (idx != -1) { - this.resolver = location.substring(0, idx); - location = location.substring(idx + 1); - } else { - this.resolver = "classpath"; - } - - idx = location.lastIndexOf(';'); - if (idx != -1) { - this.optional = StringHelper.after(location.substring(idx + 1), "optional=", Boolean::valueOf).orElse(false); - location = location.substring(0, idx); - } else { - this.optional = false; - } - - this.path = location; - } - - public PropertiesLocation(String resolver, String path) { - this(resolver, path, false); - } - - public PropertiesLocation(String resolver, String path, Boolean optional) { - this.resolver = resolver; - this.path = path; - this.optional = optional; - } - - // ***************************** - // Getters - // ***************************** - - public String getResolver() { - return resolver; - } - - public String getPath() { - return path; - } - - public boolean isOptional() { - return optional; - } - - // ***************************** - // Equals/HashCode/ToString - // ***************************** - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - PropertiesLocation location = (PropertiesLocation) o; - - if (optional != location.optional) { - return false; - } - if (resolver != null ? !resolver.equals(location.resolver) : location.resolver != null) { - return false; - } - return path != null ? path.equals(location.path) : location.path == null; - } - - @Override - public int hashCode() { - int result = resolver != null ? resolver.hashCode() : 0; - result = 31 * result + (path != null ? path.hashCode() : 0); - result = 31 * result + (optional ? 1 : 0); - return result; - } - - @Override - public String toString() { - return resolver + ":" + path + (optional ? ";optional=true" : ""); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java deleted file mode 100644 index cc191c1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java +++ /dev/null @@ -1,33 +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.properties; - -/** - * Used by {@link PropertiesParser} to lookup properties by their name - */ -@FunctionalInterface -public interface PropertiesLookup { - - /** - * Lookup the property with the given name - * - * @param name property name - * @return the property value, or null if the properties does not exist. - */ - String lookup(String name); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java deleted file mode 100644 index 78b89ec..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java +++ /dev/null @@ -1,46 +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.properties; - -/** - * A parser to parse properties for a given input - */ -public interface PropertiesParser { - - /** - * Parses the string and replaces the property placeholders with values from the given properties. - * - * @param text the text to be parsed - * @param properties the properties resolved which values should be looked up - * @param fallback whether to support using fallback values if a property cannot be found - * @return the parsed text with replaced placeholders - * @throws IllegalArgumentException if uri syntax is not valid or a property is not found - */ - String parseUri(String text, PropertiesLookup properties, boolean fallback) throws IllegalArgumentException; - - /** - * While parsing the uri using parseUri method each parsed property found invokes this callback. - *

- * This strategy method allows you to hook into the parsing and do custom lookup and return the actual value to use. - * - * @param key the key - * @param value the value - * @param properties the properties resolved which values should be looked up - * @return the value to use - */ - String parseProperty(String key, String value, PropertiesLookup properties); -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java deleted file mode 100644 index 5c0e20a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.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.properties; - -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.util.OrderedProperties; - -import java.io.FileNotFoundException; -import java.util.Map; -import java.util.Properties; - -public class RefPropertiesSource implements LocationPropertiesSource { - - private final org.apache.camel.component.properties.PropertiesComponent propertiesComponent; - private final PropertiesLocation location; - - public RefPropertiesSource(org.apache.camel.component.properties.PropertiesComponent propertiesComponent, PropertiesLocation location) { - this.propertiesComponent = propertiesComponent; - this.location = location; - } - - @Override - public String getName() { - return "RefPropertiesSource[" + getLocation().getPath() + "]"; - } - - @Override - public PropertiesLocation getLocation() { - return location; - } - - @Override - public String getProperty(String name) { - // this will lookup the property on-demand - Properties properties = lookupPropertiesInRegistry(propertiesComponent, location); - if (properties != null) { - return properties.getProperty(name); - } else { - return null; - } - } - - protected Properties lookupPropertiesInRegistry(PropertiesComponent propertiesComponent, PropertiesLocation location) { - String path = location.getPath(); - Properties answer = null; - - Object obj = propertiesComponent.getCamelContext().getRegistry().lookupByName(path); - if (obj instanceof Properties) { - answer = (Properties) obj; - } else if (obj instanceof Map) { - answer = new OrderedProperties(); - answer.putAll((Map) obj); - } else if (!propertiesComponent.isIgnoreMissingLocation() && !location.isOptional()) { - throw RuntimeCamelException.wrapRuntimeCamelException(new FileNotFoundException("Properties " + path + " not found in registry")); - } - - return answer; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java deleted file mode 100644 index deacada..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java +++ /dev/null @@ -1,77 +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.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.StringHelper; - -import java.util.Locale; - -/** - * A {@link PropertiesFunction} that lookup the property value from - * OS environment variables using the service idiom. - *

- * A service is defined using two environment variables where name is name of the service: - *

    - *
  • NAME_SERVICE_HOST
    • - *
  • NAME_SERVICE_PORT
    • - *
- * in other words the service uses _SERVICE_HOST and _SERVICE_PORT as prefix. - *

- * This implementation is to return the host part only. - * - * @see ServicePropertiesFunction - * @see ServicePortPropertiesFunction - */ -public class ServiceHostPropertiesFunction implements PropertiesFunction { - - private static final String HOST_PREFIX = "_SERVICE_HOST"; - - @Override - public String getName() { - return "service.host"; - } - - @Override - public String apply(String remainder) { - String key = remainder; - String defaultValue = null; - - if (remainder.contains(":")) { - key = StringHelper.before(remainder, ":"); - defaultValue = StringHelper.after(remainder, ":"); - } - - // make sure to use upper case - if (key != null) { - // make sure to use underscore as dash is not supported as ENV variables - key = key.toUpperCase(Locale.ENGLISH).replace('-', '_'); - - // a service should have both the host and port defined - String host = System.getenv(key + HOST_PREFIX); - - if (host != null) { - return host; - } else { - return defaultValue; - } - } - - return defaultValue; - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java deleted file mode 100644 index b7da2b8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java +++ /dev/null @@ -1,77 +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.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.StringHelper; - -import java.util.Locale; - -/** - * A {@link PropertiesFunction} that lookup the property value from - * OS environment variables using the service idiom. - *

- * A service is defined using two environment variables where name is name of the service: - *

    - *
  • NAME_SERVICE_HOST
    • - *
  • NAME_SERVICE_PORT
    • - *
- * in other words the service uses _SERVICE_HOST and _SERVICE_PORT as prefix. - *

- * This implementation is to return the port part only. - * - * @see ServicePropertiesFunction - * @see ServiceHostPropertiesFunction - */ -public class ServicePortPropertiesFunction implements PropertiesFunction { - - private static final String PORT_PREFIX = "_SERVICE_PORT"; - - @Override - public String getName() { - return "service.port"; - } - - @Override - public String apply(String remainder) { - String key = remainder; - String defaultValue = null; - - if (remainder.contains(":")) { - key = StringHelper.before(remainder, ":"); - defaultValue = StringHelper.after(remainder, ":"); - } - - // make sure to use upper case - if (key != null) { - // make sure to use underscore as dash is not supported as ENV variables - key = key.toUpperCase(Locale.ENGLISH).replace('-', '_'); - - // a service should have both the host and port defined - String port = System.getenv(key + PORT_PREFIX); - - if (port != null) { - return port; - } else { - return defaultValue; - } - } - - return defaultValue; - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java deleted file mode 100644 index eeee01a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java +++ /dev/null @@ -1,74 +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.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.StringHelper; - -import java.util.Locale; - -/** - * A {@link PropertiesFunction} that lookup the property value from - * OS environment variables using the service idiom. - *

- * A service is defined using two environment variables where name is name of the service: - *

    - *
  • NAME_SERVICE_HOST
    • - *
  • NAME_SERVICE_PORT
    • - *
- * in other words the service uses _SERVICE_HOST and _SERVICE_PORT as prefix. - */ -public class ServicePropertiesFunction implements PropertiesFunction { - - private static final String HOST_PREFIX = "_SERVICE_HOST"; - private static final String PORT_PREFIX = "_SERVICE_PORT"; - - @Override - public String getName() { - return "service"; - } - - @Override - public String apply(String remainder) { - String key = remainder; - String defaultValue = null; - - if (remainder.contains(":")) { - key = StringHelper.before(remainder, ":"); - defaultValue = StringHelper.after(remainder, ":"); - } - - // make sure to use upper case - if (key != null) { - // make sure to use underscore as dash is not supported as ENV variables - key = key.toUpperCase(Locale.ENGLISH).replace('-', '_'); - - // a service should have both the host and port defined - String host = System.getenv(key + HOST_PREFIX); - String port = System.getenv(key + PORT_PREFIX); - - if (host != null && port != null) { - return host + ":" + port; - } else { - return defaultValue; - } - } - - return defaultValue; - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java deleted file mode 100644 index 57ba7f2..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.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.properties; - -import org.apache.camel.spi.PropertiesFunction; -import org.apache.camel.util.StringHelper; - -/** - * A {@link PropertiesFunction} that lookup the property value from - * JVM system property. - */ -public class SysPropertiesFunction implements PropertiesFunction { - - @Override - public String getName() { - return "sys"; - } - - @Override - public String apply(String remainder) { - String key = remainder; - String defaultValue = null; - - if (remainder.contains(":")) { - key = StringHelper.before(remainder, ":"); - defaultValue = StringHelper.after(remainder, ":"); - } - - String value = System.getProperty(key); - return value != null ? value : defaultValue; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/package.html deleted file mode 100644 index 746fe4e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/component/properties/package.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - -The Properties Component for lookup of property -placeholders for endpoint URI. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java deleted file mode 100644 index edf4150..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.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; - -import org.apache.camel.*; - -/** - * Some useful converters for Camel APIs such as to convert a {@link Predicate} or {@link Expression} - * to a {@link Processor} - */ -@Converter(generateLoader = true) -public final class CamelConverter { - - /** - * Utility classes should not have a public constructor. - */ - private CamelConverter() { - } - - @Converter - public static Processor toProcessor(final Predicate predicate) { - return exchange -> { - // the response from a predicate should be set on OUT - boolean answer = predicate.matches(exchange); - Message out = exchange.getOut(); - out.copyFrom(exchange.getIn()); - out.setBody(answer); - }; - } - - @Converter - public static Processor toProcessor(final Expression expression) { - return exchange -> { - // the response from a expression should be set on OUT - Object answer = expression.evaluate(exchange, Object.class); - Message out = exchange.getOut(); - out.copyFrom(exchange.getIn()); - out.setBody(answer); - }; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java deleted file mode 100644 index 8cc5ee8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.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.converter; - -import org.apache.camel.Converter; - -import java.util.*; - -/** - * Some core java.util Collection based - * Type Converters - */ -@Converter(generateLoader = true) -public final class CollectionConverter { - - /** - * Utility classes should not have a public constructor. - */ - private CollectionConverter() { - } - - /** - * Converts a collection to an array - */ - @Converter - public static Object[] toArray(Collection value) { - return value.toArray(); - } - - /** - * Converts an array to a collection - */ - @Converter - public static List toList(Object[] array) { - return Arrays.asList(array); - } - - /** - * Converts a collection to a List if it is not already - */ - @Converter - public static List toList(Collection collection) { - return new ArrayList<>(collection); - } - - /** - * Converts an {@link Iterator} to a {@link ArrayList} - */ - @Converter - public static ArrayList toArrayList(Iterator it) { - ArrayList list = new ArrayList<>(); - while (it.hasNext()) { - list.add(it.next()); - } - return list; - } - - @Converter - public static Set toSet(Object[] array) { - Set answer = new HashSet<>(); - answer.addAll(Arrays.asList(array)); - return answer; - } - - @Converter - public static Set toSet(Collection collection) { - return new HashSet<>(collection); - } - - @Converter - public static Set> toSet(Map map) { - return map.entrySet(); - } - - @Converter - public static Properties toProperties(Map map) { - Properties answer = new Properties(); - answer.putAll(map); - return answer; - } - - @Converter - public static Hashtable toHashtable(Map map) { - return new Hashtable<>(map); - } - - @Converter - public static HashMap toHashMap(Map map) { - return new HashMap<>(map); - } - - /** - * Converts an {@link Iterable} into a {@link List} - */ - @Converter - public static List toList(Iterable iterable) { - if (iterable instanceof List) { - return (List) iterable; - } - List result = new LinkedList<>(); - for (T value : iterable) { - result.add(value); - } - return result; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java deleted file mode 100644 index 89cd161..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.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.converter; - -import org.apache.camel.Converter; - -import java.util.Date; -import java.util.TimeZone; - -/** - * Date and time related converters. - */ -@Converter(generateLoader = true) -public final class DateTimeConverter { - - /** - * Utility classes should not have a public constructor. - */ - private DateTimeConverter() { - } - - @Converter - public static TimeZone toTimeZone(String s) { - return TimeZone.getTimeZone(s); - } - - @Converter - public static Date toDate(Long l) { - return new Date(l); - } - - @Converter - public static Long toLong(Date date) { - return date.getTime(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java deleted file mode 100644 index 8929fab..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java +++ /dev/null @@ -1,59 +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; - -import org.apache.camel.Converter; -import org.apache.camel.util.TimeUtils; - -import java.time.Duration; - -/** - * Converters for java.time.Duration. - */ -@Converter(generateLoader = true) -public final class DurationConverter { - - /** - * Utility classes should not have a public constructor. - */ - private DurationConverter() { - } - - @Converter - public static Long toMilliSeconds(Duration source) { - return source.toMillis(); - } - - @Converter - public static Duration toDuration(Long source) { - return Duration.ofMillis(source); - } - - @Converter - public static Duration toDuration(String source) { - if (source.startsWith("P") || source.startsWith("-P") || source.startsWith("p") || source.startsWith("-p")) { - return Duration.parse(source); - } else { - return Duration.ofMillis(TimeUtils.toMilliSeconds(source)); - } - } - - @Converter - public static String toString(Duration source) { - return source.toString(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java deleted file mode 100644 index 6178359..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java +++ /dev/null @@ -1,292 +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; - -import org.apache.camel.Converter; -import org.apache.camel.Exchange; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.InputStreamIterator; -import org.apache.camel.util.IOHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; -import java.net.URL; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.Properties; -import java.util.stream.Stream; - -/** - * Some core java.io based Type Converters - */ -@Converter(generateLoader = true) -public final class IOConverter { - - private static final Logger LOG = LoggerFactory.getLogger(IOConverter.class); - - /** - * Utility classes should not have a public constructor. - */ - private IOConverter() { - } - - @Converter - public static InputStream toInputStream(Stream stream, Exchange exchange) { - Iterator it = stream.iterator(); - return new InputStreamIterator(exchange.getContext().getTypeConverter(), it); - } - - @Converter - public static InputStream toInputStream(URL url) throws IOException { - return IOHelper.buffered(url.openStream()); - } - - @Converter - public static InputStream toInputStream(File file) throws IOException { - return IOHelper.buffered(new FileInputStream(file)); - } - - @Converter - public static BufferedReader toReader(File file, Exchange exchange) throws IOException { - return IOHelper.toReader(file, ExchangeHelper.getCharsetName(exchange)); - } - - @Converter - public static File toFile(String name) { - return new File(name); - } - - @Converter - public static OutputStream toOutputStream(File file) throws FileNotFoundException { - return IOHelper.buffered(new FileOutputStream(file)); - } - - @Converter - public static BufferedWriter toWriter(File file, Exchange exchange) throws IOException { - FileOutputStream os = new FileOutputStream(file, false); - return IOHelper.toWriter(os, ExchangeHelper.getCharsetName(exchange)); - } - - @Converter - public static Reader toReader(InputStream in, Exchange exchange) throws IOException { - return IOHelper.buffered(new InputStreamReader(in, ExchangeHelper.getCharsetName(exchange))); - } - - @Converter - public static Reader toReader(byte[] data, Exchange exchange) throws IOException { - return toReader(new ByteArrayInputStream(data), exchange); - } - - @Converter - public static Writer toWriter(OutputStream out, Exchange exchange) throws IOException { - return IOHelper.buffered(new OutputStreamWriter(out, ExchangeHelper.getCharsetName(exchange))); - } - - @Converter - public static StringReader toReader(String text) { - // no buffering required as the complete string input is already passed - // over as a whole - return new StringReader(text); - } - - @Converter - public static InputStream toInputStream(String text, Exchange exchange) throws IOException { - return toInputStream(text.getBytes(ExchangeHelper.getCharsetName(exchange))); - } - - @Converter - public static InputStream toInputStream(StringBuffer buffer, Exchange exchange) throws IOException { - return toInputStream(buffer.toString(), exchange); - } - - @Converter - public static InputStream toInputStream(StringBuilder builder, Exchange exchange) throws IOException { - return toInputStream(builder.toString(), exchange); - } - - @Converter - public static InputStream toInputStream(BufferedReader buffer, Exchange exchange) throws IOException { - return toInputStream(toString(buffer), exchange); - } - - @Converter - public static String toString(byte[] data, Exchange exchange) throws IOException { - return new String(data, ExchangeHelper.getCharsetName(exchange)); - } - - @Converter - public static String toString(File file, Exchange exchange) throws IOException { - return toString(toReader(file, exchange)); - } - - @Converter - public static byte[] toByteArray(File file) throws IOException { - InputStream is = toInputStream(file); - try { - return toBytes(is); - } finally { - IOHelper.close(is, "file", LOG); - } - } - - @Converter - public static byte[] toByteArray(Reader reader, Exchange exchange) throws IOException { - return toByteArray(IOHelper.buffered(reader), exchange); - } - - @Converter - public static String toString(URL url, Exchange exchange) throws IOException { - InputStream is = toInputStream(url); - try { - return toString(is, exchange); - } finally { - IOHelper.close(is, "url", LOG); - } - } - - @Converter - public static String toString(Reader reader) throws IOException { - return IOHelper.toString(reader); - } - - @Converter - public static String toString(BufferedReader reader) throws IOException { - return IOHelper.toString(reader); - } - - @Converter - public static byte[] toByteArray(BufferedReader reader, Exchange exchange) throws IOException { - String s = toString(reader); - return toByteArray(s, exchange); - } - - @Converter - public static byte[] toByteArray(String value, Exchange exchange) throws IOException { - return value.getBytes(ExchangeHelper.getCharsetName(exchange)); - } - - @Converter - public static String toString(InputStream in, Exchange exchange) throws IOException { - return toString(toReader(in, exchange)); - } - - @Converter - public static InputStream toInputStream(byte[] data) { - // no buffering required as the complete byte input is already passed - // over as a whole - return new ByteArrayInputStream(data); - } - - @Converter - public static ObjectOutput toObjectOutput(OutputStream stream) throws IOException { - if (stream instanceof ObjectOutput) { - return (ObjectOutput) stream; - } else { - return new ObjectOutputStream(IOHelper.buffered(stream)); - } - } - - @Converter - public static ObjectInput toObjectInput(final InputStream stream, final Exchange exchange) throws IOException { - if (stream instanceof ObjectInput) { - return (ObjectInput) stream; - } else { - return new ObjectInputStream(IOHelper.buffered(stream)) { - @Override - protected Class resolveClass(ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException { - // need to let Camel be able to resolve class using ClassResolver SPI, to let class loading - // work in OSGi and other containers - Class answer = null; - String name = objectStreamClass.getName(); - if (exchange != null) { - LOG.trace("Loading class {} using Camel ClassResolver", name); - answer = exchange.getContext().getClassResolver().resolveClass(name); - } - if (answer == null) { - LOG.trace("Loading class {} using JDK default implementation", name); - answer = super.resolveClass(objectStreamClass); - } - return answer; - } - }; - } - } - - @Converter - public static byte[] toBytes(InputStream stream) throws IOException { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - IOHelper.copy(IOHelper.buffered(stream), bos); - - // no need to close the ByteArrayOutputStream as it's close() - // implementation is noop - return bos.toByteArray(); - } - - @Converter - public static byte[] toByteArray(ByteArrayOutputStream os) { - return os.toByteArray(); - } - - @Converter - public static ByteBuffer covertToByteBuffer(InputStream is) throws IOException { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - IOHelper.copyAndCloseInput(is, os); - return ByteBuffer.wrap(os.toByteArray()); - } - - @Converter - public static String toString(ByteArrayOutputStream os, Exchange exchange) throws IOException { - return os.toString(ExchangeHelper.getCharsetName(exchange)); - } - - @Converter - public static InputStream toInputStream(ByteArrayOutputStream os) { - // no buffering required as the complete byte array input is already - // passed over as a whole - return new ByteArrayInputStream(os.toByteArray()); - } - - @Converter - public static Properties toProperties(File file) throws IOException { - return toProperties(new FileInputStream(file)); - } - - @Converter - public static Properties toProperties(InputStream is) throws IOException { - Properties prop = new Properties(); - try { - prop.load(is); - } finally { - IOHelper.close(is); - } - return prop; - } - - @Converter - public static Properties toProperties(Reader reader) throws IOException { - Properties prop = new Properties(); - try { - prop.load(reader); - } finally { - IOHelper.close(reader); - } - return prop; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java deleted file mode 100644 index e10f8fd..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java +++ /dev/null @@ -1,150 +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; - -import org.apache.camel.Converter; -import org.apache.camel.Exchange; -import org.apache.camel.util.IOHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; -import java.nio.ByteBuffer; - -import static org.apache.camel.util.BufferCaster.cast; - -/** - * Some core java.nio based - * Type Converters - */ -@Converter(generateLoader = true) -public final class NIOConverter { - - private static final Logger LOG = LoggerFactory.getLogger(NIOConverter.class); - - /** - * Utility classes should not have a public constructor. - */ - private NIOConverter() { - } - - @Converter - public static byte[] toByteArray(ByteBuffer buffer) { - byte[] bArray = new byte[buffer.limit()]; - buffer.get(bArray); - return bArray; - } - - @Converter - public static String toString(ByteBuffer buffer, Exchange exchange) throws IOException { - return org.apache.camel.converter.IOConverter.toString(toByteArray(buffer), exchange); - } - - @Converter - public static ByteBuffer toByteBuffer(byte[] data) { - return ByteBuffer.wrap(data); - } - - @Converter - public static ByteBuffer toByteBuffer(ByteArrayOutputStream baos) { - return ByteBuffer.wrap(baos.toByteArray()); - } - - @Converter - public static ByteBuffer toByteBuffer(File file) throws IOException { - InputStream in = null; - try { - byte[] buf = new byte[(int)file.length()]; - in = IOHelper.buffered(new FileInputStream(file)); - int sizeLeft = (int)file.length(); - int offset = 0; - while (sizeLeft > 0) { - int readSize = in.read(buf, offset, sizeLeft); - sizeLeft -= readSize; - offset += readSize; - } - return ByteBuffer.wrap(buf); - } finally { - IOHelper.close(in, "Failed to close file stream: " + file.getPath(), LOG); - } - } - - @Converter - public static ByteBuffer toByteBuffer(String value, Exchange exchange) { - byte[] bytes = null; - if (exchange != null) { - String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, String.class); - if (charsetName != null) { - try { - bytes = value.getBytes(charsetName); - } catch (UnsupportedEncodingException e) { - LOG.warn("Cannot convert the byte to String with the charset {}", charsetName, e); - } - } - } - if (bytes == null) { - bytes = value.getBytes(); - } - return ByteBuffer.wrap(bytes); - } - - @Converter - public static ByteBuffer toByteBuffer(Short value) { - ByteBuffer buf = ByteBuffer.allocate(2); - buf.putShort(value); - cast(buf).flip(); - return buf; - } - - @Converter - public static ByteBuffer toByteBuffer(Integer value) { - ByteBuffer buf = ByteBuffer.allocate(4); - buf.putInt(value); - cast(buf).flip(); - return buf; - } - - @Converter - public static ByteBuffer toByteBuffer(Long value) { - ByteBuffer buf = ByteBuffer.allocate(8); - buf.putLong(value); - cast(buf).flip(); - return buf; - } - - @Converter - public static ByteBuffer toByteBuffer(Float value) { - ByteBuffer buf = ByteBuffer.allocate(4); - buf.putFloat(value); - cast(buf).flip(); - return buf; - } - - @Converter - public static ByteBuffer toByteBuffer(Double value) { - ByteBuffer buf = ByteBuffer.allocate(8); - buf.putDouble(value); - cast(buf).flip(); - return buf; - } - - @Converter - public static InputStream toInputStream(ByteBuffer bufferbuffer) { - return IOConverter.toInputStream(toByteArray(bufferbuffer)); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java deleted file mode 100644 index 8197a91..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java +++ /dev/null @@ -1,268 +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; - -import org.apache.camel.Converter; -import org.apache.camel.Exchange; -import org.apache.camel.support.ObjectHelper; - -import java.math.BigInteger; -import java.util.Iterator; - -/** - * Some core java.lang based Type Converters - */ -@Converter(generateLoader = true) -public final class ObjectConverter { - - /** - * Utility classes should not have a public constructor. - */ - private ObjectConverter() { - } - - /** - * Converts the given value to a boolean, handling strings or Boolean - * objects; otherwise returning false if the value could not be converted to - * a boolean - */ - @Converter - public static boolean toBool(Object value) { - Boolean answer = toBoolean(value); - if (answer == null) { - throw new IllegalArgumentException("Cannot convert type: " + value.getClass().getName() + " to boolean"); - } - return answer; - } - - /** - * Converts the given value to a Boolean, handling strings or Boolean - * objects; otherwise returning null if the value cannot be converted to a - * boolean - */ - @Converter - public static Boolean toBoolean(Object value) { - return org.apache.camel.util.ObjectHelper.toBoolean(value); - } - - /** - * Creates an iterator over the value - */ - @Converter - public static Iterator iterator(Object value) { - return ObjectHelper.createIterator(value); - } - - /** - * Creates an iterable over the value - */ - @Converter - public static Iterable iterable(Object value) { - return ObjectHelper.createIterable(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter(allowNull = true) - public static Byte toByte(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return null; - } - return value.byteValue(); - } - - @Converter - public static Byte toByte(String value) { - return Byte.valueOf(value); - } - - @Converter - public static char[] toCharArray(String value) { - return value.toCharArray(); - } - - @Converter - public static Character toCharacter(String value) { - return toChar(value); - } - - @Converter - public static char toChar(String value) { - // must be string with the length of 1 - if (value.length() != 1) { - throw new IllegalArgumentException("String must have exactly a length of 1: " + value); - } - return value.charAt(0); - } - - @Converter - public static String fromCharArray(char[] value) { - return new String(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter - public static Class toClass(String value, Exchange exchange) { - // prefer to use class resolver API - if (exchange != null) { - return exchange.getContext().getClassResolver().resolveClass(value); - } else { - return org.apache.camel.util.ObjectHelper.loadClass(value); - } - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter(allowNull = true) - public static Short toShort(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return null; - } - return value.shortValue(); - } - - @Converter - public static Short toShort(String value) { - return Short.valueOf(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter(allowNull = true) - public static Integer toInteger(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return null; - } - return value.intValue(); - } - - @Converter - public static Integer toInteger(String value) { - return Integer.valueOf(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter(allowNull = true) - public static Long toLong(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return null; - } - return value.longValue(); - } - - @Converter - public static Long toLong(String value) { - return Long.valueOf(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter(allowNull = true) - public static BigInteger toBigInteger(Object value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return null; - } - if (value instanceof String) { - return new BigInteger((String) value); - } - - Long num = null; - if (value instanceof Number) { - Number number = (Number) value; - num = number.longValue(); - } - if (num != null) { - return BigInteger.valueOf(num); - } else { - return null; - } - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter - public static Float toFloat(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return Float.NaN; - } - return value.floatValue(); - } - - @Converter - public static Float toFloat(String value) { - return Float.valueOf(value); - } - - /** - * Returns the converted value, or null if the value is null - */ - @Converter - public static Double toDouble(Number value) { - if (org.apache.camel.util.ObjectHelper.isNaN(value)) { - return Double.NaN; - } - return value.doubleValue(); - } - - @Converter - public static Double toDouble(String value) { - return Double.valueOf(value); - } - - // add fast type converters from most common used - - @Converter - public static String toString(Integer value) { - return value.toString(); - } - - @Converter - public static String toString(Long value) { - return value.toString(); - } - - @Converter - public static String toString(Boolean value) { - return value.toString(); - } - - @Converter - public static String toString(StringBuffer value) { - return value.toString(); - } - - @Converter - public static String toString(StringBuilder value) { - return value.toString(); - } - - @Converter - public static Boolean toBoolean(String value) { - return org.apache.camel.util.ObjectHelper.toBoolean(value); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java deleted file mode 100644 index 39b3941..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java +++ /dev/null @@ -1,44 +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; - -import org.apache.camel.Converter; - -import java.sql.Timestamp; - -/** - * SQL Date and time related converters. - */ -@Converter(generateLoader = true) -public final class SQLConverter { - - /** - * Utility classes should not have a public constructor. - */ - private SQLConverter() { - } - - @Converter - public static Timestamp toTimestamp(Long l) { - return new Timestamp(l); - } - - @Converter - public static Long toLong(Timestamp ts) { - return ts.getTime(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/package.html deleted file mode 100644 index f9a4ea7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/converter/package.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - -A set of helper classes for converting from different types of Java object to be used by the -Type Conversion Support - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java deleted file mode 100644 index da7c8bb..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java +++ /dev/null @@ -1,414 +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.impl.converter; - -import org.apache.camel.Converter; -import org.apache.camel.Exchange; -import org.apache.camel.TypeConverter; -import org.apache.camel.TypeConverterLoaderException; -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.TypeConverterLoader; -import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.util.CastUtils; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.*; - -import static java.lang.reflect.Modifier.*; - -/** - * A class which will auto-discover {@link Converter} objects and methods to pre-load - * the {@link TypeConverterRegistry} of converters on startup. - *

- * This implementation supports scanning for type converters in JAR files. The {@link #META_INF_SERVICES} - * contains a list of packages or FQN class names for {@link Converter} classes. The FQN class names - * is loaded first and directly by the class loader. - *

- * The {@link PackageScanClassResolver} is being used to scan packages for {@link Converter} classes and - * this procedure is slower than loading the {@link Converter} classes directly by its FQN class name. - * Therefore its recommended to specify FQN class names in the {@link #META_INF_SERVICES} file. - * Likewise the procedure for scanning using {@link PackageScanClassResolver} may require custom implementations - * to work in various containers such as JBoss, OSGi, etc. - */ -public class AnnotationTypeConverterLoader implements TypeConverterLoader { - public static final String META_INF_SERVICES = "META-INF/services/org/apache/camel/TypeConverter"; - private static final Logger LOG = LoggerFactory.getLogger(AnnotationTypeConverterLoader.class); - private static final Charset UTF8 = Charset.forName("UTF-8"); - protected PackageScanClassResolver resolver; - protected Set> visitedClasses = new HashSet<>(); - protected Set visitedURIs = new HashSet<>(); - - public AnnotationTypeConverterLoader(PackageScanClassResolver resolver) { - this.resolver = resolver; - } - - @Override - public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException { - String[] packageNames; - - LOG.trace("Searching for {} services", META_INF_SERVICES); - try { - packageNames = findPackageNames(); - if (packageNames == null || packageNames.length == 0) { - LOG.debug("No package names found to be used for classpath scanning for annotated type converters."); - return; - } - } catch (Exception e) { - throw new TypeConverterLoaderException("Cannot find package names to be used for classpath scanning for annotated type converters.", e); - } - - // if we only have camel-core on the classpath then we have already pre-loaded all its type converters - // but we exposed the "org.apache.camel.core" package in camel-core. This ensures there is at least one - // packageName to scan, which triggers the scanning process. That allows us to ensure that we look for - // META-INF/services in all the JARs. - if (packageNames.length == 1 && "org.apache.camel.core".equals(packageNames[0])) { - LOG.debug("No additional package names found in classpath for annotated type converters."); - // no additional package names found to load type converters so break out - return; - } - - // now filter out org.apache.camel.core as its not needed anymore (it was just a dummy) - packageNames = filterUnwantedPackage("org.apache.camel.core", packageNames); - - // filter out package names which can be loaded as a class directly so we avoid package scanning which - // is much slower and does not work 100% in all runtime containers - Set> classes = new HashSet<>(); - packageNames = filterPackageNamesOnly(resolver, packageNames, classes); - if (!classes.isEmpty()) { - LOG.debug("Loaded {} @Converter classes", classes.size()); - } - - // if there is any packages to scan and load @Converter classes, then do it - if (packageNames != null && packageNames.length > 0) { - if (LOG.isTraceEnabled()) { - LOG.trace("Found converter packages to scan: {}", String.join(", ", packageNames)); - } - Set> scannedClasses = resolver.findAnnotated(Converter.class, packageNames); - if (scannedClasses.isEmpty()) { - throw new TypeConverterLoaderException("Cannot find any type converter classes from the following packages: " + Arrays.asList(packageNames)); - } - LOG.debug("Found {} packages with {} @Converter classes to load", packageNames.length, scannedClasses.size()); - classes.addAll(scannedClasses); - } - - // load all the found classes into the type converter registry - for (Class type : classes) { - if (acceptClass(type)) { - if (LOG.isTraceEnabled()) { - LOG.trace("Loading converter class: {}", ObjectHelper.name(type)); - } - loadConverterMethods(registry, type); - } - } - - // now clear the maps so we do not hold references - visitedClasses.clear(); - visitedURIs.clear(); - } - - /** - * Filters the given list of packages and returns an array of only package names. - *

- * This implementation will check the given list of packages, and if it contains a class name, - * that class will be loaded directly and added to the list of classes. This optimizes the - * type converter to avoid excessive file scanning for .class files. - * - * @param resolver the class resolver - * @param packageNames the package names - * @param classes to add loaded @Converter classes - * @return the filtered package names - */ - protected String[] filterPackageNamesOnly(PackageScanClassResolver resolver, String[] packageNames, Set> classes) { - if (packageNames == null || packageNames.length == 0) { - return packageNames; - } - - // optimize for CorePackageScanClassResolver - if (resolver.getClassLoaders().isEmpty()) { - return packageNames; - } - - // the filtered packages to return - List packages = new ArrayList<>(); - - // try to load it as a class first - for (String name : packageNames) { - // must be a FQN class name by having an upper case letter - if (StringHelper.isClassName(name)) { - Class clazz = null; - for (ClassLoader loader : resolver.getClassLoaders()) { - try { - clazz = ObjectHelper.loadClass(name, loader); - if (clazz != null) { - LOG.trace("Loaded {} as class {}", name, clazz); - classes.add(clazz); - // class found, so no need to load it with another class loader - } - break; - } catch (Throwable e) { - // do nothing here - } - } - if (clazz == null) { - // ignore as its not a class (will be package scan afterwards) - packages.add(name); - } - } else { - // ignore as its not a class (will be package scan afterwards) - packages.add(name); - } - } - - // return the packages which is not FQN classes - return packages.toArray(new String[packages.size()]); - } - - /** - * Finds the names of the packages to search for on the classpath looking - * for text files on the classpath at the {@link #META_INF_SERVICES} location. - * - * @return a collection of packages to search for - * @throws IOException is thrown for IO related errors - */ - protected String[] findPackageNames() throws IOException { - Set packages = new HashSet<>(); - ClassLoader ccl = Thread.currentThread().getContextClassLoader(); - if (ccl != null) { - findPackages(packages, ccl); - } - findPackages(packages, getClass().getClassLoader()); - return packages.toArray(new String[packages.size()]); - } - - protected void findPackages(Set packages, ClassLoader classLoader) throws IOException { - Enumeration resources = classLoader.getResources(META_INF_SERVICES); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - String path = url.getPath(); - if (!visitedURIs.contains(path)) { - // remember we have visited this uri so we wont read it twice - visitedURIs.add(path); - LOG.debug("Loading file {} to retrieve list of packages, from url: {}", META_INF_SERVICES, url); - BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), UTF8)); - try { - while (true) { - String line = reader.readLine(); - if (line == null) { - break; - } - line = line.trim(); - if (line.startsWith("#") || line.length() == 0) { - continue; - } - tokenize(packages, line); - } - } finally { - IOHelper.close(reader, null, LOG); - } - } - } - } - - /** - * Tokenizes the line from the META-IN/services file using commas and - * ignoring whitespace between packages - */ - private void tokenize(Set packages, String line) { - StringTokenizer iter = new StringTokenizer(line, ","); - while (iter.hasMoreTokens()) { - String name = iter.nextToken().trim(); - if (name.length() > 0) { - packages.add(name); - } - } - } - - /** - * Loads all of the converter methods for the given type - */ - protected void loadConverterMethods(TypeConverterRegistry registry, Class type) { - if (visitedClasses.contains(type)) { - return; - } - visitedClasses.add(type); - try { - Method[] methods = type.getDeclaredMethods(); - org.apache.camel.impl.converter.CachingInjector injector = null; - - for (Method method : methods) { - // this may be prone to ClassLoader or packaging problems when the same class is defined - // in two different jars (as is the case sometimes with specs). - if (ObjectHelper.hasAnnotation(method, Converter.class, true)) { - boolean allowNull = false; - if (method.getAnnotation(Converter.class) != null) { - allowNull = method.getAnnotation(Converter.class).allowNull(); - } - boolean fallback = method.getAnnotation(Converter.class).fallback(); - if (fallback) { - injector = handleHasFallbackConverterAnnotation(registry, type, injector, method, allowNull); - } else { - injector = handleHasConverterAnnotation(registry, type, injector, method, allowNull); - } - } - } - - Class superclass = type.getSuperclass(); - if (superclass != null && !superclass.equals(Object.class)) { - loadConverterMethods(registry, superclass); - } - } catch (NoClassDefFoundError e) { - boolean ignore = false; - // does the class allow to ignore the type converter when having load errors - if (ObjectHelper.hasAnnotation(type, Converter.class, true)) { - if (type.getAnnotation(Converter.class) != null) { - ignore = type.getAnnotation(Converter.class).ignoreOnLoadError(); - } - } - // if we should ignore then only log at debug level - if (ignore) { - LOG.debug("Ignoring converter type: " + type.getCanonicalName() + " as a dependent class could not be found: " + e, e); - } else { - LOG.warn("Ignoring converter type: " + type.getCanonicalName() + " as a dependent class could not be found: " + e, e); - } - } - } - - protected boolean acceptClass(Class clazz) { - return true; - } - - private org.apache.camel.impl.converter.CachingInjector handleHasConverterAnnotation(TypeConverterRegistry registry, Class type, - org.apache.camel.impl.converter.CachingInjector injector, Method method, boolean allowNull) { - if (isValidConverterMethod(method)) { - int modifiers = method.getModifiers(); - if (isAbstract(modifiers) || !isPublic(modifiers)) { - LOG.warn("Ignoring bad converter on type: " + type.getCanonicalName() + " method: " + method - + " as a converter method is not a public and concrete method"); - } else { - Class toType = method.getReturnType(); - if (toType.equals(Void.class)) { - LOG.warn("Ignoring bad converter on type: " + type.getCanonicalName() + " method: " - + method + " as a converter method returns a void method"); - } else { - Class fromType = method.getParameterTypes()[0]; - if (isStatic(modifiers)) { - registerTypeConverter(registry, method, toType, fromType, - new StaticMethodTypeConverter(method, allowNull)); - } else { - if (injector == null) { - injector = new org.apache.camel.impl.converter.CachingInjector<>(registry, CastUtils.cast(type, Object.class)); - } - registerTypeConverter(registry, method, toType, fromType, - new InstanceMethodTypeConverter(injector, method, registry, allowNull)); - } - } - } - } else { - LOG.warn("Ignoring bad converter on type: " + type.getCanonicalName() + " method: " + method - + " as a converter method should have one parameter"); - } - return injector; - } - - private org.apache.camel.impl.converter.CachingInjector handleHasFallbackConverterAnnotation(TypeConverterRegistry registry, Class type, - org.apache.camel.impl.converter.CachingInjector injector, Method method, boolean allowNull) { - if (isValidFallbackConverterMethod(method)) { - int modifiers = method.getModifiers(); - if (isAbstract(modifiers) || !isPublic(modifiers)) { - LOG.warn("Ignoring bad fallback converter on type: " + type.getCanonicalName() + " method: " + method - + " as a fallback converter method is not a public and concrete method"); - } else { - Class toType = method.getReturnType(); - if (toType.equals(Void.class)) { - LOG.warn("Ignoring bad fallback converter on type: " + type.getCanonicalName() + " method: " - + method + " as a fallback converter method returns a void method"); - } else { - if (isStatic(modifiers)) { - registerFallbackTypeConverter(registry, new StaticMethodFallbackTypeConverter(method, registry, allowNull), method); - } else { - if (injector == null) { - injector = new CachingInjector<>(registry, CastUtils.cast(type, Object.class)); - } - registerFallbackTypeConverter(registry, new InstanceMethodFallbackTypeConverter(injector, method, registry, allowNull), method); - } - } - } - } else { - LOG.warn("Ignoring bad fallback converter on type: " + type.getCanonicalName() + " method: " + method - + " as a fallback converter method should have one parameter"); - } - return injector; - } - - protected void registerTypeConverter(TypeConverterRegistry registry, - Method method, Class toType, Class fromType, TypeConverter typeConverter) { - registry.addTypeConverter(toType, fromType, typeConverter); - } - - protected boolean isValidConverterMethod(Method method) { - Class[] parameterTypes = method.getParameterTypes(); - return (parameterTypes != null) && (parameterTypes.length == 1 - || (parameterTypes.length == 2 && Exchange.class.isAssignableFrom(parameterTypes[1]))); - } - - protected void registerFallbackTypeConverter(TypeConverterRegistry registry, TypeConverter typeConverter, Method method) { - boolean canPromote = false; - // check whether the annotation may indicate it can promote - if (method.getAnnotation(Converter.class) != null) { - canPromote = method.getAnnotation(Converter.class).fallbackCanPromote(); - } - registry.addFallbackTypeConverter(typeConverter, canPromote); - } - - protected boolean isValidFallbackConverterMethod(Method method) { - Class[] parameterTypes = method.getParameterTypes(); - return (parameterTypes != null) && (parameterTypes.length == 3 - || (parameterTypes.length == 4 && Exchange.class.isAssignableFrom(parameterTypes[1])) - && (TypeConverterRegistry.class.isAssignableFrom(parameterTypes[parameterTypes.length - 1]))); - } - - /** - * Filters the given list of packages - * - * @param name the name to filter out - * @param packageNames the packages - * @return he packages without the given name - */ - protected static String[] filterUnwantedPackage(String name, String[] packageNames) { - // the filtered packages to return - List packages = new ArrayList<>(); - - for (String s : packageNames) { - if (!name.equals(s)) { - packages.add(s); - } - } - - return packages.toArray(new String[packages.size()]); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java deleted file mode 100644 index 72f6d0d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java +++ /dev/null @@ -1,76 +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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -/** - * A type converter which is used to convert to and from array types - * particularly for derived types of array component types and dealing with - * primitive array types. - */ -public class ArrayTypeConverter extends TypeConverterSupport { - - @Override - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - if (type.isArray()) { - if (value instanceof Collection) { - Collection collection = (Collection)value; - Object array = Array.newInstance(type.getComponentType(), collection.size()); - if (array instanceof Object[]) { - collection.toArray((Object[])array); - } else { - int index = 0; - for (Object element : collection) { - Array.set(array, index++, element); - } - } - return (T)array; - } else if (value != null && value.getClass().isArray()) { - int size = Array.getLength(value); - Object answer = Array.newInstance(type.getComponentType(), size); - for (int i = 0; i < size; i++) { - Array.set(answer, i, Array.get(value, i)); - } - return (T)answer; - } - } else if (Collection.class.isAssignableFrom(type)) { - if (value != null) { - if (value instanceof Object[]) { - return (T)Arrays.asList((Object[])value); - } else if (value.getClass().isArray()) { - int size = Array.getLength(value); - List answer = new ArrayList<>(size); - for (int i = 0; i < size; i++) { - answer.add(Array.get(value, i)); - } - return (T)answer; - } - } - } - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java deleted file mode 100644 index f71c46e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.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.impl.converter; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.TypeConverterSupport; - -/** - * A simple converter that can convert any {@link Processor} to an {@link AsyncProcessor}. - * Processing will still occur synchronously but it will provide the required - * notifications that the caller expects. - */ -public class AsyncProcessorTypeConverter extends TypeConverterSupport { - - @Override - public T convertTo(Class type, Exchange exchange, Object value) { - if (type.equals(AsyncProcessor.class)) { - if (value instanceof Processor) { - return type.cast(AsyncProcessorConverterHelper.convert((Processor) value)); - } - } - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java deleted file mode 100644 index 5983fca..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java +++ /dev/null @@ -1,287 +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.impl.converter; - -import org.apache.camel.*; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.Injector; -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.TypeConverterLoader; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.*; - -/** - * Base implementation of a type converter registry used for - * type converters in Camel. - */ -public abstract class BaseTypeConverterRegistry extends CoreTypeConverterRegistry { - - public static final String META_INF_SERVICES_TYPE_CONVERTER_LOADER = "META-INF/services/org/apache/camel/TypeConverterLoader"; - public static final String META_INF_SERVICES_FALLBACK_TYPE_CONVERTER = "META-INF/services/org/apache/camel/FallbackTypeConverter"; - - private static final Logger LOG = LoggerFactory.getLogger(BaseTypeConverterRegistry.class); - - protected final List typeConverterLoaders = new ArrayList<>(); - protected CamelContext camelContext; - protected PackageScanClassResolver resolver; - protected Injector injector; - protected final FactoryFinder factoryFinder; - - public BaseTypeConverterRegistry(CamelContext camelContext, PackageScanClassResolver resolver, Injector injector, FactoryFinder factoryFinder) { - this.camelContext = camelContext; - this.injector = injector; - this.factoryFinder = factoryFinder; - this.resolver = resolver; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public List getTypeConverterLoaders() { - return typeConverterLoaders; - } - - @Override - public void addTypeConverters(TypeConverters typeConverters) { - LOG.trace("Adding type converters: {}", typeConverters); - try { - // scan the class for @Converter and load them into this registry - TypeConvertersLoader loader = new TypeConvertersLoader(typeConverters); - loader.load(this); - } catch (TypeConverterLoaderException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - @Override - public void addFallbackTypeConverter(TypeConverter typeConverter, boolean canPromote) { - super.addFallbackTypeConverter(typeConverter, canPromote); - if (typeConverter instanceof CamelContextAware) { - CamelContextAware camelContextAware = (CamelContextAware) typeConverter; - if (camelContext != null) { - camelContextAware.setCamelContext(camelContext); - } - } - } - - private void addCoreFallbackTypeConverterToList(TypeConverter typeConverter, boolean canPromote, - List converters) { - LOG.trace("Adding core fallback type converter: {} which can promote: {}", typeConverter, canPromote); - - // add in top of fallback as the toString() fallback will nearly always be able to convert - // the last one which is add to the FallbackTypeConverter will be called at the first place - converters.add(0, new FallbackTypeConverter(typeConverter, canPromote)); - - if (typeConverter instanceof CamelContextAware) { - CamelContextAware camelContextAware = (CamelContextAware) typeConverter; - if (camelContext != null) { - camelContextAware.setCamelContext(camelContext); - } - } - } - - @Override - public Injector getInjector() { - return injector; - } - - @Override - public void setInjector(Injector injector) { - this.injector = injector; - } - - public PackageScanClassResolver getResolver() { - return resolver; - } - - /** - * Loads the core type converters which is mandatory to use Camel, - * and also loads the fast type converters (generated via @Converter(loader = true). - */ - public void loadCoreAndFastTypeConverters() throws Exception { - Collection names = findTypeConverterLoaderClasses(); - for (String name : names) { - LOG.debug("Resolving TypeConverterLoader: {}", name); - Class clazz = null; - for (ClassLoader loader : getResolver().getClassLoaders()) { - try { - clazz = loader.loadClass(name); - } catch (Throwable e) { - // ignore - } - if (clazz != null) { - break; - } - } - if (clazz == null) { - throw new ClassNotFoundException(name); - } - Object obj = getInjector().newInstance(clazz, false); - if (obj instanceof TypeConverterLoader) { - TypeConverterLoader loader = (TypeConverterLoader) obj; - LOG.debug("TypeConverterLoader: {} loading converters", name); - loader.load(this); - } - } - } - - /** - * Finds the type converter loader classes from the classpath looking - * for text files on the classpath at the {@link #META_INF_SERVICES_TYPE_CONVERTER_LOADER} location. - */ - protected Collection findTypeConverterLoaderClasses() throws IOException { - Set loaders = new LinkedHashSet<>(); - Collection loaderResources = getLoaderUrls(); - for (URL url : loaderResources) { - LOG.debug("Loading file {} to retrieve list of type converters, from url: {}", META_INF_SERVICES_TYPE_CONVERTER_LOADER, url); - BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)); - String line; - do { - line = reader.readLine(); - if (line != null && !line.startsWith("#") && !line.isEmpty()) { - loaders.add(line); - } - } while (line != null); - IOHelper.close(reader); - } - return loaders; - } - - protected Collection getLoaderUrls() throws IOException { - List loaderResources = new ArrayList<>(); - for (ClassLoader classLoader : resolver.getClassLoaders()) { - Enumeration resources = classLoader.getResources(META_INF_SERVICES_TYPE_CONVERTER_LOADER); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - loaderResources.add(url); - } - } - return loaderResources; - } - - /** - * Checks if the registry is loaded and if not lazily load it - */ - protected void loadTypeConverters() throws Exception { - for (TypeConverterLoader typeConverterLoader : getTypeConverterLoaders()) { - typeConverterLoader.load(this); - } - - // lets try load any other fallback converters - try { - loadFallbackTypeConverters(); - } catch (NoFactoryAvailableException e) { - // ignore its fine to have none - } - } - - /** - * Finds the fallback type converter classes from the classpath looking - * for text files on the classpath at the {@link #META_INF_SERVICES_FALLBACK_TYPE_CONVERTER} location. - */ - protected Collection findFallbackTypeConverterClasses() throws IOException { - Set loaders = new LinkedHashSet<>(); - Collection loaderResources = getFallbackUrls(); - for (URL url : loaderResources) { - LOG.debug("Loading file {} to retrieve list of fallback type converters, from url: {}", META_INF_SERVICES_FALLBACK_TYPE_CONVERTER, url); - BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)); - try { - reader.lines() - .map(String::trim) - .filter(l -> !l.isEmpty()) - .filter(l -> !l.startsWith("#")) - .forEach(loaders::add); - } finally { - IOHelper.close(reader, url.toString(), LOG); - } - } - return loaders; - } - - protected Collection getFallbackUrls() throws IOException { - List loaderResources = new ArrayList<>(); - for (ClassLoader classLoader : resolver.getClassLoaders()) { - Enumeration resources = classLoader.getResources(META_INF_SERVICES_FALLBACK_TYPE_CONVERTER); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - loaderResources.add(url); - } - } - return loaderResources; - } - - protected void loadFallbackTypeConverters() throws IOException, ClassNotFoundException { - Collection names = findFallbackTypeConverterClasses(); - for (String name : names) { - LOG.debug("Resolving FallbackTypeConverter: {}", name); - Class clazz = getResolver().getClassLoaders().stream() - .map(cl -> ObjectHelper.loadClass(name, cl)) - .filter(Objects::nonNull) - .findAny().orElseThrow(() -> new ClassNotFoundException(name)); - Object obj = getInjector().newInstance(clazz, false); - if (obj instanceof TypeConverter) { - TypeConverter fb = (TypeConverter) obj; - LOG.debug("Adding loaded FallbackTypeConverter: {}", name); - addFallbackTypeConverter(fb, false); - } - } - } - - @Override - protected void doInit() throws Exception { - if (injector == null && camelContext != null) { - injector = camelContext.getInjector(); - } - if (resolver == null && camelContext != null) { - resolver = camelContext.adapt(ExtendedCamelContext.class).getPackageScanClassResolver(); - } - - List fallbacks = new ArrayList<>(); - // add to string first as it will then be last in the last as to string can nearly - // always convert something to a string so we want it only as the last resort - // ToStringTypeConverter should NOT allow to be promoted - addCoreFallbackTypeConverterToList(new ToStringTypeConverter(), false, fallbacks); - // enum is okay to be promoted - addCoreFallbackTypeConverterToList(new EnumTypeConverter(), true, fallbacks); - // arrays is okay to be promoted - addCoreFallbackTypeConverterToList(new ArrayTypeConverter(), true, fallbacks); - // and future should also not allowed to be promoted - addCoreFallbackTypeConverterToList(new FutureTypeConverter(this), false, fallbacks); - // add sync processor to async processor converter is to be promoted - addCoreFallbackTypeConverterToList(new AsyncProcessorTypeConverter(), true, fallbacks); - - // add all core fallback converters at once which is faster (profiler) - fallbackConverters.addAll(fallbacks); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java deleted file mode 100644 index fa2de81..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java +++ /dev/null @@ -1,44 +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.impl.converter; - -import org.apache.camel.spi.TypeConverterRegistry; - -/** - * A caching proxy - */ -public class CachingInjector { - private final TypeConverterRegistry repository; - private final Class type; - private T instance; - - public CachingInjector(TypeConverterRegistry repository, Class type) { - this.repository = repository; - this.type = type; - } - - public synchronized T newInstance() { - if (instance == null) { - instance = createInstance(type); - } - return instance; - } - - protected T createInstance(Class t) { - return repository.getInjector().newInstance(t); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java deleted file mode 100644 index b2e2c63..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java +++ /dev/null @@ -1,678 +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.impl.converter; - -import org.apache.camel.*; -import org.apache.camel.converter.ObjectConverter; -import org.apache.camel.spi.CamelLogger; -import org.apache.camel.spi.Injector; -import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.TypeConverterSupport; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.DoubleMap; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.LongAdder; - -public class CoreTypeConverterRegistry extends ServiceSupport implements TypeConverter, TypeConverterRegistry { - - protected static final TypeConverter MISS_CONVERTER = new TypeConverterSupport() { - @Override - public T convertTo(Class type, Exchange exchange, Object value) throws TypeConversionException { - return (T) MISS_VALUE; - } - }; - - private static final Logger LOG = LoggerFactory.getLogger(CoreTypeConverterRegistry.class); - - protected final DoubleMap, Class, TypeConverter> typeMappings = new DoubleMap<>(200); - protected final List fallbackConverters = new CopyOnWriteArrayList<>(); - protected TypeConverterExists typeConverterExists = TypeConverterExists.Override; - protected LoggingLevel typeConverterExistsLoggingLevel = LoggingLevel.WARN; - protected final Statistics statistics = new UtilizationStatistics(); - protected final LongAdder noopCounter = new LongAdder(); - protected final LongAdder attemptCounter = new LongAdder(); - protected final LongAdder missCounter = new LongAdder(); - protected final LongAdder hitCounter = new LongAdder(); - protected final LongAdder failedCounter = new LongAdder(); - - public CoreTypeConverterRegistry() { - } - - public CoreTypeConverterRegistry(TypeConverterRegistry registry) { - if (registry instanceof CoreTypeConverterRegistry) { - CoreTypeConverterRegistry reg = (CoreTypeConverterRegistry) registry; - reg.getTypeMappings().forEach(typeMappings::put); - this.fallbackConverters.addAll(reg.getFallbackConverters()); - } else { - throw new UnsupportedOperationException(); - } - this.typeConverterExistsLoggingLevel = registry.getTypeConverterExistsLoggingLevel(); - this.typeConverterExists = registry.getTypeConverterExists(); - } - - @Override - public boolean allowNull() { - return false; - } - - @Override - public void setInjector(Injector injector) { - throw new UnsupportedOperationException(); - } - - @Override - public Injector getInjector() { - throw new UnsupportedOperationException(); - } - - @Override - public void setCamelContext(CamelContext camelContext) { - throw new UnsupportedOperationException(); - } - - @Override - public CamelContext getCamelContext() { - throw new UnsupportedOperationException(); - } - - public DoubleMap, Class, TypeConverter> getTypeMappings() { - return typeMappings; - } - - public List getFallbackConverters() { - return fallbackConverters; - } - - public T convertTo(Class type, Object value) { - return convertTo(type, null, value); - } - - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - // optimize for a few common conversions - if (value != null) { - if (type.isInstance(value)) { - // same instance - return (T) value; - } - if (type == boolean.class) { - // primitive boolean which must return a value so throw exception if not possible - Object answer = ObjectConverter.toBoolean(value); - if (answer == null) { - throw new TypeConversionException(value, type, new IllegalArgumentException("Cannot convert type: " + value.getClass().getName() + " to boolean")); - } - return (T) answer; - } else if (type == Boolean.class && (value instanceof String)) { - // String -> Boolean - String str = (String) value; - if ("true".equalsIgnoreCase(str)) { - return (T) Boolean.TRUE; - } else if ("false".equalsIgnoreCase(str)) { - return (T) Boolean.FALSE; - } - } else if (type.isPrimitive()) { - // okay its a wrapper -> primitive then return as-is for some common types - Class cls = value.getClass(); - if (cls == Integer.class || cls == Long.class) { - return (T) value; - } - } else if (type == String.class) { - // okay its a primitive -> string then return as-is for some common types - Class cls = value.getClass(); - if (cls.isPrimitive() - || cls == Boolean.class || cls == boolean.class - || cls == Integer.class || cls == int.class - || cls == Long.class || cls == long.class) { - return (T) value.toString(); - } - } - // NOTE: we cannot optimize any more if value is String as it may be time pattern and other patterns - } - - return (T) doConvertTo(type, exchange, value, false, false); - } - - public T mandatoryConvertTo(Class type, Object value) throws NoTypeConversionAvailableException { - return mandatoryConvertTo(type, null, value); - } - - @SuppressWarnings("unchecked") - public T mandatoryConvertTo(Class type, Exchange exchange, Object value) throws NoTypeConversionAvailableException { - // optimize for a few common conversions - if (value != null) { - if (type.isInstance(value)) { - // same instance - return (T) value; - } - if (type == boolean.class) { - // primitive boolean which must return a value so throw exception if not possible - Object answer = ObjectConverter.toBoolean(value); - if (answer == null) { - throw new TypeConversionException(value, type, new IllegalArgumentException("Cannot convert type: " + value.getClass().getName() + " to boolean")); - } - return (T) answer; - } else if (type == Boolean.class && (value instanceof String)) { - // String -> Boolean - String str = (String) value; - if ("true".equalsIgnoreCase(str)) { - return (T) Boolean.TRUE; - } else if ("false".equalsIgnoreCase(str)) { - return (T) Boolean.FALSE; - } - } else if (type.isPrimitive()) { - // okay its a wrapper -> primitive then return as-is for some common types - Class cls = value.getClass(); - if (cls == Integer.class || cls == Long.class) { - return (T) value; - } - } else if (type == String.class) { - // okay its a primitive -> string then return as-is for some common types - Class cls = value.getClass(); - if (cls.isPrimitive() - || cls == Boolean.class || cls == boolean.class - || cls == Integer.class || cls == int.class - || cls == Long.class || cls == long.class) { - return (T) value.toString(); - } - } - // NOTE: we cannot optimize any more if value is String as it may be time pattern and other patterns - } - - Object answer = doConvertTo(type, exchange, value, true, false); - if (answer == null) { - // Could not find suitable conversion - throw new NoTypeConversionAvailableException(value, type); - } - return (T) answer; - } - - public T tryConvertTo(Class type, Object value) { - return tryConvertTo(type, null, value); - } - - @SuppressWarnings("unchecked") - public T tryConvertTo(Class type, Exchange exchange, Object value) { - return (T) doConvertTo(type, exchange, value, false, true); - } - - protected Object doConvertTo(final Class type, final Exchange exchange, final Object value, - final boolean mandatory, final boolean tryConvert) { - Object answer; - try { - answer = doConvertTo(type, exchange, value, tryConvert); - } catch (Exception e) { - if (statistics.isStatisticsEnabled()) { - failedCounter.increment(); - } - if (tryConvert) { - return null; - } - - // if its a ExecutionException then we have rethrow it as its not due to failed conversion - // this is special for FutureTypeConverter - boolean execution = ObjectHelper.getException(ExecutionException.class, e) != null - || ObjectHelper.getException(CamelExecutionException.class, e) != null; - if (execution) { - throw CamelExecutionException.wrapCamelExecutionException(exchange, e); - } - // error occurred during type conversion - throw createTypeConversionException(exchange, type, value, e); - } - if (answer == TypeConverter.MISS_VALUE) { - // Could not find suitable conversion - if (statistics.isStatisticsEnabled()) { - missCounter.increment(); - } - return null; - } else { - if (statistics.isStatisticsEnabled()) { - hitCounter.increment(); - } - return answer; - } - } - - protected Object doConvertTo(final Class type, final Exchange exchange, final Object value, - final boolean tryConvert) throws Exception { - boolean trace = LOG.isTraceEnabled(); - boolean statisticsEnabled = statistics.isStatisticsEnabled(); - - if (trace) { - LOG.trace("Finding type converter to convert {} -> {} with value: {}", - value == null ? "null" : value.getClass().getCanonicalName(), - type.getCanonicalName(), value); - } - - - if (value == null) { - // no type conversion was needed - if (statisticsEnabled) { - noopCounter.increment(); - } - // lets avoid NullPointerException when converting to primitives for null values - if (type.isPrimitive()) { - if (boolean.class == type) { - return Boolean.FALSE; - } - if (int.class == type) { - return 0; - } - if (long.class == type) { - return 0L; - } - if (byte.class == type) { - return (byte) 0; - } - if (short.class == type) { - return (short) 0; - } - if (double.class == type) { - return 0.0; - } - if (float.class == type) { - return 0.0f; - } - if (char.class == type) { - return '\0'; - } - } - return null; - } - - // same instance type - if (type.isInstance(value)) { - // no type conversion was needed - if (statisticsEnabled) { - noopCounter.increment(); - } - return value; - } - - // okay we need to attempt to convert - if (statisticsEnabled) { - attemptCounter.increment(); - } - - // try to find a suitable type converter - TypeConverter converter = getOrFindTypeConverter(type, value.getClass()); - if (converter != null) { - if (trace) { - LOG.trace("Using converter: {} to convert [{}=>{}]", converter, value.getClass(), type); - } - Object rc; - if (tryConvert) { - rc = converter.tryConvertTo(type, exchange, value); - } else { - rc = converter.convertTo(type, exchange, value); - } - if (rc != null) { - return rc; - } else if (converter.allowNull()) { - return null; - } - } - - // not found with that type then if it was a primitive type then try again with the wrapper type - if (type.isPrimitive()) { - Class primitiveType = ObjectHelper.convertPrimitiveTypeToWrapperType(type); - if (primitiveType != type) { - Class fromType = value.getClass(); - TypeConverter tc = getOrFindTypeConverter(primitiveType, fromType); - if (tc != null) { - // add the type as a known type converter as we can convert from primitive to object converter - addTypeConverter(type, fromType, tc); - Object rc; - if (tryConvert) { - rc = tc.tryConvertTo(primitiveType, exchange, value); - } else { - rc = tc.convertTo(primitiveType, exchange, value); - } - if (rc == null && tc.allowNull()) { - return null; - } else if (rc != null) { - return rc; - } - } - } - } - - // fallback converters - for (FallbackTypeConverter fallback : fallbackConverters) { - TypeConverter tc = fallback.getFallbackTypeConverter(); - Object rc; - if (tryConvert) { - rc = tc.tryConvertTo(type, exchange, value); - } else { - rc = tc.convertTo(type, exchange, value); - } - if (rc == null && tc.allowNull()) { - return null; - } - - if (rc == TypeConverter.MISS_VALUE) { - // it cannot be converted so give up - return TypeConverter.MISS_VALUE; - } - - if (rc != null) { - // if fallback can promote then let it be promoted to a first class type converter - if (fallback.isCanPromote()) { - // add it as a known type converter since we found a fallback that could do it - if (LOG.isDebugEnabled()) { - LOG.debug("Promoting fallback type converter as a known type converter to convert from: {} to: {} for the fallback converter: {}", - type.getCanonicalName(), value.getClass().getCanonicalName(), fallback.getFallbackTypeConverter()); - } - addTypeConverter(type, value.getClass(), fallback.getFallbackTypeConverter()); - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Fallback type converter {} converted type from: {} to: {}", - fallback.getFallbackTypeConverter(), type.getCanonicalName(), value.getClass().getCanonicalName()); - } - - // return converted value - return rc; - } - } - - if (!tryConvert) { - // Could not find suitable conversion, so remember it - // do not register misses for try conversions - typeMappings.put(type, value.getClass(), MISS_CONVERTER); - } - - // Could not find suitable conversion, so return Void to indicate not found - return TypeConverter.MISS_VALUE; - } - - public TypeConverter getTypeConverter(Class toType, Class fromType) { - return typeMappings.get(toType, fromType); - } - - public void addTypeConverter(Class toType, Class fromType, TypeConverter typeConverter) { - LOG.trace("Adding type converter: {}", typeConverter); - TypeConverter converter = typeMappings.get(toType, fromType); - // only override it if its different - // as race conditions can lead to many threads trying to promote the same fallback converter - - if (typeConverter != converter) { - - // add the converter unless we should ignore - boolean add = true; - - // if converter is not null then a duplicate exists - if (converter != null) { - if (typeConverterExists == TypeConverterExists.Override) { - CamelLogger logger = new CamelLogger(LOG, typeConverterExistsLoggingLevel); - logger.log("Overriding type converter from: " + converter + " to: " + typeConverter); - } else if (typeConverterExists == TypeConverterExists.Ignore) { - CamelLogger logger = new CamelLogger(LOG, typeConverterExistsLoggingLevel); - logger.log("Ignoring duplicate type converter from: " + converter + " to: " + typeConverter); - add = false; - } else { - // we should fail - throw new TypeConverterExistsException(toType, fromType); - } - } - - if (add) { - typeMappings.put(toType, fromType, typeConverter); - } - } - } - - public boolean removeTypeConverter(Class toType, Class fromType) { - LOG.trace("Removing type converter from: {} to: {}", fromType, toType); - return typeMappings.remove(toType, fromType); - } - - @Override - public void addTypeConverters(TypeConverters typeConverters) { - throw new UnsupportedOperationException(); - } - - public void addFallbackTypeConverter(TypeConverter typeConverter, boolean canPromote) { - LOG.trace("Adding fallback type converter: {} which can promote: {}", typeConverter, canPromote); - - // add in top of fallback as the toString() fallback will nearly always be able to convert - // the last one which is add to the FallbackTypeConverter will be called at the first place - fallbackConverters.add(0, new FallbackTypeConverter(typeConverter, canPromote)); - } - - public TypeConverter lookup(Class toType, Class fromType) { - return doLookup(toType, fromType, false); - } - - protected TypeConverter getOrFindTypeConverter(Class toType, Class fromType) { - TypeConverter converter = typeMappings.get(toType, fromType); - if (converter == null) { - // converter not found, try to lookup then - converter = lookup(toType, fromType); - if (converter != null) { - typeMappings.put(toType, fromType, converter); - } - } - return converter; - } - - protected TypeConverter doLookup(Class toType, Class fromType, boolean isSuper) { - - if (fromType != null) { - // lets try if there is a direct match - TypeConverter converter = getTypeConverter(toType, fromType); - if (converter != null) { - return converter; - } - - // try the interfaces - for (Class type : fromType.getInterfaces()) { - converter = getTypeConverter(toType, type); - if (converter != null) { - return converter; - } - } - - // try super then - Class fromSuperClass = fromType.getSuperclass(); - if (fromSuperClass != null && !fromSuperClass.equals(Object.class)) { - converter = doLookup(toType, fromSuperClass, true); - if (converter != null) { - return converter; - } - } - } - - // only do these tests as fallback and only on the target type (eg not on its super) - if (!isSuper) { - if (fromType != null && !fromType.equals(Object.class)) { - - // lets try classes derived from this toType - TypeConverter converter = typeMappings.getFirst( - toType::isAssignableFrom, - // skip Object based we do them last - from -> !from.equals(Object.class) && from.isAssignableFrom(fromType)); - if (converter != null) { - return converter; - } - - // lets test for Object based converters as last resort - converter = getTypeConverter(toType, Object.class); - if (converter != null) { - return converter; - } - } - } - - // none found - return null; - } - - public List[]> listAllTypeConvertersFromTo() { - List[]> answer = new ArrayList<>(); - typeMappings.forEach((k1, k2, v) -> answer.add(new Class[]{k2, k1})); - return answer; - } - - protected TypeConversionException createTypeConversionException(Exchange exchange, Class type, Object - value, Throwable cause) { - if (cause instanceof TypeConversionException) { - if (((TypeConversionException) cause).getToType() == type) { - return (TypeConversionException) cause; - } - } - Object body; - // extract the body for logging which allows to limit the message body in the exception/stacktrace - // and also can be used to turn off logging sensitive message data - if (exchange != null) { - body = MessageHelper.extractValueForLogging(value, exchange.getIn()); - } else { - body = value; - } - return new TypeConversionException(body, type, cause); - } - - public Statistics getStatistics() { - return statistics; - } - - public int size() { - return typeMappings.size(); - } - - public LoggingLevel getTypeConverterExistsLoggingLevel() { - return typeConverterExistsLoggingLevel; - } - - public void setTypeConverterExistsLoggingLevel(LoggingLevel typeConverterExistsLoggingLevel) { - this.typeConverterExistsLoggingLevel = typeConverterExistsLoggingLevel; - } - - public TypeConverterExists getTypeConverterExists() { - return typeConverterExists; - } - - public void setTypeConverterExists(TypeConverterExists typeConverterExists) { - this.typeConverterExists = typeConverterExists; - } - - protected void doStop() throws Exception { - // log utilization statistics when stopping, including mappings - if (statistics.isStatisticsEnabled()) { - String info = statistics.toString(); - AtomicInteger misses = new AtomicInteger(); - typeMappings.forEach((k1, k2, v) -> { - if (v == MISS_CONVERTER) { - misses.incrementAndGet(); - } - }); - info += String.format(" mappings[total=%s, misses=%s]", typeMappings.size(), misses); - LOG.info(info); - } - - typeMappings.clear(); - statistics.reset(); - } - - /** - * Represents utilization statistics - */ - private final class UtilizationStatistics implements Statistics { - - private boolean statisticsEnabled; - - @Override - public long getNoopCounter() { - return noopCounter.longValue(); - } - - @Override - public long getAttemptCounter() { - return attemptCounter.longValue(); - } - - @Override - public long getHitCounter() { - return hitCounter.longValue(); - } - - @Override - public long getMissCounter() { - return missCounter.longValue(); - } - - @Override - public long getFailedCounter() { - return failedCounter.longValue(); - } - - @Override - public void reset() { - noopCounter.reset(); - attemptCounter.reset(); - hitCounter.reset(); - missCounter.reset(); - failedCounter.reset(); - } - - @Override - public boolean isStatisticsEnabled() { - return statisticsEnabled; - } - - @Override - public void setStatisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - - @Override - public String toString() { - return String.format("TypeConverterRegistry utilization[noop=%s, attempts=%s, hits=%s, misses=%s, failures=%s]", - getNoopCounter(), getAttemptCounter(), getHitCounter(), getMissCounter(), getFailedCounter()); - } - } - - /** - * Represents a fallback type converter - */ - public static class FallbackTypeConverter { - private final boolean canPromote; - private final TypeConverter fallbackTypeConverter; - - FallbackTypeConverter(TypeConverter fallbackTypeConverter, boolean canPromote) { - this.canPromote = canPromote; - this.fallbackTypeConverter = fallbackTypeConverter; - } - - public boolean isCanPromote() { - return canPromote; - } - - public TypeConverter getFallbackTypeConverter() { - return fallbackTypeConverter; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java deleted file mode 100644 index e311563..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java +++ /dev/null @@ -1,117 +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.impl.converter; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.AnnotationScanTypeConverters; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.Injector; -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.TimeUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Default implementation of a type converter registry used for - * type converters in Camel. - *

- * This implementation will load type converters up-front on startup. - */ -public class DefaultTypeConverter extends BaseTypeConverterRegistry implements AnnotationScanTypeConverters { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultTypeConverter.class); - - private volatile boolean loadTypeConvertersDone; - private final boolean loadTypeConverters; - - public DefaultTypeConverter(PackageScanClassResolver resolver, Injector injector, - FactoryFinder factoryFinder, boolean loadTypeConverters) { - this(null, resolver, injector, factoryFinder, loadTypeConverters); - } - - public DefaultTypeConverter(CamelContext camelContext, PackageScanClassResolver resolver, Injector injector, - FactoryFinder factoryFinder, boolean loadTypeConverters) { - super(camelContext, resolver, injector, factoryFinder); - this.loadTypeConverters = loadTypeConverters; - } - - @Override - public boolean isRunAllowed() { - // as type converter is used during initialization then allow it to always run - return true; - } - - @Override - protected void doInit() throws Exception { - StopWatch watch = new StopWatch(); - - super.doInit(); - - // core type converters is always loaded which does not use any classpath scanning and therefore is fast - loadCoreAndFastTypeConverters(); - - String time = TimeUtils.printDuration(watch.taken()); - LOG.debug("Loaded {} type converters in {}", typeMappings.size(), time); - - if (!loadTypeConvertersDone && isLoadTypeConverters()) { - scanTypeConverters(); - } - } - - private boolean isLoadTypeConverters() { - boolean load = loadTypeConverters; - if (camelContext != null) { - // camel context can override - load = camelContext.isLoadTypeConverters(); - } - return load; - } - - @Override - public void scanTypeConverters() throws Exception { - StopWatch watch = new StopWatch(); - - // we are using backwards compatible legacy mode to detect additional converters - if (!loadTypeConvertersDone) { - loadTypeConvertersDone = true; - - if (resolver != null) { - typeConverterLoaders.add(new AnnotationTypeConverterLoader(resolver)); - } - - int fast = typeMappings.size(); - // load type converters up front - loadTypeConverters(); - int additional = typeMappings.size() - fast; - - // report how many type converters we have loaded - if (additional > 0) { - LOG.info("Type converters loaded (fast: {}, scanned: {})", fast, additional); - LOG.warn("Annotation scanning mode loaded {} type converters. Its recommended to migrate to @Converter(loader = true) for fast type converter mode.", additional); - } - - // lets clear the cache from the resolver as its often only used during startup - if (resolver != null) { - resolver.clearCache(); - } - } - - String time = TimeUtils.printDuration(watch.taken()); - LOG.debug("Scanned {} type converters in {}", typeMappings.size(), time); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java deleted file mode 100644 index 61a9272..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java +++ /dev/null @@ -1,61 +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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Method; - -/** - * A type converter which is used to convert from String to enum type - */ -public class EnumTypeConverter extends TypeConverterSupport { - - @Override - public T convertTo(Class type, Exchange exchange, Object value) { - return EnumTypeConverter.doConvertTo(type, exchange, value); - } - - @SuppressWarnings("unchecked") - public static T doConvertTo(Class type, Exchange exchange, Object value) { - if (type.isEnum()) { - String text = value.toString(); - Class enumClass = (Class) type; - - // we want to match case insensitive for enums - for (Enum enumValue : enumClass.getEnumConstants()) { - if (enumValue.name().equalsIgnoreCase(text)) { - return type.cast(enumValue); - } - } - - // fallback to the JDK valueOf which is case-sensitive and throws exception if not found - Method method; - try { - method = type.getMethod("valueOf", String.class); - } catch (NoSuchMethodException e) { - throw new RuntimeCamelException("Could not find valueOf method on enum type: " + type.getName()); - } - return (T) ObjectHelper.invokeMethod(method, null, text); - } - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java deleted file mode 100644 index 7614f73..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FastAnnotationTypeConverterLoader.java +++ /dev/null @@ -1,37 +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.impl.converter; - -import org.apache.camel.Converter; -import org.apache.camel.spi.PackageScanClassResolver; - -public final class FastAnnotationTypeConverterLoader extends AnnotationTypeConverterLoader { - - public FastAnnotationTypeConverterLoader(PackageScanClassResolver resolver) { - super(resolver); - } - - @Override - protected boolean acceptClass(Class clazz) { - Converter conv = clazz.getAnnotation(Converter.class); - if (conv != null) { - // skip all loader classes as they have already been loaded - return !conv.generateLoader(); - } - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java deleted file mode 100644 index 71acfd0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.StreamCache; -import org.apache.camel.TypeConversionException; -import org.apache.camel.TypeConverter; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.TypeConverterSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.Future; - -/** - * Future type converter. - */ -public final class FutureTypeConverter extends TypeConverterSupport { - - private static final Logger LOG = LoggerFactory.getLogger(FutureTypeConverter.class); - - private final TypeConverter converter; - - public FutureTypeConverter(TypeConverter converter) { - this.converter = converter; - } - - @Override - public T convertTo(Class type, Exchange exchange, Object value) { - try { - return doConvertTo(type, exchange, value); - } catch (Exception e) { - throw new TypeConversionException(value, type, e); - } - } - - @SuppressWarnings("unchecked") - private T doConvertTo(Class type, Exchange exchange, Object value) throws Exception { - // do not convert to stream cache - if (StreamCache.class.isAssignableFrom(value.getClass())) { - return null; - } - - if (Future.class.isAssignableFrom(value.getClass())) { - - Future future = (Future) value; - - if (future.isCancelled()) { - // return void to indicate its not possible to convert at this time - return (T) MISS_VALUE; - } - - // do some trace logging as the get is blocking until the response is ready - LOG.trace("Getting future response"); - - Object body = future.get(); - LOG.trace("Got future response"); - - if (body == null) { - // return void to indicate its not possible to convert at this time - return (T) MISS_VALUE; - } - - // maybe from is already the type we want - if (type.isAssignableFrom(body.getClass())) { - return type.cast(body); - } else if (body instanceof Exchange) { - Exchange result = (Exchange) body; - body = ExchangeHelper.extractResultBody(result, result.getPattern()); - } - - // no then convert to the type - return converter.convertTo(type, exchange, body); - } - - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java deleted file mode 100644 index 5f5989a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Method; - -/** - * A {@link org.apache.camel.TypeConverter} implementation which instantiates an object - * so that an instance method can be used as a fallback type converter - */ -public class InstanceMethodFallbackTypeConverter extends TypeConverterSupport { - private final org.apache.camel.impl.converter.CachingInjector injector; - private final Method method; - private final boolean useExchange; - private final TypeConverterRegistry registry; - private final boolean allowNull; - - public InstanceMethodFallbackTypeConverter(CachingInjector injector, Method method, TypeConverterRegistry registry, boolean allowNull) { - this.injector = injector; - this.method = method; - this.useExchange = method.getParameterCount() == 4; - this.registry = registry; - this.allowNull = allowNull; - } - - @Override - public String toString() { - return "InstanceMethodFallbackTypeConverter: " + method; - } - - @Override - public boolean allowNull() { - return allowNull; - } - - @Override - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - Object instance = injector.newInstance(); - if (instance == null) { - throw new RuntimeCamelException("Could not instantiate an instance of: " + type.getCanonicalName()); - } - return useExchange - ? (T)ObjectHelper.invokeMethod(method, instance, type, exchange, value, registry) : (T) ObjectHelper - .invokeMethod(method, instance, type, value, registry); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java deleted file mode 100644 index 629201b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java +++ /dev/null @@ -1,67 +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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.TypeConverter; -import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Method; - -/** - * A {@link TypeConverter} implementation which instantiates an object - * so that an instance method can be used as a type converter - */ -public class InstanceMethodTypeConverter extends TypeConverterSupport { - private final org.apache.camel.impl.converter.CachingInjector injector; - private final Method method; - private final boolean useExchange; - private final boolean allowNull; - - public InstanceMethodTypeConverter(CachingInjector injector, Method method, TypeConverterRegistry registry, boolean allowNull) { - this.injector = injector; - this.method = method; - this.useExchange = method.getParameterCount() == 2; - this.allowNull = allowNull; - } - - @Override - public String toString() { - return "InstanceMethodTypeConverter: " + method; - } - - @Override - public boolean allowNull() { - return allowNull; - } - - @Override - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - Object instance = injector.newInstance(); - if (instance == null) { - throw new RuntimeCamelException("Could not instantiate an instance of: " + type.getCanonicalName()); - } - return useExchange - ? (T)ObjectHelper.invokeMethod(method, instance, value, exchange) : (T) ObjectHelper - .invokeMethod(method, instance, value); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java deleted file mode 100644 index 4a9faf1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java +++ /dev/null @@ -1,60 +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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Method; - -/** - * A {@link org.apache.camel.TypeConverter} implementation which invokes a static method - * as a fallback type converter from a type to another type - */ -public class StaticMethodFallbackTypeConverter extends TypeConverterSupport { - private final Method method; - private final boolean useExchange; - private final TypeConverterRegistry registry; - private final boolean allowNull; - - public StaticMethodFallbackTypeConverter(Method method, TypeConverterRegistry registry, boolean allowNull) { - this.method = method; - this.useExchange = method.getParameterCount() == 4; - this.registry = registry; - this.allowNull = allowNull; - } - - @Override - public boolean allowNull() { - return allowNull; - } - - @Override - public String toString() { - return "StaticMethodFallbackTypeConverter: " + method; - } - - @Override - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - return useExchange ? (T)ObjectHelper.invokeMethod(method, null, type, exchange, value, registry) - : (T) ObjectHelper.invokeMethod(method, null, type, value, registry); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java deleted file mode 100644 index 35f423b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java +++ /dev/null @@ -1,57 +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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.TypeConverter; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.TypeConverterSupport; - -import java.lang.reflect.Method; - -/** - * A {@link TypeConverter} implementation which invokes a static method to convert from a type to another type - */ -public class StaticMethodTypeConverter extends TypeConverterSupport { - private final Method method; - private final boolean useExchange; - private final boolean allowNull; - - public StaticMethodTypeConverter(Method method, boolean allowNull) { - this.method = method; - this.useExchange = method.getParameterCount() == 2; - this.allowNull = allowNull; - } - - @Override - public String toString() { - return "StaticMethodTypeConverter: " + method; - } - - @Override - public boolean allowNull() { - return allowNull; - } - - @Override - @SuppressWarnings("unchecked") - public T convertTo(Class type, Exchange exchange, Object value) { - return useExchange ? (T)ObjectHelper.invokeMethod(method, null, value, exchange) - : (T) ObjectHelper.invokeMethod(method, null, value); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java deleted file mode 100644 index 51b2148..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.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.impl.converter; - -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.WrappedFile; -import org.apache.camel.support.TypeConverterSupport; - -import java.util.concurrent.Future; - -/** - * A simple converter that can convert any object to a String type by using the - * toString() method of the object. - */ -public class ToStringTypeConverter extends TypeConverterSupport { - - @SuppressWarnings("unchecked") - @Override - public T convertTo(Class toType, Exchange exchange, Object value) { - - // should not try to convert these specific types - if (value instanceof Message || value instanceof WrappedFile || value instanceof Future) { - return (T) MISS_VALUE; - } - - if (toType.equals(String.class)) { - return (T) value.toString(); - } - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java deleted file mode 100644 index 08e81a6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java +++ /dev/null @@ -1,48 +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.impl.converter; - -import org.apache.camel.TypeConverters; - -import java.io.IOException; - -/** - * A type converter loader, that only supports scanning a {@link TypeConverters} class - * for methods that has been annotated with {@link org.apache.camel.Converter}. - */ -public class TypeConvertersLoader extends AnnotationTypeConverterLoader { - - private final TypeConverters typeConverters; - - /** - * Creates the loader - * - * @param typeConverters The implementation that has the type converters - */ - public TypeConvertersLoader(TypeConverters typeConverters) { - super(new TypeConvertersPackageScanClassResolver(typeConverters.getClass())); - this.typeConverters = typeConverters; - } - - @Override - protected String[] findPackageNames() throws IOException { - // this method doesn't change the behavior of the CorePackageScanClassResolver - String name = typeConverters.getClass().getPackage().getName(); - return new String[]{name}; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java deleted file mode 100644 index d1261df..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.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.impl.converter; - -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.PackageScanFilter; -import org.apache.camel.support.service.ServiceSupport; - -import java.lang.annotation.Annotation; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * A {@link org.apache.camel.spi.ClassResolver} which loads type converters - * from an instance that implements {@link org.apache.camel.TypeConverters}. - *

- * This is used when adding converters manually using the - * {@link org.apache.camel.impl.converter.BaseTypeConverterRegistry#addTypeConverters(org.apache.camel.TypeConverters)} method. - */ -public class TypeConvertersPackageScanClassResolver extends ServiceSupport implements PackageScanClassResolver { - - private final Set classLoaders = new LinkedHashSet<>(); - private final Set> converters = new LinkedHashSet<>(); - - public TypeConvertersPackageScanClassResolver(Class clazz) { - converters.add(clazz); - // use the classloader that loaded the class - classLoaders.add(clazz.getClassLoader()); - } - - @Override - public Set getClassLoaders() { - // return a new set to avoid any concurrency issues in other runtimes such as OSGi - return Collections.unmodifiableSet(new LinkedHashSet<>(classLoaders)); - } - - @Override - public void addClassLoader(ClassLoader classLoader) { - classLoaders.add(classLoader); - } - - @Override - public Set> findAnnotated(Class annotation, String... packageNames) { - return converters; - } - - @Override - public Set> findAnnotated(Set> annotations, String... packageNames) { - return converters; - } - - @Override - public Set> findImplementations(Class parent, String... packageNames) { - // noop - return null; - } - - @Override - public Set> findByFilter(PackageScanFilter filter, String... packageNames) { - // noop - return null; - } - - @Override - public void addFilter(PackageScanFilter filter) { - // noop - } - - @Override - public void removeFilter(PackageScanFilter filter) { - // noop - } - - @Override - public void setAcceptableSchemes(String schemes) { - // noop - } - - @Override - public void clearCache() { - // noop - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java deleted file mode 100644 index 7f72779..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java +++ /dev/null @@ -1,52 +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.impl.converter; - -import org.apache.camel.Converter; -import org.apache.camel.TypeConversionException; -import org.apache.camel.TypeConverter; - -import java.net.URI; -import java.net.URISyntaxException; - -/** - * A {@link TypeConverter} that converts to and from {@link URI}s. - */ -@Converter(generateLoader = true) -public final class UriTypeConverter { - - private UriTypeConverter() { - // utility class - } - - @Converter - public static CharSequence toCharSequence(final URI value) { - return value.toString(); - } - - @Converter - public static URI toUri(final CharSequence value) { - final String stringValue = String.valueOf(value); - - try { - return new URI(stringValue); - } catch (final URISyntaxException e) { - throw new TypeConversionException(value, URI.class, e); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/package.html deleted file mode 100644 index 6eb971b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/converter/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Default implementation classes the Type Conversion Strategies - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java deleted file mode 100644 index 862a404..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ /dev/null @@ -1,4134 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.catalog.RuntimeCamelCatalog; -import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.transformer.TransformerKey; -import org.apache.camel.impl.validator.ValidatorKey; -import org.apache.camel.spi.*; -import org.apache.camel.spi.RouteError.Phase; -import org.apache.camel.support.*; -import org.apache.camel.support.jsse.SSLContextParameters; -import org.apache.camel.support.service.BaseService; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.MDC; - -import java.io.IOException; -import java.io.InputStream; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.function.Supplier; - -import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID; - -/** - * Represents the context used to configure routes and the policies to use. - */ -public abstract class AbstractCamelContext extends BaseService - implements ExtendedCamelContext, CatalogCamelContext, Suspendable { - - private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelContext.class); - - // start auto assigning route ids using numbering 1000 and upwards - int defaultRouteStartupOrder = 1000; - - public enum Initialization { - Eager, Default, Lazy - } - - private VetoCamelContextStartException vetoed; - private String managementName; - private ClassLoader applicationContextClassLoader; - private final AtomicInteger endpointKeyCounter = new AtomicInteger(); - private final List endpointStrategies = new ArrayList<>(); - private final GlobalEndpointConfiguration globalEndpointConfiguration = new DefaultGlobalEndpointConfiguration(); - private final Map components = new ConcurrentHashMap<>(); - private final Set routes = new LinkedHashSet<>(); - private final List servicesToStop = new CopyOnWriteArrayList<>(); - private final List startupListeners = new CopyOnWriteArrayList<>(); - private final org.apache.camel.impl.engine.DeferServiceStartupListener deferStartupListener = new DeferServiceStartupListener(); - private boolean autoCreateComponents = true; - private final Map languages = new ConcurrentHashMap<>(); - private final List lifecycleStrategies = new CopyOnWriteArrayList<>(); - private volatile RestConfiguration restConfiguration; - private List interceptStrategies = new ArrayList<>(); - private List routePolicyFactories = new ArrayList<>(); - private Set logListeners = new LinkedHashSet<>(); - // special flags to control the first startup which can are special - private volatile boolean firstStartDone; - private volatile boolean doNotStartRoutesOnFirstStart; - private final ThreadLocal isStartingRoutes = new ThreadLocal<>(); - private final ThreadLocal isSetupRoutes = new ThreadLocal<>(); - private Initialization initialization = Initialization.Default; - private Boolean autoStartup = Boolean.TRUE; - private Boolean backlogTrace = Boolean.FALSE; - private Boolean trace = Boolean.FALSE; - private String tracePattern; - private Boolean debug = Boolean.FALSE; - private Boolean messageHistory = Boolean.FALSE; - private Boolean logMask = Boolean.FALSE; - private Boolean logExhaustedMessageBody = Boolean.FALSE; - private Boolean streamCache = Boolean.FALSE; - private Boolean disableJMX = Boolean.FALSE; - private Boolean loadTypeConverters = Boolean.FALSE; - private Boolean typeConverterStatisticsEnabled = Boolean.FALSE; - private Boolean useMDCLogging = Boolean.FALSE; - private String mdcLoggingKeysPattern; - private Boolean useDataType = Boolean.FALSE; - private Boolean useBreadcrumb = Boolean.FALSE; - private Boolean allowUseOriginalMessage = Boolean.FALSE; - private Boolean caseInsensitiveHeaders = Boolean.TRUE; - private Long delay; - private ErrorHandlerFactory errorHandlerFactory; - private Map globalOptions = new HashMap<>(); - private final Map factories = new ConcurrentHashMap<>(); - private final Map routeServices = new LinkedHashMap<>(); - private final Map suspendedRouteServices = new LinkedHashMap<>(); - - private final Object lock = new Object(); - private volatile String version; - private volatile PropertiesComponent propertiesComponent; - private volatile CamelContextNameStrategy nameStrategy; - private volatile ReactiveExecutor reactiveExecutor; - private volatile ManagementNameStrategy managementNameStrategy; - private volatile Registry registry; - private volatile TypeConverter typeConverter; - private volatile TypeConverterRegistry typeConverterRegistry; - private volatile Injector injector; - private volatile CamelBeanPostProcessor beanPostProcessor; - private volatile ComponentResolver componentResolver; - private volatile ComponentNameResolver componentNameResolver; - private volatile LanguageResolver languageResolver; - private volatile ConfigurerResolver configurerResolver; - private volatile DataFormatResolver dataFormatResolver; - private volatile ManagementStrategy managementStrategy; - private volatile ManagementMBeanAssembler managementMBeanAssembler; - private volatile RestRegistryFactory restRegistryFactory; - private volatile RestRegistry restRegistry; - private volatile HeadersMapFactory headersMapFactory; - private volatile BeanProxyFactory beanProxyFactory; - private volatile BeanProcessorFactory beanProcessorFactory; - private volatile XMLRoutesDefinitionLoader xmlRoutesDefinitionLoader; - private volatile ModelToXMLDumper modelToXMLDumper; - private volatile RestBindingJaxbDataFormatFactory restBindingJaxbDataFormatFactory; - private volatile RuntimeCamelCatalog runtimeCamelCatalog; - private volatile ClassResolver classResolver; - private volatile PackageScanClassResolver packageScanClassResolver; - private volatile PackageScanResourceResolver packageScanResourceResolver; - private volatile NodeIdFactory nodeIdFactory; - private volatile ProcessorFactory processorFactory; - private volatile MessageHistoryFactory messageHistoryFactory; - private volatile FactoryFinderResolver factoryFinderResolver; - private volatile StreamCachingStrategy streamCachingStrategy; - private volatile InflightRepository inflightRepository; - private volatile AsyncProcessorAwaitManager asyncProcessorAwaitManager; - private volatile ShutdownStrategy shutdownStrategy; - private volatile ModelJAXBContextFactory modelJAXBContextFactory; - private volatile ExecutorServiceManager executorServiceManager; - private volatile UuidGenerator uuidGenerator; - private volatile UnitOfWorkFactory unitOfWorkFactory; - private volatile RouteController routeController; - private final RouteController internalRouteController = new org.apache.camel.impl.engine.InternalRouteController(this); - private final org.apache.camel.impl.engine.InternalRouteStartupManager internalRouteStartupManager = new org.apache.camel.impl.engine.InternalRouteStartupManager(this); - private volatile ScheduledExecutorService errorHandlerExecutorService; - private volatile BeanIntrospection beanIntrospection; - private volatile Tracer tracer; - private volatile boolean eventNotificationApplicable; - private final DeferServiceFactory deferServiceFactory = new DefaultDeferServiceFactory(); - private final AnnotationBasedProcessorFactory annotationBasedProcessorFactory = new DefaultAnnotationBasedProcessorFactory(); - - private volatile TransformerRegistry transformerRegistry; - private volatile ValidatorRegistry validatorRegistry; - private EndpointRegistry endpoints; - private RuntimeEndpointRegistry runtimeEndpointRegistry; - - private final List routeStartupOrder = new ArrayList<>(); - private ShutdownRoute shutdownRoute = ShutdownRoute.Default; - private ShutdownRunningTask shutdownRunningTask = ShutdownRunningTask.CompleteCurrentTaskOnly; - private Debugger debugger; - private final StopWatch stopWatch = new StopWatch(false); - private Date startDate; - - private SSLContextParameters sslContextParameters; - private final ThreadLocal> componentsInCreation = new ThreadLocal>() { - @Override - public Set initialValue() { - return new HashSet<>(); - } - }; - private Map, Object> extensions = new ConcurrentHashMap<>(); - - /** - * Creates the {@link CamelContext} using - * {@link org.apache.camel.support.DefaultRegistry} as registry. - *

- * Use one of the other constructors to force use an explicit registry. - */ - public AbstractCamelContext() { - this(true); - } - - /** - * Creates the {@link CamelContext} using the given registry - * - * @param registry the registry - */ - public AbstractCamelContext(Registry registry) { - this(); - setRegistry(registry); - } - - public AbstractCamelContext(boolean build) { - // create a provisional (temporary) endpoint registry at first since end - // users may access endpoints before CamelContext is started - // we will later transfer the endpoints to the actual - // DefaultEndpointRegistry later, but we do this to starup Camel faster. - this.endpoints = new org.apache.camel.impl.engine.ProvisionalEndpointRegistry(); - - // add the defer service startup listener - this.startupListeners.add(deferStartupListener); - - // add a default LifecycleStrategy that discover strategies on the registry and invoke them - this.lifecycleStrategies.add(new org.apache.camel.impl.engine.OnCamelContextLifecycleStrategy()); - - if (build) { - try { - build(); - } catch (Exception e) { - throw new RuntimeException("Error initializing CamelContext", e); - } - } - } - - public void close() throws IOException { - try { - stop(); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } - - public CamelContext getCamelContextReference() { - return this; - } - - /** - * Whether to eager create {@link TypeConverter} during initialization of CamelContext. - * This is enabled by default to optimize camel-core. - */ - protected boolean eagerCreateTypeConverter() { - return true; - } - - @Override - public T adapt(Class type) { - return type.cast(this); - } - - @Override - public T getExtension(Class type) { - if (type.isInstance(this)) { - return type.cast(this); - } - Object extension = extensions.get(type); - if (extension instanceof Supplier) { - extension = ((Supplier)extension).get(); - setExtension(type, (T)extension); - } - return (T)extension; - } - - @Override - public void setExtension(Class type, T module) { - if (module != null) { - try { - extensions.put(type, doAddService(module)); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - } - - public void setDefaultExtension(Class type, Supplier module) { - if (module != null) { - extensions.putIfAbsent(type, module); - } - } - - @Override - public boolean isVetoStarted() { - return vetoed != null; - } - - public Initialization getInitialization() { - return initialization; - } - - public void setInitialization(Initialization initialization) { - this.initialization = initialization; - } - - @Override - public String getName() { - return getNameStrategy().getName(); - } - - @Override - public void setName(String name) { - // use an explicit name strategy since an explicit name was provided to be used - setNameStrategy(new ExplicitCamelContextNameStrategy(name)); - } - - @Override - public CamelContextNameStrategy getNameStrategy() { - if (nameStrategy == null) { - synchronized (lock) { - if (nameStrategy == null) { - setNameStrategy(createCamelContextNameStrategy()); - } - } - } - return nameStrategy; - } - - @Override - public void setNameStrategy(CamelContextNameStrategy nameStrategy) { - this.nameStrategy = doAddService(nameStrategy); - } - - @Override - public ManagementNameStrategy getManagementNameStrategy() { - if (managementNameStrategy == null) { - synchronized (lock) { - if (managementNameStrategy == null) { - setManagementNameStrategy(createManagementNameStrategy()); - } - } - } - return managementNameStrategy; - } - - @Override - public void setManagementNameStrategy(ManagementNameStrategy managementNameStrategy) { - this.managementNameStrategy = doAddService(managementNameStrategy); - } - - @Override - public String getManagementName() { - return managementName; - } - - @Override - public void setManagementName(String managementName) { - this.managementName = managementName; - } - - @Override - public Component hasComponent(String componentName) { - if (components.isEmpty()) { - return null; - } - return components.get(componentName); - } - - @Override - public void addComponent(String componentName, final Component component) { - ObjectHelper.notNull(component, "component"); - component.setCamelContext(getCamelContextReference()); - ServiceHelper.initService(component); - Component oldValue = components.putIfAbsent(componentName, component); - if (oldValue != null) { - throw new IllegalArgumentException("Cannot add component as its already previously added: " + componentName); - } - postInitComponent(componentName, component); - } - - private void postInitComponent(String componentName, final Component component) { - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onComponentAdd(componentName, component); - } - } - - @Override - public Component getComponent(String name) { - return getComponent(name, autoCreateComponents, true); - } - - @Override - public Component getComponent(String name, boolean autoCreateComponents) { - return getComponent(name, autoCreateComponents, true); - } - - @Override - public Component getComponent(String name, boolean autoCreateComponents, boolean autoStart) { - // ensure CamelContext are initialized before we can get a component - build(); - - // Check if the named component is already being created, that would mean - // that the initComponent has triggered a new getComponent - if (componentsInCreation.get().contains(name)) { - throw new IllegalStateException("Circular dependency detected, the component " + name + " is already being created"); - } - - try { - // Flag used to mark a component of being created. - final AtomicBoolean created = new AtomicBoolean(false); - - // atomic operation to get/create a component. Avoid global locks. - final Component component = components.computeIfAbsent(name, new Function() { - @Override - public Component apply(String comp) { - created.set(true); - return AbstractCamelContext.this.initComponent(name, autoCreateComponents); - } - }); - - // Start the component after its creation as if it is a component proxy - // that creates/start a delegated component, we may end up in a deadlock - if (component != null && created.get() && autoStart && (isStarted() || isStarting())) { - // If the component is looked up after the context is started, - // lets start it up. - startService(component); - } - - return component; - } catch (Exception e) { - throw new RuntimeCamelException("Cannot auto create component: " + name, e); - } finally { - // remove the reference to the component being created - componentsInCreation.get().remove(name); - } - } - - /** - * Function to initialize a component and auto start. Returns null if the - * autoCreateComponents is disabled - */ - private Component initComponent(String name, boolean autoCreateComponents) { - Component component = null; - if (autoCreateComponents) { - try { - if (LOG.isDebugEnabled()) { - LOG.debug("Using ComponentResolver: {} to resolve component with name: {}", getComponentResolver(), name); - } - - // Mark the component as being created so we can detect circular - // requests. - // - // In spring apps, the component resolver may trigger a new - // getComponent because of the underlying bean factory and as - // the endpoints are registered as singleton, the spring factory - // creates the bean and then check the type so the getComponent - // is always triggered. - // - // Simple circular dependency: - // - // - // - // - // - // - // - // - // Complex circular dependency: - // - // - // - // - // - // - // - // - // This would freeze the app (lock or infinite loop). - // - // See https://issues.apache.org/jira/browse/CAMEL-11225 - componentsInCreation.get().add(name); - - component = getComponentResolver().resolveComponent(name, getCamelContextReference()); - if (component != null) { - component.setCamelContext(getCamelContextReference()); - component.build(); - postInitComponent(name, component); - } - } catch (Exception e) { - throw new RuntimeCamelException("Cannot auto create component: " + name, e); - } - } - return component; - } - - @Override - public T getComponent(String name, Class componentType) { - Component component = getComponent(name); - if (componentType.isInstance(component)) { - return componentType.cast(component); - } else { - String message; - if (component == null) { - message = "Did not find component given by the name: " + name; - } else { - message = "Found component of type: " + component.getClass() + " instead of expected: " + componentType; - } - throw new IllegalArgumentException(message); - } - } - - public Component resolveComponent(String name) { - Component answer = hasComponent(name); - if (answer == null) { - try { - answer = getComponentResolver().resolveComponent(name, this); - } catch (Exception e) { - throw new RuntimeCamelException("Cannot resolve component: " + name, e); - } - } - return answer; - } - - @Override - public Component removeComponent(String componentName) { - Component oldComponent = components.remove(componentName); - if (oldComponent != null) { - try { - stopServices(oldComponent); - } catch (Exception e) { - LOG.warn("Error stopping component " + oldComponent + ". This exception will be ignored.", e); - } - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onComponentRemove(componentName, oldComponent); - } - } - return oldComponent; - } - - // Endpoint Management Methods - // ----------------------------------------------------------------------- - - @Override - public EndpointRegistry getEndpointRegistry() { - return endpoints; - } - - @Override - public Collection getEndpoints() { - return new ArrayList<>(endpoints.values()); - } - - @Override - public Map getEndpointMap() { - Map answer = new TreeMap<>(); - for (Map.Entry entry : endpoints.entrySet()) { - answer.put(entry.getKey().get(), entry.getValue()); - } - return answer; - } - - @Override - public Endpoint hasEndpoint(String uri) { - if (endpoints.isEmpty()) { - return null; - } - return endpoints.get(getEndpointKey(uri)); - } - - @Override - public Endpoint hasEndpoint(NormalizedEndpointUri uri) { - if (endpoints.isEmpty()) { - return null; - } - org.apache.camel.impl.engine.EndpointKey key; - if (uri instanceof org.apache.camel.impl.engine.EndpointKey) { - key = (org.apache.camel.impl.engine.EndpointKey) uri; - } else { - key = new org.apache.camel.impl.engine.EndpointKey(uri.getUri(), true); - } - return endpoints.get(key); - } - - @Override - public Endpoint addEndpoint(String uri, Endpoint endpoint) throws Exception { - Endpoint oldEndpoint; - - startService(endpoint); - oldEndpoint = endpoints.remove(getEndpointKey(uri)); - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onEndpointAdd(endpoint); - } - addEndpointToRegistry(uri, endpoint); - if (oldEndpoint != null && oldEndpoint != endpoint) { - stopServices(oldEndpoint); - } - - return oldEndpoint; - } - - @Override - public void removeEndpoint(Endpoint endpoint) throws Exception { - removeEndpoints(endpoint.getEndpointUri()); - } - - @Override - public Collection removeEndpoints(String uri) throws Exception { - Collection answer = new ArrayList<>(); - Endpoint oldEndpoint = endpoints.remove(getEndpointKey(uri)); - if (oldEndpoint != null) { - answer.add(oldEndpoint); - stopServices(oldEndpoint); - } else { - for (Map.Entry entry : endpoints.entrySet()) { - oldEndpoint = entry.getValue(); - if (EndpointHelper.matchEndpoint(this, oldEndpoint.getEndpointUri(), uri)) { - try { - stopServices(oldEndpoint); - } catch (Exception e) { - LOG.warn("Error stopping endpoint " + oldEndpoint + ". This exception will be ignored.", e); - } - answer.add(oldEndpoint); - endpoints.remove(entry.getKey()); - } - } - } - - // notify lifecycle its being removed - for (Endpoint endpoint : answer) { - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onEndpointRemove(endpoint); - } - } - - return answer; - } - - @Override - public NormalizedEndpointUri normalizeUri(String uri) { - try { - uri = resolvePropertyPlaceholders(uri); - uri = URISupport.normalizeUri(uri); - return new NormalizedUri(uri); - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - } - - @Override - public Endpoint getEndpoint(String uri) { - return doGetEndpoint(uri, false, false); - } - - @Override - public Endpoint getEndpoint(NormalizedEndpointUri uri) { - return doGetEndpoint(uri.getUri(), true, false); - } - - @Override - public Endpoint getPrototypeEndpoint(String uri) { - return doGetEndpoint(uri, false, true); - } - - @Override - public Endpoint getPrototypeEndpoint(NormalizedEndpointUri uri) { - return doGetEndpoint(uri.getUri(), true, true); - } - - protected Endpoint doGetEndpoint(String uri, boolean normalized, boolean prototype) { - // ensure CamelContext are initialized before we can get a component - build(); - - StringHelper.notEmpty(uri, "uri"); - - LOG.trace("Getting endpoint with uri: {}", uri); - - // in case path has property placeholders then try to let property - // component resolve those - if (!normalized) { - try { - uri = resolvePropertyPlaceholders(uri); - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - } - - final String rawUri = uri; - - // normalize uri so we can do endpoint hits with minor mistakes and - // parameters is not in the same order - if (!normalized) { - uri = EndpointHelper.normalizeEndpointUri(uri); - } - - LOG.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri); - - String scheme; - Endpoint answer = null; - if (!prototype) { - // use optimized method to get the endpoint uri - org.apache.camel.impl.engine.EndpointKey key = getEndpointKeyPreNormalized(uri); - // only lookup and reuse existing endpoints if not prototype scoped - answer = endpoints.get(key); - } - if (answer == null) { - try { - scheme = StringHelper.before(uri, ":"); - if (scheme == null) { - // it may refer to a logical endpoint - answer = getRegistry().lookupByNameAndType(uri, Endpoint.class); - if (answer != null) { - return answer; - } else { - throw new NoSuchEndpointException(uri); - } - } - LOG.trace("Endpoint uri: {} is from component with name: {}", uri, scheme); - Component component = getComponent(scheme); - ServiceHelper.initService(component); - - // Ask the component to resolve the endpoint. - if (component != null) { - LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component); - - // Have the component create the endpoint if it can. - if (component.useRawUri()) { - answer = component.createEndpoint(rawUri); - } else { - answer = component.createEndpoint(uri); - } - - if (answer != null && LOG.isDebugEnabled()) { - LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component); - } - } - - if (answer == null) { - // no component then try in registry and elsewhere - answer = createEndpoint(uri); - LOG.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer); - } - - if (answer != null) { - if (!prototype) { - addService(answer); - // register in registry - answer = addEndpointToRegistry(uri, answer); - } else { - addPrototypeService(answer); - // if there is endpoint strategies, then use the endpoints they return - // as this allows to intercept endpoints etc. - for (EndpointStrategy strategy : endpointStrategies) { - answer = strategy.registerEndpoint(uri, answer); - } - } - } - } catch (NoSuchEndpointException e) { - // throw as-is - throw e; - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - } - - // unknown scheme - if (answer == null) { - throw new NoSuchEndpointException(uri); - } - - return answer; - } - - @Override - public Endpoint getEndpoint(String uri, Map parameters) { - return doGetEndpoint(uri, parameters, false); - } - - @Override - public Endpoint getEndpoint(NormalizedEndpointUri uri, Map parameters) { - return doGetEndpoint(uri.getUri(), parameters, true); - } - - protected Endpoint doGetEndpoint(String uri, Map parameters, boolean normalized) { - // ensure CamelContext are initialized before we can get an endpoint - init(); - - StringHelper.notEmpty(uri, "uri"); - - LOG.trace("Getting endpoint with uri: {} and parameters: {}", uri, parameters); - - // in case path has property placeholders then try to let property - // component resolve those - if (!normalized) { - try { - uri = resolvePropertyPlaceholders(uri); - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - } - - final String rawUri = uri; - - // normalize uri so we can do endpoint hits with minor mistakes and - // parameters is not in the same order - if (!normalized) { - uri = EndpointHelper.normalizeEndpointUri(uri); - } - - LOG.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri); - - Endpoint answer; - String scheme = null; - // use optimized method to get the endpoint uri - org.apache.camel.impl.engine.EndpointKey key = getEndpointKeyPreNormalized(uri); - answer = endpoints.get(key); - if (answer == null) { - try { - scheme = StringHelper.before(uri, ":"); - if (scheme == null) { - // it may refer to a logical endpoint - answer = getRegistry().lookupByNameAndType(uri, Endpoint.class); - if (answer != null) { - return answer; - } else { - throw new NoSuchEndpointException(uri); - } - } - LOG.trace("Endpoint uri: {} is from component with name: {}", uri, scheme); - Component component = getComponent(scheme); - ServiceHelper.initService(component); - - // Ask the component to resolve the endpoint. - if (component != null) { - LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component); - - // Have the component create the endpoint if it can. - if (component.useRawUri()) { - answer = component.createEndpoint(rawUri, parameters); - } else { - answer = component.createEndpoint(uri, parameters); - } - - if (answer != null && LOG.isDebugEnabled()) { - LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component); - } - } - - if (answer == null) { - // no component then try in registry and elsewhere - answer = createEndpoint(uri); - LOG.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer); - } - - if (answer != null) { - addService(answer); - answer = addEndpointToRegistry(uri, answer); - } - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - } - - // unknown scheme - if (answer == null) { - throw new ResolveEndpointFailedException(uri, "No component found with scheme: " + scheme); - } - - return answer; - } - - @Override - public T getEndpoint(String name, Class endpointType) { - Endpoint endpoint = getEndpoint(name); - if (endpoint == null) { - throw new NoSuchEndpointException(name); - } - if (endpoint instanceof InterceptSendToEndpoint) { - endpoint = ((InterceptSendToEndpoint)endpoint).getOriginalEndpoint(); - } - if (endpointType.isInstance(endpoint)) { - return endpointType.cast(endpoint); - } else { - throw new IllegalArgumentException("The endpoint is not of type: " + endpointType + " but is: " + endpoint.getClass().getCanonicalName()); - } - } - - @Override - public void registerEndpointCallback(EndpointStrategy strategy) { - if (!endpointStrategies.contains(strategy)) { - // let it be invoked for already registered endpoints so it can - // catch-up. - endpointStrategies.add(strategy); - for (Endpoint endpoint : getEndpoints()) { - Endpoint newEndpoint = strategy.registerEndpoint(endpoint.getEndpointUri(), endpoint); - if (newEndpoint != null) { - // put will replace existing endpoint with the new endpoint - endpoints.put(getEndpointKey(endpoint.getEndpointUri()), newEndpoint); - } - } - } - } - - /** - * Strategy to add the given endpoint to the internal endpoint registry - * - * @param uri uri of the endpoint - * @param endpoint the endpoint to add - * @return the added endpoint - */ - protected Endpoint addEndpointToRegistry(String uri, Endpoint endpoint) { - StringHelper.notEmpty(uri, "uri"); - ObjectHelper.notNull(endpoint, "endpoint"); - - // if there is endpoint strategies, then use the endpoints they return - // as this allows to intercept endpoints etc. - for (EndpointStrategy strategy : endpointStrategies) { - endpoint = strategy.registerEndpoint(uri, endpoint); - } - endpoints.put(getEndpointKey(uri, endpoint), endpoint); - return endpoint; - } - - /** - * Gets the endpoint key to use for lookup or whe adding endpoints to the - * {@link org.apache.camel.impl.engine.DefaultEndpointRegistry} - * - * @param uri the endpoint uri - * @return the key - */ - protected org.apache.camel.impl.engine.EndpointKey getEndpointKey(String uri) { - return new org.apache.camel.impl.engine.EndpointKey(uri); - } - - /** - * Gets the endpoint key to use for lookup or whe adding endpoints to the - * {@link org.apache.camel.impl.engine.DefaultEndpointRegistry} - * - * @param uri the endpoint uri which is pre normalized - * @return the key - */ - protected org.apache.camel.impl.engine.EndpointKey getEndpointKeyPreNormalized(String uri) { - return new org.apache.camel.impl.engine.EndpointKey(uri, true); - } - - /** - * Gets the endpoint key to use for lookup or whe adding endpoints to the - * {@link DefaultEndpointRegistry} - * - * @param uri the endpoint uri - * @param endpoint the endpoint - * @return the key - */ - protected org.apache.camel.impl.engine.EndpointKey getEndpointKey(String uri, Endpoint endpoint) { - if (endpoint != null && !endpoint.isSingleton()) { - int counter = endpointKeyCounter.incrementAndGet(); - return new org.apache.camel.impl.engine.EndpointKey(uri + ":" + counter); - } else { - return new org.apache.camel.impl.engine.EndpointKey(uri); - } - } - - @Override - public GlobalEndpointConfiguration getGlobalEndpointConfiguration() { - return globalEndpointConfiguration; - } - - // Route Management Methods - // ----------------------------------------------------------------------- - - @Override - public void setRouteController(RouteController routeController) { - this.routeController = doAddService(routeController); - } - - @Override - public RouteController getRouteController() { - if (routeController == null) { - synchronized (lock) { - if (routeController == null) { - setRouteController(createRouteController()); - } - } - } - return routeController; - } - - @Override - public List getRouteStartupOrder() { - return routeStartupOrder; - } - - @Override - public List getRoutes() { - // lets return a copy of the collection as objects are removed later - // when services are stopped - if (routes.isEmpty()) { - return Collections.emptyList(); - } else { - synchronized (routes) { - return new ArrayList<>(routes); - } - } - } - - @Override - public int getRoutesSize() { - return routes.size(); - } - - @Override - public Route getRoute(String id) { - if (id != null) { - for (Route route : getRoutes()) { - if (route.getId().equals(id)) { - return route; - } - } - } - return null; - } - - @Override - public Processor getProcessor(String id) { - for (Route route : getRoutes()) { - List list = route.filter(id); - if (list.size() == 1) { - return list.get(0); - } - } - return null; - } - - @Override - public T getProcessor(String id, Class type) { - Processor answer = getProcessor(id); - if (answer != null) { - return type.cast(answer); - } - return null; - } - - public void removeRoute(Route route) { - synchronized (this.routes) { - this.routes.remove(route); - } - } - - public void addRoute(Route route) { - synchronized (this.routes) { - this.routes.add(route); - } - } - - @Override - public void addRoutes(final RoutesBuilder builder) throws Exception { - try (LifecycleHelper helper = new LifecycleHelper()) { - build(); - LOG.debug("Adding routes from builder: {}", builder); - builder.addRoutesToCamelContext(AbstractCamelContext.this); - } - } - - public ServiceStatus getRouteStatus(String key) { - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(key); - if (routeService != null) { - return routeService.getStatus(); - } - return null; - } - - public boolean isStartingRoutes() { - Boolean answer = isStartingRoutes.get(); - return answer != null && answer; - } - - public void setStartingRoutes(boolean starting) { - if (starting) { - isStartingRoutes.set(true); - } else { - isStartingRoutes.remove(); - } - } - - @Override - public boolean isSetupRoutes() { - Boolean answer = isSetupRoutes.get(); - return answer != null && answer; - } - - public void startAllRoutes() throws Exception { - internalRouteStartupManager.doStartOrResumeRoutes(routeServices, true, true, false, false); - } - - public synchronized void startRoute(String routeId) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - try { - startRouteService(routeService, false); - } catch (Exception e) { - org.apache.camel.impl.engine.DefaultRouteError.set(this, routeId, Phase.START, e); - throw e; - } - } - } - - public synchronized void resumeRoute(String routeId) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - try { - if (!routeSupportsSuspension(routeId)) { - // start route if suspension is not supported - startRoute(routeId); - return; - } - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - resumeRouteService(routeService); - // must resume the route as well - Route route = getRoute(routeId); - ServiceHelper.resumeService(route); - } - } catch (Exception e) { - org.apache.camel.impl.engine.DefaultRouteError.set(this, routeId, Phase.RESUME, e); - throw e; - } - } - - public synchronized boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - try { - RouteStartupOrder route = new DefaultRouteStartupOrder(1, routeService.getRoute(), routeService); - - boolean completed = getShutdownStrategy().shutdown(this, route, timeout, timeUnit, abortAfterTimeout); - if (completed) { - // must stop route service as well - stopRouteService(routeService, false); - } else { - // shutdown was aborted, make sure route is re-started properly - startRouteService(routeService, false); - } - return completed; - } catch (Exception e) { - org.apache.camel.impl.engine.DefaultRouteError.set(this, routeId, Phase.STOP, e); - throw e; - } - } - - return false; - } - - public void stopRoute(String routeId) throws Exception { - doShutdownRoute(routeId, getShutdownStrategy().getTimeout(), getShutdownStrategy().getTimeUnit(), false); - } - - public void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - doShutdownRoute(routeId, timeout, timeUnit, false); - } - - protected synchronized void doShutdownRoute(String routeId, long timeout, TimeUnit timeUnit, boolean removingRoutes) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - try { - List routes = new ArrayList<>(1); - RouteStartupOrder order = new DefaultRouteStartupOrder(1, routeService.getRoute(), routeService); - routes.add(order); - - getShutdownStrategy().shutdown(this, routes, timeout, timeUnit); - // must stop route service as well (and remove the routes from - // management) - stopRouteService(routeService, removingRoutes); - } catch (Exception e) { - org.apache.camel.impl.engine.DefaultRouteError.set(this, routeId, removingRoutes ? Phase.SHUTDOWN : Phase.STOP, e); - throw e; - } - } - } - - @Override - public synchronized boolean removeRoute(String routeId) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - // gather a map of all the endpoints in use by the routes, so we can - // known if a given endpoints is in use - // by one or more routes, when we remove the route - Map> endpointsInUse = new HashMap<>(); - for (Map.Entry entry : routeServices.entrySet()) { - endpointsInUse.put(entry.getKey(), entry.getValue().gatherEndpoints()); - } - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - if (getRouteStatus(routeId).isStopped()) { - try { - routeService.setRemovingRoutes(true); - shutdownRouteService(routeService); - routeServices.remove(routeId); - // remove route from startup order as well, as it was - // removed - routeStartupOrder.removeIf(order -> order.getRoute().getId().equals(routeId)); - - // from the route which we have removed, then remove all its - // private endpoints - // (eg the endpoints which are not in use by other routes) - Set toRemove = new LinkedHashSet<>(); - for (Endpoint endpoint : endpointsInUse.get(routeId)) { - // how many times is the endpoint in use - int count = 0; - for (Set endpoints : endpointsInUse.values()) { - if (endpoints.contains(endpoint)) { - count++; - } - } - // notice we will count ourselves so if there is only 1 - // then its safe to remove - if (count <= 1) { - toRemove.add(endpoint); - } - } - for (Endpoint endpoint : toRemove) { - LOG.debug("Removing: {} which was only in use by route: {}", endpoint, routeId); - removeEndpoint(endpoint); - } - } catch (Exception e) { - org.apache.camel.impl.engine.DefaultRouteError.set(this, routeId, Phase.REMOVE, e); - throw e; - } - - return true; - } else { - return false; - } - } - return false; - } - - public void suspendRoute(String routeId) throws Exception { - suspendRoute(routeId, getShutdownStrategy().getTimeout(), getShutdownStrategy().getTimeUnit()); - } - - public synchronized void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - org.apache.camel.impl.engine.DefaultRouteError.reset(this, routeId); - - try { - if (!routeSupportsSuspension(routeId)) { - stopRoute(routeId, timeout, timeUnit); - return; - } - - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - List routes = new ArrayList<>(1); - Route route = routeService.getRoute(); - RouteStartupOrder order = new DefaultRouteStartupOrder(1, route, routeService); - routes.add(order); - - getShutdownStrategy().suspend(this, routes, timeout, timeUnit); - // must suspend route service as well - suspendRouteService(routeService); - // must suspend the route as well - if (route instanceof SuspendableService) { - ((SuspendableService)route).suspend(); - } - } - } catch (Exception e) { - DefaultRouteError.set(this, routeId, Phase.SUSPEND, e); - throw e; - } - } - - @Override - public void addService(Object object) throws Exception { - addService(object, true); - } - - @Override - public void addService(Object object, boolean stopOnShutdown) throws Exception { - addService(object, stopOnShutdown, false); - } - - @Override - public void addService(Object object, boolean stopOnShutdown, boolean forceStart) throws Exception { - internalAddService(object, stopOnShutdown, forceStart, true); - } - - @Override - public void addPrototypeService(Object object) throws Exception { - doAddService(object, false, true, false); - } - - protected T doAddService(T object) { - return doAddService(object, true); - } - - protected T doAddService(T object, boolean stopOnShutdown) { - return doAddService(object, stopOnShutdown, true, true); - } - - protected T doAddService(T object, boolean stopOnShutdown, boolean forceStart, boolean useLifecycleStrategies) { - try { - internalAddService(object, stopOnShutdown, forceStart, useLifecycleStrategies); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return object; - } - - private void internalAddService(Object object, boolean stopOnShutdown, - boolean forceStart, boolean useLifecycleStrategies) throws Exception { - - // inject CamelContext - if (object instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware)object; - aware.setCamelContext(getCamelContextReference()); - } - - if (object instanceof Service) { - Service service = (Service)object; - - if (useLifecycleStrategies) { - for (LifecycleStrategy strategy : lifecycleStrategies) { - if (service instanceof Endpoint) { - // use specialized endpoint add - strategy.onEndpointAdd((Endpoint) service); - } else { - Route route; - if (service instanceof RouteAware) { - route = ((RouteAware)service).getRoute(); - } else { - // if the service is added while creating a new route then grab the route from the startup manager - route = internalRouteStartupManager.getSetupRoute(); - } - strategy.onServiceAdd(getCamelContextReference(), service, route); - } - } - } - - if (!forceStart) { - ServiceHelper.initService(service); - // now start the service (and defer starting if CamelContext is - // starting up itself) - deferStartService(object, stopOnShutdown); - } else { - // only add to services to close if its a singleton - // otherwise we could for example end up with a lot of prototype - // scope endpoints - boolean singleton = true; // assume singleton by default - if (object instanceof IsSingleton) { - singleton = ((IsSingleton)service).isSingleton(); - } - // do not add endpoints as they have their own list - if (singleton && !(service instanceof Endpoint)) { - // only add to list of services to stop if its not already there - if (stopOnShutdown && !hasService(service)) { - // special for type converter / type converter registry which is stopped manual later - boolean tc = service instanceof TypeConverter || service instanceof TypeConverterRegistry; - if (!tc) { - servicesToStop.add(service); - } - } - } - if (isStartingOrStarted()) { - ServiceHelper.startService(service); - } else { - ServiceHelper.initService(service); - deferStartService(object, stopOnShutdown, true); - } - } - } - } - - @Override - public boolean removeService(Object object) throws Exception { - if (object instanceof Endpoint) { - removeEndpoint((Endpoint)object); - return true; - } - if (object instanceof Service) { - Service service = (Service)object; - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onServiceRemove(this, service, null); - } - return servicesToStop.remove(service); - } - return false; - } - - @Override - public boolean hasService(Object object) { - if (servicesToStop.isEmpty()) { - return false; - } - if (object instanceof Service) { - Service service = (Service)object; - return servicesToStop.contains(service); - } - return false; - } - - @Override - public T hasService(Class type) { - if (servicesToStop.isEmpty()) { - return null; - } - for (Service service : servicesToStop) { - if (type.isInstance(service)) { - return type.cast(service); - } - } - return null; - } - - @Override - @SuppressWarnings("unchecked") - public Set hasServices(Class type) { - if (servicesToStop.isEmpty()) { - return Collections.EMPTY_SET; - } - Set set = new HashSet<>(); - for (Service service : servicesToStop) { - if (type.isInstance(service)) { - set.add((T)service); - } - } - return set; - } - - @Override - public void deferStartService(Object object, boolean stopOnShutdown) throws Exception { - deferStartService(object, stopOnShutdown, false); - } - - public void deferStartService(Object object, boolean stopOnShutdown, boolean startEarly) throws Exception { - if (object instanceof Service) { - Service service = (Service)object; - - // only add to services to close if its a singleton - // otherwise we could for example end up with a lot of prototype - // scope endpoints - boolean singleton = true; // assume singleton by default - if (object instanceof IsSingleton) { - singleton = ((IsSingleton)service).isSingleton(); - } - // do not add endpoints as they have their own list - if (singleton && !(service instanceof Endpoint)) { - // only add to list of services to stop if its not already there - if (stopOnShutdown && !hasService(service)) { - servicesToStop.add(service); - } - } - // are we already started? - if (isStarted()) { - ServiceHelper.startService(service); - } else { - deferStartupListener.addService(service, startEarly); - } - } - } - - protected List getStartupListeners() { - return startupListeners; - } - - @Override - public void addStartupListener(StartupListener listener) throws Exception { - // either add to listener so we can invoke then later when CamelContext - // has been started - // or invoke the callback right now - if (isStarted()) { - listener.onCamelContextStarted(this, true); - } else { - startupListeners.add(listener); - } - } - - public String getComponentParameterJsonSchema(String componentName) throws IOException { - // use the component factory finder to find the package name of the - // component class, which is the location - // where the documentation exists as well - FactoryFinder finder = getFactoryFinder(DefaultComponentResolver.RESOURCE_PATH); - Class clazz = finder.findClass(componentName).orElse(null); - if (clazz == null) { - // fallback and find existing component - Component existing = hasComponent(componentName); - if (existing != null) { - clazz = existing.getClass(); - } else { - return null; - } - } - - String packageName = clazz.getPackage().getName(); - packageName = packageName.replace('.', '/'); - String path = packageName + "/" + componentName + ".json"; - - ClassResolver resolver = getClassResolver(); - InputStream inputStream = resolver.loadResourceAsStream(path); - LOG.debug("Loading component JSON Schema for: {} using class resolver: {} -> {}", componentName, resolver, inputStream); - if (inputStream != null) { - try { - return IOHelper.loadText(inputStream); - } finally { - IOHelper.close(inputStream); - } - } - // special for ActiveMQ as it is really just JMS - if ("ActiveMQComponent".equals(clazz.getSimpleName())) { - return getComponentParameterJsonSchema("jms"); - } else { - return null; - } - } - - public String getDataFormatParameterJsonSchema(String dataFormatName) throws IOException { - // use the dataformat factory finder to find the package name of the - // dataformat class, which is the location - // where the documentation exists as well - FactoryFinder finder = getFactoryFinder(DefaultDataFormatResolver.DATAFORMAT_RESOURCE_PATH); - Class clazz = finder.findClass(dataFormatName).orElse(null); - if (clazz == null) { - return null; - } - - String packageName = clazz.getPackage().getName(); - packageName = packageName.replace('.', '/'); - String path = packageName + "/" + dataFormatName + ".json"; - - ClassResolver resolver = getClassResolver(); - InputStream inputStream = resolver.loadResourceAsStream(path); - LOG.debug("Loading dataformat JSON Schema for: {} using class resolver: {} -> {}", dataFormatName, resolver, inputStream); - if (inputStream != null) { - try { - return IOHelper.loadText(inputStream); - } finally { - IOHelper.close(inputStream); - } - } - return null; - } - - public String getLanguageParameterJsonSchema(String languageName) throws IOException { - // use the language factory finder to find the package name of the - // language class, which is the location - // where the documentation exists as well - FactoryFinder finder = getFactoryFinder(DefaultLanguageResolver.LANGUAGE_RESOURCE_PATH); - Class clazz = finder.findClass(languageName).orElse(null); - if (clazz == null) { - return null; - } - - String packageName = clazz.getPackage().getName(); - packageName = packageName.replace('.', '/'); - String path = packageName + "/" + languageName + ".json"; - - ClassResolver resolver = getClassResolver(); - InputStream inputStream = resolver.loadResourceAsStream(path); - LOG.debug("Loading language JSON Schema for: {} using class resolver: {} -> {}", languageName, resolver, inputStream); - if (inputStream != null) { - try { - return IOHelper.loadText(inputStream); - } finally { - IOHelper.close(inputStream); - } - } - return null; - } - - public String getEipParameterJsonSchema(String eipName) throws IOException { - // the eip json schema may be in some of the sub-packages so look until - // we find it - String[] subPackages = new String[] {"", "/config", "/dataformat", "/language", "/loadbalancer", "/rest"}; - for (String sub : subPackages) { - String path = CamelContextHelper.MODEL_DOCUMENTATION_PREFIX + sub + "/" + eipName + ".json"; - ClassResolver resolver = getClassResolver(); - InputStream inputStream = resolver.loadResourceAsStream(path); - if (inputStream != null) { - LOG.debug("Loading eip JSON Schema for: {} using class resolver: {} -> {}", eipName, resolver, inputStream); - try { - return IOHelper.loadText(inputStream); - } finally { - IOHelper.close(inputStream); - } - } - } - return null; - } - - // Helper methods - // ----------------------------------------------------------------------- - - @Override - public Language resolveLanguage(String language) { - Language answer; - synchronized (languages) { - answer = languages.get(language); - - // check if the language is singleton, if so return the shared - // instance - if (answer instanceof IsSingleton) { - boolean singleton = ((IsSingleton)answer).isSingleton(); - if (singleton) { - return answer; - } - } - - // language not known or not singleton, then use resolver - answer = getLanguageResolver().resolveLanguage(language, getCamelContextReference()); - - // inject CamelContext if aware - if (answer != null) { - if (answer instanceof CamelContextAware) { - ((CamelContextAware)answer).setCamelContext(getCamelContextReference()); - } - if (answer instanceof Service) { - try { - startService((Service)answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - languages.put(language, answer); - } - } - - return answer; - } - - @Override - public String resolvePropertyPlaceholders(String text) { - if (text != null && text.contains(PropertiesComponent.PREFIX_TOKEN)) { - // the parser will throw exception if property key was not found - String answer = getPropertiesComponent().parseUri(text); - LOG.debug("Resolved text: {} -> {}", text, answer); - return answer; - } - // is the value a known field (currently we only support - // constants from Exchange.class) - if (text != null && text.startsWith("Exchange.")) { - String field = StringHelper.after(text, "Exchange."); - String constant = ExchangeConstantProvider.lookup(field); - if (constant != null) { - LOG.debug("Resolved constant: {} -> {}", text, constant); - return constant; - } else { - throw new IllegalArgumentException("Constant field with name: " + field + " not found on Exchange.class"); - } - } - - // return original text as is - return text; - } - - // Properties - // ----------------------------------------------------------------------- - - @Override - public TypeConverter getTypeConverter() { - return typeConverter; - } - - protected TypeConverter getOrCreateTypeConverter() { - if (typeConverter == null) { - synchronized (lock) { - if (typeConverter == null) { - setTypeConverter(createTypeConverter()); - } - } - } - return typeConverter; - } - - public void setTypeConverter(TypeConverter typeConverter) { - this.typeConverter = doAddService(typeConverter); - } - - @Override - public TypeConverterRegistry getTypeConverterRegistry() { - if (typeConverterRegistry == null) { - synchronized (lock) { - if (typeConverterRegistry == null) { - setTypeConverterRegistry(createTypeConverterRegistry()); - } - } - } - return typeConverterRegistry; - } - - @Override - public void setTypeConverterRegistry(TypeConverterRegistry typeConverterRegistry) { - this.typeConverterRegistry = doAddService(typeConverterRegistry); - // some registries are also a type converter implementation - if (typeConverterRegistry instanceof TypeConverter) { - this.typeConverter = (TypeConverter)typeConverterRegistry; - } - } - - @Override - public Injector getInjector() { - if (injector == null) { - synchronized (lock) { - if (injector == null) { - setInjector(createInjector()); - } - } - } - return injector; - } - - @Override - public void setInjector(Injector injector) { - this.injector = doAddService(injector); - } - - @Override - public PropertiesComponent getPropertiesComponent() { - if (propertiesComponent == null) { - synchronized (lock) { - if (propertiesComponent == null) { - setPropertiesComponent(createPropertiesComponent()); - } - } - } - return propertiesComponent; - } - - @Override - public void setPropertiesComponent(PropertiesComponent propertiesComponent) { - this.propertiesComponent = doAddService(propertiesComponent); - } - - @Override - public CamelBeanPostProcessor getBeanPostProcessor() { - if (beanPostProcessor == null) { - synchronized (lock) { - if (beanPostProcessor == null) { - setBeanPostProcessor(createBeanPostProcessor()); - } - } - } - return beanPostProcessor; - } - - public void setBeanPostProcessor(CamelBeanPostProcessor beanPostProcessor) { - this.beanPostProcessor = doAddService(beanPostProcessor); - } - - @Override - public ManagementMBeanAssembler getManagementMBeanAssembler() { - return managementMBeanAssembler; - } - - public void setManagementMBeanAssembler(ManagementMBeanAssembler managementMBeanAssembler) { - this.managementMBeanAssembler = doAddService(managementMBeanAssembler, false); - } - - public ComponentResolver getComponentResolver() { - if (componentResolver == null) { - synchronized (lock) { - if (componentResolver == null) { - setComponentResolver(createComponentResolver()); - } - } - } - return componentResolver; - } - - public void setComponentResolver(ComponentResolver componentResolver) { - this.componentResolver = doAddService(componentResolver); - } - - public ComponentNameResolver getComponentNameResolver() { - if (componentNameResolver == null) { - synchronized (lock) { - if (componentNameResolver == null) { - setComponentNameResolver(createComponentNameResolver()); - } - } - } - return componentNameResolver; - } - - public void setComponentNameResolver(ComponentNameResolver componentNameResolver) { - this.componentNameResolver = doAddService(componentNameResolver); - } - - public LanguageResolver getLanguageResolver() { - if (languageResolver == null) { - synchronized (lock) { - if (languageResolver == null) { - setLanguageResolver(createLanguageResolver()); - } - } - } - return languageResolver; - } - - public void setLanguageResolver(LanguageResolver languageResolver) { - this.languageResolver = doAddService(languageResolver); - } - - public ConfigurerResolver getConfigurerResolver() { - if (configurerResolver == null) { - synchronized (lock) { - if (configurerResolver == null) { - setConfigurerResolver(createConfigurerResolver()); - } - } - } - return configurerResolver; - } - - public void setConfigurerResolver(ConfigurerResolver configurerResolver) { - this.configurerResolver = doAddService(configurerResolver); - } - - public boolean isAutoCreateComponents() { - return autoCreateComponents; - } - - public void setAutoCreateComponents(boolean autoCreateComponents) { - this.autoCreateComponents = autoCreateComponents; - } - - @Override - public Registry getRegistry() { - if (registry == null) { - synchronized (lock) { - if (registry == null) { - setRegistry(createRegistry()); - } - } - } - return registry; - } - - @Override - public T getRegistry(Class type) { - Registry reg = getRegistry(); - - if (type.isAssignableFrom(reg.getClass())) { - return type.cast(reg); - } - return null; - } - - @Override - public void setRegistry(Registry registry) { - if (registry instanceof CamelContextAware) { - ((CamelContextAware)registry).setCamelContext(getCamelContextReference()); - } - this.registry = registry; - } - - @Override - public List getLifecycleStrategies() { - return lifecycleStrategies; - } - - @Override - public void addLifecycleStrategy(LifecycleStrategy lifecycleStrategy) { - getLifecycleStrategies().add(lifecycleStrategy); - } - - @Override - public void setupRoutes(boolean done) { - if (done) { - isSetupRoutes.remove(); - } else { - isSetupRoutes.set(true); - } - } - - @Override - public RestConfiguration getRestConfiguration() { - if (restConfiguration == null) { - synchronized (lock) { - if (restConfiguration == null) { - setRestConfiguration(createRestConfiguration()); - } - } - } - return restConfiguration; - } - - @Override - public void setRestConfiguration(RestConfiguration restConfiguration) { - this.restConfiguration = restConfiguration; - } - - @Override - public List getInterceptStrategies() { - return interceptStrategies; - } - - public void setInterceptStrategies(List interceptStrategies) { - this.interceptStrategies = interceptStrategies; - } - - @Override - public void addInterceptStrategy(InterceptStrategy interceptStrategy) { - getInterceptStrategies().add(interceptStrategy); - } - - @Override - public List getRoutePolicyFactories() { - return routePolicyFactories; - } - - public void setRoutePolicyFactories(List routePolicyFactories) { - this.routePolicyFactories = routePolicyFactories; - } - - @Override - public void addRoutePolicyFactory(RoutePolicyFactory routePolicyFactory) { - getRoutePolicyFactories().add(routePolicyFactory); - } - - @Override - public Set getLogListeners() { - return logListeners; - } - - @Override - public void addLogListener(LogListener listener) { - logListeners.add(listener); - } - - @Override - public void setStreamCaching(Boolean cache) { - this.streamCache = cache; - } - - @Override - public Boolean isStreamCaching() { - return streamCache; - } - - @Override - public void setTracing(Boolean tracing) { - this.trace = tracing; - } - - @Override - public Boolean isTracing() { - return trace; - } - - @Override - public String getTracingPattern() { - return tracePattern; - } - - @Override - public void setTracingPattern(String tracePattern) { - this.tracePattern = tracePattern; - } - - @Override - public Boolean isBacklogTracing() { - return backlogTrace; - } - - @Override - public void setBacklogTracing(Boolean backlogTrace) { - this.backlogTrace = backlogTrace; - } - - @Override - public void setDebugging(Boolean debug) { - this.debug = debug; - } - - @Override - public Boolean isDebugging() { - return debug; - } - - @Override - public void setMessageHistory(Boolean messageHistory) { - this.messageHistory = messageHistory; - } - - @Override - public Boolean isMessageHistory() { - return messageHistory; - } - - @Override - public void setLogMask(Boolean logMask) { - this.logMask = logMask; - } - - @Override - public Boolean isLogMask() { - return logMask != null && logMask; - } - - @Override - public Boolean isLogExhaustedMessageBody() { - return logExhaustedMessageBody; - } - - @Override - public void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody) { - this.logExhaustedMessageBody = logExhaustedMessageBody; - } - - @Override - public Long getDelayer() { - return delay; - } - - @Override - public void setDelayer(Long delay) { - this.delay = delay; - } - - @Override - public ProducerTemplate createProducerTemplate() { - return createProducerTemplate(0); - } - - @Override - public ProducerTemplate createProducerTemplate(int maximumCacheSize) { - DefaultProducerTemplate answer = new DefaultProducerTemplate(getCamelContextReference()); - answer.setMaximumCacheSize(maximumCacheSize); - // start it so its ready to use - try { - startService(answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - @Override - public FluentProducerTemplate createFluentProducerTemplate() { - return createFluentProducerTemplate(0); - } - - @Override - public FluentProducerTemplate createFluentProducerTemplate(int maximumCacheSize) { - org.apache.camel.impl.engine.DefaultFluentProducerTemplate answer = new DefaultFluentProducerTemplate(getCamelContextReference()); - answer.setMaximumCacheSize(maximumCacheSize); - // start it so its ready to use - try { - startService(answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - @Override - public ConsumerTemplate createConsumerTemplate() { - return createConsumerTemplate(0); - } - - @Override - public ConsumerTemplate createConsumerTemplate(int maximumCacheSize) { - org.apache.camel.impl.engine.DefaultConsumerTemplate answer = new DefaultConsumerTemplate(getCamelContextReference()); - answer.setMaximumCacheSize(maximumCacheSize); - // start it so its ready to use - try { - startService(answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - @Override - public ErrorHandlerFactory getErrorHandlerFactory() { - return errorHandlerFactory; - } - - @Override - public void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory) { - this.errorHandlerFactory = errorHandlerFactory; - } - - @Override - public ScheduledExecutorService getErrorHandlerExecutorService() { - if (errorHandlerExecutorService == null) { - synchronized (lock) { - if (errorHandlerExecutorService == null) { - // setup default thread pool for error handler - errorHandlerExecutorService = createErrorHandlerExecutorService(); - } - } - } - return errorHandlerExecutorService; - } - - protected ScheduledExecutorService createErrorHandlerExecutorService() { - return getExecutorServiceManager().newDefaultScheduledThreadPool("ErrorHandlerRedeliveryThreadPool", "ErrorHandlerRedeliveryTask"); - } - - public void setErrorHandlerExecutorService(ScheduledExecutorService errorHandlerExecutorService) { - this.errorHandlerExecutorService = errorHandlerExecutorService; - } - - @Override - public UnitOfWorkFactory getUnitOfWorkFactory() { - if (unitOfWorkFactory == null) { - synchronized (lock) { - if (unitOfWorkFactory == null) { - setUnitOfWorkFactory(createUnitOfWorkFactory()); - } - } - } - return unitOfWorkFactory; - } - - @Override - public void setUnitOfWorkFactory(UnitOfWorkFactory unitOfWorkFactory) { - this.unitOfWorkFactory = doAddService(unitOfWorkFactory); - } - - @Override - public RuntimeEndpointRegistry getRuntimeEndpointRegistry() { - return runtimeEndpointRegistry; - } - - @Override - public void setRuntimeEndpointRegistry(RuntimeEndpointRegistry runtimeEndpointRegistry) { - this.runtimeEndpointRegistry = doAddService(runtimeEndpointRegistry); - } - - @Override - public String getUptime() { - long delta = getUptimeMillis(); - if (delta == 0) { - return ""; - } - return TimeUtils.printDuration(delta); - } - - @Override - public long getUptimeMillis() { - if (startDate == null) { - return 0; - } - return new Date().getTime() - startDate.getTime(); - } - - @Override - public Date getStartDate() { - return startDate; - } - - @Override - public boolean isEventNotificationApplicable() { - return eventNotificationApplicable; - } - - @Override - public void setEventNotificationApplicable(boolean eventNotificationApplicable) { - this.eventNotificationApplicable = eventNotificationApplicable; - } - - @Override - public String getVersion() { - if (version == null) { - synchronized (lock) { - if (version == null) { - version = doGetVersion(); - } - } - } - return version; - } - - private String doGetVersion() { - String version = null; - - InputStream is = null; - // try to load from maven properties first - try { - Properties p = new Properties(); - is = getClass().getResourceAsStream("/META-INF/maven/org.apache.camel/camel-base/pom.properties"); - if (is != null) { - p.load(is); - version = p.getProperty("version", ""); - } - } catch (Exception e) { - // ignore - } finally { - if (is != null) { - IOHelper.close(is); - } - } - - // fallback to using Java API - if (version == null) { - Package aPackage = getClass().getPackage(); - if (aPackage != null) { - version = aPackage.getImplementationVersion(); - if (version == null) { - version = aPackage.getSpecificationVersion(); - } - } - } - - if (version == null) { - // we could not compute the version so use a blank - version = ""; - } - - return version; - } - - @Override - protected void doSuspend() throws Exception { - EventHelper.notifyCamelContextSuspending(this); - - LOG.info("Apache Camel {} ({}) is suspending", getVersion(), getName()); - StopWatch watch = new StopWatch(); - - // update list of started routes to be suspended - // because we only want to suspend started routes - // (so when we resume we only resume the routes which actually was - // suspended) - for (Map.Entry entry : getRouteServices().entrySet()) { - if (entry.getValue().getStatus().isStarted()) { - suspendedRouteServices.put(entry.getKey(), entry.getValue()); - } - } - - // assemble list of startup ordering so routes can be shutdown - // accordingly - List orders = new ArrayList<>(); - for (Map.Entry entry : suspendedRouteServices.entrySet()) { - Route route = entry.getValue().getRoute(); - Integer order = route.getStartupOrder(); - if (order == null) { - order = defaultRouteStartupOrder++; - } - orders.add(new DefaultRouteStartupOrder(order, route, entry.getValue())); - } - - // suspend routes using the shutdown strategy so it can shutdown in - // correct order - // routes which doesn't support suspension will be stopped instead - getShutdownStrategy().suspend(this, orders); - - // mark the route services as suspended or stopped - for (org.apache.camel.impl.engine.RouteService service : suspendedRouteServices.values()) { - if (routeSupportsSuspension(service.getId())) { - service.suspend(); - } else { - service.stop(); - } - } - - watch.taken(); - if (LOG.isInfoEnabled()) { - LOG.info("Apache Camel {} ({}) is suspended in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken())); - } - - EventHelper.notifyCamelContextSuspended(this); - } - - @Override - protected void doResume() throws Exception { - try { - EventHelper.notifyCamelContextResuming(this); - - LOG.info("Apache Camel {} ({}) is resuming", getVersion(), getName()); - StopWatch watch = new StopWatch(); - - // start the suspended routes (do not check for route clashes, and - // indicate) - internalRouteStartupManager.doStartOrResumeRoutes(suspendedRouteServices, false, true, true, false); - - // mark the route services as resumed (will be marked as started) as - // well - for (org.apache.camel.impl.engine.RouteService service : suspendedRouteServices.values()) { - if (routeSupportsSuspension(service.getId())) { - service.resume(); - } else { - service.start(); - } - } - - if (LOG.isInfoEnabled()) { - LOG.info("Resumed {} routes", suspendedRouteServices.size()); - LOG.info("Apache Camel {} ({}) resumed in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken())); - } - - // and clear the list as they have been resumed - suspendedRouteServices.clear(); - - EventHelper.notifyCamelContextResumed(this); - } catch (Exception e) { - EventHelper.notifyCamelContextResumeFailed(this, e); - throw e; - } - } - - // Implementation methods - // ----------------------------------------------------------------------- - - @Override - protected AutoCloseable doLifecycleChange() { - return new LifecycleHelper(); - } - - @Override - public void init() { - super.init(); - - // was the initialization vetoed? - if (vetoed != null) { - if (vetoed.isRethrowException()) { - throw RuntimeCamelException.wrapRuntimeException(vetoed); - } else { - LOG.info("CamelContext ({}) vetoed to not initialize due to {}", getName(), vetoed.getMessage()); - // swallow exception and change state of this camel context to stopped - fail(vetoed); - return; - } - } - } - - @Override - public void start() { - super.start(); - - // - // We need to perform the following actions after the {@link #start()} method - // is called, so that the state of the {@link CamelContext} is Started. - // - - // did the start veto? - if (vetoed != null) { - if (vetoed.isRethrowException()) { - throw RuntimeCamelException.wrapRuntimeException(vetoed); - } else { - LOG.info("CamelContext ({}) vetoed to not start due to {}", getName(), vetoed.getMessage()); - // swallow exception and change state of this camel context to stopped - stop(); - return; - } - } - - // okay the routes has been started so emit event that CamelContext - // has started (here at the end) - EventHelper.notifyCamelContextStarted(this); - - // now call the startup listeners where the routes has been started - for (StartupListener startup : startupListeners) { - try { - startup.onCamelContextFullyStarted(this, isStarted()); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - } - - @Override - public void doBuild() throws Exception { - // Initialize LRUCacheFactory as eager as possible, - // to let it warm up concurrently while Camel is startup up - if (initialization != Initialization.Lazy) { - LRUCacheFactory.init(); - } - - // Setup management first since end users may use it to add event - // notifiers using the management strategy before the CamelContext has been started - setupManagement(null); - - // setup health-check registry as its needed this early phase for 3rd party to register custom repositories - HealthCheckRegistry hcr = getExtension(HealthCheckRegistry.class); - if (hcr == null) { - hcr = createHealthCheckRegistry(); - if (hcr != null) { - // install health-check registry if it was discovered from classpath (camel-health) - hcr.setCamelContext(this); - setExtension(HealthCheckRegistry.class, hcr); - } - } - - // Call all registered trackers with this context - // Note, this may use a partially constructed object - CamelContextTracker.notifyContextCreated(this); - - // Setup type converter eager as its highly in use and should not be lazy initialized - if (eagerCreateTypeConverter()) { - getOrCreateTypeConverter(); - } - } - - @Override - public void doInit() throws Exception { - // start the route controller - this.routeController = getRouteController(); - ServiceHelper.initService(this.routeController); - - // optimize - before starting routes lets check if event notifications is possible - eventNotificationApplicable = EventHelper.eventsApplicable(this); - - // ensure additional type converters is loaded - if (loadTypeConverters && typeConverter instanceof AnnotationScanTypeConverters) { - ((AnnotationScanTypeConverters) typeConverter).scanTypeConverters(); - } - - // custom properties may use property placeholders so resolve those - // early on - if (globalOptions != null && !globalOptions.isEmpty()) { - for (Map.Entry entry : globalOptions.entrySet()) { - String key = entry.getKey(); - String value = entry.getValue(); - if (value != null) { - String replaced = resolvePropertyPlaceholders(value); - if (!value.equals(replaced)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Camel property with key {} replaced value from {} -> {}", key, value, replaced); - } - entry.setValue(replaced); - } - } - } - } - - forceLazyInitialization(); - - addService(getManagementStrategy(), false); - ServiceHelper.initService(lifecycleStrategies); - for (LifecycleStrategy strategy : lifecycleStrategies) { - try { - strategy.onContextInitialized(this); - } catch (VetoCamelContextStartException e) { - // okay we should not start Camel since it was vetoed - LOG.warn("Lifecycle strategy " + strategy + " vetoed initializing CamelContext ({}) due to: {}", getName(), e.getMessage()); - throw e; - } catch (Exception e) { - LOG.warn("Lifecycle strategy " + strategy + " failed initializing CamelContext ({}) due to: {}", getName(), e.getMessage()); - throw e; - } - } - - // optimize - before starting routes lets check if event notifications is possible - eventNotificationApplicable = EventHelper.eventsApplicable(this); - - // start notifiers as services - for (EventNotifier notifier : getManagementStrategy().getEventNotifiers()) { - if (notifier instanceof Service) { - Service service = (Service) notifier; - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onServiceAdd(getCamelContextReference(), service, null); - } - } - ServiceHelper.initService(notifier); - } - - EventHelper.notifyCamelContextInitializing(this); - - // re-create endpoint registry as the cache size limit may be set after the constructor of this instance was called. - // and we needed to create endpoints up-front as it may be accessed before this context is started - endpoints = doAddService(createEndpointRegistry(endpoints)); - - // optimised to not include runtimeEndpointRegistry unless startServices - // is enabled or JMX statistics is in extended mode - if (runtimeEndpointRegistry == null && getManagementStrategy() != null && getManagementStrategy().getManagementAgent() != null) { - Boolean isEnabled = getManagementStrategy().getManagementAgent().getEndpointRuntimeStatisticsEnabled(); - boolean isExtended = getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended(); - // extended mode is either if we use Extended statistics level or - // the option is explicit enabled - boolean extended = isExtended || isEnabled != null && isEnabled; - if (extended) { - runtimeEndpointRegistry = new DefaultRuntimeEndpointRegistry(); - } - } - if (runtimeEndpointRegistry != null) { - if (runtimeEndpointRegistry instanceof EventNotifier && getManagementStrategy() != null) { - getManagementStrategy().addEventNotifier((EventNotifier)runtimeEndpointRegistry); - } - addService(runtimeEndpointRegistry, true, true); - } - - bindDataFormats(); - - // start components - ServiceHelper.initService(components.values()); - - // start the route definitions before the routes is started - startRouteDefinitions(); - - EventHelper.notifyCamelContextInitialized(this); - } - - @Override - protected void doStart() throws Exception { - try { - doStartContext(); - } catch (Exception e) { - // fire event that we failed to start - EventHelper.notifyCamelContextStartupFailed(AbstractCamelContext.this, e); - // rethrow cause - throw e; - } - } - - protected void doStartContext() throws Exception { - LOG.info("Apache Camel {} ({}) is starting", getVersion(), getName()); - vetoed = null; - startDate = new Date(); - stopWatch.restart(); - - // Start the route controller - ServiceHelper.startService(this.routeController); - - doNotStartRoutesOnFirstStart = !firstStartDone && !isAutoStartup(); - - // if the context was configured with auto startup = false, and we - // are already started, - // then we may need to start the routes on the 2nd start call - if (firstStartDone && !isAutoStartup() && isStarted()) { - // invoke this logic to warm up the routes and if possible also - // start the routes - try { - internalRouteStartupManager.doStartOrResumeRoutes(routeServices, true, true, false, true); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - - // super will invoke doStart which will prepare internal services - // and start routes etc. - try { - firstStartDone = true; - doStartCamel(); - } catch (Exception e) { - VetoCamelContextStartException veto = ObjectHelper.getException(VetoCamelContextStartException.class, e); - if (veto != null) { - // mark we veto against starting Camel - vetoed = veto; - return; - } else { - LOG.error("Error starting CamelContext (" + getName() + ") due to exception thrown: " + e.getMessage(), e); - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - - if (LOG.isInfoEnabled()) { - // count how many routes are actually started - int started = 0; - for (Route route : getRoutes()) { - ServiceStatus status = getRouteStatus(route.getId()); - if (status != null && status.isStarted()) { - started++; - } - } - - final Collection controlledRoutes = getRouteController().getControlledRoutes(); - if (controlledRoutes.isEmpty()) { - LOG.info("Total {} routes, of which {} are started", getRoutes().size(), started); - } else { - LOG.info("Total {} routes, of which {} are started, and {} are managed by RouteController: {}", getRoutes().size(), started, controlledRoutes.size(), - getRouteController().getClass().getName()); - } - LOG.info("Apache Camel {} ({}) started in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken())); - } - } - - protected void doStartCamel() throws Exception { - if (LOG.isDebugEnabled()) { - LOG.debug("Using ClassResolver={}, PackageScanClassResolver={}, ApplicationContextClassLoader={}, RouteController={}", getClassResolver(), - getPackageScanClassResolver(), getApplicationContextClassLoader(), getRouteController()); - } - if (isStreamCaching()) { - LOG.info("StreamCaching is enabled on CamelContext: {}", getName()); - } - if (isBacklogTracing()) { - // tracing is added in the DefaultChannel so we can enable it on the fly - LOG.info("Backlog Tracing is enabled on CamelContext: {}", getName()); - } - if (isTracing()) { - // tracing is added in the DefaultChannel so we can enable it on the fly - LOG.info("Tracing is enabled on CamelContext: {}", getName()); - } - if (isUseMDCLogging()) { - // log if MDC has been enabled - String pattern = getMDCLoggingKeysPattern(); - if (pattern != null) { - LOG.info("MDC logging (keys-pattern: {}) is enabled on CamelContext: {}", pattern, getName()); - } else { - LOG.info("MDC logging is enabled on CamelContext: {}", getName()); - } - } - if (getDelayer() != null && getDelayer() > 0) { - LOG.info("Delayer is enabled with: {} ms. on CamelContext: {}", getDelayer(), getName()); - } - - // start management strategy before lifecycles are started - ManagementStrategy managementStrategy = getManagementStrategy(); - startService(managementStrategy); - - // start lifecycle strategies - ServiceHelper.startService(lifecycleStrategies); - for (LifecycleStrategy strategy : lifecycleStrategies) { - try { - strategy.onContextStart(this); - } catch (VetoCamelContextStartException e) { - // okay we should not start Camel since it was vetoed - LOG.warn("Lifecycle strategy " + strategy + " vetoed starting CamelContext ({}) due to: {}", getName(), e.getMessage()); - throw e; - } catch (Exception e) { - LOG.warn("Lifecycle strategy " + strategy + " failed starting CamelContext ({}) due to: {}", getName(), e.getMessage()); - throw e; - } - } - - // sort the startup listeners so they are started in the right order - startupListeners.sort(OrderedComparator.get()); - // now call the startup listeners where the routes has been warmed up - // (only the actual route consumer has not yet been started) - for (StartupListener startup : startupListeners) { - startup.onCamelContextStarting(getCamelContextReference(), isStarted()); - } - - // start notifiers as services - for (EventNotifier notifier : getManagementStrategy().getEventNotifiers()) { - if (notifier instanceof Service) { - startService((Service)notifier); - } - } - - // must let some bootstrap service be started before we can notify the starting event - EventHelper.notifyCamelContextStarting(this); - - // start components - startServices(components.values()); - - if (isUseDataType()) { - // log if DataType has been enabled - LOG.info("Message DataType is enabled on CamelContext: {}", getName()); - } - - // is there any stream caching enabled then log an info about this and - // its limit of spooling to disk, so people is aware of this - if (isStreamCachingInUse()) { - // stream caching is in use so enable the strategy - getStreamCachingStrategy().setEnabled(true); - } else { - // log if stream caching is not in use as this can help people to - // enable it if they use streams - LOG.info("StreamCaching is not in use. If using streams then its recommended to enable stream caching." - + " See more details at http://camel.apache.org/stream-caching.html"); - } - - if (isAllowUseOriginalMessage()) { - LOG.debug("AllowUseOriginalMessage enabled because UseOriginalMessage is in use"); - } - - LOG.debug("Using HeadersMapFactory: {}", getHeadersMapFactory()); - if (isCaseInsensitiveHeaders() && !getHeadersMapFactory().isCaseInsensitive()) { - LOG.info("HeadersMapFactory: {} is case-sensitive which can cause problems for protocols such as HTTP based, which rely on case-insensitive headers.", - getHeadersMapFactory()); - } else if (!isCaseInsensitiveHeaders()) { - // notify user that the headers are sensitive which can be a problem - LOG.info("Case-insensitive headers is not in use. This can cause problems for protocols such as HTTP based, which rely on case-insensitive headers."); - } - - // lets log at INFO level if we are not using the default reactive executor - if (!getReactiveExecutor().getClass().getSimpleName().equals("DefaultReactiveExecutor")) { - LOG.info("Using ReactiveExecutor: {}", getReactiveExecutor()); - } else { - LOG.debug("Using ReactiveExecutor: {}", getReactiveExecutor()); - } - - HealthCheckRegistry hcr = getExtension(HealthCheckRegistry.class); - if (hcr != null && hcr.isEnabled()) { - LOG.info("Using HealthCheck: {}", hcr.getId()); - } - - // start routes - if (doNotStartRoutesOnFirstStart) { - LOG.debug("Skip starting routes as CamelContext has been configured with autoStartup=false"); - } - - // invoke this logic to warmup the routes and if possible also start the routes - EventHelper.notifyCamelContextRoutesStarting(this); - internalRouteStartupManager.doStartOrResumeRoutes(routeServices, true, !doNotStartRoutesOnFirstStart, false, true); - EventHelper.notifyCamelContextRoutesStarted(this); - - long cacheCounter = beanIntrospection != null ? beanIntrospection.getCachedClassesCounter() : 0; - if (cacheCounter > 0) { - LOG.debug("Clearing BeanIntrospection cache with {} objects using during starting Camel", cacheCounter); - beanIntrospection.clearCache(); - } - long invokedCounter = beanIntrospection != null ? beanIntrospection.getInvokedCounter() : 0; - if (invokedCounter > 0) { - LOG.debug("BeanIntrospection invoked {} times during starting Camel", invokedCounter); - } - - // starting will continue in the start method - } - - @Override - protected void doStop() throws Exception { - stopWatch.restart(); - LOG.info("Apache Camel {} ({}) is shutting down", getVersion(), getName()); - EventHelper.notifyCamelContextStopping(this); - EventHelper.notifyCamelContextRoutesStopping(this); - - // Stop the route controller - ServiceHelper.stopAndShutdownService(this.routeController); - - // stop route inputs in the same order as they was started so we stop - // the very first inputs first - try { - // force shutting down routes as they may otherwise cause shutdown to hang - if (shutdownStrategy != null) { - shutdownStrategy.shutdownForced(this, getRouteStartupOrder()); - } - } catch (Throwable e) { - LOG.warn("Error occurred while shutting down routes. This exception will be ignored.", e); - } - - // shutdown await manager to trigger interrupt of blocked threads to - // attempt to free these threads graceful - shutdownServices(asyncProcessorAwaitManager); - - // we need also to include routes which failed to start to ensure all resources get stopped when stopping Camel - for (org.apache.camel.impl.engine.RouteService routeService : routeServices.values()) { - boolean found = routeStartupOrder.stream().anyMatch(o -> o.getRoute().getId().equals(routeService.getId())); - if (!found) { - LOG.debug("Route: {} which failed to startup will be stopped", routeService.getId()); - routeStartupOrder.add(internalRouteStartupManager.doPrepareRouteToBeStarted(routeService)); - } - } - - routeStartupOrder.sort(Comparator.comparingInt(RouteStartupOrder::getStartupOrder).reversed()); - List list = new ArrayList<>(); - for (RouteStartupOrder startupOrder : routeStartupOrder) { - DefaultRouteStartupOrder order = (DefaultRouteStartupOrder)startupOrder; - org.apache.camel.impl.engine.RouteService routeService = order.getRouteService(); - list.add(routeService); - } - shutdownServices(list, false); - // do not clear route services or startup listeners as we can start - // Camel again and get the route back as before - routeStartupOrder.clear(); - - EventHelper.notifyCamelContextRoutesStopped(this); - - // but clear any suspend routes - suspendedRouteServices.clear(); - - // stop consumers from the services to close first, such as POJO - // consumer (eg @Consumer) - // which we need to stop after the routes, as a POJO consumer is - // essentially a route also - for (Service service : servicesToStop) { - if (service instanceof Consumer) { - shutdownServices(service); - } - } - - // the stop order is important - - // shutdown default error handler thread pool - if (errorHandlerExecutorService != null) { - // force shutting down the thread pool - getExecutorServiceManager().shutdownNow(errorHandlerExecutorService); - errorHandlerExecutorService = null; - } - - // shutdown debugger - ServiceHelper.stopAndShutdownService(getDebugger()); - - shutdownServices(endpoints.values()); - endpoints.clear(); - - shutdownServices(components.values()); - components.clear(); - - shutdownServices(languages.values()); - languages.clear(); - - try { - for (LifecycleStrategy strategy : lifecycleStrategies) { - strategy.onContextStop(this); - } - } catch (Throwable e) { - LOG.warn("Error occurred while stopping lifecycle strategies. This exception will be ignored.", e); - } - - // shutdown services as late as possible (except type converters as they may be needed during the remainder of the stopping) - shutdownServices(servicesToStop); - servicesToStop.clear(); - - // must notify that we are stopped before stopping the management strategy - EventHelper.notifyCamelContextStopped(this); - - // stop the notifier service - if (getManagementStrategy() != null) { - for (EventNotifier notifier : getManagementStrategy().getEventNotifiers()) { - shutdownServices(notifier); - } - } - - // shutdown executor service, reactive executor and management as the last one - shutdownServices(executorServiceManager); - shutdownServices(reactiveExecutor); - shutdownServices(managementStrategy); - shutdownServices(managementMBeanAssembler); - shutdownServices(lifecycleStrategies); - // do not clear lifecycleStrategies as we can start Camel again and get - // the route back as before - - // shutdown type converter as late as possible - ServiceHelper.stopService(typeConverter); - ServiceHelper.stopService(typeConverterRegistry); - - // stop the lazy created so they can be re-created on restart - forceStopLazyInitialization(); - - if (LOG.isInfoEnabled()) { - LOG.info("Apache Camel {} ({}) uptime {}", getVersion(), getName(), getUptime()); - LOG.info("Apache Camel {} ({}) is shutdown in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken())); - } - - // and clear start date - startDate = null; - - // Call all registered trackers with this context - // Note, this may use a partially constructed object - CamelContextTracker.notifyContextDestroyed(this); - } - - public void startRouteDefinitions() throws Exception { - } - - protected boolean isStreamCachingInUse() throws Exception { - return isStreamCaching(); - } - - protected void bindDataFormats() throws Exception { - } - - protected boolean routeSupportsSuspension(String routeId) { - org.apache.camel.impl.engine.RouteService routeService = routeServices.get(routeId); - if (routeService != null) { - return routeService.getRoute().supportsSuspension(); - } - return false; - } - - private void shutdownServices(Object service) { - // do not rethrow exception as we want to keep shutting down in case of - // problems - - // allow us to do custom work before delegating to service helper - try { - if (service instanceof Service) { - ServiceHelper.stopAndShutdownService(service); - } else if (service instanceof Collection) { - ServiceHelper.stopAndShutdownServices((Collection)service); - } - } catch (Throwable e) { - LOG.warn("Error occurred while shutting down service: " + service + ". This exception will be ignored.", e); - // fire event - EventHelper.notifyServiceStopFailure(this, service, e); - } - } - - private void shutdownServices(Collection services) { - // reverse stopping by default - shutdownServices(services, true); - } - - private void shutdownServices(Collection services, boolean reverse) { - Collection list = services; - if (reverse) { - List reverseList = new ArrayList<>(services); - Collections.reverse(reverseList); - list = reverseList; - } - - for (Object service : list) { - shutdownServices(service); - } - } - - void startService(Service service) throws Exception { - // and register startup aware so they can be notified when - // camel context has been started - if (service instanceof StartupListener) { - StartupListener listener = (StartupListener)service; - addStartupListener(listener); - } - - if (service instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware)service; - aware.setCamelContext(getCamelContextReference()); - } - - service.start(); - } - - private void startServices(Collection services) throws Exception { - for (Object element : services) { - if (element instanceof Service) { - startService((Service)element); - } - } - } - - private void stopServices(Object service) throws Exception { - // allow us to do custom work before delegating to service helper - try { - ServiceHelper.stopService(service); - } catch (Exception e) { - // fire event - EventHelper.notifyServiceStopFailure(getCamelContextReference(), service, e); - // rethrow to signal error with stopping - throw e; - } - } - - /** - * Starts the given route service - */ - public synchronized void startRouteService(org.apache.camel.impl.engine.RouteService routeService, boolean addingRoutes) throws Exception { - // we may already be starting routes so remember this, so we can unset - // accordingly in finally block - boolean alreadyStartingRoutes = isStartingRoutes(); - if (!alreadyStartingRoutes) { - setStartingRoutes(true); - } - - try { - // the route service could have been suspended, and if so then - // resume it instead - if (routeService.getStatus().isSuspended()) { - resumeRouteService(routeService); - } else { - // start the route service - routeServices.put(routeService.getId(), routeService); - if (shouldStartRoutes()) { - // this method will log the routes being started - internalRouteStartupManager.safelyStartRouteServices(true, true, true, false, addingRoutes, routeService); - // start route services if it was configured to auto startup - // and we are not adding routes - boolean autoStartup = routeService.isAutoStartup(); - if (!addingRoutes || autoStartup) { - // start the route since auto start is enabled or we are - // starting a route (not adding new routes) - routeService.start(); - } - } - } - } finally { - if (!alreadyStartingRoutes) { - setStartingRoutes(false); - } - } - } - - /** - * Resumes the given route service - */ - protected synchronized void resumeRouteService(org.apache.camel.impl.engine.RouteService routeService) throws Exception { - // the route service could have been stopped, and if so then start it - // instead - if (!routeService.getStatus().isSuspended()) { - startRouteService(routeService, false); - } else { - // resume the route service - if (shouldStartRoutes()) { - // this method will log the routes being started - internalRouteStartupManager.safelyStartRouteServices(true, false, true, true, false, routeService); - // must resume route service as well - routeService.resume(); - } - } - } - - protected synchronized void stopRouteService(org.apache.camel.impl.engine.RouteService routeService, boolean removingRoutes) throws Exception { - routeService.setRemovingRoutes(removingRoutes); - stopRouteService(routeService); - } - - protected void logRouteState(Route route, String state) { - if (LOG.isInfoEnabled()) { - if (route.getConsumer() != null) { - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = route.getEndpoint().getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - LOG.info("Route: {} is {}, was consuming from: {}", route.getId(), state, uri); - } else { - LOG.info("Route: {} is {}.", route.getId(), state); - } - } - } - - protected synchronized void stopRouteService(org.apache.camel.impl.engine.RouteService routeService) throws Exception { - routeService.stop(); - logRouteState(routeService.getRoute(), "stopped"); - } - - protected synchronized void shutdownRouteService(org.apache.camel.impl.engine.RouteService routeService) throws Exception { - routeService.shutdown(); - logRouteState(routeService.getRoute(), "shutdown and removed"); - } - - protected synchronized void suspendRouteService(org.apache.camel.impl.engine.RouteService routeService) throws Exception { - routeService.setRemovingRoutes(false); - routeService.suspend(); - logRouteState(routeService.getRoute(), "suspended"); - } - - /** - * Force some lazy initialization to occur upfront before we start any - * components and create routes - */ - protected void forceLazyInitialization() { - initEagerMandatoryServices(); - - if (initialization != Initialization.Lazy) { - doStartStandardServices(); - - if (initialization == Initialization.Eager) { - doStartEagerServices(); - } - } - } - - /** - * Initializes eager some mandatory services which needs to warmup and - * be ready as this helps optimize Camel at runtime. - */ - protected void initEagerMandatoryServices() { - if (headersMapFactory == null) { - // we want headers map to be created as then JVM can optimize using it as we use it per exchange/message - synchronized (lock) { - if (headersMapFactory == null) { - if (isCaseInsensitiveHeaders()) { - // use factory to find the map factory to use - setHeadersMapFactory(createHeadersMapFactory()); - } else { - // case sensitive so we can use hash map - setHeadersMapFactory(new HashMapHeadersMapFactory()); - } - } - } - } - } - - - protected void doStartStandardServices() { - getVersion(); - getTypeConverter(); - getTypeConverterRegistry(); - getInjector(); - getRegistry(); - getLanguageResolver(); - getConfigurerResolver(); - getExecutorServiceManager(); - getInflightRepository(); - getAsyncProcessorAwaitManager(); - getShutdownStrategy(); - getPackageScanClassResolver(); - try { - getRestRegistryFactory(); - } catch (IllegalArgumentException e) { - // ignore in case camel-rest is not on the classpath - } - getReactiveExecutor(); - getBeanIntrospection(); - getPropertiesComponent(); - - if (isTypeConverterStatisticsEnabled() != null) { - getTypeConverterRegistry().getStatistics().setStatisticsEnabled(isTypeConverterStatisticsEnabled()); - } - - // resolve simple language to initialize it - resolveLanguage("simple"); - } - - protected void doStartEagerServices() { - getFactoryFinderResolver(); - getDefaultFactoryFinder(); - getComponentResolver(); - getComponentNameResolver(); - getDataFormatResolver(); - getManagementStrategy(); - getHeadersMapFactory(); - getXMLRoutesDefinitionLoader(); - getModelToXMLDumper(); - getClassResolver(); - getNodeIdFactory(); - getProcessorFactory(); - getModelJAXBContextFactory(); - getUuidGenerator(); - getUnitOfWorkFactory(); - getRouteController(); - try { - getBeanProxyFactory(); - getBeanProcessorFactory(); - } catch (IllegalArgumentException e) { - // ignore in case camel-bean is not on the classpath - } - getBeanPostProcessor(); - } - - /** - * Force clear lazy initialization so they can be re-created on restart - */ - protected void forceStopLazyInitialization() { - injector = null; - languageResolver = null; - dataFormatResolver = null; - componentResolver = null; - typeConverterRegistry = null; - typeConverter = null; - reactiveExecutor = null; - } - - /** - * A pluggable strategy to allow an endpoint to be created without requiring - * a component to be its factory, such as for looking up the URI inside some - * {@link Registry} - * - * @param uri the uri for the endpoint to be created - * @return the newly created endpoint or null if it could not be resolved - */ - protected Endpoint createEndpoint(String uri) { - Object value = getRegistry().lookupByName(uri); - if (value instanceof Endpoint) { - return (Endpoint)value; - } else if (value instanceof Processor) { - return new ProcessorEndpoint(uri, getCamelContextReference(), (Processor)value); - } else if (value != null) { - return convertBeanToEndpoint(uri, value); - } - return null; - } - - /** - * Strategy method for attempting to convert the bean from a - * {@link Registry} to an endpoint using some kind of transformation or - * wrapper - * - * @param uri the uri for the endpoint (and name in the registry) - * @param bean the bean to be converted to an endpoint, which will be not - * null - * @return a new endpoint - */ - protected Endpoint convertBeanToEndpoint(String uri, Object bean) { - throw new IllegalArgumentException("uri: " + uri + " bean: " + bean + " could not be converted to an Endpoint"); - } - - /** - * Should we start newly added routes? - */ - protected boolean shouldStartRoutes() { - return isStarted() && !isStarting(); - } - - @Override - public Map getGlobalOptions() { - return globalOptions; - } - - @Override - public void setGlobalOptions(Map globalOptions) { - this.globalOptions = globalOptions; - } - - @Override - public FactoryFinder getDefaultFactoryFinder() { - return getFactoryFinder(FactoryFinder.DEFAULT_PATH); - } - - @Override - public FactoryFinderResolver getFactoryFinderResolver() { - if (factoryFinderResolver == null) { - synchronized (lock) { - if (factoryFinderResolver == null) { - factoryFinderResolver = createFactoryFinderResolver(); - } - } - } - return factoryFinderResolver; - } - - @Override - public void setFactoryFinderResolver(FactoryFinderResolver factoryFinderResolver) { - this.factoryFinderResolver = doAddService(factoryFinderResolver); - } - - @Override - public FactoryFinder getFactoryFinder(String path) { - return factories.computeIfAbsent(path, this::createFactoryFinder); - } - - protected FactoryFinder createFactoryFinder(String path) { - return getFactoryFinderResolver().resolveFactoryFinder(getClassResolver(), path); - } - - @Override - public ClassResolver getClassResolver() { - if (classResolver == null) { - synchronized (lock) { - if (classResolver == null) { - setClassResolver(createClassResolver()); - } - } - } - return classResolver; - } - - @Override - public void setClassResolver(ClassResolver classResolver) { - this.classResolver = doAddService(classResolver); - } - - @Override - public PackageScanClassResolver getPackageScanClassResolver() { - if (packageScanClassResolver == null) { - synchronized (lock) { - if (packageScanClassResolver == null) { - setPackageScanClassResolver(createPackageScanClassResolver()); - } - } - } - return packageScanClassResolver; - } - - @Override - public void setPackageScanClassResolver(PackageScanClassResolver packageScanClassResolver) { - this.packageScanClassResolver = doAddService(packageScanClassResolver); - } - - @Override - public PackageScanResourceResolver getPackageScanResourceResolver() { - if (packageScanResourceResolver == null) { - synchronized (lock) { - if (packageScanResourceResolver == null) { - setPackageScanResourceResolver(createPackageScanResourceResolver()); - } - } - } - return packageScanResourceResolver; - } - - @Override - public void setPackageScanResourceResolver(PackageScanResourceResolver packageScanResourceResolver) { - this.packageScanResourceResolver = doAddService(packageScanResourceResolver); - } - - @Override - public List getComponentNames() { - return new ArrayList<>(components.keySet()); - } - - @Override - public List getLanguageNames() { - return new ArrayList<>(languages.keySet()); - } - - @Override - public ModelJAXBContextFactory getModelJAXBContextFactory() { - if (modelJAXBContextFactory == null) { - synchronized (lock) { - if (modelJAXBContextFactory == null) { - setModelJAXBContextFactory(createModelJAXBContextFactory()); - } - } - } - return modelJAXBContextFactory; - } - - @Override - public void setModelJAXBContextFactory(final ModelJAXBContextFactory modelJAXBContextFactory) { - this.modelJAXBContextFactory = doAddService(modelJAXBContextFactory); - } - - @Override - public NodeIdFactory getNodeIdFactory() { - if (nodeIdFactory == null) { - synchronized (lock) { - if (nodeIdFactory == null) { - setNodeIdFactory(createNodeIdFactory()); - } - } - } - return nodeIdFactory; - } - - @Override - public void setNodeIdFactory(NodeIdFactory idFactory) { - this.nodeIdFactory = doAddService(idFactory); - } - - @Override - public ManagementStrategy getManagementStrategy() { - return managementStrategy; - } - - @Override - public void setManagementStrategy(ManagementStrategy managementStrategy) { - this.managementStrategy = managementStrategy; - } - - @Override - public void disableJMX() { - if (isNew()) { - disableJMX = true; - } else if (isInit() || isBuild()) { - disableJMX = true; - // we are still in initializing mode, so we can disable JMX, by - // setting up management again - setupManagement(null); - } else { - throw new IllegalStateException("Disabling JMX can only be done when CamelContext has not been started"); - } - } - - public boolean isJMXDisabled() { - String override = System.getProperty("org.apache.camel.jmx.disabled"); - if (override != null) { - return "true".equals(override); - } else { - return disableJMX; - } - } - - @Override - public void setupManagement(Map options) { - LOG.trace("Setting up management"); - - ManagementStrategyFactory factory = null; - if (!isJMXDisabled()) { - try { - FactoryFinder finder = getFactoryFinder("META-INF/services/org/apache/camel/management/"); - if (finder != null) { - Object object = finder.newInstance("ManagementStrategyFactory").orElse(null); - if (object instanceof ManagementStrategyFactory) { - factory = (ManagementStrategyFactory)object; - } - } - } catch (Exception e) { - LOG.warn("Cannot create JmxManagementStrategyFactory. Will fallback and disable JMX.", e); - } - } - if (factory == null) { - factory = new DefaultManagementStrategyFactory(); - } - LOG.debug("Setting up management with factory: {}", factory); - - // preserve any existing event notifiers that may have been already added - List notifiers = null; - if (managementStrategy != null) { - notifiers = managementStrategy.getEventNotifiers(); - } - - try { - ManagementStrategy strategy = factory.create(getCamelContextReference(), options); - if (notifiers != null) { - notifiers.forEach(strategy::addEventNotifier); - } - LifecycleStrategy lifecycle = factory.createLifecycle(this); - factory.setupManagement(this, strategy, lifecycle); - } catch (Exception e) { - LOG.warn("Error setting up management due " + e.getMessage()); - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - @Override - public InflightRepository getInflightRepository() { - if (inflightRepository == null) { - synchronized (lock) { - if (inflightRepository == null) { - setInflightRepository(createInflightRepository()); - } - } - } - return inflightRepository; - } - - @Override - public void setInflightRepository(InflightRepository repository) { - this.inflightRepository = doAddService(repository); - } - - @Override - public AsyncProcessorAwaitManager getAsyncProcessorAwaitManager() { - if (asyncProcessorAwaitManager == null) { - synchronized (lock) { - if (asyncProcessorAwaitManager == null) { - setAsyncProcessorAwaitManager(createAsyncProcessorAwaitManager()); - } - } - } - return asyncProcessorAwaitManager; - } - - @Override - public void setAsyncProcessorAwaitManager(AsyncProcessorAwaitManager asyncProcessorAwaitManager) { - this.asyncProcessorAwaitManager = doAddService(asyncProcessorAwaitManager); - } - - @Override - public BeanIntrospection getBeanIntrospection() { - if (beanIntrospection == null) { - synchronized (lock) { - if (beanIntrospection == null) { - setBeanIntrospection(createBeanIntrospection()); - } - } - } - return beanIntrospection; - } - - @Override - public void setBeanIntrospection(BeanIntrospection beanIntrospection) { - this.beanIntrospection = doAddService(beanIntrospection); - } - - @Override - public void setAutoStartup(Boolean autoStartup) { - this.autoStartup = autoStartup; - } - - @Override - public Boolean isAutoStartup() { - return autoStartup != null && autoStartup; - } - - @Override - public Boolean isLoadTypeConverters() { - return loadTypeConverters != null && loadTypeConverters; - } - - @Override - public void setLoadTypeConverters(Boolean loadTypeConverters) { - this.loadTypeConverters = loadTypeConverters; - } - - @Override - public Boolean isTypeConverterStatisticsEnabled() { - return typeConverterStatisticsEnabled != null && typeConverterStatisticsEnabled; - } - - @Override - public void setTypeConverterStatisticsEnabled(Boolean typeConverterStatisticsEnabled) { - this.typeConverterStatisticsEnabled = typeConverterStatisticsEnabled; - } - - @Override - public Boolean isUseMDCLogging() { - return useMDCLogging != null && useMDCLogging; - } - - @Override - public void setUseMDCLogging(Boolean useMDCLogging) { - this.useMDCLogging = useMDCLogging; - } - - @Override - public String getMDCLoggingKeysPattern() { - return mdcLoggingKeysPattern; - } - - @Override - public void setMDCLoggingKeysPattern(String pattern) { - this.mdcLoggingKeysPattern = pattern; - } - - @Override - public Boolean isUseDataType() { - return useDataType; - } - - @Override - public void setUseDataType(Boolean useDataType) { - this.useDataType = useDataType; - } - - @Override - public Boolean isUseBreadcrumb() { - return useBreadcrumb != null && useBreadcrumb; - } - - @Override - public void setUseBreadcrumb(Boolean useBreadcrumb) { - this.useBreadcrumb = useBreadcrumb; - } - - @Override - public ClassLoader getApplicationContextClassLoader() { - return applicationContextClassLoader; - } - - @Override - public void setApplicationContextClassLoader(ClassLoader classLoader) { - applicationContextClassLoader = classLoader; - } - - @Override - public DataFormatResolver getDataFormatResolver() { - if (dataFormatResolver == null) { - synchronized (lock) { - if (dataFormatResolver == null) { - setDataFormatResolver(createDataFormatResolver()); - } - } - } - return dataFormatResolver; - } - - @Override - public void setDataFormatResolver(DataFormatResolver dataFormatResolver) { - this.dataFormatResolver = doAddService(dataFormatResolver); - } - - @Override - public DataFormat resolveDataFormat(String name) { - DataFormat answer = getDataFormatResolver().resolveDataFormat(name, getCamelContextReference()); - - // inject CamelContext if aware - if (answer instanceof CamelContextAware) { - ((CamelContextAware)answer).setCamelContext(getCamelContextReference()); - } - - return answer; - } - - @Override - public DataFormat createDataFormat(String name) { - DataFormat answer = getDataFormatResolver().createDataFormat(name, getCamelContextReference()); - - // inject CamelContext if aware - if (answer instanceof CamelContextAware) { - ((CamelContextAware)answer).setCamelContext(getCamelContextReference()); - } - - return answer; - } - - protected static T lookup(CamelContext context, String ref, Class type) { - try { - return context.getRegistry().lookupByNameAndType(ref, type); - } catch (Exception e) { - // need to ignore not same type and return it as null - return null; - } - } - - @Override - public ShutdownStrategy getShutdownStrategy() { - if (shutdownStrategy == null) { - synchronized (lock) { - if (shutdownStrategy == null) { - setShutdownStrategy(createShutdownStrategy()); - } - } - } - return shutdownStrategy; - } - - @Override - public void setShutdownStrategy(ShutdownStrategy shutdownStrategy) { - this.shutdownStrategy = doAddService(shutdownStrategy); - } - - @Override - public ShutdownRoute getShutdownRoute() { - return shutdownRoute; - } - - @Override - public void setShutdownRoute(ShutdownRoute shutdownRoute) { - this.shutdownRoute = shutdownRoute; - } - - @Override - public ShutdownRunningTask getShutdownRunningTask() { - return shutdownRunningTask; - } - - @Override - public void setShutdownRunningTask(ShutdownRunningTask shutdownRunningTask) { - this.shutdownRunningTask = shutdownRunningTask; - } - - @Override - public void setAllowUseOriginalMessage(Boolean allowUseOriginalMessage) { - this.allowUseOriginalMessage = allowUseOriginalMessage; - } - - @Override - public Boolean isAllowUseOriginalMessage() { - return allowUseOriginalMessage != null && allowUseOriginalMessage; - } - - public Boolean isCaseInsensitiveHeaders() { - return caseInsensitiveHeaders != null && caseInsensitiveHeaders; - } - - public void setCaseInsensitiveHeaders(Boolean caseInsensitiveHeaders) { - this.caseInsensitiveHeaders = caseInsensitiveHeaders; - } - - @Override - public ExecutorServiceManager getExecutorServiceManager() { - if (executorServiceManager == null) { - synchronized (lock) { - if (executorServiceManager == null) { - setExecutorServiceManager(createExecutorServiceManager()); - } - } - } - return this.executorServiceManager; - } - - @Override - public void setExecutorServiceManager(ExecutorServiceManager executorServiceManager) { - // special for executorServiceManager as want to stop it manually so - // false in stopOnShutdown - this.executorServiceManager = doAddService(executorServiceManager, false); - } - - @Override - public ProcessorFactory getProcessorFactory() { - if (processorFactory == null) { - synchronized (lock) { - if (processorFactory == null) { - setProcessorFactory(createProcessorFactory()); - } - } - } - return processorFactory; - } - - @Override - public void setProcessorFactory(ProcessorFactory processorFactory) { - this.processorFactory = doAddService(processorFactory); - } - - @Override - public MessageHistoryFactory getMessageHistoryFactory() { - if (messageHistoryFactory == null) { - synchronized (lock) { - if (messageHistoryFactory == null) { - setMessageHistoryFactory(createMessageHistoryFactory()); - } - } - } - return messageHistoryFactory; - } - - @Override - public void setMessageHistoryFactory(MessageHistoryFactory messageHistoryFactory) { - this.messageHistoryFactory = doAddService(messageHistoryFactory); - // enable message history if we set a custom factory - setMessageHistory(true); - } - - @Override - public Debugger getDebugger() { - return debugger; - } - - @Override - public void setDebugger(Debugger debugger) { - if (isStartingOrStarted()) { - throw new IllegalStateException("Can not set debugger on a started CamelContext"); - } - this.debugger = doAddService(debugger, true, false, true); - // enable debugging if we set a custom debugger - setDebugging(true); - } - - @Override - public Tracer getTracer() { - if (tracer == null) { - synchronized (lock) { - if (tracer == null) { - setTracer(createTracer()); - } - } - } - return tracer; - } - - @Override - public void setTracer(Tracer tracer) { - this.tracer = doAddService(tracer, true, false, true); - // enable tracing if we set a custom tracer - setTracing(true); - } - - @Override - public UuidGenerator getUuidGenerator() { - if (uuidGenerator == null) { - synchronized (lock) { - if (uuidGenerator == null) { - setUuidGenerator(createUuidGenerator()); - } - } - } - return uuidGenerator; - } - - @Override - public void setUuidGenerator(UuidGenerator uuidGenerator) { - this.uuidGenerator = doAddService(uuidGenerator); - } - - @Override - public StreamCachingStrategy getStreamCachingStrategy() { - if (streamCachingStrategy == null) { - synchronized (lock) { - if (streamCachingStrategy == null) { - setStreamCachingStrategy(createStreamCachingStrategy()); - } - } - } - return streamCachingStrategy; - } - - @Override - public void setStreamCachingStrategy(StreamCachingStrategy streamCachingStrategy) { - this.streamCachingStrategy = doAddService(streamCachingStrategy, true, false, true); - } - - @Override - public RestRegistry getRestRegistry() { - if (restRegistry == null) { - synchronized (lock) { - if (restRegistry == null) { - setRestRegistry(createRestRegistry()); - } - } - } - return restRegistry; - } - - @Override - public void setRestRegistry(RestRegistry restRegistry) { - this.restRegistry = doAddService(restRegistry); - } - - protected RestRegistry createRestRegistry() { - RestRegistryFactory factory = getRestRegistryFactory(); - return factory.createRegistry(); - } - - public RestRegistryFactory getRestRegistryFactory() { - if (restRegistryFactory == null) { - synchronized (lock) { - if (restRegistryFactory == null) { - setRestRegistryFactory(createRestRegistryFactory()); - } - } - } - return restRegistryFactory; - } - - public void setRestRegistryFactory(RestRegistryFactory restRegistryFactory) { - this.restRegistryFactory = doAddService(restRegistryFactory); - } - - @Override - public String getGlobalOption(String key) { - String value = getGlobalOptions().get(key); - if (ObjectHelper.isNotEmpty(value)) { - try { - value = resolvePropertyPlaceholders(value); - } catch (Exception e) { - throw new RuntimeCamelException("Error getting global option: " + key, e); - } - } - return value; - } - - @Override - public Transformer resolveTransformer(String scheme) { - return getTransformerRegistry().resolveTransformer(new TransformerKey(scheme)); - } - - @Override - public Transformer resolveTransformer(DataType from, DataType to) { - return getTransformerRegistry().resolveTransformer(new TransformerKey(from, to)); - } - - @Override - public TransformerRegistry getTransformerRegistry() { - if (transformerRegistry == null) { - synchronized (lock) { - if (transformerRegistry == null) { - setTransformerRegistry(createTransformerRegistry()); - } - } - } - return transformerRegistry; - } - - public void setTransformerRegistry(TransformerRegistry transformerRegistry) { - this.transformerRegistry = doAddService(transformerRegistry); - } - - @Override - public Validator resolveValidator(DataType type) { - return getValidatorRegistry().resolveValidator(new ValidatorKey(type)); - } - - @Override - public ValidatorRegistry getValidatorRegistry() { - if (validatorRegistry == null) { - synchronized (lock) { - if (validatorRegistry == null) { - setValidatorRegistry(createValidatorRegistry()); - } - } - } - return validatorRegistry; - } - - public void setValidatorRegistry(ValidatorRegistry validatorRegistry) { - this.validatorRegistry = doAddService(validatorRegistry); - } - - @Override - public void setSSLContextParameters(SSLContextParameters sslContextParameters) { - this.sslContextParameters = sslContextParameters; - } - - @Override - public SSLContextParameters getSSLContextParameters() { - return this.sslContextParameters; - } - - @Override - public HeadersMapFactory getHeadersMapFactory() { - return headersMapFactory; - } - - @Override - public void setHeadersMapFactory(HeadersMapFactory headersMapFactory) { - this.headersMapFactory = doAddService(headersMapFactory); - } - - public XMLRoutesDefinitionLoader getXMLRoutesDefinitionLoader() { - if (xmlRoutesDefinitionLoader == null) { - synchronized (lock) { - if (xmlRoutesDefinitionLoader == null) { - setXMLRoutesDefinitionLoader(createXMLRoutesDefinitionLoader()); - } - } - } - return xmlRoutesDefinitionLoader; - } - - public void setXMLRoutesDefinitionLoader(XMLRoutesDefinitionLoader xmlRoutesDefinitionLoader) { - this.xmlRoutesDefinitionLoader = doAddService(xmlRoutesDefinitionLoader); - } - - public ModelToXMLDumper getModelToXMLDumper() { - if (modelToXMLDumper == null) { - synchronized (lock) { - if (modelToXMLDumper == null) { - setModelToXMLDumper(createModelToXMLDumper()); - } - } - } - return modelToXMLDumper; - } - - public void setModelToXMLDumper(ModelToXMLDumper modelToXMLDumper) { - this.modelToXMLDumper = doAddService(modelToXMLDumper); - } - - public RestBindingJaxbDataFormatFactory getRestBindingJaxbDataFormatFactory() { - if (restBindingJaxbDataFormatFactory == null) { - synchronized (lock) { - if (restBindingJaxbDataFormatFactory == null) { - setRestBindingJaxbDataFormatFactory(createRestBindingJaxbDataFormatFactory()); - } - } - } - return restBindingJaxbDataFormatFactory; - } - - public void setRestBindingJaxbDataFormatFactory(RestBindingJaxbDataFormatFactory restBindingJaxbDataFormatFactory) { - this.restBindingJaxbDataFormatFactory = restBindingJaxbDataFormatFactory; - } - - @Override - public RuntimeCamelCatalog getRuntimeCamelCatalog() { - if (runtimeCamelCatalog == null) { - synchronized (lock) { - if (runtimeCamelCatalog == null) { - setRuntimeCamelCatalog(createRuntimeCamelCatalog()); - } - } - } - return runtimeCamelCatalog; - } - - @Override - public void setRuntimeCamelCatalog(RuntimeCamelCatalog runtimeCamelCatalog) { - this.runtimeCamelCatalog = doAddService(runtimeCamelCatalog); - } - - @Override - public ReactiveExecutor getReactiveExecutor() { - if (reactiveExecutor == null) { - synchronized (lock) { - if (reactiveExecutor == null) { - setReactiveExecutor(createReactiveExecutor()); - } - } - } - return reactiveExecutor; - } - - @Override - public void setReactiveExecutor(ReactiveExecutor reactiveExecutor) { - // special for executorServiceManager as want to stop it manually so - // false in stopOnShutdown - this.reactiveExecutor = doAddService(reactiveExecutor, false); - } - - @Override - public DeferServiceFactory getDeferServiceFactory() { - return deferServiceFactory; - } - - @Override - public AnnotationBasedProcessorFactory getAnnotationBasedProcessorFactory() { - return annotationBasedProcessorFactory; - } - - @Override - public BeanProxyFactory getBeanProxyFactory() { - if (beanProxyFactory == null) { - synchronized (lock) { - if (beanProxyFactory == null) { - setBeanProxyFactory(createBeanProxyFactory()); - } - } - } - return beanProxyFactory; - } - - public void setBeanProxyFactory(BeanProxyFactory beanProxyFactory) { - this.beanProxyFactory = doAddService(beanProxyFactory); - } - - @Override - public BeanProcessorFactory getBeanProcessorFactory() { - if (beanProcessorFactory == null) { - synchronized (lock) { - if (beanProcessorFactory == null) { - setBeanProcessorFactory(createBeanProcessorFactory()); - } - } - } - return beanProcessorFactory; - } - - public void setBeanProcessorFactory(BeanProcessorFactory beanProcessorFactory) { - this.beanProcessorFactory = doAddService(beanProcessorFactory); - } - - protected Map getRouteServices() { - return routeServices; - } - - /** - * Reset context counter to a preset value. Mostly used for tests to ensure - * a predictable getName() - * - * @param value new value for the context counter - */ - public static void setContextCounter(int value) { - DefaultCamelContextNameStrategy.setCounter(value); - DefaultManagementNameStrategy.setCounter(value); - } - - @Override - public String toString() { - return "CamelContext(" + getName() + ")"; - } - - class LifecycleHelper implements AutoCloseable { - final Map originalContextMap; - final ClassLoader tccl; - - LifecycleHelper() { - // Using the ApplicationClassLoader as the default for TCCL - tccl = Thread.currentThread().getContextClassLoader(); - if (applicationContextClassLoader != null) { - Thread.currentThread().setContextClassLoader(applicationContextClassLoader); - } - if (isUseMDCLogging()) { - originalContextMap = MDC.getCopyOfContextMap(); - MDC.put(MDC_CAMEL_CONTEXT_ID, getName()); - } else { - originalContextMap = null; - } - } - - @Override - public void close() { - if (isUseMDCLogging()) { - if (originalContextMap != null) { - MDC.setContextMap(originalContextMap); - } else { - MDC.clear(); - } - } - Thread.currentThread().setContextClassLoader(tccl); - } - } - - protected abstract HealthCheckRegistry createHealthCheckRegistry(); - - protected abstract ReactiveExecutor createReactiveExecutor(); - - protected abstract StreamCachingStrategy createStreamCachingStrategy(); - - protected abstract TypeConverter createTypeConverter(); - - protected abstract TypeConverterRegistry createTypeConverterRegistry(); - - protected abstract Injector createInjector(); - - protected abstract PropertiesComponent createPropertiesComponent(); - - protected abstract CamelBeanPostProcessor createBeanPostProcessor(); - - protected abstract ComponentResolver createComponentResolver(); - - protected abstract ComponentNameResolver createComponentNameResolver(); - - protected abstract Registry createRegistry(); - - protected abstract UuidGenerator createUuidGenerator(); - - protected abstract ModelJAXBContextFactory createModelJAXBContextFactory(); - - protected abstract NodeIdFactory createNodeIdFactory(); - - protected abstract FactoryFinderResolver createFactoryFinderResolver(); - - protected abstract ClassResolver createClassResolver(); - - protected abstract ProcessorFactory createProcessorFactory(); - - protected abstract DataFormatResolver createDataFormatResolver(); - - protected abstract MessageHistoryFactory createMessageHistoryFactory(); - - protected abstract InflightRepository createInflightRepository(); - - protected abstract AsyncProcessorAwaitManager createAsyncProcessorAwaitManager(); - - protected abstract RouteController createRouteController(); - - protected abstract ShutdownStrategy createShutdownStrategy(); - - protected abstract PackageScanClassResolver createPackageScanClassResolver(); - - protected abstract PackageScanResourceResolver createPackageScanResourceResolver(); - - protected abstract ExecutorServiceManager createExecutorServiceManager(); - - protected abstract UnitOfWorkFactory createUnitOfWorkFactory(); - - protected abstract CamelContextNameStrategy createCamelContextNameStrategy(); - - protected abstract ManagementNameStrategy createManagementNameStrategy(); - - protected abstract HeadersMapFactory createHeadersMapFactory(); - - protected abstract BeanProxyFactory createBeanProxyFactory(); - - protected abstract BeanProcessorFactory createBeanProcessorFactory(); - - protected abstract BeanIntrospection createBeanIntrospection(); - - protected abstract XMLRoutesDefinitionLoader createXMLRoutesDefinitionLoader(); - - protected abstract ModelToXMLDumper createModelToXMLDumper(); - - protected abstract RestBindingJaxbDataFormatFactory createRestBindingJaxbDataFormatFactory(); - - protected abstract RuntimeCamelCatalog createRuntimeCamelCatalog(); - - protected abstract Tracer createTracer(); - - protected abstract LanguageResolver createLanguageResolver(); - - protected abstract ConfigurerResolver createConfigurerResolver(); - - protected abstract RestRegistryFactory createRestRegistryFactory(); - - protected abstract EndpointRegistry createEndpointRegistry(Map endpoints); - - protected abstract TransformerRegistry createTransformerRegistry(); - - protected abstract ValidatorRegistry createValidatorRegistry(); - - protected RestConfiguration createRestConfiguration() { - // lookup a global which may have been on a container such spring-boot / CDI / etc. - RestConfiguration conf = CamelContextHelper.lookup(this, RestConfiguration.DEFAULT_REST_CONFIGURATION_ID, RestConfiguration.class); - if (conf == null) { - conf = CamelContextHelper.findByType(this, RestConfiguration.class); - } - if (conf == null) { - conf = new RestConfiguration(); - } - - return conf; - } - - @Override - public RouteController getInternalRouteController() { - return internalRouteController; - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java deleted file mode 100644 index 9811485..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java +++ /dev/null @@ -1,197 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.StaticService; -import org.apache.camel.spi.RouteController; -import org.apache.camel.support.LRUCache; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.support.service.ServiceHelper; - -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Base implementation for {@link org.apache.camel.spi.TransformerRegistry}, {@link org.apache.camel.spi.ValidatorRegistry} - * and {@link org.apache.camel.spi.EndpointRegistry}. - */ -public class AbstractDynamicRegistry extends AbstractMap implements StaticService { - - protected final ExtendedCamelContext context; - protected final RouteController routeController; - protected final int maxCacheSize; - protected final Map dynamicMap; - protected final Map staticMap; - - public AbstractDynamicRegistry(CamelContext context, int maxCacheSize) { - this.context = (ExtendedCamelContext) context; - this.routeController = context.getRouteController(); - this.maxCacheSize = maxCacheSize; - // do not stop on eviction, as the transformer may still be in use - this.dynamicMap = LRUCacheFactory.newLRUCache(this.maxCacheSize, this.maxCacheSize, false); - // static map to hold transformers we do not want to be evicted - this.staticMap = new ConcurrentHashMap<>(); - } - - @Override - public void start() { - if (dynamicMap instanceof LRUCache) { - ((LRUCache) dynamicMap).resetStatistics(); - } - } - - @Override - public V get(Object o) { - // try static map first - V answer = staticMap.get(o); - if (answer == null) { - answer = dynamicMap.get(o); - if (answer != null && (context.isSetupRoutes() || routeController.isStartingRoutes())) { - dynamicMap.remove(o); - staticMap.put((K) o, answer); - } - } - return answer; - } - - @Override - public V put(K key, V transformer) { - // at first we must see if the key already exists and then replace it back, so it stays the same spot - V answer = staticMap.remove(key); - if (answer != null) { - // replace existing - staticMap.put(key, transformer); - return answer; - } - - answer = dynamicMap.remove(key); - if (answer != null) { - // replace existing - dynamicMap.put(key, transformer); - return answer; - } - - // we want transformers to be static if they are part of setting up or starting routes - if (context.isSetupRoutes() || routeController.isStartingRoutes()) { - answer = staticMap.put(key, transformer); - } else { - answer = dynamicMap.put(key, transformer); - } - - return answer; - } - - @Override - public boolean containsKey(Object o) { - return staticMap.containsKey(o) || dynamicMap.containsKey(o); - } - - @Override - public boolean containsValue(Object o) { - return staticMap.containsValue(o) || dynamicMap.containsValue(o); - } - - @Override - public int size() { - return staticMap.size() + dynamicMap.size(); - } - - public int staticSize() { - return staticMap.size(); - } - - public int dynamicSize() { - return dynamicMap.size(); - } - - @Override - public boolean isEmpty() { - return staticMap.isEmpty() && dynamicMap.isEmpty(); - } - - @Override - public V remove(Object o) { - V answer = staticMap.remove(o); - if (answer == null) { - answer = dynamicMap.remove(o); - } - return answer; - } - - @Override - public void clear() { - staticMap.clear(); - dynamicMap.clear(); - } - - @Override - public Set> entrySet() { - return new AbstractSet>() { - @Override - public Iterator> iterator() { - return new org.apache.camel.impl.engine.CompoundIterator<>(Arrays.asList( - staticMap.entrySet().iterator(), dynamicMap.entrySet().iterator() - )); - } - - @Override - public int size() { - return staticMap.size() + dynamicMap.size(); - } - }; - } - - public int getMaximumCacheSize() { - return maxCacheSize; - } - - /** - * Purges the cache - */ - public void purge() { - // only purge the dynamic part - dynamicMap.clear(); - } - - public void cleanUp() { - if (dynamicMap instanceof LRUCache) { - ((LRUCache) dynamicMap).cleanUp(); - } - } - - public boolean isStatic(K key) { - return staticMap.containsKey(key); - } - - public boolean isDynamic(K key) { - return dynamicMap.containsKey(key); - } - - @Override - public void stop() { - ServiceHelper.stopService(staticMap.values(), dynamicMap.values()); - purge(); - } - - @Override - public String toString() { - return "Registry for " + context.getName() + ", capacity: " + maxCacheSize; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java deleted file mode 100644 index f696b4d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java +++ /dev/null @@ -1,536 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.NamedNode; -import org.apache.camel.StaticService; -import org.apache.camel.spi.ExecutorServiceManager; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.ThreadPoolFactory; -import org.apache.camel.spi.ThreadPoolProfile; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.DefaultThreadPoolFactory; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.*; -import org.apache.camel.util.concurrent.CamelThreadFactory; -import org.apache.camel.util.concurrent.SizedScheduledExecutorService; -import org.apache.camel.util.concurrent.ThreadHelper; -import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.concurrent.*; - -/** - * Base {@link ExecutorServiceManager} which can be used for implementations - */ -public class BaseExecutorServiceManager extends ServiceSupport implements ExecutorServiceManager { - private static final Logger LOG = LoggerFactory.getLogger(BaseExecutorServiceManager.class); - - private final CamelContext camelContext; - private ThreadPoolFactory threadPoolFactory = new DefaultThreadPoolFactory(); - private final List executorServices = new CopyOnWriteArrayList<>(); - private String threadNamePattern; - private long shutdownAwaitTermination = 10000; - private String defaultThreadPoolProfileId = "defaultThreadPoolProfile"; - private final Map threadPoolProfiles = new ConcurrentHashMap<>(); - private ThreadPoolProfile defaultProfile; - - public BaseExecutorServiceManager(CamelContext camelContext) { - this.camelContext = camelContext; - - defaultProfile = new ThreadPoolProfile(defaultThreadPoolProfileId); - defaultProfile.setDefaultProfile(true); - defaultProfile.setPoolSize(10); - defaultProfile.setMaxPoolSize(20); - defaultProfile.setKeepAliveTime(60L); - defaultProfile.setTimeUnit(TimeUnit.SECONDS); - defaultProfile.setMaxQueueSize(1000); - defaultProfile.setAllowCoreThreadTimeOut(true); - defaultProfile.setRejectedPolicy(ThreadPoolRejectedPolicy.CallerRuns); - - registerThreadPoolProfile(defaultProfile); - } - - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public ThreadPoolFactory getThreadPoolFactory() { - return threadPoolFactory; - } - - @Override - public void setThreadPoolFactory(ThreadPoolFactory threadPoolFactory) { - this.threadPoolFactory = threadPoolFactory; - } - - @Override - public void registerThreadPoolProfile(ThreadPoolProfile profile) { - ObjectHelper.notNull(profile, "profile"); - StringHelper.notEmpty(profile.getId(), "id", profile); - threadPoolProfiles.put(profile.getId(), profile); - } - - @Override - public ThreadPoolProfile getThreadPoolProfile(String id) { - return threadPoolProfiles.get(id); - } - - @Override - public ThreadPoolProfile getDefaultThreadPoolProfile() { - return getThreadPoolProfile(defaultThreadPoolProfileId); - } - - @Override - public void setDefaultThreadPoolProfile(ThreadPoolProfile defaultThreadPoolProfile) { - threadPoolProfiles.remove(defaultThreadPoolProfileId); - defaultThreadPoolProfile.addDefaults(defaultProfile); - - LOG.info("Using custom DefaultThreadPoolProfile: {}", defaultThreadPoolProfile); - - this.defaultThreadPoolProfileId = defaultThreadPoolProfile.getId(); - defaultThreadPoolProfile.setDefaultProfile(true); - registerThreadPoolProfile(defaultThreadPoolProfile); - } - - @Override - public String getThreadNamePattern() { - return threadNamePattern; - } - - @Override - public void setThreadNamePattern(String threadNamePattern) { - // must set camel id here in the pattern and let the other placeholders be resolved on demand - this.threadNamePattern = StringHelper.replaceAll(threadNamePattern, "#camelId#", this.camelContext.getName()); - } - - @Override - public long getShutdownAwaitTermination() { - return shutdownAwaitTermination; - } - - @Override - public void setShutdownAwaitTermination(long shutdownAwaitTermination) { - this.shutdownAwaitTermination = shutdownAwaitTermination; - } - - @Override - public String resolveThreadName(String name) { - return ThreadHelper.resolveThreadName(threadNamePattern, name); - } - - @Override - public Thread newThread(String name, Runnable runnable) { - ThreadFactory factory = createThreadFactory(name, true); - return factory.newThread(runnable); - } - - @Override - public ExecutorService newDefaultThreadPool(Object source, String name) { - return newThreadPool(source, name, getDefaultThreadPoolProfile()); - } - - @Override - public ScheduledExecutorService newDefaultScheduledThreadPool(Object source, String name) { - return newScheduledThreadPool(source, name, getDefaultThreadPoolProfile()); - } - - @Override - public ExecutorService newThreadPool(Object source, String name, String profileId) { - ThreadPoolProfile profile = getThreadPoolProfile(profileId); - if (profile != null) { - return newThreadPool(source, name, profile); - } else { - // no profile with that id - return null; - } - } - - @Override - public ExecutorService newThreadPool(Object source, String name, ThreadPoolProfile profile) { - String sanitizedName = URISupport.sanitizeUri(name); - ObjectHelper.notNull(profile, "ThreadPoolProfile"); - - ThreadPoolProfile defaultProfile = getDefaultThreadPoolProfile(); - profile.addDefaults(defaultProfile); - - ThreadFactory threadFactory = createThreadFactory(sanitizedName, true); - ExecutorService executorService = threadPoolFactory.newThreadPool(profile, threadFactory); - onThreadPoolCreated(executorService, source, profile.getId()); - if (LOG.isDebugEnabled()) { - LOG.debug("Created new ThreadPool for source: {} with name: {}. -> {}", source, sanitizedName, executorService); - } - - return executorService; - } - - @Override - public ExecutorService newThreadPool(Object source, String name, int poolSize, int maxPoolSize) { - ThreadPoolProfile profile = new ThreadPoolProfile(name); - profile.setPoolSize(poolSize); - profile.setMaxPoolSize(maxPoolSize); - return newThreadPool(source, name, profile); - } - - @Override - public ExecutorService newSingleThreadExecutor(Object source, String name) { - return newFixedThreadPool(source, name, 1); - } - - @Override - public ExecutorService newCachedThreadPool(Object source, String name) { - String sanitizedName = URISupport.sanitizeUri(name); - ExecutorService answer = threadPoolFactory.newCachedThreadPool(createThreadFactory(sanitizedName, true)); - onThreadPoolCreated(answer, source, null); - - if (LOG.isDebugEnabled()) { - LOG.debug("Created new CachedThreadPool for source: {} with name: {}. -> {}", source, sanitizedName, answer); - } - return answer; - } - - @Override - public ExecutorService newFixedThreadPool(Object source, String name, int poolSize) { - ThreadPoolProfile profile = new ThreadPoolProfile(name); - profile.setPoolSize(poolSize); - profile.setMaxPoolSize(poolSize); - profile.setKeepAliveTime(0L); - profile.setAllowCoreThreadTimeOut(false); - return newThreadPool(source, name, profile); - } - - @Override - public ScheduledExecutorService newSingleThreadScheduledExecutor(Object source, String name) { - ThreadPoolProfile profile = new ThreadPoolProfile(name); - profile.setPoolSize(1); - profile.setAllowCoreThreadTimeOut(false); - return newScheduledThreadPool(source, name, profile); - } - - @Override - public ScheduledExecutorService newScheduledThreadPool(Object source, String name, ThreadPoolProfile profile) { - String sanitizedName = URISupport.sanitizeUri(name); - profile.addDefaults(getDefaultThreadPoolProfile()); - ScheduledExecutorService answer = threadPoolFactory.newScheduledThreadPool(profile, createThreadFactory(sanitizedName, true)); - onThreadPoolCreated(answer, source, null); - - if (LOG.isDebugEnabled()) { - LOG.debug("Created new ScheduledThreadPool for source: {} with name: {} -> {}", source, sanitizedName, answer); - } - return answer; - } - - @Override - public ScheduledExecutorService newScheduledThreadPool(Object source, String name, String profileId) { - ThreadPoolProfile profile = getThreadPoolProfile(profileId); - if (profile != null) { - return newScheduledThreadPool(source, name, profile); - } else { - // no profile with that id - return null; - } - } - - @Override - public ScheduledExecutorService newScheduledThreadPool(Object source, String name, int poolSize) { - ThreadPoolProfile profile = new ThreadPoolProfile(name); - profile.setPoolSize(poolSize); - return newScheduledThreadPool(source, name, profile); - } - - @Override - public void shutdown(ExecutorService executorService) { - doShutdown(executorService, 0, false); - } - - @Override - public void shutdownGraceful(ExecutorService executorService) { - doShutdown(executorService, getShutdownAwaitTermination(), false); - } - - @Override - public void shutdownGraceful(ExecutorService executorService, long shutdownAwaitTermination) { - doShutdown(executorService, shutdownAwaitTermination, false); - } - - private boolean doShutdown(ExecutorService executorService, long shutdownAwaitTermination, boolean failSafe) { - if (executorService == null) { - return false; - } - - boolean warned = false; - - // shutting down a thread pool is a 2 step process. First we try graceful, and if that fails, then we go more aggressively - // and try shutting down again. In both cases we wait at most the given shutdown timeout value given - // (total wait could then be 2 x shutdownAwaitTermination, but when we shutdown the 2nd time we are aggressive and thus - // we ought to shutdown much faster) - if (!executorService.isShutdown()) { - StopWatch watch = new StopWatch(); - - LOG.trace("Shutdown of ExecutorService: {} with await termination: {} millis", executorService, shutdownAwaitTermination); - executorService.shutdown(); - - if (shutdownAwaitTermination > 0) { - try { - if (!awaitTermination(executorService, shutdownAwaitTermination)) { - warned = true; - LOG.warn("Forcing shutdown of ExecutorService: {} due first await termination elapsed.", executorService); - executorService.shutdownNow(); - // we are now shutting down aggressively, so wait to see if we can completely shutdown or not - if (!awaitTermination(executorService, shutdownAwaitTermination)) { - LOG.warn("Cannot completely force shutdown of ExecutorService: {} due second await termination elapsed.", executorService); - } - } - } catch (InterruptedException e) { - warned = true; - LOG.warn("Forcing shutdown of ExecutorService: {} due interrupted.", executorService); - // we were interrupted during shutdown, so force shutdown - executorService.shutdownNow(); - } - } - - // if we logged at WARN level, then report at INFO level when we are complete so the end user can see this in the log - if (warned) { - LOG.info("Shutdown of ExecutorService: {} is shutdown: {} and terminated: {} took: {}.", - executorService, executorService.isShutdown(), executorService.isTerminated(), TimeUtils.printDuration(watch.taken())); - } else if (LOG.isDebugEnabled()) { - LOG.debug("Shutdown of ExecutorService: {} is shutdown: {} and terminated: {} took: {}.", - executorService, executorService.isShutdown(), executorService.isTerminated(), TimeUtils.printDuration(watch.taken())); - } - } - - // let lifecycle strategy be notified as well which can let it be managed in JMX as well - ThreadPoolExecutor threadPool = null; - if (executorService instanceof ThreadPoolExecutor) { - threadPool = (ThreadPoolExecutor) executorService; - } else if (executorService instanceof SizedScheduledExecutorService) { - threadPool = ((SizedScheduledExecutorService) executorService).getScheduledThreadPoolExecutor(); - } - if (threadPool != null) { - for (LifecycleStrategy lifecycle : camelContext.getLifecycleStrategies()) { - lifecycle.onThreadPoolRemove(camelContext, threadPool); - } - } - - // remove reference as its shutdown (do not remove if fail-safe) - if (!failSafe) { - executorServices.remove(executorService); - } - - return warned; - } - - @Override - public List shutdownNow(ExecutorService executorService) { - return doShutdownNow(executorService, false); - } - - private List doShutdownNow(ExecutorService executorService, boolean failSafe) { - ObjectHelper.notNull(executorService, "executorService"); - - List answer = null; - if (!executorService.isShutdown()) { - if (failSafe) { - // log as warn, as we shutdown as fail-safe, so end user should see more details in the log. - LOG.warn("Forcing shutdown of ExecutorService: {}", executorService); - } else { - LOG.debug("Forcing shutdown of ExecutorService: {}", executorService); - } - answer = executorService.shutdownNow(); - if (LOG.isTraceEnabled()) { - LOG.trace("Shutdown of ExecutorService: {} is shutdown: {} and terminated: {}.", - executorService, executorService.isShutdown(), executorService.isTerminated()); - } - } - - // let lifecycle strategy be notified as well which can let it be managed in JMX as well - ThreadPoolExecutor threadPool = null; - if (executorService instanceof ThreadPoolExecutor) { - threadPool = (ThreadPoolExecutor) executorService; - } else if (executorService instanceof SizedScheduledExecutorService) { - threadPool = ((SizedScheduledExecutorService) executorService).getScheduledThreadPoolExecutor(); - } - if (threadPool != null) { - for (LifecycleStrategy lifecycle : camelContext.getLifecycleStrategies()) { - lifecycle.onThreadPoolRemove(camelContext, threadPool); - } - } - - // remove reference as its shutdown (do not remove if fail-safe) - if (!failSafe) { - executorServices.remove(executorService); - } - - return answer; - } - - @Override - public boolean awaitTermination(ExecutorService executorService, long shutdownAwaitTermination) throws InterruptedException { - // log progress every 2nd second so end user is aware of we are shutting down - StopWatch watch = new StopWatch(); - long interval = Math.min(2000, shutdownAwaitTermination); - boolean done = false; - while (!done && interval > 0) { - if (executorService.awaitTermination(interval, TimeUnit.MILLISECONDS)) { - done = true; - } else { - LOG.info("Waited {} for ExecutorService: {} to terminate...", TimeUtils.printDuration(watch.taken()), executorService); - // recalculate interval - interval = Math.min(2000, shutdownAwaitTermination - watch.taken()); - } - } - - return done; - } - - /** - * Strategy callback when a new {@link ExecutorService} have been created. - * - * @param executorService the created {@link ExecutorService} - */ - protected void onNewExecutorService(ExecutorService executorService) { - // noop - } - - @Override - protected void doInit() throws Exception { - super.doInit(); - if (threadNamePattern == null) { - // set default name pattern which includes the camel context name - threadNamePattern = "Camel (" + camelContext.getName() + ") thread ##counter# - #name#"; - } - } - - @Override - protected void doShutdown() throws Exception { - // shutdown all remainder executor services by looping and doing this aggressively - // as by normal all threads pool should have been shutdown using proper lifecycle - // by their EIPs, components etc. This is acting as a fail-safe during shutdown - // of CamelContext itself. - Set forced = new LinkedHashSet<>(); - if (!executorServices.isEmpty()) { - // at first give a bit of time to shutdown nicely as the thread pool is most likely in the process of being shutdown also - LOG.debug("Giving time for {} ExecutorService's to shutdown properly (acting as fail-safe)", executorServices.size()); - for (ExecutorService executorService : executorServices) { - try { - boolean warned = doShutdown(executorService, getShutdownAwaitTermination(), true); - // remember the thread pools that was forced to shutdown (eg warned) - if (warned) { - forced.add(executorService); - } - } catch (Throwable e) { - // only log if something goes wrong as we want to shutdown them all - LOG.warn("Error occurred during shutdown of ExecutorService: " - + executorService + ". This exception will be ignored.", e); - } - } - } - - // log the thread pools which was forced to shutdown so it may help the user to identify a problem of his - if (!forced.isEmpty()) { - LOG.warn("Forced shutdown of {} ExecutorService's which has not been shutdown properly (acting as fail-safe)", forced.size()); - for (ExecutorService executorService : forced) { - LOG.warn(" forced -> {}", executorService); - } - } - forced.clear(); - - // clear list - executorServices.clear(); - - // do not clear the default profile as we could potential be restarted - Iterator it = threadPoolProfiles.values().iterator(); - while (it.hasNext()) { - ThreadPoolProfile profile = it.next(); - if (!profile.isDefaultProfile()) { - it.remove(); - } - } - } - - /** - * Invoked when a new thread pool is created. - * This implementation will invoke the {@link LifecycleStrategy#onThreadPoolAdd(CamelContext, - * ThreadPoolExecutor, String, String, String, String) LifecycleStrategy.onThreadPoolAdd} method, - * which for example will enlist the thread pool in JMX management. - * - * @param executorService the thread pool - * @param source the source to use the thread pool - * @param threadPoolProfileId profile id, if the thread pool was created from a thread pool profile - */ - private void onThreadPoolCreated(ExecutorService executorService, Object source, String threadPoolProfileId) { - // add to internal list of thread pools - executorServices.add(executorService); - - String id; - String sourceId = null; - String routeId = null; - - // extract id from source - if (source instanceof NamedNode) { - id = ((NamedNode) source).getId(); - // and let source be the short name of the pattern - sourceId = ((NamedNode) source).getShortName(); - } else if (source instanceof String) { - id = (String) source; - } else if (source != null) { - if (source instanceof StaticService) { - // the source is static service so its name would be unique - id = source.getClass().getSimpleName(); - } else { - // fallback and use the simple class name with hashcode for the id so its unique for this given source - id = source.getClass().getSimpleName() + "(" + ObjectHelper.getIdentityHashCode(source) + ")"; - } - } else { - // no source, so fallback and use the simple class name from thread pool and its hashcode identity so its unique - id = executorService.getClass().getSimpleName() + "(" + ObjectHelper.getIdentityHashCode(executorService) + ")"; - } - - // id is mandatory - StringHelper.notEmpty(id, "id for thread pool " + executorService); - - // extract route id if possible - if (source instanceof NamedNode) { - routeId = CamelContextHelper.getRouteId((NamedNode) source); - } - - // let lifecycle strategy be notified as well which can let it be managed in JMX as well - ThreadPoolExecutor threadPool = null; - if (executorService instanceof ThreadPoolExecutor) { - threadPool = (ThreadPoolExecutor) executorService; - } else if (executorService instanceof SizedScheduledExecutorService) { - threadPool = ((SizedScheduledExecutorService) executorService).getScheduledThreadPoolExecutor(); - } - if (threadPool != null) { - for (LifecycleStrategy lifecycle : camelContext.getLifecycleStrategies()) { - lifecycle.onThreadPoolAdd(camelContext, threadPool, id, sourceId, routeId, threadPoolProfileId); - } - } - - // now call strategy to allow custom logic - onNewExecutorService(executorService); - } - - protected ThreadFactory createThreadFactory(String name, boolean isDaemon) { - return new CamelThreadFactory(threadNamePattern, name, isDaemon); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java deleted file mode 100644 index 4eaebce..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java +++ /dev/null @@ -1,124 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * Base class for package scan resolvers. - */ -public abstract class BasePackageScanResolver extends ServiceSupport implements CamelContextAware { - protected final Logger log = LoggerFactory.getLogger(getClass()); - protected String[] acceptableSchemes = {}; - private final Set classLoaders = new LinkedHashSet<>(); - private CamelContext camelContext; - - public BasePackageScanResolver() { - try { - ClassLoader ccl = Thread.currentThread().getContextClassLoader(); - if (ccl != null) { - log.trace("Adding ContextClassLoader from current thread: {}", ccl); - classLoaders.add(ccl); - } - } catch (Exception e) { - // Ignore this exception - log.warn("Cannot add ContextClassLoader from current thread due {}. This exception will be ignored.", e.getMessage()); - } - - classLoaders.add(BasePackageScanResolver.class.getClassLoader()); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public void addClassLoader(ClassLoader classLoader) { - classLoaders.add(classLoader); - } - - /** - * To specify a set of accepted schemas to use for loading resources as URL connections - * (besides http and https schemas) - */ - public void setAcceptableSchemes(String schemes) { - if (schemes != null) { - acceptableSchemes = schemes.split(";"); - } - } - - protected boolean isAcceptableScheme(String urlPath) { - if (urlPath != null) { - for (String scheme : acceptableSchemes) { - if (urlPath.startsWith(scheme)) { - return true; - } - } - } - return false; - } - - public Set getClassLoaders() { - // return a new set to avoid any concurrency issues in other runtimes such as OSGi - return Collections.unmodifiableSet(new LinkedHashSet<>(classLoaders)); - } - - // We can override this method to support the custom ResourceLocator - protected URL customResourceLocator(URL url) throws IOException { - // Do nothing here - return url; - } - - /** - * Strategy to get the resources by the given classloader. - *

- * Notice that in WebSphere platforms there is a {@link WebSpherePackageScanClassResolver} - * to take care of WebSphere's oddity of resource loading. - * - * @param loader the classloader - * @param packageName the packagename for the package to load - * @return URL's for the given package - * @throws IOException is thrown by the classloader - */ - protected Enumeration getResources(ClassLoader loader, String packageName) throws IOException { - log.trace("Getting resource URL for package: {} with classloader: {}", packageName, loader); - - // If the URL is a jar, the URLClassloader.getResources() seems to require a trailing slash. The - // trailing slash is harmless for other URLs - if (!packageName.endsWith("/")) { - packageName = packageName + "/"; - } - return loader.getResources(packageName); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java deleted file mode 100644 index 51868c6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseServiceResolver.java +++ /dev/null @@ -1,64 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.spi.FactoryFinder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Optional; - -public class BaseServiceResolver { - - protected final Logger log = LoggerFactory.getLogger(getClass()); - - protected final String factoryKey; - protected final Class factoryClass; - - public BaseServiceResolver(String factoryKey, Class factoryClass) { - this.factoryKey = factoryKey; - this.factoryClass = factoryClass; - } - - public Optional resolve(CamelContext context) { - // use factory finder to find a custom implementations - Class type = null; - try { - FactoryFinder finder = context.adapt(ExtendedCamelContext.class).getFactoryFinder(FactoryFinder.DEFAULT_PATH); - type = finder.findClass(factoryKey).orElse(null); - } catch (Exception e) { - // ignore - } - - if (type != null) { - if (log.isDebugEnabled()) { - log.debug("Found {}: {} via: {}{}", factoryClass.getSimpleName(), type.getName(), FactoryFinder.DEFAULT_PATH, factoryKey); - } - if (factoryClass.isAssignableFrom(type)) { - T answer = factoryClass.cast(context.getInjector().newInstance(type, false)); - log.debug("Detected and using {}: {}", factoryClass.getSimpleName(), answer); - return Optional.of(answer); - } else { - throw new IllegalArgumentException("Type is not a " + factoryClass.getSimpleName() + " implementation. Found: " + type.getName()); - } - } - return Optional.empty(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java deleted file mode 100644 index ff4a387..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java +++ /dev/null @@ -1,477 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.BeanProxyFactory; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertiesComponent; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.PropertyBindingSupport; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.reflect.Method; -import java.util.*; - -/** - * A helper class for Camel based injector or post processing hooks which can be - * reused by both the Spring - * and Blueprint support. - */ -public class CamelPostProcessorHelper implements CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(CamelPostProcessorHelper.class); - - private CamelContext camelContext; - - public CamelPostProcessorHelper() { - } - - public CamelPostProcessorHelper(CamelContext camelContext) { - this.setCamelContext(camelContext); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public void consumerInjection(Method method, Object bean, String beanName) { - Consume consume = method.getAnnotation(Consume.class); - if (consume != null) { - LOG.debug("Creating a consumer for: {}", consume); - String uri = consume.value().isEmpty() ? consume.uri() : consume.value(); - subscribeMethod(method, bean, beanName, uri, consume.property(), consume.predicate()); - } - } - - public void subscribeMethod(Method method, Object bean, String beanName, String endpointUri, String endpointProperty, String predicate) { - // lets bind this method to a listener - String injectionPointName = method.getName(); - Endpoint endpoint = getEndpointInjection(bean, endpointUri, endpointProperty, injectionPointName, true); - if (endpoint != null) { - boolean multipleConsumer = false; - if (endpoint instanceof MultipleConsumersSupport) { - multipleConsumer = ((MultipleConsumersSupport) endpoint).isMultipleConsumersSupported(); - } - try { - SubscribeMethodProcessor processor = getConsumerProcessor(endpoint); - // if multiple consumer then create a new consumer per subscribed method - if (multipleConsumer || processor == null) { - // create new processor and new consumer which happens the first time - processor = new SubscribeMethodProcessor(endpoint); - // make sure processor is registered in registry so we can reuse it (eg we can look it up) - endpoint.getCamelContext().addService(processor, true); - processor.addMethod(bean, method, endpoint, predicate); - Consumer consumer = endpoint.createConsumer(processor); - startService(consumer, endpoint.getCamelContext(), bean, beanName); - } else { - // add method to existing processor - processor.addMethod(bean, method, endpoint, predicate); - } - if (predicate != null) { - LOG.debug("Subscribed method: {} to consume from endpoint: {} with predicate: {}", method, endpoint, predicate); - } else { - LOG.debug("Subscribed method: {} to consume from endpoint: {}", method, endpoint); - } - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - } - - /** - * Stats the given service - */ - protected void startService(Service service, CamelContext camelContext, Object bean, String beanName) throws Exception { - // defer starting the service until CamelContext has started all its initial services - if (camelContext != null) { - camelContext.deferStartService(service, true); - } else { - // mo CamelContext then start service manually - ServiceHelper.startService(service); - } - - boolean singleton = isSingleton(bean, beanName); - if (!singleton) { - LOG.debug("Service is not singleton so you must remember to stop it manually {}", service); - } - } - - protected SubscribeMethodProcessor getConsumerProcessor(Endpoint endpoint) { - Set processors = endpoint.getCamelContext().hasServices(SubscribeMethodProcessor.class); - return processors.stream().filter(s -> s.getEndpoint() == endpoint).findFirst().orElse(null); - } - - public Endpoint getEndpointInjection(Object bean, String uri, String propertyName, - String injectionPointName, boolean mandatory) { - Endpoint answer; - if (ObjectHelper.isEmpty(uri)) { - // if no uri then fallback and try the endpoint property - answer = doGetEndpointInjection(bean, propertyName, injectionPointName); - } else { - answer = doGetEndpointInjection(uri, injectionPointName, mandatory); - } - // it may be a delegate endpoint via ref component - if (answer instanceof DelegateEndpoint) { - answer = ((DelegateEndpoint) answer).getEndpoint(); - } - return answer; - } - - private Endpoint doGetEndpointInjection(String uri, String injectionPointName, boolean mandatory) { - return CamelContextHelper.getEndpointInjection(getCamelContext(), uri, injectionPointName, mandatory); - } - - /** - * Gets the injection endpoint from a bean property. - * - * @param bean the bean - * @param propertyName the property name on the bean - */ - private Endpoint doGetEndpointInjection(Object bean, String propertyName, String injectionPointName) { - // fall back and use the method name if no explicit property name was given - if (ObjectHelper.isEmpty(propertyName)) { - propertyName = injectionPointName; - } - - // we have a property name, try to lookup a getter method on the bean with that name using this strategy - // 1. first the getter with the name as given - // 2. then the getter with Endpoint as postfix - // 3. then if start with on then try step 1 and 2 again, but omit the on prefix - try { - Object value = getCamelContext().adapt(ExtendedCamelContext.class).getBeanIntrospection().getOrElseProperty(bean, propertyName, null, false); - if (value == null) { - // try endpoint as postfix - value = getCamelContext().adapt(ExtendedCamelContext.class).getBeanIntrospection().getOrElseProperty(bean, propertyName + "Endpoint", null, false); - } - if (value == null && propertyName.startsWith("on")) { - // retry but without the on as prefix - propertyName = propertyName.substring(2); - return doGetEndpointInjection(bean, propertyName, injectionPointName); - } - if (value == null) { - return null; - } else if (value instanceof Endpoint) { - return (Endpoint) value; - } else { - String uriOrRef = getCamelContext().getTypeConverter().mandatoryConvertTo(String.class, value); - return getCamelContext().getEndpoint(uriOrRef); - } - } catch (Exception e) { - throw new IllegalArgumentException("Error getting property " + propertyName + " from bean " + bean + " due " + e.getMessage(), e); - } - } - - /** - * Creates the object to be injected for an - * {@link org.apache.camel.EndpointInject} or - * {@link org.apache.camel.Produce} injection point - */ - public Object getInjectionValue(Class type, String endpointUri, String endpointProperty, - String injectionPointName, Object bean, String beanName) { - return getInjectionValue(type, endpointUri, endpointProperty, injectionPointName, bean, beanName, true); - } - - /** - * Creates the object to be injected for an - * {@link org.apache.camel.EndpointInject} or - * {@link org.apache.camel.Produce} injection point - */ - @SuppressWarnings("unchecked") - public Object getInjectionValue(Class type, String endpointUri, String endpointProperty, - String injectionPointName, Object bean, String beanName, boolean binding) { - if (type.isAssignableFrom(ProducerTemplate.class)) { - return createInjectionProducerTemplate(endpointUri, endpointProperty, injectionPointName, bean); - } else if (type.isAssignableFrom(FluentProducerTemplate.class)) { - return createInjectionFluentProducerTemplate(endpointUri, endpointProperty, injectionPointName, bean); - } else if (type.isAssignableFrom(ConsumerTemplate.class)) { - return createInjectionConsumerTemplate(endpointUri, endpointProperty, injectionPointName); - } else { - Endpoint endpoint = getEndpointInjection(bean, endpointUri, endpointProperty, injectionPointName, true); - if (endpoint != null) { - if (type.isInstance(endpoint)) { - return endpoint; - } else if (type.isAssignableFrom(Producer.class)) { - return createInjectionProducer(endpoint, bean, beanName); - } else if (type.isAssignableFrom(PollingConsumer.class)) { - return createInjectionPollingConsumer(endpoint, bean, beanName); - } else if (type.isInterface()) { - // lets create a proxy - try { - // use proxy service - BeanProxyFactory factory = endpoint.getCamelContext().adapt(ExtendedCamelContext.class).getBeanProxyFactory(); - return factory.createProxy(endpoint, binding, type); - } catch (Exception e) { - throw createProxyInstantiationRuntimeException(type, endpoint, e); - } - } else { - throw new IllegalArgumentException("Invalid type: " + type.getName() - + " which cannot be injected via @EndpointInject/@Produce for: " + endpoint); - } - } - return null; - } - } - - public Object getInjectionPropertyValue(Class type, String propertyName, String propertyDefaultValue, - String injectionPointName, Object bean, String beanName) { - try { - String key; - String prefix = PropertiesComponent.PREFIX_TOKEN; - String suffix = PropertiesComponent.SUFFIX_TOKEN; - if (!propertyName.contains(prefix)) { - // must enclose the property name with prefix/suffix to have it resolved - key = prefix + propertyName + suffix; - } else { - // key has already prefix/suffix so use it as-is as it may be a compound key - key = propertyName; - } - String value = getCamelContext().resolvePropertyPlaceholders(key); - if (value != null) { - return getCamelContext().getTypeConverter().mandatoryConvertTo(type, value); - } else { - return null; - } - } catch (Exception e) { - if (ObjectHelper.isNotEmpty(propertyDefaultValue)) { - try { - return getCamelContext().getTypeConverter().mandatoryConvertTo(type, propertyDefaultValue); - } catch (Exception e2) { - throw RuntimeCamelException.wrapRuntimeCamelException(e2); - } - } - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - public Object getInjectionBeanValue(Class type, String name) { - if (ObjectHelper.isEmpty(name)) { - // is it camel context itself? - if (getCamelContext() != null && type.isAssignableFrom(getCamelContext().getClass())) { - return getCamelContext(); - } - Set found = getCamelContext().getRegistry().findByType(type); - if (found == null || found.isEmpty()) { - throw new NoSuchBeanException(name, type.getName()); - } else if (found.size() > 1) { - throw new NoSuchBeanException("Found " + found.size() + " beans of type: " + type + ". Only one bean expected."); - } else { - // we found only one - return found.iterator().next(); - } - } else { - return CamelContextHelper.mandatoryLookup(getCamelContext(), name, type); - } - } - - public Object getInjectionBeanConfigValue(Class type, String name) { - ExtendedCamelContext ecc = (ExtendedCamelContext) getCamelContext(); - - // is it a map or properties - boolean mapType = false; - Map map = null; - if (type.isAssignableFrom(Map.class)) { - map = new LinkedHashMap(); - mapType = true; - } else if (type.isAssignableFrom(Properties.class)) { - map = new Properties(); - mapType = true; - } - - // create an instance of type - Object bean = null; - if (map == null) { - Set instances = ecc.getRegistry().findByType(type); - if (instances.size() == 1) { - bean = instances.iterator().next(); - } else if (instances.size() > 1) { - return null; - } else { - // attempt to create a new instance - try { - bean = ecc.getInjector().newInstance(type); - } catch (Throwable e) { - // ignore - return null; - } - } - } - - // root key - String rootKey = name; - // clip trailing dot - if (rootKey.endsWith(".")) { - rootKey = rootKey.substring(0, rootKey.length() - 1); - } - String uRootKey = rootKey.toUpperCase(Locale.US); - - // get all properties and transfer to map - Properties props = ecc.getPropertiesComponent().loadProperties(); - if (map == null) { - map = new LinkedHashMap<>(); - } - for (String key : props.stringPropertyNames()) { - String uKey = key.toUpperCase(Locale.US); - // need to ignore case - if (uKey.startsWith(uRootKey)) { - // strip prefix - String sKey = key.substring(rootKey.length()); - if (sKey.startsWith(".")) { - sKey = sKey.substring(1); - } - map.put(sKey, props.getProperty(key)); - } - } - if (mapType) { - return map; - } - - // lookup configurer if there is any - // use FQN class name first, then simple name, and root key last - GeneratedPropertyConfigurer configurer = null; - String[] names = new String[]{type.getName() + "-configurer", type.getSimpleName() + "-configurer", rootKey + "-configurer"}; - for (String n : names) { - configurer = ecc.getConfigurerResolver().resolvePropertyConfigurer(n, ecc); - if (configurer != null) { - break; - } - } - - new PropertyBindingSupport.Builder() - .withCamelContext(ecc) - .withIgnoreCase(true) - .withTarget(bean) - .withConfigurer(configurer) - .withProperties(map) - .bind(); - - return bean; - } - - /** - * Factory method to create a {@link ProducerTemplate} to - * be injected into a POJO - */ - protected ProducerTemplate createInjectionProducerTemplate(String endpointUri, String endpointProperty, - String injectionPointName, Object bean) { - // endpoint is optional for this injection point - Endpoint endpoint = getEndpointInjection(bean, endpointUri, endpointProperty, injectionPointName, false); - CamelContext context = endpoint != null ? endpoint.getCamelContext() : getCamelContext(); - ProducerTemplate answer = new DefaultProducerTemplate(context, endpoint); - // start the template so its ready to use - try { - // no need to defer the template as it can adjust to the endpoint at runtime - startService(answer, context, bean, null); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - /** - * Factory method to create a - * {@link FluentProducerTemplate} to be injected into a - * POJO - */ - protected FluentProducerTemplate createInjectionFluentProducerTemplate(String endpointUri, String endpointProperty, - String injectionPointName, Object bean) { - // endpoint is optional for this injection point - Endpoint endpoint = getEndpointInjection(bean, endpointUri, endpointProperty, injectionPointName, false); - CamelContext context = endpoint != null ? endpoint.getCamelContext() : getCamelContext(); - FluentProducerTemplate answer = new DefaultFluentProducerTemplate(context); - answer.setDefaultEndpoint(endpoint); - // start the template so its ready to use - try { - // no need to defer the template as it can adjust to the endpoint at runtime - startService(answer, context, bean, null); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - /** - * Factory method to create a {@link ConsumerTemplate} to - * be injected into a POJO - */ - protected ConsumerTemplate createInjectionConsumerTemplate(String endpointUri, String endpointProperty, - String injectionPointName) { - ConsumerTemplate answer = new DefaultConsumerTemplate(getCamelContext()); - // start the template so its ready to use - try { - startService(answer, null, null, null); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - return answer; - } - - /** - * Factory method to create a started - * {@link PollingConsumer} to be injected into a POJO - */ - protected PollingConsumer createInjectionPollingConsumer(Endpoint endpoint, Object bean, String beanName) { - try { - PollingConsumer consumer = endpoint.createPollingConsumer(); - startService(consumer, endpoint.getCamelContext(), bean, beanName); - return consumer; - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - /** - * A Factory method to create a started {@link Producer} to - * be injected into a POJO - */ - protected Producer createInjectionProducer(Endpoint endpoint, Object bean, String beanName) { - try { - return endpoint.getCamelContext().adapt(ExtendedCamelContext.class).getDeferServiceFactory().createProducer(endpoint); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - protected RuntimeException createProxyInstantiationRuntimeException(Class type, Endpoint endpoint, Exception e) { - return new ProxyInstantiationException(type, endpoint, e); - } - - /** - * Implementations can override this method to determine if the bean is - * singleton. - * - * @param bean the bean - * @return true if its singleton scoped, for prototype scoped - * false is returned. - */ - protected boolean isSingleton(Object bean, String beanName) { - if (bean instanceof IsSingleton) { - IsSingleton singleton = (IsSingleton) bean; - return singleton.isSingleton(); - } - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java deleted file mode 100644 index 3515fe4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/CompoundIterator.java +++ /dev/null @@ -1,64 +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.impl.engine; - -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * Compound iterator to iterate over multiple iterators sequentially. - */ -class CompoundIterator implements Iterator { - - final Iterator> it; - Iterator current; - - public CompoundIterator(Iterable> it) { - this(it.iterator()); - } - - public CompoundIterator(Iterator> it) { - this.it = it; - this.current = it.hasNext() ? it.next() : null; - } - - @Override - public boolean hasNext() { - while (current != null) { - if (current.hasNext()) { - return true; - } else { - current = it.hasNext() ? it.next() : null; - } - - } - return false; - } - - @Override - public T next() { - if (current != null) { - return current.next(); - } - throw new NoSuchElementException(); - } - - @Override - public void remove() { - current.remove(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAnnotationBasedProcessorFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAnnotationBasedProcessorFactory.java deleted file mode 100644 index 92ae4e3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAnnotationBasedProcessorFactory.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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.AnnotationBasedProcessorFactory; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.util.ObjectHelper; - -import java.util.concurrent.ExecutorService; - -public final class DefaultAnnotationBasedProcessorFactory implements AnnotationBasedProcessorFactory { - - @Override - public AsyncProcessor createDynamicRouter(CamelContext camelContext, DynamicRouter annotation) { - org.apache.camel.processor.DynamicRouter dynamicRouter = new org.apache.camel.processor.DynamicRouter(camelContext); - dynamicRouter.setDelimiter(annotation.delimiter()); - dynamicRouter.setIgnoreInvalidEndpoints(annotation.ignoreInvalidEndpoints()); - dynamicRouter.setCacheSize(annotation.cacheSize()); - return dynamicRouter; - } - - @Override - public AsyncProcessor createRecipientList(CamelContext camelContext, RecipientList annotation) { - org.apache.camel.processor.RecipientList recipientList = new org.apache.camel.processor.RecipientList(camelContext, annotation.delimiter()); - recipientList.setStopOnException(annotation.stopOnException()); - recipientList.setStopOnAggregateException(annotation.stopOnAggregateException()); - recipientList.setIgnoreInvalidEndpoints(annotation.ignoreInvalidEndpoints()); - recipientList.setParallelProcessing(annotation.parallelProcessing()); - recipientList.setParallelAggregate(annotation.parallelAggregate()); - recipientList.setStreaming(annotation.streaming()); - recipientList.setTimeout(annotation.timeout()); - recipientList.setCacheSize(annotation.cacheSize()); - recipientList.setShareUnitOfWork(annotation.shareUnitOfWork()); - - if (ObjectHelper.isNotEmpty(annotation.executorServiceRef())) { - ExecutorService executor = camelContext.getExecutorServiceManager().newDefaultThreadPool(this, annotation.executorServiceRef()); - recipientList.setExecutorService(executor); - } - - if (annotation.parallelProcessing() && recipientList.getExecutorService() == null) { - // we are running in parallel so we need a thread pool - ExecutorService executor = camelContext.getExecutorServiceManager().newDefaultThreadPool(this, "@RecipientList"); - recipientList.setExecutorService(executor); - } - - if (ObjectHelper.isNotEmpty(annotation.strategyRef())) { - AggregationStrategy strategy = CamelContextHelper.mandatoryLookup(camelContext, annotation.strategyRef(), AggregationStrategy.class); - recipientList.setAggregationStrategy(strategy); - } - - if (ObjectHelper.isNotEmpty(annotation.onPrepareRef())) { - Processor onPrepare = CamelContextHelper.mandatoryLookup(camelContext, annotation.onPrepareRef(), Processor.class); - recipientList.setOnPrepare(onPrepare); - } - - return recipientList; - } - - @Override - public AsyncProcessor createRoutingSlip(CamelContext camelContext, RoutingSlip annotation) { - org.apache.camel.processor.RoutingSlip routingSlip = new org.apache.camel.processor.RoutingSlip(camelContext); - routingSlip.setDelimiter(annotation.delimiter()); - routingSlip.setIgnoreInvalidEndpoints(annotation.ignoreInvalidEndpoints()); - routingSlip.setCacheSize(annotation.cacheSize()); - return routingSlip; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java deleted file mode 100644 index 3c12e26..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java +++ /dev/null @@ -1,382 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.AsyncProcessorAwaitManager; -import org.apache.camel.spi.ExchangeFormatter; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.processor.DefaultExchangeFormatter; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.atomic.AtomicLong; - -public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements AsyncProcessorAwaitManager, StaticService { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultAsyncProcessorAwaitManager.class); - - private final Statistics statistics = new UtilizationStatistics(); - private final AtomicLong blockedCounter = new AtomicLong(); - private final AtomicLong interruptedCounter = new AtomicLong(); - private final AtomicLong totalDuration = new AtomicLong(); - private final AtomicLong minDuration = new AtomicLong(); - private final AtomicLong maxDuration = new AtomicLong(); - private final AtomicLong meanDuration = new AtomicLong(); - - private final Map inflight = new ConcurrentHashMap<>(); - private final ExchangeFormatter exchangeFormatter; - private boolean interruptThreadsWhileStopping = true; - - public DefaultAsyncProcessorAwaitManager() { - // setup exchange formatter to be used for message history dump - DefaultExchangeFormatter formatter = new DefaultExchangeFormatter(); - formatter.setShowExchangeId(true); - formatter.setMultiline(true); - formatter.setShowHeaders(true); - formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Fixed); - this.exchangeFormatter = formatter; - } - - /** - * Calls the async version of the processor's process method and waits - * for it to complete before returning. This can be used by {@link AsyncProcessor} - * objects to implement their sync version of the process method. - *

- * Important: This method is discouraged to be used, as its better to invoke the asynchronous - * {@link AsyncProcessor#process(Exchange, org.apache.camel.AsyncCallback)} method, whenever possible. - * - * @param processor the processor - * @param exchange the exchange - */ - @Override - public void process(final AsyncProcessor processor, final Exchange exchange) { - CountDownLatch latch = new CountDownLatch(1); - processor.process(exchange, doneSync -> countDown(exchange, latch)); - if (latch.getCount() > 0) { - await(exchange, latch); - } - } - - public void await(Exchange exchange, CountDownLatch latch) { - ReactiveExecutor reactiveExecutor = exchange.getContext().adapt(ExtendedCamelContext.class).getReactiveExecutor(); - // Early exit for pending reactive queued work - do { - if (latch.getCount() <= 0) { - return; - } - } while (reactiveExecutor.executeFromQueue()); - - if (LOG.isTraceEnabled()) { - LOG.trace("Waiting for asynchronous callback before continuing for exchangeId: {} -> {}", - exchange.getExchangeId(), exchange); - } - try { - if (statistics.isStatisticsEnabled()) { - blockedCounter.incrementAndGet(); - } - inflight.put(exchange, new AwaitThreadEntry(Thread.currentThread(), exchange, latch)); - latch.await(); - if (LOG.isTraceEnabled()) { - LOG.trace("Asynchronous callback received, will continue routing exchangeId: {} -> {}", - exchange.getExchangeId(), exchange); - } - - } catch (InterruptedException e) { - if (LOG.isTraceEnabled()) { - LOG.trace("Interrupted while waiting for callback, will continue routing exchangeId: {} -> {}", - exchange.getExchangeId(), exchange); - } - exchange.setException(e); - } finally { - AwaitThread thread = inflight.remove(exchange); - - if (statistics.isStatisticsEnabled() && thread != null) { - long time = thread.getWaitDuration(); - long total = totalDuration.get() + time; - totalDuration.set(total); - - if (time < minDuration.get()) { - minDuration.set(time); - } else if (time > maxDuration.get()) { - maxDuration.set(time); - } - - // update mean - long count = blockedCounter.get(); - long mean = count > 0 ? total / count : 0; - meanDuration.set(mean); - } - } - } - - public void countDown(Exchange exchange, CountDownLatch latch) { - if (LOG.isTraceEnabled()) { - LOG.trace("Asynchronous callback received for exchangeId: {}", exchange.getExchangeId()); - } - latch.countDown(); - } - - @Override - public int size() { - return inflight.size(); - } - - @Override - public Collection browse() { - return Collections.unmodifiableCollection(inflight.values()); - } - - @Override - public void interrupt(String exchangeId) { - // need to find the exchange with the given exchange id - Exchange found = null; - for (AwaitThread entry : browse()) { - Exchange exchange = entry.getExchange(); - if (exchangeId.equals(exchange.getExchangeId())) { - found = exchange; - break; - } - } - - if (found != null) { - interrupt(found); - } - } - - @Override - public void interrupt(Exchange exchange) { - AwaitThreadEntry entry = (AwaitThreadEntry) inflight.get(exchange); - if (entry != null) { - try { - StringBuilder sb = new StringBuilder(); - sb.append("Interrupted while waiting for asynchronous callback, will release the following blocked thread which was waiting for exchange to finish processing with exchangeId: "); - sb.append(exchange.getExchangeId()); - sb.append("\n"); - - sb.append(dumpBlockedThread(entry)); - - // dump a route stack trace of the exchange - String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, exchangeFormatter, false); - if (routeStackTrace != null) { - sb.append(routeStackTrace); - } - LOG.warn(sb.toString()); - - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } finally { - if (statistics.isStatisticsEnabled()) { - interruptedCounter.incrementAndGet(); - } - exchange.setException(new RejectedExecutionException("Interrupted while waiting for asynchronous callback for exchangeId: " + exchange.getExchangeId())); - exchange.adapt(ExtendedExchange.class).setInterrupted(true); - entry.getLatch().countDown(); - } - } - } - - @Override - public boolean isInterruptThreadsWhileStopping() { - return interruptThreadsWhileStopping; - } - - @Override - public void setInterruptThreadsWhileStopping(boolean interruptThreadsWhileStopping) { - this.interruptThreadsWhileStopping = interruptThreadsWhileStopping; - } - - @Override - public Statistics getStatistics() { - return statistics; - } - - @Override - protected void doStop() throws Exception { - Collection threads = browse(); - int count = threads.size(); - if (count > 0) { - LOG.warn("Shutting down while there are still {} inflight threads currently blocked.", count); - - StringBuilder sb = new StringBuilder(); - for (AwaitThread entry : threads) { - sb.append(dumpBlockedThread(entry)); - } - - if (isInterruptThreadsWhileStopping()) { - LOG.warn("The following threads are blocked and will be interrupted so the threads are released:\n{}", sb); - for (AwaitThread entry : threads) { - try { - interrupt(entry.getExchange()); - } catch (Throwable e) { - LOG.warn("Error while interrupting thread: " + entry.getBlockedThread().getName() + ". This exception is ignored.", e); - } - } - } else { - LOG.warn("The following threads are blocked, and may reside in the JVM:\n{}", sb); - } - } else { - LOG.debug("Shutting down with no inflight threads."); - } - - inflight.clear(); - } - - private static String dumpBlockedThread(AwaitThread entry) { - StringBuilder sb = new StringBuilder(); - sb.append("\n"); - sb.append("Blocked Thread\n"); - sb.append("---------------------------------------------------------------------------------------------------------------------------------------\n"); - - sb.append(style("Id:")).append(entry.getBlockedThread().getId()).append("\n"); - sb.append(style("Name:")).append(entry.getBlockedThread().getName()).append("\n"); - sb.append(style("RouteId:")).append(safeNull(entry.getRouteId())).append("\n"); - sb.append(style("NodeId:")).append(safeNull(entry.getNodeId())).append("\n"); - sb.append(style("Duration:")).append(entry.getWaitDuration()).append(" msec.\n"); - return sb.toString(); - } - - private static String style(String label) { - return String.format("\t%-20s", label); - } - - private static String safeNull(Object value) { - return value != null ? value.toString() : ""; - } - - private static final class AwaitThreadEntry implements AwaitThread { - private final Thread thread; - private final Exchange exchange; - private final CountDownLatch latch; - private final long start; - - private AwaitThreadEntry(Thread thread, Exchange exchange, CountDownLatch latch) { - this.thread = thread; - this.exchange = exchange; - this.latch = latch; - this.start = System.currentTimeMillis(); - } - - @Override - public Thread getBlockedThread() { - return thread; - } - - @Override - public Exchange getExchange() { - return exchange; - } - - @Override - public long getWaitDuration() { - return System.currentTimeMillis() - start; - } - - @Override - public String getRouteId() { - return ExchangeHelper.getAtRouteId(exchange); - } - - @Override - public String getNodeId() { - return exchange.adapt(ExtendedExchange.class).getHistoryNodeId(); - } - - public CountDownLatch getLatch() { - return latch; - } - - @Override - public String toString() { - return "AwaitThreadEntry[name=" + thread.getName() + ", exchangeId=" + exchange.getExchangeId() + "]"; - } - } - - /** - * Represents utilization statistics - */ - private final class UtilizationStatistics implements Statistics { - - private boolean statisticsEnabled; - - @Override - public long getThreadsBlocked() { - return blockedCounter.get(); - } - - @Override - public long getThreadsInterrupted() { - return interruptedCounter.get(); - } - - @Override - public long getTotalDuration() { - return totalDuration.get(); - } - - @Override - public long getMinDuration() { - return minDuration.get(); - } - - @Override - public long getMaxDuration() { - return maxDuration.get(); - } - - @Override - public long getMeanDuration() { - return meanDuration.get(); - } - - @Override - public void reset() { - blockedCounter.set(0); - interruptedCounter.set(0); - totalDuration.set(0); - minDuration.set(0); - maxDuration.set(0); - meanDuration.set(0); - } - - @Override - public boolean isStatisticsEnabled() { - return statisticsEnabled; - } - - @Override - public void setStatisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - - @Override - public String toString() { - return String.format("AsyncProcessAwaitManager utilization[blocked=%s, interrupted=%s, total=%s min=%s, max=%s, mean=%s]", - getThreadsBlocked(), getThreadsInterrupted(), getTotalDuration(), getMinDuration(), getMaxDuration(), getMeanDuration()); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java deleted file mode 100644 index 4077a2c..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java +++ /dev/null @@ -1,244 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.BeanIntrospection; -import org.apache.camel.spi.CamelLogger; -import org.apache.camel.support.IntrospectionSupport; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.reflect.Method; -import java.util.*; -import java.util.concurrent.atomic.AtomicLong; -import java.util.regex.Pattern; - -@SuppressWarnings("deprecation") -public class DefaultBeanIntrospection extends ServiceSupport implements BeanIntrospection, CamelContextAware, StartupListener { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultBeanIntrospection.class); - private static final Pattern SECRETS = Pattern.compile(".*(passphrase|password|secretKey).*", Pattern.CASE_INSENSITIVE); - - private CamelContext camelContext; - private volatile boolean preStartDone; - private final List preStartLogs = new ArrayList<>(); - private final AtomicLong invoked = new AtomicLong(); - private volatile boolean extendedStatistics; - private LoggingLevel loggingLevel = LoggingLevel.TRACE; - private CamelLogger logger = new CamelLogger(LOG, loggingLevel); - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public long getInvokedCounter() { - return invoked.get(); - } - - @Override - public void resetCounters() { - invoked.set(0); - } - - public boolean isExtendedStatistics() { - return extendedStatistics; - } - - public void setExtendedStatistics(boolean extendedStatistics) { - this.extendedStatistics = extendedStatistics; - } - - public LoggingLevel getLoggingLevel() { - return loggingLevel; - } - - public void setLoggingLevel(LoggingLevel loggingLevel) { - this.loggingLevel = loggingLevel; - // recreate logger as level is changed - this.logger = new CamelLogger(LOG, loggingLevel); - } - - private void log(String method, Object target, Object... args) { - Object obj = "null"; - if (args != null && args.length > 0) { - obj = Arrays.asList(args); - } - - if (target != null) { - // use Object.toString as target logging - target = target.getClass().getName() + "@" + Integer.toHexString(target.hashCode()); - } - - String line; - if (target == null) { - line = "Invoked: " + invoked.get() + " times (overall) [Method: " + method + "]"; - } else if (args == null) { - line = "Invoked: " + invoked.get() + " times (overall) [Method: " + method + ", Target: " + target + "]"; - } else { - line = "Invoked: " + invoked.get() + " times (overall) [Method: " + method + ", Target: " + target + ", Arguments: " + obj + "]"; - } - - if (preStartDone) { - logger.log(line); - } else { - // remember log lines before we are starting - preStartLogs.add(line); - } - } - - @Override - public ClassInfo cacheClass(Class clazz) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("cacheClass", clazz); - } - return IntrospectionSupport.cacheClass(clazz); - } - - @Override - public void clearCache() { - if (invoked.get() > 0) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("clearCache", null); - } - IntrospectionSupport.clearCache(); - } - } - - @Override - public long getCachedClassesCounter() { - if (invoked.get() > 0) { - return IntrospectionSupport.getCacheCounter(); - } else { - return 0; - } - } - - @Override - public boolean getProperties(Object target, Map properties, String optionPrefix) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("getProperties", target); - } - return IntrospectionSupport.getProperties(target, properties, optionPrefix); - } - - @Override - public boolean getProperties(Object target, Map properties, String optionPrefix, boolean includeNull) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("getProperties", target); - } - return IntrospectionSupport.getProperties(target, properties, optionPrefix, includeNull); - } - - @Override - public Object getOrElseProperty(Object target, String propertyName, Object defaultValue, boolean ignoreCase) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("getOrElseProperty", target, propertyName); - } - return IntrospectionSupport.getOrElseProperty(target, propertyName, defaultValue, ignoreCase); - } - - @Override - public Method getPropertyGetter(Class type, String propertyName, boolean ignoreCase) throws NoSuchMethodException { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("getPropertyGetter", type, propertyName); - } - return IntrospectionSupport.getPropertyGetter(type, propertyName, ignoreCase); - } - - @Override - public boolean setProperty(CamelContext context, TypeConverter typeConverter, Object target, String name, Object value, String refName, boolean allowBuilderPattern, boolean allowPrivateSetter, boolean ignoreCase) throws Exception { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - Object text = value; - if (SECRETS.matcher(name).find()) { - text = "xxxxxx"; - } - log("setProperty", target, name, text); - } - return IntrospectionSupport.setProperty(context, typeConverter, target, name, value, refName, allowBuilderPattern, allowPrivateSetter, ignoreCase); - } - - @Override - public boolean setProperty(CamelContext context, Object target, String name, Object value) throws Exception { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - Object text = value; - if (SECRETS.matcher(name).find()) { - text = "xxxxxx"; - } - log("setProperty", target, name, text); - } - return IntrospectionSupport.setProperty(context, target, name, value); - } - - @Override - public Set findSetterMethods(Class clazz, String name, boolean allowBuilderPattern, boolean allowPrivateSetter, boolean ignoreCase) { - invoked.incrementAndGet(); - if (!preStartDone || logger.shouldLog()) { - log("findSetterMethods", clazz); - } - return IntrospectionSupport.findSetterMethods(clazz, name, allowBuilderPattern, allowPrivateSetter, ignoreCase); - } - - @Override - public void afterPropertiesConfigured(CamelContext camelContext) { - // log any pre starting logs so we can see them all - preStartLogs.forEach(logger::log); - preStartLogs.clear(); - preStartDone = true; - } - - @Override - protected void doInit() throws Exception { - if (camelContext != null) { - camelContext.addStartupListener(this); - } - } - - @Override - protected void doStop() throws Exception { - if (invoked.get() > 0) { - IntrospectionSupport.stop(); - } - if (extendedStatistics) { - LOG.info("Stopping BeanIntrospection which was invoked: {} times", invoked.get()); - } else { - LOG.debug("Stopping BeanIntrospection which was invoked: {} times", invoked.get()); - } - } - - @Override - public void onCamelContextStarted(CamelContext context, boolean alreadyStarted) throws Exception { - // ensure after properties is called - afterPropertiesConfigured(camelContext); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java deleted file mode 100644 index d93c665..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java +++ /dev/null @@ -1,548 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.CamelBeanPostProcessor; -import org.apache.camel.spi.Registry; -import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.util.ReflectionHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Set; -import java.util.function.Function; - -import static org.apache.camel.support.ObjectHelper.invokeMethod; -import static org.apache.camel.util.ObjectHelper.isEmpty; - -/** - * A bean post processor which implements the Bean Integration - * features in Camel. Features such as the Bean Injection of objects like - * {@link org.apache.camel.Endpoint} and - * {@link org.apache.camel.ProducerTemplate} together with support for - * POJO Consuming via the - * {@link org.apache.camel.Consume} annotation along with - * POJO Producing via the - * {@link Produce} annotation along with other annotations such as - * {@link org.apache.camel.DynamicRouter} for creating a Dynamic router via annotations. - * {@link org.apache.camel.RecipientList} for creating a Recipient List router via annotations. - * {@link org.apache.camel.RoutingSlip} for creating a Routing Slip router via annotations. - *

- * Components such as camel-spring, and camel-blueprint can leverage this post processor to hook in Camel - * bean post processing into their bean processing framework. - */ -public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor { - - protected static final Logger LOG = LoggerFactory.getLogger(DefaultCamelBeanPostProcessor.class); - protected CamelPostProcessorHelper camelPostProcessorHelper; - protected CamelContext camelContext; - - public DefaultCamelBeanPostProcessor() { - } - - public DefaultCamelBeanPostProcessor(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public Object postProcessBeforeInitialization(Object bean, String beanName) throws Exception { - LOG.trace("Camel bean processing before initialization for bean: {}", beanName); - - // some beans cannot be post processed at this given time, so we gotta check beforehand - if (!canPostProcessBean(bean, beanName)) { - return bean; - } - - // do bean binding on simple types first, and then afterwards on complex types - injectFirstPass(bean, beanName, type -> !isComplexUserType(type)); - injectSecondPass(bean, beanName, type -> isComplexUserType(type)); - - if (bean instanceof CamelContextAware && canSetCamelContext(bean, beanName)) { - CamelContextAware contextAware = (CamelContextAware)bean; - DeferredContextBinding deferredBinding = bean.getClass().getAnnotation(DeferredContextBinding.class); - CamelContext context = getOrLookupCamelContext(); - - if (context == null && deferredBinding == null) { - LOG.warn("No CamelContext defined yet so cannot inject into bean: {}", beanName); - } else if (context != null) { - contextAware.setCamelContext(context); - } - } - - return bean; - } - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws Exception { - LOG.trace("Camel bean processing after initialization for bean: {}", beanName); - - // some beans cannot be post processed at this given time, so we gotta check beforehand - if (!canPostProcessBean(bean, beanName)) { - return bean; - } - - if (bean instanceof DefaultEndpoint) { - DefaultEndpoint defaultEndpoint = (DefaultEndpoint) bean; - defaultEndpoint.setEndpointUriIfNotSpecified(beanName); - } - - return bean; - } - - /** - * Strategy to get the {@link CamelContext} to use. - */ - public CamelContext getOrLookupCamelContext() { - return camelContext; - } - - /** - * Strategy to get the {@link CamelPostProcessorHelper} - */ - public CamelPostProcessorHelper getPostProcessorHelper() { - if (camelPostProcessorHelper == null) { - camelPostProcessorHelper = new CamelPostProcessorHelper(getOrLookupCamelContext()); - } - return camelPostProcessorHelper; - } - - protected boolean canPostProcessBean(Object bean, String beanName) { - if (beanName != null && "properties".equals(beanName)) { - // we cannot process the properties component - // its instantiated very eager during creation of camel context - return false; - } - return bean != null; - } - - /** - * Whether support for the annotation {@link BindToRegistry} is supported. - * This is only intended for standalone runtimes such as camel-main, camel-quarkus, etc. - */ - protected boolean bindToRegistrySupported() { - return true; - } - - protected boolean canSetCamelContext(Object bean, String beanName) { - if (bean instanceof CamelContextAware) { - CamelContextAware camelContextAware = (CamelContextAware) bean; - CamelContext context = camelContextAware.getCamelContext(); - if (context != null) { - LOG.trace("CamelContext already set on bean with id [{}]. Will keep existing CamelContext on bean.", beanName); - return false; - } - } - - return true; - } - - protected void injectFirstPass(Object bean, String beanName, Function filter) { - // on first pass do field and methods first - injectFields(bean, beanName, filter); - injectMethods(bean, beanName, filter); - - if (bindToRegistrySupported()) { - injectClass(bean, beanName); - injectNestedClasses(bean, beanName); - injectBindToRegistryFields(bean, beanName, filter); - injectBindToRegistryMethods(bean, beanName, filter); - } - } - - protected void injectSecondPass(Object bean, String beanName, Function filter) { - // on second pass do bind to registry beforehand as they may be used by field/method injections below - if (bindToRegistrySupported()) { - injectClass(bean, beanName); - injectNestedClasses(bean, beanName); - injectBindToRegistryFields(bean, beanName, filter); - injectBindToRegistryMethods(bean, beanName, filter); - } - - injectFields(bean, beanName, filter); - injectMethods(bean, beanName, filter); - } - - protected void injectFields(final Object bean, final String beanName, Function accept) { - ReflectionHelper.doWithFields(bean.getClass(), field -> { - if (accept != null && !accept.apply(field.getType())) { - return; - } - - PropertyInject propertyInject = field.getAnnotation(PropertyInject.class); - if (propertyInject != null) { - injectFieldProperty(field, propertyInject.value(), propertyInject.defaultValue(), bean, beanName); - } - - BeanInject beanInject = field.getAnnotation(BeanInject.class); - if (beanInject != null) { - injectFieldBean(field, beanInject.value(), bean, beanName); - } - - BeanConfigInject beanConfigInject = field.getAnnotation(BeanConfigInject.class); - if (beanConfigInject != null) { - injectFieldBeanConfig(field, beanConfigInject.value(), bean, beanName); - } - - EndpointInject endpointInject = field.getAnnotation(EndpointInject.class); - if (endpointInject != null) { - @SuppressWarnings("deprecation") - String uri = endpointInject.value().isEmpty() ? endpointInject.uri() : endpointInject.value(); - injectField(field, uri, endpointInject.property(), bean, beanName); - } - - Produce produce = field.getAnnotation(Produce.class); - if (produce != null) { - @SuppressWarnings("deprecation") - String uri = produce.value().isEmpty() ? produce.uri() : produce.value(); - injectField(field, uri, produce.property(), bean, beanName, produce.binding()); - } - }); - } - - protected void injectBindToRegistryFields(final Object bean, final String beanName, Function accept) { - ReflectionHelper.doWithFields(bean.getClass(), field -> { - if (accept != null && !accept.apply(field.getType())) { - return; - } - - BindToRegistry bind = field.getAnnotation(BindToRegistry.class); - if (bind != null) { - bindToRegistry(field, bind.value(), bean, beanName, bind.beanPostProcess()); - } - }); - } - - public void injectField(Field field, String endpointUri, String endpointProperty, - Object bean, String beanName) { - injectField(field, endpointUri, endpointProperty, bean, beanName, true); - } - - public void injectField(Field field, String endpointUri, String endpointProperty, - Object bean, String beanName, boolean binding) { - ReflectionHelper.setField(field, bean, - getPostProcessorHelper().getInjectionValue(field.getType(), endpointUri, endpointProperty, - field.getName(), bean, beanName, binding)); - } - - public void injectFieldBean(Field field, String name, Object bean, String beanName) { - ReflectionHelper.setField(field, bean, - getPostProcessorHelper().getInjectionBeanValue(field.getType(), name)); - } - - public void injectFieldBeanConfig(Field field, String name, Object bean, String beanName) { - ReflectionHelper.setField(field, bean, - getPostProcessorHelper().getInjectionBeanConfigValue(field.getType(), name)); - } - - public void injectFieldProperty(Field field, String propertyName, String propertyDefaultValue, Object bean, String beanName) { - ReflectionHelper.setField(field, bean, - getPostProcessorHelper().getInjectionPropertyValue(field.getType(), propertyName, propertyDefaultValue, - field.getName(), bean, beanName)); - } - - protected void injectMethods(final Object bean, final String beanName, Function accept) { - ReflectionHelper.doWithMethods(bean.getClass(), method -> { - if (accept != null && !accept.apply(method.getReturnType())) { - return; - } - - setterInjection(method, bean, beanName); - getPostProcessorHelper().consumerInjection(method, bean, beanName); - }); - } - - protected void injectBindToRegistryMethods(final Object bean, final String beanName, Function accept) { - // sort the methods so the simplest are used first - - final List methods = new ArrayList<>(); - ReflectionHelper.doWithMethods(bean.getClass(), method -> { - if (accept != null && !accept.apply(method.getReturnType())) { - return; - } - - BindToRegistry bind = method.getAnnotation(BindToRegistry.class); - if (bind != null) { - methods.add(method); - } - }); - - // sort methods on shortest number of parameters as we want to process the most simplest first - methods.sort(Comparator.comparingInt(Method::getParameterCount)); - - // then do a more complex sorting where we check inter-dependency among the methods - methods.sort((m1, m2) -> { - Class[] types1 = m1.getParameterTypes(); - Class[] types2 = m2.getParameterTypes(); - - // favour methods that has no parameters - if (types1.length == 0 && types2.length == 0) { - return 0; - } else if (types1.length == 0) { - return -1; - } else if (types2.length == 0) { - return 1; - } - - // okay then compare so we favour methods that does not use parameter types that are returned from other methods - boolean usedByOthers1 = false; - for (Class clazz : types1) { - usedByOthers1 |= methods.stream().anyMatch(m -> m.getParameterCount() > 0 && clazz.isAssignableFrom(m.getReturnType())); - } - boolean usedByOthers2 = false; - for (Class clazz : types2) { - usedByOthers2 |= methods.stream().anyMatch(m -> m.getParameterCount() > 0 && clazz.isAssignableFrom(m.getReturnType())); - } - return Boolean.compare(usedByOthers1, usedByOthers2); - }); - - LOG.trace("Discovered {} @BindToRegistry methods", methods.size()); - - // bind each method - methods.forEach(method -> { - BindToRegistry bind = method.getAnnotation(BindToRegistry.class); - bindToRegistry(method, bind.value(), bean, beanName, bind.beanPostProcess()); - }); - } - - protected void injectClass(final Object bean, final String beanName) { - Class clazz = bean.getClass(); - BindToRegistry ann = clazz.getAnnotation(BindToRegistry.class); - if (ann != null) { - bindToRegistry(clazz, ann.value(), bean, beanName, ann.beanPostProcess()); - } - } - - protected void injectNestedClasses(final Object bean, final String beanName) { - ReflectionHelper.doWithClasses(bean.getClass(), clazz -> { - BindToRegistry ann = (BindToRegistry) clazz.getAnnotation(BindToRegistry.class); - if (ann != null) { - // its a nested class so we dont have a bean instance for it - bindToRegistry(clazz, ann.value(), null, null, ann.beanPostProcess()); - } - }); - } - - protected void setterInjection(Method method, Object bean, String beanName) { - PropertyInject propertyInject = method.getAnnotation(PropertyInject.class); - if (propertyInject != null) { - setterPropertyInjection(method, propertyInject.value(), propertyInject.defaultValue(), bean, beanName); - } - - BeanInject beanInject = method.getAnnotation(BeanInject.class); - if (beanInject != null) { - setterBeanInjection(method, beanInject.value(), bean, beanName); - } - - BeanConfigInject beanConfigInject = method.getAnnotation(BeanConfigInject.class); - if (beanConfigInject != null) { - setterBeanConfigInjection(method, beanConfigInject.value(), bean, beanName); - } - - EndpointInject endpointInject = method.getAnnotation(EndpointInject.class); - if (endpointInject != null) { - String uri = endpointInject.value().isEmpty() ? endpointInject.uri() : endpointInject.value(); - setterInjection(method, bean, beanName, uri, endpointInject.property()); - } - - Produce produce = method.getAnnotation(Produce.class); - if (produce != null) { - String uri = produce.value().isEmpty() ? produce.uri() : produce.value(); - setterInjection(method, bean, beanName, uri, produce.property()); - } - } - - public void setterInjection(Method method, Object bean, String beanName, String endpointUri, String endpointProperty) { - Class[] parameterTypes = method.getParameterTypes(); - if (parameterTypes.length != 1) { - LOG.warn("Ignoring badly annotated method for injection due to incorrect number of parameters: {}", method); - } else { - String propertyName = org.apache.camel.util.ObjectHelper.getPropertyName(method); - Object value = getPostProcessorHelper().getInjectionValue(parameterTypes[0], endpointUri, endpointProperty, - propertyName, bean, beanName); - invokeMethod(method, bean, value); - } - } - - public void setterPropertyInjection(Method method, String propertyValue, String propertyDefaultValue, - Object bean, String beanName) { - Class[] parameterTypes = method.getParameterTypes(); - if (parameterTypes.length != 1) { - LOG.warn("Ignoring badly annotated method for injection due to incorrect number of parameters: {}", method); - } else { - String propertyName = org.apache.camel.util.ObjectHelper.getPropertyName(method); - Object value = getPostProcessorHelper().getInjectionPropertyValue(parameterTypes[0], propertyValue, propertyDefaultValue, propertyName, bean, beanName); - invokeMethod(method, bean, value); - } - } - - public void setterBeanInjection(Method method, String name, Object bean, String beanName) { - Class[] parameterTypes = method.getParameterTypes(); - if (parameterTypes.length != 1) { - LOG.warn("Ignoring badly annotated method for injection due to incorrect number of parameters: {}", method); - } else { - Object value = getPostProcessorHelper().getInjectionBeanValue(parameterTypes[0], name); - invokeMethod(method, bean, value); - } - } - - public void setterBeanConfigInjection(Method method, String name, Object bean, String beanName) { - Class[] parameterTypes = method.getParameterTypes(); - if (parameterTypes.length != 1) { - LOG.warn("Ignoring badly annotated method for injection due to incorrect number of parameters: {}", method); - } else { - Object value = getPostProcessorHelper().getInjectionBeanConfigValue(parameterTypes[0], name); - invokeMethod(method, bean, value); - } - } - - private void bindToRegistry(Class clazz, String name, Object bean, String beanName, boolean beanPostProcess) { - if (isEmpty(name)) { - name = clazz.getSimpleName(); - } - if (bean == null) { - // no bean so then create an instance from its type - bean = getOrLookupCamelContext().getInjector().newInstance(clazz); - } - if (beanPostProcess) { - try { - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessBeforeInitialization(bean, beanName); - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessAfterInitialization(bean, beanName); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - getOrLookupCamelContext().getRegistry().bind(name, bean); - } - - private void bindToRegistry(Field field, String name, Object bean, String beanName, boolean beanPostProcess) { - if (isEmpty(name)) { - name = field.getName(); - } - Object value = ReflectionHelper.getField(field, bean); - if (value != null) { - if (beanPostProcess) { - try { - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessBeforeInitialization(value, beanName); - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessAfterInitialization(value, beanName); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - getOrLookupCamelContext().getRegistry().bind(name, value); - } - } - - private void bindToRegistry(Method method, String name, Object bean, String beanName, boolean beanPostProcess) { - if (isEmpty(name)) { - name = method.getName(); - } - Class returnType = method.getReturnType(); - if (returnType == null || returnType == Void.TYPE) { - throw new IllegalArgumentException("@BindToRegistry on class: " + method.getDeclaringClass() - + " method: " + method.getName() + " with void return type is not allowed"); - } - - Object value; - Object[] parameters = bindToRegistryParameterMapping(method); - if (parameters != null) { - value = invokeMethod(method, bean, parameters); - } else { - value = invokeMethod(method, bean); - } - if (value != null) { - if (beanPostProcess) { - try { - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessBeforeInitialization(value, beanName); - getOrLookupCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor().postProcessAfterInitialization(value, beanName); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - getOrLookupCamelContext().getRegistry().bind(name, value); - } - } - - private Object[] bindToRegistryParameterMapping(Method method) { - if (method.getParameterCount() == 0) { - return null; - } - - // map each parameter if possible - Object[] parameters = new Object[method.getParameterCount()]; - for (int i = 0; i < method.getParameterCount(); i++) { - Class type = method.getParameterTypes()[i]; - if (type.isAssignableFrom(CamelContext.class)) { - parameters[i] = getOrLookupCamelContext(); - } else if (type.isAssignableFrom(Registry.class)) { - parameters[i] = getOrLookupCamelContext().getRegistry(); - } else if (type.isAssignableFrom(TypeConverter.class)) { - parameters[i] = getOrLookupCamelContext().getTypeConverter(); - } else { - // we also support @BeanInject and @PropertyInject annotations - Annotation[] anns = method.getParameterAnnotations()[i]; - if (anns.length == 1) { - // we dont assume there are multiple annotations on the same parameter so grab first - Annotation ann = anns[0]; - if (ann.annotationType() == PropertyInject.class) { - PropertyInject pi = (PropertyInject) ann; - Object result = getPostProcessorHelper().getInjectionPropertyValue(type, pi.value(), pi.defaultValue(), null, null, null); - parameters[i] = result; - } else if (ann.annotationType() == BeanConfigInject.class) { - BeanConfigInject pi = (BeanConfigInject) ann; - Object result = getPostProcessorHelper().getInjectionBeanConfigValue(type, pi.value()); - parameters[i] = result; - } else if (ann.annotationType() == BeanInject.class) { - BeanInject bi = (BeanInject) ann; - Object result = getPostProcessorHelper().getInjectionBeanValue(type, bi.value()); - parameters[i] = result; - } - } else { - // okay attempt to default to singleton instances from the registry - Set instances = getOrLookupCamelContext().getRegistry().findByType(type); - if (instances.size() == 1) { - parameters[i] = instances.iterator().next(); - } else if (instances.size() > 1) { - // there are multiple instances of the same type, so barf - throw new IllegalArgumentException("Multiple beans of the same type: " + type - + " exists in the Camel registry. Specify the bean name on @BeanInject to bind to a single bean, at the method: " + method); - } - } - } - - // each parameter must be mapped - if (parameters[i] == null) { - int pos = i + 1; - throw new IllegalArgumentException("@BindToProperty cannot bind parameter #" + pos + " on method: " + method); - } - } - - return parameters; - } - - private static boolean isComplexUserType(Class type) { - // lets consider all non java, as complex types - return type != null && !type.isPrimitive() && !type.getName().startsWith("java."); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.java deleted file mode 100644 index 2ff6f28..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextNameStrategy.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.impl.engine; - -import org.apache.camel.spi.CamelContextNameStrategy; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * A default name strategy which auto assigns a name using a prefix-counter pattern. - */ -public class DefaultCamelContextNameStrategy implements CamelContextNameStrategy { - - private static final AtomicInteger CONTEXT_COUNTER = new AtomicInteger(0); - private final String prefix; - private String name; - - public DefaultCamelContextNameStrategy() { - this("camel"); - } - - public DefaultCamelContextNameStrategy(String prefix) { - this.prefix = prefix; - this.name = getNextName(); - } - - @Override - public String getName() { - if (name == null) { - name = getNextName(); - } - return name; - } - - @Override - public String getNextName() { - return prefix + "-" + getNextCounter(); - } - - @Override - public boolean isFixedName() { - return false; - } - - public static int getNextCounter() { - // we want to start counting from 1, so increment first - return CONTEXT_COUNTER.incrementAndGet(); - } - - /** - * To reset the counter, should only be used for testing purposes. - * - * @param value the counter value - */ - public static void setCounter(int value) { - CONTEXT_COUNTER.set(value); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClaimCheckRepository.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClaimCheckRepository.java deleted file mode 100644 index 848f5f1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClaimCheckRepository.java +++ /dev/null @@ -1,84 +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.impl.engine; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.ClaimCheckRepository; - -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashMap; -import java.util.Map; - -/** - * The default {@link ClaimCheckRepository} implementation that is an in-memory storage. - */ -public class DefaultClaimCheckRepository implements ClaimCheckRepository { - - private final Map map = new HashMap<>(); - private final Deque stack = new ArrayDeque<>(); - - @Override - public boolean add(String key, Exchange exchange) { - return map.put(key, exchange) == null; - } - - @Override - public boolean contains(String key) { - return map.containsKey(key); - } - - @Override - public Exchange get(String key) { - return map.get(key); - } - - @Override - public Exchange getAndRemove(String key) { - return map.remove(key); - } - - @Override - public void push(Exchange exchange) { - stack.push(exchange); - } - - @Override - public Exchange pop() { - if (!stack.isEmpty()) { - return stack.pop(); - } else { - return null; - } - } - - @Override - public void clear() { - map.clear(); - stack.clear(); - } - - @Override - public void start() { - // noop - } - - @Override - public void stop() { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java deleted file mode 100644 index ce19ac7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java +++ /dev/null @@ -1,147 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.spi.ClassResolver; -import org.apache.camel.util.CastUtils; -import org.apache.camel.util.ObjectHelper; - -import java.io.InputStream; -import java.net.URL; -import java.util.Enumeration; - -/** - * Default class resolver that uses regular class loader to load classes. - */ -public class DefaultClassResolver implements ClassResolver, CamelContextAware { - - private CamelContext camelContext; - - public DefaultClassResolver() { - } - - public DefaultClassResolver(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public Class resolveClass(String name) { - Class answer = loadClass(name, DefaultClassResolver.class.getClassLoader()); - if (answer == null && getApplicationContextClassLoader() != null) { - // fallback and use application context class loader - answer = loadClass(name, getApplicationContextClassLoader()); - } - return answer; - } - - @Override - public Class resolveClass(String name, Class type) { - Class answer = CastUtils.cast(loadClass(name, DefaultClassResolver.class.getClassLoader())); - if (answer == null && getApplicationContextClassLoader() != null) { - // fallback and use application context class loader - answer = CastUtils.cast(loadClass(name, getApplicationContextClassLoader())); - } - return answer; - } - - @Override - public Class resolveClass(String name, ClassLoader loader) { - return loadClass(name, loader); - } - - @Override - public Class resolveClass(String name, Class type, ClassLoader loader) { - return CastUtils.cast(loadClass(name, loader)); - } - - @Override - public Class resolveMandatoryClass(String name) throws ClassNotFoundException { - Class answer = resolveClass(name); - if (answer == null) { - throw new ClassNotFoundException(name); - } - return answer; - } - - @Override - public Class resolveMandatoryClass(String name, Class type) throws ClassNotFoundException { - Class answer = resolveClass(name, type); - if (answer == null) { - throw new ClassNotFoundException(name); - } - return answer; - } - - @Override - public Class resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException { - Class answer = resolveClass(name, loader); - if (answer == null) { - throw new ClassNotFoundException(name); - } - return answer; - } - - @Override - public Class resolveMandatoryClass(String name, Class type, ClassLoader loader) throws ClassNotFoundException { - Class answer = resolveClass(name, type, loader); - if (answer == null) { - throw new ClassNotFoundException(name); - } - return answer; - } - - @Override - public InputStream loadResourceAsStream(String uri) { - return ObjectHelper.loadResourceAsStream(uri, getApplicationContextClassLoader()); - } - - @Override - public URL loadResourceAsURL(String uri) { - return ObjectHelper.loadResourceAsURL(uri, getApplicationContextClassLoader()); - } - - @Override - public Enumeration loadResourcesAsURL(String uri) { - return loadAllResourcesAsURL(uri); - } - - @Override - public Enumeration loadAllResourcesAsURL(String uri) { - return ObjectHelper.loadResourcesAsURL(uri); - } - - protected Class loadClass(String name, ClassLoader loader) { - return ObjectHelper.loadClass(name, loader); - } - - protected ClassLoader getApplicationContextClassLoader() { - return camelContext != null ? camelContext.getApplicationContextClassLoader() : null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.java deleted file mode 100644 index ebfdb51..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentNameResolver.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.ComponentNameResolver; - -import java.util.Set; -import java.util.TreeSet; - -public class DefaultComponentNameResolver implements ComponentNameResolver { - - public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/component/*"; - - @Override - public Set resolveNames(CamelContext camelContext) { - // remove leading path to only keep name - Set sorted = new TreeSet<>(); - - try { - Set locations = camelContext.adapt(ExtendedCamelContext.class).getPackageScanResourceResolver().findResourceNames(RESOURCE_PATH); - locations.forEach(l -> sorted.add(l.substring(l.lastIndexOf('/') + 1))); - } catch (Exception e) { - throw new RuntimeCamelException(e); - } - - return sorted; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java deleted file mode 100644 index 8b9bf9d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java +++ /dev/null @@ -1,90 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.Component; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.NoFactoryAvailableException; -import org.apache.camel.spi.ComponentResolver; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.support.ResolverHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; - -/** - * The default implementation of {@link ComponentResolver} which tries to find - * components by using the URI scheme prefix and searching for a file of the URI - * scheme name in the META-INF/services/org/apache/camel/component/ - * directory on the classpath. - */ -public class DefaultComponentResolver implements ComponentResolver { - - public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/component/"; - - private static final Logger LOG = LoggerFactory.getLogger(DefaultComponentResolver.class); - - private FactoryFinder factoryFinder; - - @Override - public Component resolveComponent(String name, CamelContext context) { - // lookup in registry first - Component componentReg = ResolverHelper.lookupComponentInRegistryWithFallback(context, name); - if (componentReg != null) { - return componentReg; - } - - // not in registry then use component factory - Class type; - try { - type = findComponent(name, context); - if (type == null) { - // not found - return null; - } - } catch (NoFactoryAvailableException e) { - return null; - } catch (Exception e) { - throw new IllegalArgumentException("Invalid URI, no Component registered for scheme: " + name, e); - } - - if (getLog().isDebugEnabled()) { - getLog().debug("Found component: {} via type: {} via: {}{}", name, type.getName(), factoryFinder.getResourcePath(), name); - } - - // create the component - if (Component.class.isAssignableFrom(type)) { - return (Component) context.getInjector().newInstance(type, false); - } else { - throw new IllegalArgumentException("Type is not a Component implementation. Found: " + type.getName()); - } - } - - private Class findComponent(String name, CamelContext context) throws IOException { - if (factoryFinder == null) { - factoryFinder = context.adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH); - } - return factoryFinder.findClass(name).orElse(null); - } - - protected Logger getLog() { - return LOG; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java deleted file mode 100644 index d4e7e80..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.NoFactoryAvailableException; -import org.apache.camel.spi.ConfigurerResolver; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; - -/** - * Default configurer resolver that looks for configurer factories in META-INF/services/org/apache/camel/configurer/. - */ -public class DefaultConfigurerResolver implements ConfigurerResolver { - public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/configurer/"; - - private static final Logger LOG = LoggerFactory.getLogger(DefaultConfigurerResolver.class); - - protected FactoryFinder factoryFinder; - - @Override - public GeneratedPropertyConfigurer resolvePropertyConfigurer(String name, CamelContext context) { - if (ObjectHelper.isEmpty(name)) { - return null; - } - - // lookup in registry first - GeneratedPropertyConfigurer configurer = context.getRegistry().lookupByNameAndType(name, GeneratedPropertyConfigurer.class); - if (configurer != null) { - return configurer; - } - - // clip -configurer from the name as that is not the name in META-INF - if (name.endsWith("-configurer")) { - name = name.substring(0, name.length() - 11); - } - - // not in registry then use configurer factory - Class type; - try { - type = findConfigurer(name, context); - if (type == null) { - // not found - return null; - } - } catch (NoFactoryAvailableException e) { - return null; - } catch (Exception e) { - throw new IllegalArgumentException("Invalid URI, no Configurer registered for scheme: " + name, e); - } - - if (getLog().isDebugEnabled()) { - getLog().debug("Found configurer: {} via type: {} via: {}{}", name, type.getName(), factoryFinder.getResourcePath(), name); - } - - // create the component - if (GeneratedPropertyConfigurer.class.isAssignableFrom(type)) { - return (GeneratedPropertyConfigurer) context.getInjector().newInstance(type, false); - } else { - throw new IllegalArgumentException("Type is not a GeneratedPropertyConfigurer implementation. Found: " + type.getName()); - } - } - - private Class findConfigurer(String name, CamelContext context) throws IOException { - if (factoryFinder == null) { - factoryFinder = context.adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH); - } - return factoryFinder.findClass(name).orElse(null); - } - - protected Logger getLog() { - return LOG; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java deleted file mode 100644 index d3601b1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java +++ /dev/null @@ -1,251 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.ConsumerCache; -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.RejectedExecutionException; - -/** - * Cache containing created {@link Consumer}. - */ -public class DefaultConsumerCache extends ServiceSupport implements ConsumerCache { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumerCache.class); - - private final CamelContext camelContext; - private final org.apache.camel.impl.engine.PollingConsumerServicePool consumers; - private final Object source; - - private EndpointUtilizationStatistics statistics; - private boolean extendedStatistics; - private int maxCacheSize; - - public DefaultConsumerCache(Object source, CamelContext camelContext, int cacheSize) { - this.source = source; - this.camelContext = camelContext; - this.maxCacheSize = cacheSize <= 0 ? CamelContextHelper.getMaximumCachePoolSize(camelContext) : cacheSize; - this.consumers = createServicePool(camelContext, maxCacheSize); - // only if JMX is enabled - if (camelContext.getManagementStrategy().getManagementAgent() != null) { - this.extendedStatistics = camelContext.getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended(); - } else { - this.extendedStatistics = false; - } - } - - protected org.apache.camel.impl.engine.PollingConsumerServicePool createServicePool(CamelContext camelContext, int cacheSize) { - return new PollingConsumerServicePool(Endpoint::createPollingConsumer, Consumer::getEndpoint, cacheSize); - } - - public boolean isExtendedStatistics() { - return extendedStatistics; - } - - /** - * Whether extended JMX statistics is enabled for {@link EndpointUtilizationStatistics} - */ - public void setExtendedStatistics(boolean extendedStatistics) { - this.extendedStatistics = extendedStatistics; - } - - /** - * Releases an acquired producer back after usage. - * - * @param endpoint the endpoint - * @param pollingConsumer the pollingConsumer to release - */ - @Override - public void releasePollingConsumer(Endpoint endpoint, PollingConsumer pollingConsumer) { - consumers.release(endpoint, pollingConsumer); - } - - /** - * Acquires a pooled PollingConsumer which you must release back again after usage using the - * {@link #releasePollingConsumer(Endpoint, PollingConsumer)} method. - * - * @param endpoint the endpoint - * @return the PollingConsumer - */ - @Override - public PollingConsumer acquirePollingConsumer(Endpoint endpoint) { - try { - PollingConsumer consumer = consumers.acquire(endpoint); - if (statistics != null) { - statistics.onHit(endpoint.getEndpointUri()); - } - return consumer; - } catch (Throwable e) { - throw new FailedToCreateConsumerException(endpoint, e); - } - } - - @Override - public Exchange receive(Endpoint endpoint) { - if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); - } - - LOG.debug("<<<< {}", endpoint); - PollingConsumer consumer = null; - try { - consumer = acquirePollingConsumer(endpoint); - return consumer.receive(); - } finally { - if (consumer != null) { - releasePollingConsumer(endpoint, consumer); - } - } - } - - @Override - public Exchange receive(Endpoint endpoint, long timeout) { - if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); - } - - LOG.debug("<<<< {}", endpoint); - PollingConsumer consumer = null; - try { - consumer = acquirePollingConsumer(endpoint); - return consumer.receive(timeout); - } finally { - if (consumer != null) { - releasePollingConsumer(endpoint, consumer); - } - } - } - - @Override - public Exchange receiveNoWait(Endpoint endpoint) { - if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); - } - - LOG.debug("<<<< {}", endpoint); - PollingConsumer consumer = null; - try { - consumer = acquirePollingConsumer(endpoint); - return consumer.receiveNoWait(); - } finally { - if (consumer != null) { - releasePollingConsumer(endpoint, consumer); - } - } - } - - public CamelContext getCamelContext() { - return camelContext; - } - - /** - * Gets the source which uses this cache - * - * @return the source - */ - @Override - public Object getSource() { - return source; - } - - /** - * Gets the maximum cache size (capacity). - * - * @return the capacity - */ - @Override - public int getCapacity() { - return maxCacheSize; - } - - /** - * Returns the current size of the cache - * - * @return the current size - */ - @Override - public int size() { - int size = consumers.size(); - LOG.trace("size = {}", size); - return size; - } - - /** - * Purges this cache - */ - @Override - public synchronized void purge() { - try { - consumers.stop(); - consumers.start(); - } catch (Exception e) { - LOG.debug("Error restarting consumer pool", e); - } - if (statistics != null) { - statistics.clear(); - } - } - - @Override - public void cleanUp() { - consumers.cleanUp(); - } - - @Override - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return statistics; - } - - @Override - public String toString() { - return "ConsumerCache for source: " + source + ", capacity: " + getCapacity(); - } - - @Override - protected void doInit() throws Exception { - if (extendedStatistics) { - int max = maxCacheSize == 0 ? CamelContextHelper.getMaximumCachePoolSize(camelContext) : maxCacheSize; - statistics = new DefaultEndpointUtilizationStatistics(max); - } - ServiceHelper.initService(consumers); - } - - @Override - protected void doStart() throws Exception { - if (statistics != null) { - statistics.clear(); - } - ServiceHelper.startService(consumers); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(consumers); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(consumers); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java deleted file mode 100644 index 868b488..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java +++ /dev/null @@ -1,295 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.ConsumerCache; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.UnitOfWorkHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException; - -/** - * Default implementation of {@link ConsumerTemplate}. - */ -public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerTemplate { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumerTemplate.class); - - private final CamelContext camelContext; - private ConsumerCache consumerCache; - private int maximumCacheSize; - - public DefaultConsumerTemplate(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public int getMaximumCacheSize() { - return maximumCacheSize; - } - - @Override - public void setMaximumCacheSize(int maximumCacheSize) { - this.maximumCacheSize = maximumCacheSize; - } - - @Override - public int getCurrentCacheSize() { - if (consumerCache == null) { - return 0; - } - return consumerCache.size(); - } - - @Override - public void cleanUp() { - if (consumerCache != null) { - consumerCache.cleanUp(); - } - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public Exchange receive(String endpointUri) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return getConsumerCache().receive(endpoint); - } - - @Override - public Exchange receive(Endpoint endpoint) { - return receive(endpoint.getEndpointUri()); - } - - @Override - public Exchange receive(String endpointUri, long timeout) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return getConsumerCache().receive(endpoint, timeout); - } - - @Override - public Exchange receive(Endpoint endpoint, long timeout) { - return receive(endpoint.getEndpointUri(), timeout); - } - - @Override - public Exchange receiveNoWait(String endpointUri) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return getConsumerCache().receiveNoWait(endpoint); - } - - @Override - public Exchange receiveNoWait(Endpoint endpoint) { - return receiveNoWait(endpoint.getEndpointUri()); - } - - @Override - public Object receiveBody(String endpointUri) { - return receiveBody(receive(endpointUri)); - } - - @Override - public Object receiveBody(Endpoint endpoint) { - return receiveBody(endpoint.getEndpointUri()); - } - - @Override - public Object receiveBody(String endpointUri, long timeout) { - return receiveBody(receive(endpointUri, timeout)); - } - - @Override - public Object receiveBody(Endpoint endpoint, long timeout) { - return receiveBody(endpoint.getEndpointUri(), timeout); - } - - @Override - public Object receiveBodyNoWait(String endpointUri) { - return receiveBody(receiveNoWait(endpointUri)); - } - - private Object receiveBody(Exchange exchange) { - Object answer; - try { - answer = extractResultBody(exchange); - } finally { - doneUoW(exchange); - } - return answer; - } - - - @Override - public Object receiveBodyNoWait(Endpoint endpoint) { - return receiveBodyNoWait(endpoint.getEndpointUri()); - } - - @Override - @SuppressWarnings("unchecked") - public T receiveBody(String endpointUri, Class type) { - Object answer; - Exchange exchange = receive(endpointUri); - try { - answer = extractResultBody(exchange); - answer = camelContext.getTypeConverter().convertTo(type, exchange, answer); - } finally { - doneUoW(exchange); - } - return (T) answer; - } - - @Override - public T receiveBody(Endpoint endpoint, Class type) { - return receiveBody(endpoint.getEndpointUri(), type); - } - - @Override - @SuppressWarnings("unchecked") - public T receiveBody(String endpointUri, long timeout, Class type) { - Object answer; - Exchange exchange = receive(endpointUri, timeout); - try { - answer = extractResultBody(exchange); - answer = camelContext.getTypeConverter().convertTo(type, exchange, answer); - } finally { - doneUoW(exchange); - } - return (T) answer; - } - - @Override - public T receiveBody(Endpoint endpoint, long timeout, Class type) { - return receiveBody(endpoint.getEndpointUri(), timeout, type); - } - - @Override - @SuppressWarnings("unchecked") - public T receiveBodyNoWait(String endpointUri, Class type) { - Object answer; - Exchange exchange = receiveNoWait(endpointUri); - try { - answer = extractResultBody(exchange); - answer = camelContext.getTypeConverter().convertTo(type, exchange, answer); - } finally { - doneUoW(exchange); - } - return (T) answer; - } - - @Override - public T receiveBodyNoWait(Endpoint endpoint, Class type) { - return receiveBodyNoWait(endpoint.getEndpointUri(), type); - } - - @Override - public void doneUoW(Exchange exchange) { - try { - // The receiveBody method will get a null exchange - if (exchange == null) { - return; - } - if (exchange.getUnitOfWork() == null) { - // handover completions and done them manually to ensure they are being executed - List synchronizations = exchange.adapt(ExtendedExchange.class).handoverCompletions(); - UnitOfWorkHelper.doneSynchronizations(exchange, synchronizations, LOG); - } else { - // done the unit of work - exchange.getUnitOfWork().done(exchange); - } - } catch (Throwable e) { - LOG.warn("Exception occurred during done UnitOfWork for Exchange: " + exchange - + ". This exception will be ignored.", e); - } - } - - protected Endpoint resolveMandatoryEndpoint(String endpointUri) { - return CamelContextHelper.getMandatoryEndpoint(camelContext, endpointUri); - } - - /** - * Extracts the body from the given result. - *

- * If the exchange pattern is provided it will try to honor it and retrieve the body - * from either IN or OUT according to the pattern. - * - * @param result the result - * @return the result, can be null. - */ - protected Object extractResultBody(Exchange result) { - Object answer = null; - if (result != null) { - // rethrow if there was an exception - if (result.getException() != null) { - throw wrapRuntimeCamelException(result.getException()); - } - - // okay no fault then return the response - answer = result.getMessage().getBody(); - - // in a very seldom situation then getBody can cause an exception to be set on the exchange - // rethrow if there was an exception during execution - if (result.getException() != null) { - throw wrapRuntimeCamelException(result.getException()); - } - } - return answer; - } - - private ConsumerCache getConsumerCache() { - if (!isStarted()) { - throw new IllegalStateException("ConsumerTemplate has not been started"); - } - return consumerCache; - } - - @Override - protected void doInit() throws Exception { - if (consumerCache == null) { - consumerCache = new DefaultConsumerCache(this, camelContext, maximumCacheSize); - } - ServiceHelper.initService(consumerCache); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(consumerCache); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(consumerCache); - } - - @Override - protected void doShutdown() throws Exception { - // we should shutdown the services as this is our intention, to not re-use the services anymore - ServiceHelper.stopAndShutdownService(consumerCache); - consumerCache = null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.java deleted file mode 100644 index 280f8a5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDataFormatResolver.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.DataFormatFactory; -import org.apache.camel.spi.DataFormatResolver; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.support.ResolverHelper; - -/** - * Default data format resolver - */ -public class DefaultDataFormatResolver implements DataFormatResolver { - public static final String DATAFORMAT_RESOURCE_PATH = "META-INF/services/org/apache/camel/dataformat/"; - - private FactoryFinder dataformatFactory; - - @Override - public DataFormat resolveDataFormat(String name, CamelContext context) { - // lookup in registry first - DataFormat dataFormat = ResolverHelper.lookupDataFormatInRegistryWithFallback(context, name); - - if (dataFormat == null) { - // If not found in the registry, try to create a new instance using - // a DataFormatFactory or from resources - dataFormat = createDataFormat(name, context); - } - - return dataFormat; - } - - @Override - public DataFormat createDataFormat(String name, CamelContext context) { - DataFormat dataFormat = null; - - // lookup in registry first - DataFormatFactory dataFormatFactory = ResolverHelper.lookupDataFormatFactoryInRegistryWithFallback(context, name); - if (dataFormatFactory != null) { - dataFormat = dataFormatFactory.newInstance(); - } - - if (dataFormat == null) { - dataFormat = createDataFormatFromResource(name, context); - } - - return dataFormat; - } - - private DataFormat createDataFormatFromResource(String name, CamelContext context) { - DataFormat dataFormat = null; - - Class type; - try { - if (dataformatFactory == null) { - dataformatFactory = context.adapt(ExtendedCamelContext.class).getFactoryFinder(DATAFORMAT_RESOURCE_PATH); - } - type = dataformatFactory.findClass(name).orElse(null); - } catch (Exception e) { - throw new IllegalArgumentException("Invalid URI, no DataFormat registered for scheme: " + name, e); - } - - if (type == null) { - type = context.getClassResolver().resolveClass(name); - } - - if (type != null) { - if (DataFormat.class.isAssignableFrom(type)) { - dataFormat = (DataFormat) context.getInjector().newInstance(type, false); - } else { - throw new IllegalArgumentException("Resolving dataformat: " + name + " detected type conflict: Not a DataFormat implementation. Found: " + type.getName()); - } - } - - return dataFormat; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDeferServiceFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDeferServiceFactory.java deleted file mode 100644 index 65ee621..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultDeferServiceFactory.java +++ /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. - */ -package org.apache.camel.impl.engine; - -import org.apache.camel.Endpoint; -import org.apache.camel.Producer; -import org.apache.camel.processor.EventNotifierProducer; -import org.apache.camel.processor.UnitOfWorkProducer; -import org.apache.camel.spi.DeferServiceFactory; - -public final class DefaultDeferServiceFactory implements DeferServiceFactory { - - @Override - public Producer createProducer(Endpoint endpoint) throws Exception { - Producer producer = new DeferProducer(endpoint); - producer = new UnitOfWorkProducer(producer); - producer = new EventNotifierProducer(producer); - endpoint.getCamelContext().deferStartService(producer, true); - return producer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java deleted file mode 100644 index c278f14..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.Endpoint; -import org.apache.camel.spi.EndpointRegistry; -import org.apache.camel.support.CamelContextHelper; - -import java.util.Map; - -/** - * Default implementation of {@link EndpointRegistry} - */ -public class DefaultEndpointRegistry extends AbstractDynamicRegistry implements EndpointRegistry { - - public DefaultEndpointRegistry(CamelContext context) { - super(context, CamelContextHelper.getMaximumEndpointCacheSize(context)); - } - - public DefaultEndpointRegistry(CamelContext context, Map endpoints) { - this(context); - putAll(endpoints); - } - - @Override - public boolean isStatic(String key) { - return isStatic(new EndpointKey(key)); - } - - @Override - public boolean isDynamic(String key) { - return isDynamic(new EndpointKey(key)); - } - - @Override - public String toString() { - return "EndpointRegistry for " + context.getName() + ", capacity: " + maxCacheSize; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointUtilizationStatistics.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointUtilizationStatistics.java deleted file mode 100644 index 52d0c9a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointUtilizationStatistics.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.impl.engine; - -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.support.LRUCacheFactory; - -import java.util.Collections; -import java.util.Map; - -public class DefaultEndpointUtilizationStatistics implements EndpointUtilizationStatistics { - - private final int maxCapacity; - private final Map map; - - @SuppressWarnings("unchecked") - public DefaultEndpointUtilizationStatistics(int maxCapacity) { - this.map = LRUCacheFactory.newLRUCache(16, maxCapacity, false); - this.maxCapacity = maxCapacity; - } - - @Override - public int maxCapacity() { - return maxCapacity; - } - - @Override - public int size() { - return map.size(); - } - - @Override - public void onHit(String uri) { - map.compute(uri, (key, current) -> { - if (current == null) { - return 1L; - } else { - return ++current; - } - }); - } - - @Override - public void remove(String uri) { - map.remove(uri); - } - - @Override - public Map getStatistics() { - return Collections.unmodifiableMap(map); - } - - @Override - public void clear() { - map.clear(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java deleted file mode 100644 index 2efe4a1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java +++ /dev/null @@ -1,174 +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.impl.engine; - -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.ClassResolver; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.util.IOHelper; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Optional; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.function.Function; - -/** - * Default factory finder. - */ -public class DefaultFactoryFinder implements FactoryFinder { - - private final ConcurrentMap> classMap = new ConcurrentHashMap<>(); - private final ConcurrentMap classesNotFound = new ConcurrentHashMap<>(); - private final ConcurrentMap classesNotFoundExceptions = new ConcurrentHashMap<>(); - private final ClassResolver classResolver; - private final String path; - - public DefaultFactoryFinder(ClassResolver classResolver, String resourcePath) { - this.classResolver = classResolver; - this.path = resourcePath; - } - - @Override - public String getResourcePath() { - return path; - } - - @Override - public Optional newInstance(String key) { - return Optional.ofNullable(doNewInstance(key)); - } - - @Override - public Optional newInstance(String key, Class type) { - Object obj = doNewInstance(key); - return Optional.ofNullable(type.cast(obj)); - } - - @Override - public Optional> findClass(String key) { - final String classKey = key; - - Class clazz = addToClassMap(classKey, () -> { - Properties prop = doFindFactoryProperties(key); - if (prop != null) { - return doNewInstance(prop, true).orElse(null); - } else { - return null; - } - }); - return Optional.ofNullable(clazz); - } - - @Override - public Optional> findOptionalClass(String key) { - final String classKey = key; - - Class clazz = addToClassMap(classKey, () -> { - Properties prop = doFindFactoryProperties(key); - if (prop != null) { - return doNewInstance(prop, false).orElse(null); - } else { - return null; - } - }); - return Optional.ofNullable(clazz); - } - - private Object doNewInstance(String key) { - Optional> clazz = findClass(key); - return clazz.map(ObjectHelper::newInstance).orElse(null); - } - - private Optional> doNewInstance(Properties properties, boolean mandatory) throws IOException { - String className = properties.getProperty("class"); - if (className == null && mandatory) { - throw new IOException("Expected property is missing: class"); - } else if (className == null) { - return Optional.empty(); - } - - Class clazz = classResolver.resolveClass(className); - return Optional.ofNullable(clazz); - } - - private Properties doFindFactoryProperties(String key) throws IOException { - String uri = path + key; - - InputStream in = classResolver.loadResourceAsStream(uri); - if (in == null) { - return null; - } - - // lets load the file - BufferedInputStream reader = null; - try { - reader = IOHelper.buffered(in); - Properties properties = new Properties(); - properties.load(reader); - return properties; - } finally { - IOHelper.close(reader, key, null); - IOHelper.close(in, key, null); - } - } - - /* - * This is a wrapper function to deal with exceptions in lambdas: the exception - * is wrapped by a runtime exception (WrappedRuntimeException) which we catch - * later on with the only purpose to re-throw the original exception. - */ - protected Class addToClassMap(String key, ClassSupplier mappingFunction) { - if (classesNotFound.containsKey(key) || classesNotFoundExceptions.containsKey(key)) { - Exception e = classesNotFoundExceptions.get(key); - if (e == null) { - return null; - } else { - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - - Class suppliedClass = classMap.computeIfAbsent(key, new Function>() { - @Override - public Class apply(String classKey) { - try { - return mappingFunction.get(); - } catch (Exception e) { - classesNotFoundExceptions.put(key, e); - throw RuntimeCamelException.wrapRuntimeException(e); - } - } - }); - - if (suppliedClass == null) { - // mark the key as non-resolvable to prevent pointless searching - classesNotFound.put(key, Boolean.TRUE); - } - - return suppliedClass; - } - - @FunctionalInterface - protected interface ClassSupplier { - Class get() throws Exception; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java deleted file mode 100644 index 027dead..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java +++ /dev/null @@ -1,33 +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.impl.engine; - -import org.apache.camel.spi.ClassResolver; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.FactoryFinderResolver; - -/** - * Default factory finder. - */ -public class DefaultFactoryFinderResolver implements FactoryFinderResolver { - - @Override - public FactoryFinder resolveFactoryFinder(ClassResolver classResolver, String resourcePath) { - return new DefaultFactoryFinder(classResolver, resourcePath); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java deleted file mode 100644 index 32a8d00..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java +++ /dev/null @@ -1,407 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.ConvertBodyProcessor; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.concurrent.Future; -import java.util.function.Consumer; -import java.util.function.Supplier; - -public class DefaultFluentProducerTemplate extends ServiceSupport implements FluentProducerTemplate { - - // transient state of endpoint, headers and body which needs to be thread local scoped to be thread-safe - private final ThreadLocal> headers = new ThreadLocal<>(); - private final ThreadLocal body = new ThreadLocal<>(); - private final ThreadLocal endpoint = new ThreadLocal<>(); - private final ThreadLocal> exchangeSupplier = new ThreadLocal<>(); - private final ThreadLocal> processorSupplier = new ThreadLocal<>(); - private final ThreadLocal> templateCustomizer = new ThreadLocal<>(); - - private final CamelContext context; - private final ClassValue resultProcessors; - private Endpoint defaultEndpoint; - private int maximumCacheSize; - private boolean eventNotifierEnabled; - private volatile ProducerTemplate template; - - public DefaultFluentProducerTemplate(CamelContext context) { - this.context = context; - this.eventNotifierEnabled = true; - this.resultProcessors = new ClassValue() { - @Override - protected ConvertBodyProcessor computeValue(Class type) { - return new ConvertBodyProcessor(type); - } - }; - } - - @Override - public CamelContext getCamelContext() { - return context; - } - - @Override - public int getCurrentCacheSize() { - if (template == null) { - return 0; - } - return template.getCurrentCacheSize(); - } - - @Override - public void cleanUp() { - if (template != null) { - template.cleanUp(); - } - } - - @Override - public void setDefaultEndpointUri(String endpointUri) { - setDefaultEndpoint(getCamelContext().getEndpoint(endpointUri)); - } - - @Override - public Endpoint getDefaultEndpoint() { - return defaultEndpoint; - } - - @Override - public void setDefaultEndpoint(Endpoint defaultEndpoint) { - this.defaultEndpoint = defaultEndpoint; - } - - @Override - public int getMaximumCacheSize() { - return maximumCacheSize; - } - - @Override - public void setMaximumCacheSize(int maximumCacheSize) { - this.maximumCacheSize = maximumCacheSize; - } - - @Override - public boolean isEventNotifierEnabled() { - return eventNotifierEnabled; - } - - @Override - public void setEventNotifierEnabled(boolean eventNotifierEnabled) { - this.eventNotifierEnabled = eventNotifierEnabled; - } - - @Override - public FluentProducerTemplate clearAll() { - clearBody(); - clearHeaders(); - - return this; - } - - @Override - public FluentProducerTemplate withHeader(String key, Object value) { - Map map = headers.get(); - if (map == null) { - map = new LinkedHashMap<>(); - headers.set(map); - } - - map.put(key, value); - - return this; - } - - @Override - public FluentProducerTemplate clearHeaders() { - headers.remove(); - - return this; - } - - @Override - public FluentProducerTemplate withBody(Object body) { - this.body.set(body); - - return this; - } - - @Override - public FluentProducerTemplate withBodyAs(Object body, Class type) { - Object b = type != null - ? context.getTypeConverter().convertTo(type, body) - : body; - - this.body.set(b); - - return this; - } - - @Override - public FluentProducerTemplate clearBody() { - body.remove(); - - return this; - } - - @Override - public FluentProducerTemplate withTemplateCustomizer(final Consumer templateCustomizer) { - this.templateCustomizer.set(templateCustomizer); - - if (template != null) { - // need to re-initialize template since we have a customizer - ServiceHelper.stopService(template); - templateCustomizer.accept(template); - ServiceHelper.startService(template); - } - - return this; - } - - @Override - public FluentProducerTemplate withExchange(final Exchange exchange) { - return withExchange(() -> exchange); - } - - @Override - public FluentProducerTemplate withExchange(final Supplier exchangeSupplier) { - this.exchangeSupplier.set(exchangeSupplier); - return this; - } - - @Override - public FluentProducerTemplate withProcessor(final Processor processor) { - return withProcessor(() -> processor); - } - - @Override - public FluentProducerTemplate withProcessor(final Supplier processorSupplier) { - this.processorSupplier.set(processorSupplier); - return this; - } - - @Override - public FluentProducerTemplate to(String endpointUri) { - return to(context.getEndpoint(endpointUri)); - } - - @Override - public FluentProducerTemplate to(Endpoint endpoint) { - this.endpoint.set(endpoint); - return this; - } - - // ************************ - // REQUEST - // ************************ - - @Override - public Object request() throws CamelExecutionException { - return request(Object.class); - } - - @Override - @SuppressWarnings("unchecked") - public T request(Class type) throws CamelExecutionException { - if (exchangeSupplier.get() != null) { - throw new IllegalArgumentException("withExchange not supported on FluentProducerTemplate.request method. Use send method instead."); - } - - // Determine the target endpoint - final Endpoint target = target(); - - // Create the default processor if not provided. - final Processor processorSupplier = this.processorSupplier.get() != null ? this.processorSupplier.get().get() : defaultProcessor(); - - T result; - if (type == Exchange.class) { - result = (T)template().request(target, processorSupplier); - } else if (type == Message.class) { - Exchange exchange = template().request(target, processorSupplier); - result = (T)exchange.getMessage(); - } else { - Exchange exchange = template().send( - target, - ExchangePattern.InOut, - processorSupplier, - resultProcessors.get(type) - ); - - result = context.getTypeConverter().convertTo( - type, - ExchangeHelper.extractResultBody(exchange, exchange.getPattern()) - ); - } - - return result; - } - - @Override - public Future asyncRequest() { - return asyncRequest(Object.class); - } - - @Override - public Future asyncRequest(Class type) { - // Determine the target endpoint - final Endpoint target = target(); - - Future result; - if (ObjectHelper.isNotEmpty(headers.get())) { - // Make a copy of the headers and body so that async processing won't - // be invalidated by subsequent reuse of the template - final Map headersCopy = new HashMap<>(headers.get()); - final Object bodyCopy = body.get(); - - result = template().asyncRequestBodyAndHeaders(target, bodyCopy, headersCopy, type); - } else { - // Make a copy of the and body so that async processing won't be - // invalidated by subsequent reuse of the template - final Object bodyCopy = body.get(); - - result = template().asyncRequestBody(target, bodyCopy, type); - } - - return result; - } - - // ************************ - // SEND - // ************************ - - @Override - public Exchange send() throws CamelExecutionException { - // Determine the target endpoint - final Endpoint target = target(); - - Exchange exchange = exchangeSupplier.get() != null ? exchangeSupplier.get().get() : null; - if (exchange != null) { - return template().send(target, exchange); - } else { - Processor processor = processorSupplier.get() != null ? processorSupplier.get().get() : defaultProcessor(); - return template().send(target, processor); - } - } - - @Override - public Future asyncSend() { - // Determine the target endpoint - final Endpoint target = target(); - - Exchange exchange = exchangeSupplier.get() != null ? exchangeSupplier.get().get() : null; - if (exchange != null) { - return template().asyncSend(target, exchange); - } else { - Processor processor = processorSupplier.get() != null ? processorSupplier.get().get() : defaultAsyncProcessor(); - return template().asyncSend(target, processor); - } - } - - // ************************ - // HELPERS - // ************************ - - /** - * Create the FluentProducerTemplate by setting the camel context - * - * @param context the camel context - */ - public static FluentProducerTemplate on(CamelContext context) { - DefaultFluentProducerTemplate fluent = new DefaultFluentProducerTemplate(context); - fluent.start(); - return fluent; - } - - private ProducerTemplate template() { - return template; - } - - private Processor defaultProcessor() { - return exchange -> { - ObjectHelper.ifNotEmpty(headers.get(), exchange.getIn().getHeaders()::putAll); - ObjectHelper.ifNotEmpty(body.get(), exchange.getIn()::setBody); - }; - } - - private Processor defaultAsyncProcessor() { - final Map headersCopy = ObjectHelper.isNotEmpty(this.headers.get()) ? new HashMap<>(this.headers.get()) : null; - final Object bodyCopy = this.body.get(); - - return exchange -> { - ObjectHelper.ifNotEmpty(headersCopy, exchange.getIn().getHeaders()::putAll); - ObjectHelper.ifNotEmpty(bodyCopy, exchange.getIn()::setBody); - }; - } - - private Endpoint target() { - if (endpoint.get() != null) { - return endpoint.get(); - } - if (defaultEndpoint != null) { - return defaultEndpoint; - } - - if (template != null && template.getDefaultEndpoint() != null) { - return template.getDefaultEndpoint(); - } - - throw new IllegalArgumentException("No endpoint configured on FluentProducerTemplate. You can configure an endpoint with to(uri)"); - } - - @Override - protected void doInit() throws Exception { - ObjectHelper.notNull(context, "CamelContext"); - template = context.createProducerTemplate(maximumCacheSize); - if (defaultEndpoint != null) { - template.setDefaultEndpoint(defaultEndpoint); - } - template.setEventNotifierEnabled(eventNotifierEnabled); - if (templateCustomizer.get() != null) { - templateCustomizer.get().accept(template); - } - ServiceHelper.initService(template); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(template); - } - - @Override - protected void doStop() throws Exception { - clearAll(); - this.endpoint.remove(); - this.exchangeSupplier.remove(); - this.processorSupplier.remove(); - this.templateCustomizer.remove(); - ServiceHelper.stopService(template); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownService(template); - template = null; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.java deleted file mode 100644 index 129db24..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultGlobalEndpointConfiguration.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.impl.engine; - -import org.apache.camel.GlobalEndpointConfiguration; - -public final class DefaultGlobalEndpointConfiguration implements GlobalEndpointConfiguration { - - private boolean lazyStartProducer; - private boolean bridgeErrorHandler; - private boolean basicPropertyBinding; - - @Override - public boolean isLazyStartProducer() { - return lazyStartProducer; - } - - @Override - public void setLazyStartProducer(boolean lazyStartProducer) { - this.lazyStartProducer = lazyStartProducer; - } - - @Override - public boolean isBridgeErrorHandler() { - return bridgeErrorHandler; - } - - @Override - public void setBridgeErrorHandler(boolean bridgeErrorHandler) { - this.bridgeErrorHandler = bridgeErrorHandler; - } - - @Override - public boolean isBasicPropertyBinding() { - return basicPropertyBinding; - } - - @Override - public void setBasicPropertyBinding(boolean basicPropertyBinding) { - this.basicPropertyBinding = basicPropertyBinding; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java deleted file mode 100644 index 9b11113..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultHeadersMapFactory.java +++ /dev/null @@ -1,52 +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.impl.engine; - -import org.apache.camel.spi.HeadersMapFactory; -import org.apache.camel.util.CaseInsensitiveMap; - -import java.util.Map; - -/** - * Default {@link HeadersMapFactory} which uses the {@link CaseInsensitiveMap CaseInsensitiveMap}. - * This implementation uses a {@link CaseInsensitiveMap} storing the headers. - * This allows us to be able to lookup headers using case insensitive keys, making it easier for end users - * as they do not have to be worried about using exact keys. - * See more details at {@link CaseInsensitiveMap}. - */ -public class DefaultHeadersMapFactory implements HeadersMapFactory { - - @Override - public Map newMap() { - return new CaseInsensitiveMap(); - } - - @Override - public Map newMap(Map map) { - return new CaseInsensitiveMap(map); - } - - @Override - public boolean isInstanceOf(Map map) { - return map instanceof CaseInsensitiveMap; - } - - @Override - public boolean isCaseInsensitive() { - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java deleted file mode 100644 index 07d5d13..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java +++ /dev/null @@ -1,275 +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.impl.engine; - -import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; -import org.apache.camel.MessageHistory; -import org.apache.camel.spi.InflightRepository; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * Default {@link InflightRepository}. - */ -public class DefaultInflightRepository extends ServiceSupport implements InflightRepository { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class); - - private final AtomicInteger size = new AtomicInteger(); - private final ConcurrentMap inflight = new ConcurrentHashMap<>(); - private final ConcurrentMap routeCount = new ConcurrentHashMap<>(); - private boolean inflightExchangeEnabled; - - @Override - public void add(Exchange exchange) { - size.incrementAndGet(); - - if (inflightExchangeEnabled) { - inflight.put(exchange.getExchangeId(), exchange); - } - } - - @Override - public void remove(Exchange exchange) { - size.decrementAndGet(); - - if (inflightExchangeEnabled) { - inflight.remove(exchange.getExchangeId()); - } - } - - @Override - public void add(Exchange exchange, String routeId) { - AtomicInteger existing = routeCount.get(routeId); - if (existing != null) { - existing.incrementAndGet(); - } - } - - @Override - public void remove(Exchange exchange, String routeId) { - AtomicInteger existing = routeCount.get(routeId); - if (existing != null) { - existing.decrementAndGet(); - } - } - - @Override - public int size() { - return size.get(); - } - - @Override - public void addRoute(String routeId) { - routeCount.putIfAbsent(routeId, new AtomicInteger()); - } - - @Override - public void removeRoute(String routeId) { - routeCount.remove(routeId); - } - - @Override - public int size(String routeId) { - AtomicInteger existing = routeCount.get(routeId); - return existing != null ? existing.get() : 0; - } - - @Override - public boolean isInflightBrowseEnabled() { - return inflightExchangeEnabled; - } - - @Override - public void setInflightBrowseEnabled(boolean inflightBrowseEnabled) { - this.inflightExchangeEnabled = inflightBrowseEnabled; - } - - @Override - public Collection browse() { - return browse(null, -1, false); - } - - @Override - public Collection browse(String fromRouteId) { - return browse(fromRouteId, -1, false); - } - - @Override - public Collection browse(int limit, boolean sortByLongestDuration) { - return browse(null, limit, sortByLongestDuration); - } - - @Override - public Collection browse(String fromRouteId, int limit, boolean sortByLongestDuration) { - if (!inflightExchangeEnabled) { - return Collections.emptyList(); - } - - Stream values; - if (fromRouteId == null) { - // all values - values = inflight.values().stream(); - } else { - // only if route match - values = inflight.values().stream() - .filter(e -> fromRouteId.equals(e.getFromRouteId())); - } - - if (sortByLongestDuration) { - // sort by duration and grab the first - values = values.sorted((e1, e2) -> { - long d1 = getExchangeDuration(e1); - long d2 = getExchangeDuration(e2); - // need the biggest number first - return -1 * Long.compare(d1, d2); - }); - } else { - // else sort by exchange id - values = values.sorted(Comparator.comparing(Exchange::getExchangeId)); - } - - if (limit > 0) { - values = values.limit(limit); - } - - List answer = values.map(InflightExchangeEntry::new).collect(Collectors.toList()); - return Collections.unmodifiableCollection(answer); - } - - @Override - public InflightExchange oldest(String fromRouteId) { - if (!inflightExchangeEnabled) { - return null; - } - - Stream values; - - if (fromRouteId == null) { - // all values - values = inflight.values().stream(); - } else { - // only if route match - values = inflight.values().stream() - .filter(e -> fromRouteId.equals(e.getFromRouteId())); - } - - // sort by duration and grab the first - Exchange first = values.sorted((e1, e2) -> { - long d1 = getExchangeDuration(e1); - long d2 = getExchangeDuration(e2); - // need the biggest number first - return -1 * Long.compare(d1, d2); - }).findFirst().orElse(null); - - if (first != null) { - return new InflightExchangeEntry(first); - } else { - return null; - } - } - - @Override - protected void doStop() throws Exception { - int count = size(); - if (count > 0) { - LOG.warn("Shutting down while there are still {} inflight exchanges.", count); - } else { - LOG.debug("Shutting down with no inflight exchanges."); - } - routeCount.clear(); - } - - private static long getExchangeDuration(Exchange exchange) { - return System.currentTimeMillis() - exchange.getCreated(); - } - - private static final class InflightExchangeEntry implements InflightExchange { - - private final Exchange exchange; - - private InflightExchangeEntry(Exchange exchange) { - this.exchange = exchange; - } - - @Override - public Exchange getExchange() { - return exchange; - } - - @Override - public long getDuration() { - return DefaultInflightRepository.getExchangeDuration(exchange); - } - - @Override - @SuppressWarnings("unchecked") - public long getElapsed() { - // this can only be calculate if message history is enabled - LinkedList list = exchange.getProperty(Exchange.MESSAGE_HISTORY, LinkedList.class); - if (list == null || list.isEmpty()) { - return 0; - } - - // get latest entry - MessageHistory history = list.getLast(); - if (history != null) { - long elapsed = history.getElapsed(); - if (elapsed == 0 && history.getTime() > 0) { - // still in progress, so lets compute it via the start time - elapsed = System.currentTimeMillis() - history.getTime(); - } - return elapsed; - } else { - return 0; - } - } - - @Override - @SuppressWarnings("unchecked") - public String getNodeId() { - return exchange.adapt(ExtendedExchange.class).getHistoryNodeId(); - } - - @Override - public String getFromRouteId() { - return exchange.getFromRouteId(); - } - - @Override - @SuppressWarnings("unchecked") - public String getAtRouteId() { - return ExchangeHelper.getAtRouteId(exchange); - } - - @Override - public String toString() { - return "InflightExchangeEntry[exchangeId=" + exchange.getExchangeId() + "]"; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInjector.java deleted file mode 100644 index 3f34bf3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInjector.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.CamelBeanPostProcessor; -import org.apache.camel.spi.Injector; -import org.apache.camel.support.ObjectHelper; - -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; - -/** - * A default implementation of {@link Injector} which just uses reflection to - * instantiate new objects using their zero argument constructor, - * and then performing bean post processing using {@link CamelBeanPostProcessor}. - */ -public class DefaultInjector implements Injector { - - // use the reflection injector - private final CamelBeanPostProcessor postProcessor; - - public DefaultInjector(CamelContext context) { - postProcessor = context.adapt(ExtendedCamelContext.class).getBeanPostProcessor(); - } - - @Override - public T newInstance(Class type) { - return newInstance(type, true); - } - - @Override - public T newInstance(Class type, String factoryMethod) { - T answer = null; - try { - // lookup factory method - Method fm = type.getMethod(factoryMethod); - if (Modifier.isStatic(fm.getModifiers()) && Modifier.isPublic(fm.getModifiers()) && fm.getReturnType() == type) { - Object obj = fm.invoke(null); - answer = type.cast(obj); - } - } catch (Exception e) { - throw new RuntimeCamelException("Error invoking factory method: " + factoryMethod + " on class: " + type, e); - } - return answer; - } - - @Override - public T newInstance(Class type, boolean postProcessBean) { - T answer = ObjectHelper.newInstance(type); - if (answer != null && postProcessBean) { - try { - postProcessor.postProcessBeforeInitialization(answer, answer.getClass().getName()); - postProcessor.postProcessAfterInitialization(answer, answer.getClass().getName()); - } catch (Exception e) { - throw new RuntimeCamelException("Error during post processing of bean: " + answer, e); - } - } - return answer; - } - - @Override - public boolean supportsAutoWiring() { - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInterceptSendToEndpoint.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInterceptSendToEndpoint.java deleted file mode 100644 index eb8bf02..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInterceptSendToEndpoint.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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.InterceptSendToEndpoint; -import org.apache.camel.support.service.ServiceHelper; - -import java.util.Map; - -/** - * This is an endpoint when sending to it, is intercepted and is routed in a detour (before and optionally after). - */ -public class DefaultInterceptSendToEndpoint implements InterceptSendToEndpoint, ShutdownableService { - - private final Endpoint delegate; - private Processor before; - private Processor after; - private boolean skip; - - /** - * Intercepts sending to the given endpoint - * - * @param destination the original endpoint - * @param skip true to skip sending after the detour to the original endpoint - */ - public DefaultInterceptSendToEndpoint(final Endpoint destination, boolean skip) { - this.delegate = destination; - this.skip = skip; - } - - public void setBefore(Processor before) { - this.before = before; - } - - public void setAfter(Processor after) { - this.after = after; - } - - public void setSkip(boolean skip) { - this.skip = skip; - } - - @Override - public Processor getBefore() { - return before; - } - - @Override - public Processor getAfter() { - return after; - } - - @Override - public Endpoint getOriginalEndpoint() { - return delegate; - } - - @Override - public boolean isSkip() { - return skip; - } - - @Override - public String getEndpointUri() { - return delegate.getEndpointUri(); - } - - @Override - public String getEndpointBaseUri() { - return delegate.getEndpointBaseUri(); - } - - @Override - public String getEndpointKey() { - return delegate.getEndpointKey(); - } - - @Override - public Exchange createExchange() { - return delegate.createExchange(); - } - - @Override - public Exchange createExchange(ExchangePattern pattern) { - return delegate.createExchange(pattern); - } - - @Override - public CamelContext getCamelContext() { - return delegate.getCamelContext(); - } - - @Override - public Producer createProducer() throws Exception { - return createAsyncProducer(); - } - - @Override - public AsyncProducer createAsyncProducer() throws Exception { - AsyncProducer producer = delegate.createAsyncProducer(); - return new InterceptSendToEndpointProcessor(this, delegate, producer, skip); - } - - @Override - public Consumer createConsumer(Processor processor) throws Exception { - return delegate.createConsumer(processor); - } - - @Override - public PollingConsumer createPollingConsumer() throws Exception { - return delegate.createPollingConsumer(); - } - - @Override - public void configureProperties(Map options) { - delegate.configureProperties(options); - } - - @Override - public void setCamelContext(CamelContext context) { - delegate.setCamelContext(context); - } - - @Override - public boolean isLenientProperties() { - return delegate.isLenientProperties(); - } - - @Override - public boolean isSingleton() { - return delegate.isSingleton(); - } - - @Override - public void start() { - ServiceHelper.startService(before, delegate); - } - - @Override - public void stop() { - ServiceHelper.stopService(delegate, before); - } - - @Override - public void shutdown() { - ServiceHelper.stopAndShutdownServices(delegate, before); - } - - @Override - public String toString() { - return delegate.toString(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java deleted file mode 100644 index 61486f5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultLanguageResolver.java +++ /dev/null @@ -1,112 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.NoFactoryAvailableException; -import org.apache.camel.NoSuchLanguageException; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.Language; -import org.apache.camel.spi.LanguageResolver; -import org.apache.camel.support.ResolverHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Default language resolver that looks for language factories in META-INF/services/org/apache/camel/language/ and - * language resolvers in META-INF/services/org/apache/camel/language/resolver/. - */ -public class DefaultLanguageResolver implements LanguageResolver { - public static final String LANGUAGE_RESOURCE_PATH = "META-INF/services/org/apache/camel/language/"; - public static final String LANGUAGE_RESOLVER_RESOURCE_PATH = LANGUAGE_RESOURCE_PATH + "resolver/"; - - private static final Logger LOG = LoggerFactory.getLogger(DefaultLanguageResolver.class); - - protected FactoryFinder languageFactory; - protected FactoryFinder languageResolver; - - @Override - public Language resolveLanguage(String name, CamelContext context) { - // lookup in registry first - Language languageReg = ResolverHelper.lookupLanguageInRegistryWithFallback(context, name); - if (languageReg != null) { - return languageReg; - } - - Class type = null; - try { - type = findLanguage(name, context); - } catch (NoFactoryAvailableException e) { - // ignore - } catch (Exception e) { - throw new IllegalArgumentException("Invalid URI, no Language registered for scheme: " + name, e); - } - - if (type != null) { - if (Language.class.isAssignableFrom(type)) { - return (Language) context.getInjector().newInstance(type, false); - } else { - throw new IllegalArgumentException("Resolving language: " + name + " detected type conflict: Not a Language implementation. Found: " + type.getName()); - } - } else { - // no specific language found then try fallback - return noSpecificLanguageFound(name, context); - } - } - - - protected Language noSpecificLanguageFound(String name, CamelContext context) { - Class type = null; - try { - type = findLanguageResolver("default", context); - } catch (NoFactoryAvailableException e) { - // ignore - } catch (ClassNotFoundException e) { - // ignore - } catch (Exception e) { - throw new IllegalArgumentException("Invalid URI, no LanguageResolver registered for scheme: " + name, e); - } - if (type != null) { - if (LanguageResolver.class.isAssignableFrom(type)) { - LanguageResolver resolver = (LanguageResolver) context.getInjector().newInstance(type, false); - return resolver.resolveLanguage(name, context); - } else { - throw new IllegalArgumentException("Resolving language: " + name + " detected type conflict: Not a LanguageResolver implementation. Found: " + type.getName()); - } - } - throw new NoSuchLanguageException(name); - } - - protected Class findLanguage(String name, CamelContext context) throws Exception { - if (languageFactory == null) { - languageFactory = context.adapt(ExtendedCamelContext.class).getFactoryFinder(LANGUAGE_RESOURCE_PATH); - } - return languageFactory.findClass(name).orElse(null); - } - - protected Class findLanguageResolver(String name, CamelContext context) throws Exception { - if (languageResolver == null) { - languageResolver = context.adapt(ExtendedCamelContext.class).getFactoryFinder(LANGUAGE_RESOLVER_RESOURCE_PATH); - } - return languageResolver.findClass(name).orElse(null); - } - - protected Logger getLog() { - return LOG; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java deleted file mode 100644 index c8ceefd..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java +++ /dev/null @@ -1,163 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.ManagementNameStrategy; -import org.apache.camel.util.StringHelper; - -import java.util.concurrent.atomic.AtomicLong; -import java.util.regex.Pattern; - -/** - * Default implementation of {@link ManagementNameStrategy} - *

- * This implementation will by default use a name pattern as #name# and in case - * of a clash, then the pattern will fallback to be using the counter as #name#-#counter#. - */ -public class DefaultManagementNameStrategy implements ManagementNameStrategy { - - private static final Pattern INVALID_PATTERN = Pattern.compile(".*#\\w+#.*"); - private static final AtomicLong NAME_COUNTER = new AtomicLong(); - - private final CamelContext camelContext; - private final String defaultPattern; - private final String nextPattern; - private String name; - private String namePattern; - - public DefaultManagementNameStrategy(CamelContext camelContext) { - this(camelContext, null, "#name#-#counter#"); - } - - public DefaultManagementNameStrategy(CamelContext camelContext, String defaultPattern, String nextPattern) { - this.camelContext = camelContext; - this.defaultPattern = defaultPattern; - this.nextPattern = nextPattern; - } - - @Override - public String getNamePattern() { - return namePattern; - } - - @Override - public void setNamePattern(String namePattern) { - this.namePattern = namePattern; - } - - @Override - public String getName() { - if (name == null) { - String pattern = getNamePattern(); - if (pattern == null) { - // fallback and use the default pattern which is the same name as the CamelContext has been given - pattern = defaultPattern != null ? defaultPattern : camelContext.getManagementStrategy().getManagementAgent().getManagementNamePattern(); - } - name = resolveManagementName(pattern, camelContext.getName(), true); - } - return name; - } - - @Override - public String getNextName() { - if (isFixedName()) { - // use the fixed name - return getName(); - } else { - // or resolve a new name - String pattern = getNamePattern(); - if (pattern == null) { - // use a pattern that has a counter to ensure unique next name - pattern = nextPattern; - } - return resolveManagementName(pattern, camelContext.getName(), true); - } - } - - @Override - public boolean isFixedName() { - // the name will be fixed unless there is a counter token - String pattern = getNamePattern(); - if (pattern == null) { - // we are not fixed by default - return false; - } - return !pattern.contains("#counter#"); - } - - /** - * Creates a new management name with the given pattern - * - * @param pattern the pattern - * @param name the name - * @return the management name - * @throws IllegalArgumentException if the pattern or name is invalid or empty - */ - @Override - public String resolveManagementName(String pattern, String name, boolean invalidCheck) { - StringHelper.notEmpty(pattern, "pattern"); - StringHelper.notEmpty(name, "name"); - - // replace tokens - String answer = pattern; - if (pattern.contains("#counter#")) { - // only increment the counter on-demand - answer = StringHelper.replaceAll(pattern, "#counter#", "" + nextNameCounter()); - } - // camelId and name is the same tokens - answer = StringHelper.replaceAll(answer, "#camelId#", name); - answer = StringHelper.replaceAll(answer, "#name#", name); - - // allow custom name resolution as well. For example with camel-core-osgi we have a custom - // name strategy that supports OSGI specific tokens such as #bundleId# etc. - answer = customResolveManagementName(pattern, answer); - - // are there any #word# combos left, if so they should be considered invalid tokens - if (invalidCheck && INVALID_PATTERN.matcher(answer).matches()) { - throw new IllegalArgumentException("Pattern is invalid: " + pattern); - } - - return answer; - } - - /** - * Strategy to do any custom resolution of the name - * - * @param pattern the pattern - * @param answer the current answer, which may have custom patterns still to be resolved - * @return the resolved name - */ - protected String customResolveManagementName(String pattern, String answer) { - return answer; - } - - private static long nextNameCounter() { - // we want to be 1-based, so increment first - return NAME_COUNTER.incrementAndGet(); - } - - /** - * To reset the counter, should only be used for testing purposes. - * - * @param value the counter value - */ - public static void setCounter(int value) { - NAME_COUNTER.set(value); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java deleted file mode 100644 index 82af672..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java +++ /dev/null @@ -1,226 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.NamedNode; -import org.apache.camel.impl.event.DefaultEventFactory; -import org.apache.camel.spi.*; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * A default management strategy that does not manage. - *

- * This is default only used if Camel detects that it cannot use the JMX capable - * {@link org.apache.camel.management.JmxManagementStrategy} strategy. Then Camel will - * fallback to use this instead that is basically a simple and noop strategy. - *

- * This class can also be used to extend your custom management implement. In fact the JMX capable - * provided by Camel extends this class as well. - * - * @see org.apache.camel.management.JmxManagementStrategy - */ -public class DefaultManagementStrategy extends ServiceSupport implements ManagementStrategy, CamelContextAware { - - private final List eventNotifiers = new CopyOnWriteArrayList<>(); - private EventFactory eventFactory = new DefaultEventFactory(); - private ManagementObjectNameStrategy managementObjectNameStrategy; - private ManagementObjectStrategy managementObjectStrategy; - private ManagementAgent managementAgent; - private CamelContext camelContext; - - public DefaultManagementStrategy() { - } - - public DefaultManagementStrategy(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public DefaultManagementStrategy(CamelContext camelContext, ManagementAgent managementAgent) { - this.camelContext = camelContext; - this.managementAgent = managementAgent; - } - - @Override - public List getEventNotifiers() { - return eventNotifiers; - } - - @Override - public void addEventNotifier(EventNotifier eventNotifier) { - this.eventNotifiers.add(eventNotifier); - if (getCamelContext() != null) { - // okay we have an event notifier so its applicable - getCamelContext().adapt(ExtendedCamelContext.class).setEventNotificationApplicable(true); - } - } - - @Override - public boolean removeEventNotifier(EventNotifier eventNotifier) { - return eventNotifiers.remove(eventNotifier); - } - - @Override - public EventFactory getEventFactory() { - return eventFactory; - } - - @Override - public void setEventFactory(EventFactory eventFactory) { - this.eventFactory = eventFactory; - } - - @Override - public ManagementObjectNameStrategy getManagementObjectNameStrategy() { - return managementObjectNameStrategy; - } - - @Override - public void setManagementObjectNameStrategy(ManagementObjectNameStrategy managementObjectNameStrategy) { - this.managementObjectNameStrategy = managementObjectNameStrategy; - } - - @Override - public ManagementObjectStrategy getManagementObjectStrategy() { - return managementObjectStrategy; - } - - @Override - public void setManagementObjectStrategy(ManagementObjectStrategy managementObjectStrategy) { - this.managementObjectStrategy = managementObjectStrategy; - } - - @Override - public ManagementAgent getManagementAgent() { - return managementAgent; - } - - @Override - public void setManagementAgent(ManagementAgent managementAgent) { - this.managementAgent = managementAgent; - } - - @Override - public boolean manageProcessor(NamedNode definition) { - return false; - } - - @Override - public void manageObject(Object managedObject) throws Exception { - // noop - } - - @Override - public void unmanageObject(Object managedObject) throws Exception { - // noop - } - - @Override - public boolean isManaged(Object managedObject) { - // noop - return false; - } - - @Override - public boolean isManagedName(Object name) { - // noop - return false; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public void notify(CamelEvent event) throws Exception { - if (!eventNotifiers.isEmpty()) { - for (EventNotifier notifier : eventNotifiers) { - if (notifier.isEnabled(event)) { - notifier.notify(event); - } - } - } - } - - @Override - protected void doInit() throws Exception { - ObjectHelper.notNull(getCamelContext(), "CamelContext", this); - if (!getEventNotifiers().isEmpty()) { - getCamelContext().adapt(ExtendedCamelContext.class).setEventNotificationApplicable(true); - } - for (EventNotifier notifier : eventNotifiers) { - // inject CamelContext if the service is aware - if (notifier instanceof CamelContextAware) { - CamelContextAware aware = (CamelContextAware) notifier; - aware.setCamelContext(camelContext); - } - } - ServiceHelper.initService(eventNotifiers, managementAgent); - - if (managementObjectStrategy == null) { - managementObjectStrategy = createManagementObjectStrategy(); - } - if (managementObjectStrategy instanceof CamelContextAware) { - ((CamelContextAware) managementObjectStrategy).setCamelContext(getCamelContext()); - } - - if (managementObjectNameStrategy == null) { - managementObjectNameStrategy = createManagementObjectNameStrategy(); - } - if (managementObjectNameStrategy instanceof CamelContextAware) { - ((CamelContextAware) managementObjectNameStrategy).setCamelContext(getCamelContext()); - } - ServiceHelper.initService(managementObjectStrategy, managementObjectNameStrategy); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(eventNotifiers, managementAgent, managementObjectStrategy, managementObjectNameStrategy); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(managementObjectNameStrategy, managementObjectStrategy, managementAgent, eventNotifiers); - } - - protected ManagementObjectNameStrategy createManagementObjectNameStrategy(String domain) { - return null; - } - - protected ManagementObjectStrategy createManagementObjectStrategy() { - return null; - } - - protected ManagementObjectNameStrategy createManagementObjectNameStrategy() { - String domain = managementAgent != null ? managementAgent.getMBeanObjectDomainName() : null; - return createManagementObjectNameStrategy(domain); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java deleted file mode 100644 index 73a9cb5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategyFactory.java +++ /dev/null @@ -1,52 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.ManagementStrategy; -import org.apache.camel.spi.ManagementStrategyFactory; - -import java.util.Map; - -/** - * Factory for creating non JMX {@link ManagementStrategy}. - */ -public class DefaultManagementStrategyFactory implements ManagementStrategyFactory { - - @Override - public ManagementStrategy create(CamelContext context, Map properties) throws Exception { - return new DefaultManagementStrategy(context); - } - - @Override - public LifecycleStrategy createLifecycle(CamelContext context) throws Exception { - // not in use for non JMX - return null; - } - - @Override - public void setupManagement(CamelContext camelContext, ManagementStrategy strategy, LifecycleStrategy lifecycle) { - camelContext.setManagementStrategy(strategy); - - if (!camelContext.getLifecycleStrategies().isEmpty()) { - // camel-spring/camel-blueprint may re-initialize JMX during startup, - // so remove any previous JMX initialized lifecycle strategy - camelContext.getLifecycleStrategies().removeIf(s -> s.getClass().getName().startsWith("org.apache.camel.management")); - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java deleted file mode 100644 index f7dc522..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultMessageHistoryFactory.java +++ /dev/null @@ -1,97 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.api.management.ManagedAttribute; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.spi.MessageHistoryFactory; -import org.apache.camel.support.DefaultMessageHistory; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.support.service.ServiceSupport; - -@ManagedResource(description = "Managed MessageHistoryFactory") -public class DefaultMessageHistoryFactory extends ServiceSupport implements MessageHistoryFactory { - - private CamelContext camelContext; - private boolean copyMessage; - private String nodePattern; - private volatile String[] nodePatternParts; - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public MessageHistory newMessageHistory(String routeId, NamedNode node, long timestamp, Exchange exchange) { - if (nodePatternParts != null) { - String name = node.getShortName(); - for (String part : nodePatternParts) { - boolean match = PatternHelper.matchPattern(name, part); - if (!match) { - return null; - } - } - } - - Message msg = null; - if (copyMessage) { - msg = exchange.getMessage().copy(); - } - - return new DefaultMessageHistory(routeId, node, timestamp, msg); - } - - @ManagedAttribute(description = "Whether message history is enabled") - public boolean isEnabled() { - return camelContext != null ? camelContext.isMessageHistory() : false; - } - - @Override - @ManagedAttribute(description = "Whether a copy of the message is included in the message history") - public boolean isCopyMessage() { - return copyMessage; - } - - @Override - @ManagedAttribute(description = "Whether a copy of the message is included in the message history") - public void setCopyMessage(boolean copyMessage) { - this.copyMessage = copyMessage; - } - - @Override - @ManagedAttribute(description = "Pattern to filter EIPs") - public String getNodePattern() { - return nodePattern; - } - - @Override - @ManagedAttribute(description = "Pattern to filter EIPs") - public void setNodePattern(String nodePattern) { - this.nodePattern = nodePattern; - if (nodePattern != null) { - this.nodePatternParts = nodePattern.split(","); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.java deleted file mode 100644 index a808168..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultNodeIdFactory.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.impl.engine; - -import org.apache.camel.NamedNode; -import org.apache.camel.spi.NodeIdFactory; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * Default id factory. - */ -public class DefaultNodeIdFactory implements NodeIdFactory { - - protected static Map nodeCounters = new ConcurrentHashMap<>(); - - @Override - public String createId(NamedNode definition) { - String key = definition.getShortName(); - return key + getNodeCounter(key).incrementAndGet(); - } - - /** - * Returns the counter for the given node key, lazily creating one if necessary - */ - protected static AtomicInteger getNodeCounter(String key) { - return nodeCounters.computeIfAbsent(key, k -> new AtomicInteger(0)); - } - - /** - * Helper method for test purposes that allows tests to start clean (made protected - * to ensure that it is not called accidentally) - */ - protected static void resetAllCounters() { - for (AtomicInteger counter : nodeCounters.values()) { - counter.set(0); - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java deleted file mode 100644 index 76a8077..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java +++ /dev/null @@ -1,446 +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.impl.engine; - -import org.apache.camel.NonManagedService; -import org.apache.camel.impl.scan.AnnotatedWithAnyPackageScanFilter; -import org.apache.camel.impl.scan.AnnotatedWithPackageScanFilter; -import org.apache.camel.impl.scan.AssignableToPackageScanFilter; -import org.apache.camel.impl.scan.CompositePackageScanFilter; -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.PackageScanFilter; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.net.*; -import java.util.*; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; - -/** - * Default implement of {@link PackageScanClassResolver} - */ -public class DefaultPackageScanClassResolver extends BasePackageScanResolver implements PackageScanClassResolver, NonManagedService { - - private volatile Map> jarCache; - private Set scanFilters; - - @Override - public void addFilter(PackageScanFilter filter) { - if (scanFilters == null) { - scanFilters = new LinkedHashSet<>(); - } - scanFilters.add(filter); - } - - @Override - public void removeFilter(PackageScanFilter filter) { - if (scanFilters != null) { - scanFilters.remove(filter); - } - } - - @Override - public Set> findAnnotated(Class annotation, String... packageNames) { - if (packageNames == null) { - return Collections.emptySet(); - } - - if (log.isDebugEnabled()) { - log.debug("Searching for annotations of {} in packages: {}", annotation.getName(), Arrays.asList(packageNames)); - } - - PackageScanFilter test = getCompositeFilter(new AnnotatedWithPackageScanFilter(annotation, true)); - Set> classes = new LinkedHashSet<>(); - for (String pkg : packageNames) { - find(test, pkg, classes); - } - - log.debug("Found: {}", classes); - - return classes; - } - - @Override - public Set> findAnnotated(Set> annotations, String... packageNames) { - if (packageNames == null) { - return Collections.emptySet(); - } - - if (log.isDebugEnabled()) { - log.debug("Searching for annotations of {} in packages: {}", annotations, Arrays.asList(packageNames)); - } - - PackageScanFilter test = getCompositeFilter(new AnnotatedWithAnyPackageScanFilter(annotations, true)); - Set> classes = new LinkedHashSet<>(); - for (String pkg : packageNames) { - find(test, pkg, classes); - } - - log.debug("Found: {}", classes); - - return classes; - } - - @Override - public Set> findImplementations(Class parent, String... packageNames) { - if (packageNames == null) { - return Collections.emptySet(); - } - - if (log.isDebugEnabled()) { - log.debug("Searching for implementations of {} in packages: {}", parent.getName(), Arrays.asList(packageNames)); - } - - PackageScanFilter test = getCompositeFilter(new AssignableToPackageScanFilter(parent)); - Set> classes = new LinkedHashSet<>(); - for (String pkg : packageNames) { - find(test, pkg, classes); - } - - log.debug("Found: {}", classes); - - return classes; - } - - @Override - public Set> findByFilter(PackageScanFilter filter, String... packageNames) { - if (packageNames == null) { - return Collections.emptySet(); - } - - Set> classes = new LinkedHashSet<>(); - for (String pkg : packageNames) { - find(filter, pkg, classes); - } - - log.debug("Found: {}", classes); - - return classes; - } - - protected void find(PackageScanFilter test, String packageName, Set> classes) { - packageName = packageName.replace('.', '/'); - - Set set = getClassLoaders(); - - for (ClassLoader classLoader : set) { - find(test, packageName, classLoader, classes); - } - } - - protected void find(PackageScanFilter test, String packageName, ClassLoader loader, Set> classes) { - if (log.isTraceEnabled()) { - log.trace("Searching for: {} in package: {} using classloader: {}", - new Object[]{test, packageName, loader.getClass().getName()}); - } - - Enumeration urls; - try { - urls = getResources(loader, packageName); - if (!urls.hasMoreElements()) { - log.trace("No URLs returned by classloader"); - } - } catch (IOException ioe) { - log.warn("Cannot read package: {}", packageName, ioe); - return; - } - - while (urls.hasMoreElements()) { - URL url = null; - try { - url = urls.nextElement(); - log.trace("URL from classloader: {}", url); - - url = customResourceLocator(url); - - String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); - if (log.isTraceEnabled()) { - log.trace("Decoded urlPath: {} with protocol: {}", urlPath, url.getProtocol()); - } - - // If it's a file in a directory, trim the stupid file: spec - if (urlPath.startsWith("file:")) { - // file path can be temporary folder which uses characters that the URLDecoder decodes wrong - // for example + being decoded to something else (+ can be used in temp folders on Mac OS) - // to remedy this then create new path without using the URLDecoder - try { - urlPath = new URI(url.getFile()).getPath(); - } catch (URISyntaxException e) { - // fallback to use as it was given from the URLDecoder - // this allows us to work on Windows if users have spaces in paths - } - - if (urlPath.startsWith("file:")) { - urlPath = urlPath.substring(5); - } - } - - // osgi bundles should be skipped - if (url.toString().startsWith("bundle:") || urlPath.startsWith("bundle:")) { - log.trace("Skipping OSGi bundle: {}", url); - continue; - } - - // bundle resource should be skipped - if (url.toString().startsWith("bundleresource:") || urlPath.startsWith("bundleresource:")) { - log.trace("Skipping bundleresource: {}", url); - continue; - } - - // Else it's in a JAR, grab the path to the jar - if (urlPath.indexOf('!') > 0) { - urlPath = urlPath.substring(0, urlPath.indexOf('!')); - } - - log.trace("Scanning for classes in: {} matching criteria: {}", urlPath, test); - - File file = new File(urlPath); - if (file.isDirectory()) { - log.trace("Loading from directory using file: {}", file); - loadImplementationsInDirectory(test, packageName, file, classes); - } else { - InputStream stream = null; - try { - if (urlPath.startsWith("http:") || urlPath.startsWith("https:") - || urlPath.startsWith("sonicfs:") - || isAcceptableScheme(urlPath)) { - // load resources using http/https, sonicfs and other acceptable scheme - // sonic ESB requires to be loaded using a regular URLConnection - log.trace("Loading from jar using url: {}", urlPath); - URL urlStream = new URL(urlPath); - URLConnection con = urlStream.openConnection(); - // disable cache mainly to avoid jar file locking on Windows - con.setUseCaches(false); - stream = con.getInputStream(); - } else { - log.trace("Loading from jar using file: {}", file); - stream = new FileInputStream(file); - } - - // only create jar cache on-demand when needed - if (jarCache == null) { - // use a soft cache so it can be claimed if needed - jarCache = LRUCacheFactory.newLRUSoftCache(1000); - } - - loadImplementationsInJar(test, packageName, stream, urlPath, classes, jarCache); - } finally { - IOHelper.close(stream); - } - } - } catch (IOException e) { - // use debug logging to avoid being to noisy in logs - log.debug("Cannot read entries in url: {}", url, e); - } - } - } - - private PackageScanFilter getCompositeFilter(PackageScanFilter filter) { - if (scanFilters != null) { - CompositePackageScanFilter composite = new CompositePackageScanFilter(scanFilters); - composite.addFilter(filter); - return composite; - } - return filter; - } - - /** - * Finds matches in a physical directory on a filesystem. Examines all files - * within a directory - if the File object is not a directory, and ends with - * .class the file is loaded and tested to see if it is acceptable - * according to the Test. Operates recursively to find classes within a - * folder structure matching the package structure. - * - * @param test a Test used to filter the classes that are discovered - * @param parent the package name up to this directory in the package - * hierarchy. E.g. if /classes is in the classpath and we wish to - * examine files in /classes/org/apache then the values of - * parent would be org/apache - * @param location a File object representing a directory - */ - private void loadImplementationsInDirectory(PackageScanFilter test, String parent, File location, Set> classes) { - File[] files = location.listFiles(); - StringBuilder builder; - - for (File file : files) { - builder = new StringBuilder(100); - String name = file.getName(); - if (name != null) { - name = name.trim(); - builder.append(parent).append("/").append(name); - String packageOrClass = parent == null ? name : builder.toString(); - - if (file.isDirectory()) { - loadImplementationsInDirectory(test, packageOrClass, file, classes); - } else if (name.endsWith(".class")) { - addIfMatching(test, packageOrClass, classes); - } - } - } - } - - /** - * Finds matching classes within a jar files that contains a folder - * structure matching the package structure. If the File is not a JarFile or - * does not exist a warning will be logged, but no error will be raised. - * - * @param test a Test used to filter the classes that are discovered - * @param parent the parent package under which classes must be in order to - * be considered - * @param stream the inputstream of the jar file to be examined for classes - * @param urlPath the url of the jar file to be examined for classes - * @param classes to add found and matching classes - * @param jarCache cache for JARs to speedup loading - */ - private void loadImplementationsInJar(PackageScanFilter test, String parent, InputStream stream, - String urlPath, Set> classes, Map> jarCache) { - ObjectHelper.notNull(classes, "classes"); - - List entries = jarCache != null ? jarCache.get(urlPath) : null; - if (entries == null) { - entries = doLoadJarClassEntries(stream, urlPath); - if (jarCache != null) { - jarCache.put(urlPath, entries); - log.trace("Cached {} JAR with {} entries", urlPath, entries.size()); - } - } else { - log.trace("Using cached {} JAR with {} entries", urlPath, entries.size()); - } - - doLoadImplementationsInJar(test, parent, entries, classes); - } - - /** - * Loads all the class entries from the JAR. - * - * @param stream the inputstream of the jar file to be examined for classes - * @param urlPath the url of the jar file to be examined for classes - * @return all the .class entries from the JAR - */ - protected List doLoadJarClassEntries(InputStream stream, String urlPath) { - List entries = new ArrayList<>(); - - JarInputStream jarStream = null; - try { - jarStream = new JarInputStream(stream); - - JarEntry entry; - while ((entry = jarStream.getNextJarEntry()) != null) { - String name = entry.getName(); - if (name != null) { - name = name.trim(); - if (!entry.isDirectory() && name.endsWith(".class")) { - entries.add(name); - } - } - } - } catch (IOException ioe) { - log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage(), ioe); - } finally { - IOHelper.close(jarStream, urlPath, log); - } - - return entries; - } - - /** - * Adds all the matching implementations from from the JAR entries to the classes. - * - * @param test a Test used to filter the classes that are discovered - * @param parent the parent package under which classes must be in order to be considered - * @param entries the .class entries from the JAR - * @param classes to add found and matching classes - */ - private void doLoadImplementationsInJar(PackageScanFilter test, String parent, List entries, Set> classes) { - for (String entry : entries) { - if (entry.startsWith(parent)) { - addIfMatching(test, entry, classes); - } - } - } - - /** - * Add the class designated by the fully qualified class name provided to - * the set of resolved classes if and only if it is approved by the Test - * supplied. - * - * @param test the test used to determine if the class matches - * @param fqn the fully qualified name of a class - */ - protected void addIfMatching(PackageScanFilter test, String fqn, Set> classes) { - try { - String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.'); - Set set = getClassLoaders(); - boolean found = false; - for (ClassLoader classLoader : set) { - if (log.isTraceEnabled()) { - log.trace("Testing for class {} matches criteria [{}] using classloader: {}", externalName, test, classLoader); - } - try { - Class type = classLoader.loadClass(externalName); - log.trace("Loaded the class: {} in classloader: {}", type, classLoader); - if (test.matches(type)) { - log.trace("Found class: {} which matches the filter in classloader: {}", type, classLoader); - classes.add(type); - } - found = true; - break; - } catch (ClassNotFoundException e) { - if (log.isTraceEnabled()) { - log.trace("Cannot find class '" + fqn + "' in classloader: " + classLoader - + ". Reason: " + e.getMessage(), e); - } - } catch (NoClassDefFoundError e) { - if (log.isTraceEnabled()) { - log.trace("Cannot find the class definition '" + fqn + "' in classloader: " + classLoader - + ". Reason: " + e.getMessage(), e); - } - } - } - if (!found) { - log.debug("Cannot find class '{}' in any classloaders: {}", fqn, set); - } - } catch (Exception e) { - if (log.isWarnEnabled()) { - log.warn("Cannot examine class '" + fqn + "' due to a " + e.getClass().getName() - + " with message: " + e.getMessage(), e); - } - } - } - - @Override - public void clearCache() { - if (jarCache != null) { - jarCache.clear(); - jarCache = null; - } - } - - @Override - protected void doStop() throws Exception { - clearCache(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java deleted file mode 100644 index 2aeec04..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java +++ /dev/null @@ -1,299 +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.impl.engine; - -import org.apache.camel.CamelContextAware; -import org.apache.camel.NonManagedService; -import org.apache.camel.spi.PackageScanResourceResolver; -import org.apache.camel.support.ResourceHelper; -import org.apache.camel.util.AntPathMatcher; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.KeyValueHolder; -import org.apache.camel.util.ObjectHelper; - -import java.io.*; -import java.net.*; -import java.nio.file.Files; -import java.util.*; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; -import java.util.stream.Collectors; - -/** - * Default implement of {@link PackageScanResourceResolver} - */ -public class DefaultPackageScanResourceResolver extends BasePackageScanResolver implements PackageScanResourceResolver, NonManagedService, CamelContextAware { - - private static final AntPathMatcher PATH_MATCHER = AntPathMatcher.INSTANCE; - - @Override - public Set findResourceNames(String location) throws Exception { - Set> answer = new LinkedHashSet<>(); - doFindResources(location, answer); - return answer.stream().map(KeyValueHolder::getKey).collect(Collectors.toSet()); - } - - public Set findResources(String location) throws Exception { - Set> answer = new LinkedHashSet<>(); - doFindResources(location, answer); - return answer.stream().map(KeyValueHolder::getValue).collect(Collectors.toSet()); - } - - protected void doFindResources(String location, Set> resources) throws Exception { - // if its a pattern then we need to scan its root path and find - // all matching resources using the sub pattern - if (PATH_MATCHER.isPattern(location)) { - String root = PATH_MATCHER.determineRootDir(location); - String subPattern = location.substring(root.length()); - - String scheme = ResourceHelper.getScheme(location); - if ("file:".equals(scheme)) { - // file based scanning - root = root.substring(scheme.length()); - findInFileSystem(new File(root), resources, subPattern); - } else { - if ("classpath:".equals(scheme)) { - root = root.substring(scheme.length()); - } - // assume classpath based scan from root path and find all resources - findInClasspath(root, resources, subPattern); - } - } else { - // its a single resource so load it directly - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext(), location); - resources.add(new KeyValueHolder<>(location, is)); - } - } - - protected void findInFileSystem(File dir, Set> resources, String subPattern) throws Exception { - ResourceHelper.findInFileSystem(dir.toPath(), subPattern).forEach(f -> { - try { - String location = f.toString(); - resources.add(new KeyValueHolder<>(location, Files.newInputStream(f))); - } catch (IOException e) { - // ignore - } - }); - } - - protected void findInClasspath(String packageName, Set> resources, String subPattern) { - packageName = packageName.replace('.', '/'); - // If the URL is a jar, the URLClassloader.getResources() seems to require a trailing slash. - // The trailing slash is harmless for other URLs - if (!packageName.endsWith("/")) { - packageName = packageName + "/"; - } - - Set set = getClassLoaders(); - - for (ClassLoader classLoader : set) { - doFind(packageName, classLoader, resources, subPattern); - } - } - - protected void doFind(String packageName, ClassLoader classLoader, Set> resources, String subPattern) { - Enumeration urls; - try { - urls = getResources(classLoader, packageName); - if (!urls.hasMoreElements()) { - log.trace("No URLs returned by classloader"); - } - } catch (IOException ioe) { - log.warn("Cannot read package: {}", packageName, ioe); - return; - } - - while (urls.hasMoreElements()) { - URL url = null; - try { - url = urls.nextElement(); - log.trace("URL from classloader: {}", url); - - url = customResourceLocator(url); - - String urlPath = url.getFile(); - urlPath = URLDecoder.decode(urlPath, "UTF-8"); - if (log.isTraceEnabled()) { - log.trace("Decoded urlPath: {} with protocol: {}", urlPath, url.getProtocol()); - } - - // If it's a file in a directory, trim the stupid file: spec - if (urlPath.startsWith("file:")) { - // file path can be temporary folder which uses characters that the URLDecoder decodes wrong - // for example + being decoded to something else (+ can be used in temp folders on Mac OS) - // to remedy this then create new path without using the URLDecoder - try { - urlPath = new URI(url.getFile()).getPath(); - } catch (URISyntaxException e) { - // fallback to use as it was given from the URLDecoder - // this allows us to work on Windows if users have spaces in paths - } - - if (urlPath.startsWith("file:")) { - urlPath = urlPath.substring(5); - } - } - - // osgi bundles should be skipped - if (url.toString().startsWith("bundle:") || urlPath.startsWith("bundle:")) { - log.trace("Skipping OSGi bundle: {}", url); - continue; - } - - // bundle resource should be skipped - if (url.toString().startsWith("bundleresource:") || urlPath.startsWith("bundleresource:")) { - log.trace("Skipping bundleresource: {}", url); - continue; - } - - // Else it's in a JAR, grab the path to the jar - if (urlPath.indexOf('!') > 0) { - urlPath = urlPath.substring(0, urlPath.indexOf('!')); - } - - log.trace("Scanning for resources in: {} matching pattern: {}", urlPath, subPattern); - - File file = new File(urlPath); - if (file.isDirectory()) { - log.trace("Loading from directory using file: {}", file); - loadImplementationsInDirectory(subPattern, packageName, file, resources); - } else { - InputStream stream; - if (urlPath.startsWith("http:") || urlPath.startsWith("https:") - || urlPath.startsWith("sonicfs:") - || isAcceptableScheme(urlPath)) { - // load resources using http/https, sonicfs and other acceptable scheme - // sonic ESB requires to be loaded using a regular URLConnection - log.trace("Loading from jar using url: {}", urlPath); - URL urlStream = new URL(urlPath); - URLConnection con = urlStream.openConnection(); - // disable cache mainly to avoid jar file locking on Windows - con.setUseCaches(false); - stream = con.getInputStream(); - } else { - log.trace("Loading from jar using file: {}", file); - stream = new FileInputStream(file); - } - - loadImplementationsInJar(packageName, subPattern, stream, urlPath, resources); - } - } catch (IOException e) { - // use debug logging to avoid being to noisy in logs - log.debug("Cannot read entries in url: {}", url, e); - } - } - } - - /** - * Finds matching classes within a jar files that contains a folder - * structure matching the package structure. If the File is not a JarFile or - * does not exist a warning will be logged, but no error will be raised. - * - * @param stream the inputstream of the jar file to be examined for classes - * @param urlPath the url of the jar file to be examined for classes - */ - private void loadImplementationsInJar(String packageName, String subPattern, InputStream stream, - String urlPath, Set> resources) { - List entries = new ArrayList<>(); - - JarInputStream jarStream = null; - try { - jarStream = new JarInputStream(stream); - - JarEntry entry; - while ((entry = jarStream.getNextJarEntry()) != null) { - String name = entry.getName(); - if (name != null) { - name = name.trim(); - if (!entry.isDirectory() && !name.endsWith(".class")) { - // name is FQN so it must start with package name - if (name.startsWith(packageName)) { - entries.add(name); - } - } - } - } - } catch (IOException ioe) { - log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage(), ioe); - } finally { - IOHelper.close(jarStream, urlPath, log); - } - - for (String name : entries) { - String shortName = name.substring(packageName.length()); - boolean match = PATH_MATCHER.match(subPattern, shortName); - log.debug("Found resource: {} matching pattern: {} -> {}", shortName, subPattern, match); - if (match) { - // use fqn name to load resource - InputStream is = getCamelContext().getClassResolver().loadResourceAsStream(name); - if (is != null) { - resources.add(new KeyValueHolder<>(name, is)); - } - } - } - } - - /** - * Finds matches in a physical directory on a filesystem. Examines all files - * within a directory - if the File object is not a directory, and ends with - * .class the file is loaded and tested to see if it is acceptable - * according to the Test. Operates recursively to find classes within a - * folder structure matching the package structure. - * - * @param parent the package name up to this directory in the package - * hierarchy. E.g. if /classes is in the classpath and we wish to - * examine files in /classes/org/apache then the values of - * parent would be org/apache - * @param location a File object representing a directory - */ - private void loadImplementationsInDirectory(String subPattern, String parent, File location, Set> resources) throws FileNotFoundException { - File[] files = location.listFiles(); - if (files == null || files.length == 0) { - return; - } - - StringBuilder builder; - for (File file : files) { - builder = new StringBuilder(100); - String name = file.getName(); - name = name.trim(); - builder.append(parent).append("/").append(name); - String packageOrClass = parent == null ? name : builder.toString(); - - if (file.isDirectory()) { - loadImplementationsInDirectory(subPattern, packageOrClass, file, resources); - } else if (file.isFile() && file.exists() && !name.endsWith(".class")) { - boolean match = PATH_MATCHER.match(subPattern, name); - log.debug("Found resource: {} matching pattern: {} -> {}", name, subPattern, match); - if (match) { - InputStream is = new FileInputStream(file); - resources.add(new KeyValueHolder<>(name, is)); - } - } - } - } - - @Override - protected void doInit() throws Exception { - ObjectHelper.notNull(getCamelContext(), "CamelContext", this); - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java deleted file mode 100644 index 46ddd3b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProcessorFactory.java +++ /dev/null @@ -1,95 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.SendDynamicProcessor; -import org.apache.camel.processor.UnitOfWorkProducer; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.ProcessorFactory; - -import java.util.Map; - -/** - * Default {@link ProcessorFactory} that supports using 3rd party Camel components to implement the EIP {@link Processor}. - *

- * The component should use the {@link FactoryFinder} SPI to specify a file with the name of the EIP model in the - * directory of {@link #RESOURCE_PATH}. The file should contain a property with key class that refers - * to the name of the {@link ProcessorFactory} the Camel component implement, which gets called for creating - * the {@link Processor}s for the EIP. - *

- * The Hystrix EIP is such an example where the circuit breaker EIP (CircuitBreakerDefinition) is implemented - * in the camel-hystrix component. - */ -public class DefaultProcessorFactory implements ProcessorFactory { - - public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/model/"; - - @Override - public Processor createChildProcessor(Route route, NamedNode definition, boolean mandatory) throws Exception { - String name = definition.getClass().getSimpleName(); - FactoryFinder finder = route.getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH); - try { - if (finder != null) { - Object object = finder.newInstance(name); - if (object instanceof ProcessorFactory) { - ProcessorFactory pc = (ProcessorFactory) object; - return pc.createChildProcessor(route, definition, mandatory); - } - } - } catch (NoFactoryAvailableException e) { - // ignore there is no custom factory - } - - return null; - } - - @Override - public Processor createProcessor(Route route, NamedNode definition) throws Exception { - String name = definition.getClass().getSimpleName(); - FactoryFinder finder = route.getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH); - if (finder != null) { - ProcessorFactory pc = finder.newInstance(name, ProcessorFactory.class).orElse(null); - if (pc != null) { - return pc.createProcessor(route, definition); - } - } - - return null; - } - - @Override - public Processor createProcessor(CamelContext camelContext, String definitionName, Map args) throws Exception { - if ("SendDynamicProcessor".equals(definitionName)) { - String uri = (String) args.get("uri"); - Expression expression = (Expression) args.get("expression"); - ExchangePattern exchangePattern = (ExchangePattern) args.get("exchangePattern"); - SendDynamicProcessor processor = new SendDynamicProcessor(uri, expression); - processor.setCamelContext(camelContext); - if (exchangePattern != null) { - processor.setPattern(exchangePattern); - } - return processor; - } else if ("UnitOfWorkProducer".equals(definitionName)) { - Producer producer = (Producer) args.get("producer"); - return new UnitOfWorkProducer(producer); - } - - return null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java deleted file mode 100644 index 9f2bff8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java +++ /dev/null @@ -1,418 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.CamelInternalProcessor; -import org.apache.camel.processor.SharedCamelInternalProcessor; -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.spi.ProducerCache; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.StopWatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.RejectedExecutionException; - -/** - * Default implementation of {@link ProducerCache}. - */ -public class DefaultProducerCache extends ServiceSupport implements ProducerCache { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultProducerCache.class); - private static final long ACQUIRE_WAIT_TIME = 30000; - - private final ExtendedCamelContext camelContext; - private final ProducerServicePool producers; - private final Object source; - private final SharedCamelInternalProcessor internalProcessor; - - private EndpointUtilizationStatistics statistics; - private boolean eventNotifierEnabled = true; - private boolean extendedStatistics; - private int maxCacheSize; - - public DefaultProducerCache(Object source, CamelContext camelContext, int cacheSize) { - this.source = source; - this.camelContext = (ExtendedCamelContext) camelContext; - this.maxCacheSize = cacheSize <= 0 ? CamelContextHelper.getMaximumCachePoolSize(camelContext) : cacheSize; - if (cacheSize >= 0) { - this.producers = createServicePool(camelContext, maxCacheSize); - } else { - // no cache then empty - this.producers = null; - } - - // only if JMX is enabled - if (camelContext.getManagementStrategy() != null && camelContext.getManagementStrategy().getManagementAgent() != null) { - this.extendedStatistics = camelContext.getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended(); - } else { - this.extendedStatistics = false; - } - - // internal processor used for sending - internalProcessor = new SharedCamelInternalProcessor(camelContext, new CamelInternalProcessor.UnitOfWorkProcessorAdvice(null, camelContext)); - } - - protected ProducerServicePool createServicePool(CamelContext camelContext, int cacheSize) { - return new ProducerServicePool(Endpoint::createAsyncProducer, Producer::getEndpoint, cacheSize); - } - - @Override - public boolean isEventNotifierEnabled() { - return eventNotifierEnabled; - } - - @Override - public void setEventNotifierEnabled(boolean eventNotifierEnabled) { - this.eventNotifierEnabled = eventNotifierEnabled; - } - - public boolean isExtendedStatistics() { - return extendedStatistics; - } - - /** - * Whether extended JMX statistics is enabled for {@link EndpointUtilizationStatistics} - */ - public void setExtendedStatistics(boolean extendedStatistics) { - this.extendedStatistics = extendedStatistics; - } - - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public Object getSource() { - return source; - } - - @Override - public AsyncProducer acquireProducer(Endpoint endpoint) { - try { - AsyncProducer producer = producers.acquire(endpoint); - if (statistics != null) { - statistics.onHit(endpoint.getEndpointUri()); - } - // if producer is starting then wait for it to be ready - if (producer instanceof StatefulService) { - StatefulService ss = (StatefulService) producer; - if (ss.isStarting()) { - LOG.trace("Waiting for producer to finish starting: {}", producer); - StopWatch watch = new StopWatch(); - boolean done = false; - while (!done) { - done = !ss.isStarting() || watch.taken() > ACQUIRE_WAIT_TIME; - if (!done) { - Thread.sleep(5); - if (LOG.isTraceEnabled()) { - LOG.trace("Waiting {} ms for producer to finish starting: {} state: {}", watch.taken(), producer, ss.getStatus()); - } - } - } - if (LOG.isDebugEnabled()) { - LOG.debug("Waited {} ms for producer to finish starting: {} state: {}", watch.taken(), producer, ss.getStatus()); - } - } - } - return producer; - } catch (Throwable e) { - throw new FailedToCreateProducerException(endpoint, e); - } - } - - @Override - public void releaseProducer(Endpoint endpoint, AsyncProducer producer) { - producers.release(endpoint, producer); - } - - @Override - public Exchange send(Endpoint endpoint, Exchange exchange, Processor resultProcessor) { - if (camelContext.isStopped()) { - exchange.setException(new RejectedExecutionException("CamelContext is stopped")); - return exchange; - } - - AsyncProducer producer = acquireProducer(endpoint); - try { - // now lets dispatch - LOG.debug(">>>> {} {}", endpoint, exchange); - - // set property which endpoint we send to - exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri()); - - // send the exchange using the processor - StopWatch watch = null; - try { - if (eventNotifierEnabled && camelContext.isEventNotificationApplicable()) { - boolean sending = EventHelper.notifyExchangeSending(exchange.getContext(), exchange, endpoint); - if (sending) { - watch = new StopWatch(); - } - } - - // invoke the synchronous method - internalProcessor.process(exchange, producer, resultProcessor); - - } catch (Throwable e) { - // ensure exceptions is caught and set on the exchange - exchange.setException(e); - } finally { - // emit event that the exchange was sent to the endpoint - if (watch != null) { - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(exchange.getContext(), exchange, endpoint, timeTaken); - } - } - return exchange; - } finally { - releaseProducer(endpoint, producer); - } - } - - /** - * Asynchronously sends an exchange to an endpoint using a supplied - * {@link Processor} to populate the exchange - *

- * This method will neither throw an exception nor complete future exceptionally. - * If processing of the given Exchange failed then the exception is stored on the return Exchange - * - * @param endpoint the endpoint to send the exchange to - * @param pattern the message {@link ExchangePattern} such as - * {@link ExchangePattern#InOnly} or {@link ExchangePattern#InOut} - * @param processor the transformer used to populate the new exchange - * @param resultProcessor a processor to process the exchange when the send is complete. - * @param future the preexisting future to complete when processing is done or null if to create new one - * @return future that completes with exchange when processing is done. Either passed into future parameter - * or new one if parameter was null - */ - @Deprecated - public CompletableFuture asyncSend(Endpoint endpoint, - ExchangePattern pattern, - Processor processor, - Processor resultProcessor, - CompletableFuture future) { - return asyncSendExchange(endpoint, pattern, processor, resultProcessor, null, future); - } - - @Override - public CompletableFuture asyncSendExchange(Endpoint endpoint, - ExchangePattern pattern, - Processor processor, - Processor resultProcessor, - Exchange exchange, - CompletableFuture future) { - if (exchange == null) { - exchange = pattern != null ? endpoint.createExchange(pattern) : endpoint.createExchange(); - } - return doAsyncSendExchange(endpoint, processor, resultProcessor, exchange, future); - } - - protected CompletableFuture doAsyncSendExchange(Endpoint endpoint, - Processor processor, - Processor resultProcessor, - Exchange exchange, - CompletableFuture f) { - CompletableFuture future = f != null ? f : new CompletableFuture<>(); - AsyncProducerCallback cb = (p, e, c) -> asyncDispatchExchange(endpoint, p, resultProcessor, e, c); - try { - if (processor instanceof AsyncProcessor) { - ((AsyncProcessor) processor).process(exchange, - doneSync -> doInAsyncProducer(endpoint, exchange, ds -> future.complete(exchange), cb)); - } else { - if (processor != null) { - processor.process(exchange); - } - doInAsyncProducer(endpoint, exchange, ds -> future.complete(exchange), cb); - } - } catch (Throwable e) { - // populate failed so return - exchange.setException(e); - future.complete(exchange); - } - return future; - } - - @Override - public boolean doInAsyncProducer(Endpoint endpoint, - Exchange exchange, - AsyncCallback callback, - AsyncProducerCallback producerCallback) { - - AsyncProducer producer; - try { - // get the producer and we do not mind if its pooled as we can handle returning it back to the pool - producer = acquireProducer(endpoint); - - if (producer == null) { - if (isStopped()) { - LOG.warn("Ignoring exchange sent after processor is stopped: {}", exchange); - callback.done(true); - return true; - } else { - exchange.setException(new IllegalStateException("No producer, this processor has not been started: " + this)); - callback.done(true); - return true; - } - } - } catch (Throwable e) { - exchange.setException(e); - callback.done(true); - return true; - } - - try { - // record timing for sending the exchange using the producer - StopWatch watch; - if (eventNotifierEnabled && camelContext.isEventNotificationApplicable()) { - boolean sending = EventHelper.notifyExchangeSending(exchange.getContext(), exchange, endpoint); - if (sending) { - watch = new StopWatch(); - } else { - watch = null; - } - } else { - watch = null; - } - - // invoke the callback - return producerCallback.doInAsyncProducer(producer, exchange, doneSync -> { - try { - if (watch != null) { - long timeTaken = watch.taken(); - // emit event that the exchange was sent to the endpoint - EventHelper.notifyExchangeSent(exchange.getContext(), exchange, endpoint, timeTaken); - } - - // release back to the pool - releaseProducer(endpoint, producer); - } finally { - callback.done(doneSync); - } - }); - } catch (Throwable e) { - // ensure exceptions is caught and set on the exchange - if (exchange != null) { - exchange.setException(e); - } - callback.done(true); - return true; - } - } - - protected boolean asyncDispatchExchange(Endpoint endpoint, AsyncProducer producer, - Processor resultProcessor, Exchange exchange, AsyncCallback callback) { - // now lets dispatch - LOG.debug(">>>> {} {}", endpoint, exchange); - - // set property which endpoint we send to - exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri()); - - // send the exchange using the processor - try { - if (eventNotifierEnabled && camelContext.isEventNotificationApplicable()) { - callback = new EventNotifierCallback(callback, exchange, endpoint); - } - // invoke the asynchronous method - return internalProcessor.process(exchange, callback, producer, resultProcessor); - } catch (Throwable e) { - // ensure exceptions is caught and set on the exchange - exchange.setException(e); - callback.done(true); - return true; - } - - } - - @Override - protected void doInit() throws Exception { - if (extendedStatistics) { - int max = maxCacheSize == 0 ? CamelContextHelper.getMaximumCachePoolSize(camelContext) : maxCacheSize; - statistics = new DefaultEndpointUtilizationStatistics(max); - } - ServiceHelper.initService(producers); - } - - @Override - protected void doStart() throws Exception { - if (statistics != null) { - statistics.clear(); - } - ServiceHelper.startService(producers); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producers); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(producers); - } - - @Override - public int size() { - int size = producers != null ? producers.size() : 0; - - LOG.trace("size = {}", size); - return size; - } - - @Override - public int getCapacity() { - return maxCacheSize; - } - - @Override - public synchronized void purge() { - try { - if (producers != null) { - producers.stop(); - producers.start(); - } - } catch (Exception e) { - LOG.debug("Error restarting producers", e); - } - if (statistics != null) { - statistics.clear(); - } - } - - @Override - public void cleanUp() { - if (producers != null) { - producers.cleanUp(); - } - } - - @Override - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return statistics; - } - - @Override - public String toString() { - return "ProducerCache for source: " + source + ", capacity: " + getCapacity(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java deleted file mode 100644 index f1f4040..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java +++ /dev/null @@ -1,814 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.ConvertBodyProcessor; -import org.apache.camel.spi.ProducerCache; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.concurrent.SynchronousExecutorService; - -import java.util.Map; -import java.util.concurrent.*; -import java.util.function.Function; - -/** - * Template (named like Spring's TransactionTemplate & JmsTemplate - * et al) for working with Camel and sending {@link Message} instances in an - * {@link Exchange} to an {@link Endpoint}. - */ -public class DefaultProducerTemplate extends ServiceSupport implements ProducerTemplate { - private final CamelContext camelContext; - private volatile ProducerCache producerCache; - private volatile ExecutorService executor; - private Endpoint defaultEndpoint; - private int maximumCacheSize; - private boolean eventNotifierEnabled = true; - private volatile boolean threadedAsyncMode = true; - - public DefaultProducerTemplate(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public DefaultProducerTemplate(CamelContext camelContext, ExecutorService executor) { - this.camelContext = camelContext; - this.executor = executor; - } - - public DefaultProducerTemplate(CamelContext camelContext, Endpoint defaultEndpoint) { - this(camelContext); - this.defaultEndpoint = defaultEndpoint; - } - - public static DefaultProducerTemplate newInstance(CamelContext camelContext, String defaultEndpointUri) { - Endpoint endpoint = CamelContextHelper.getMandatoryEndpoint(camelContext, defaultEndpointUri); - return new DefaultProducerTemplate(camelContext, endpoint); - } - - @Override - public int getMaximumCacheSize() { - return maximumCacheSize; - } - - @Override - public void setMaximumCacheSize(int maximumCacheSize) { - this.maximumCacheSize = maximumCacheSize; - } - - @Override - public boolean isThreadedAsyncMode() { - return threadedAsyncMode; - } - - @Override - public void setThreadedAsyncMode(boolean useExecutor) { - this.threadedAsyncMode = useExecutor; - } - - @Override - public int getCurrentCacheSize() { - if (producerCache == null) { - return 0; - } - return producerCache.size(); - } - - @Override - public boolean isEventNotifierEnabled() { - return eventNotifierEnabled; - } - - @Override - public void cleanUp() { - if (producerCache != null) { - producerCache.cleanUp(); - } - } - - @Override - public void setEventNotifierEnabled(boolean eventNotifierEnabled) { - this.eventNotifierEnabled = eventNotifierEnabled; - // if we already created the cache then adjust its setting as well - if (producerCache != null) { - producerCache.setEventNotifierEnabled(eventNotifierEnabled); - } - } - - @Override - public Exchange send(String endpointUri, Exchange exchange) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return send(endpoint, exchange); - } - - @Override - public Exchange send(String endpointUri, Processor processor) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return send(endpoint, null, processor, null); - } - - @Override - public Exchange send(String endpointUri, ExchangePattern pattern, Processor processor) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - return send(endpoint, pattern, processor, null); - } - - @Override - public Exchange send(Endpoint endpoint, Exchange exchange) { - return send(endpoint, exchange, null); - } - - @Override - public Exchange send(Endpoint endpoint, Processor processor) { - return send(endpoint, null, processor, null); - } - - @Override - public Exchange send(Endpoint endpoint, ExchangePattern pattern, Processor processor) { - return send(endpoint, pattern, processor, null); - } - - @Override - public Exchange send(Endpoint endpoint, ExchangePattern pattern, Processor processor, Processor resultProcessor) { - Exchange exchange = pattern != null ? endpoint.createExchange(pattern) : endpoint.createExchange(); - if (processor != null) { - try { - processor.process(exchange); - } catch (Exception e) { - exchange.setException(e); - return exchange; - } - } - return send(endpoint, exchange, resultProcessor); - } - - public Exchange send(Endpoint endpoint, Exchange exchange, Processor resultProcessor) { - return getProducerCache().send(endpoint, exchange, resultProcessor); - } - - @Override - public Object sendBody(Endpoint endpoint, ExchangePattern pattern, Object body) { - Exchange result = send(endpoint, pattern, createSetBodyProcessor(body)); - return extractResultBody(result, pattern); - } - - @Override - public void sendBody(Endpoint endpoint, Object body) throws CamelExecutionException { - Exchange result = send(endpoint, createSetBodyProcessor(body)); - // must invoke extract result body in case of exception to be rethrown - extractResultBody(result); - } - - @Override - public void sendBody(String endpointUri, Object body) throws CamelExecutionException { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - sendBody(endpoint, body); - } - - @Override - public Object sendBody(String endpointUri, ExchangePattern pattern, Object body) throws CamelExecutionException { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - Object result = sendBody(endpoint, pattern, body); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - @Override - public void sendBodyAndHeader(String endpointUri, final Object body, final String header, final Object headerValue) throws CamelExecutionException { - sendBodyAndHeader(resolveMandatoryEndpoint(endpointUri), body, header, headerValue); - } - - @Override - public void sendBodyAndHeader(Endpoint endpoint, final Object body, final String header, final Object headerValue) throws CamelExecutionException { - Exchange result = send(endpoint, createBodyAndHeaderProcessor(body, header, headerValue)); - // must invoke extract result body in case of exception to be rethrown - extractResultBody(result); - } - - @Override - public Object sendBodyAndHeader(Endpoint endpoint, ExchangePattern pattern, final Object body, - final String header, final Object headerValue) throws CamelExecutionException { - Exchange exchange = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue)); - Object result = extractResultBody(exchange, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - @Override - public Object sendBodyAndHeader(String endpoint, ExchangePattern pattern, final Object body, - final String header, final Object headerValue) throws CamelExecutionException { - Exchange exchange = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue)); - Object result = extractResultBody(exchange, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - @Override - public void sendBodyAndProperty(String endpointUri, final Object body, - final String property, final Object propertyValue) throws CamelExecutionException { - sendBodyAndProperty(resolveMandatoryEndpoint(endpointUri), body, property, propertyValue); - } - - @Override - public void sendBodyAndProperty(Endpoint endpoint, final Object body, - final String property, final Object propertyValue) throws CamelExecutionException { - Exchange result = send(endpoint, createBodyAndPropertyProcessor(body, property, propertyValue)); - // must invoke extract result body in case of exception to be rethrown - extractResultBody(result); - } - - @Override - public Object sendBodyAndProperty(Endpoint endpoint, ExchangePattern pattern, final Object body, - final String property, final Object propertyValue) throws CamelExecutionException { - Exchange exchange = send(endpoint, pattern, createBodyAndPropertyProcessor(body, property, propertyValue)); - Object result = extractResultBody(exchange, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - @Override - public Object sendBodyAndProperty(String endpoint, ExchangePattern pattern, final Object body, - final String property, final Object propertyValue) throws CamelExecutionException { - Exchange exchange = send(endpoint, pattern, createBodyAndPropertyProcessor(body, property, propertyValue)); - Object result = extractResultBody(exchange, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - @Override - public void sendBodyAndHeaders(String endpointUri, final Object body, final Map headers) throws CamelExecutionException { - sendBodyAndHeaders(resolveMandatoryEndpoint(endpointUri), body, headers); - } - - @Override - public void sendBodyAndHeaders(Endpoint endpoint, final Object body, final Map headers) throws CamelExecutionException { - Exchange result = send(endpoint, createBodyAndHeaders(body, headers)); - // must invoke extract result body in case of exception to be rethrown - extractResultBody(result); - } - - @Override - public Object sendBodyAndHeaders(String endpointUri, ExchangePattern pattern, Object body, Map headers) throws CamelExecutionException { - return sendBodyAndHeaders(resolveMandatoryEndpoint(endpointUri), pattern, body, headers); - } - - @Override - public Object sendBodyAndHeaders(Endpoint endpoint, ExchangePattern pattern, final Object body, final Map headers) throws CamelExecutionException { - Exchange exchange = send(endpoint, pattern, createBodyAndHeaders(body, headers)); - Object result = extractResultBody(exchange, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - } - - // Methods using an InOut ExchangePattern - // ----------------------------------------------------------------------- - - @Override - public Exchange request(Endpoint endpoint, Processor processor) { - return send(endpoint, ExchangePattern.InOut, processor); - } - - @Override - public Object requestBody(Object body) throws CamelExecutionException { - return sendBody(getMandatoryDefaultEndpoint(), ExchangePattern.InOut, body); - } - - @Override - public Object requestBody(Endpoint endpoint, Object body) throws CamelExecutionException { - return sendBody(endpoint, ExchangePattern.InOut, body); - } - - @Override - public Object requestBodyAndHeader(Object body, String header, Object headerValue) throws CamelExecutionException { - return sendBodyAndHeader(getMandatoryDefaultEndpoint(), ExchangePattern.InOut, body, header, headerValue); - } - - @Override - public Object requestBodyAndHeader(Endpoint endpoint, Object body, String header, Object headerValue) throws CamelExecutionException { - return sendBodyAndHeader(endpoint, ExchangePattern.InOut, body, header, headerValue); - } - - @Override - public Exchange request(String endpointUri, Processor processor) throws CamelExecutionException { - return send(resolveMandatoryEndpoint(endpointUri), ExchangePattern.InOut, processor, null); - } - - @Override - public Object requestBody(String endpointUri, Object body) throws CamelExecutionException { - return sendBody(resolveMandatoryEndpoint(endpointUri), ExchangePattern.InOut, body); - } - - @Override - public Object requestBodyAndHeader(String endpointUri, Object body, String header, Object headerValue) throws CamelExecutionException { - return sendBodyAndHeader(resolveMandatoryEndpoint(endpointUri), ExchangePattern.InOut, body, header, headerValue); - } - - @Override - public Object requestBodyAndHeaders(String endpointUri, Object body, Map headers) { - return sendBodyAndHeaders(resolveMandatoryEndpoint(endpointUri), ExchangePattern.InOut, body, headers); - } - - @Override - public Object requestBodyAndHeaders(Endpoint endpoint, final Object body, final Map headers) { - return sendBodyAndHeaders(endpoint, ExchangePattern.InOut, body, headers); - } - - @Override - public Object requestBodyAndHeaders(final Object body, final Map headers) { - return sendBodyAndHeaders(getMandatoryDefaultEndpoint(), ExchangePattern.InOut, body, headers); - } - - @Override - public T requestBody(Object body, Class type) { - return requestBody(getMandatoryDefaultEndpoint(), body, type); - } - - @Override - public T requestBody(Endpoint endpoint, Object body, Class type) { - Exchange exchange = send(endpoint, ExchangePattern.InOut, createSetBodyProcessor(body), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - @Override - public T requestBody(String endpointUri, Object body, Class type) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - Exchange exchange = send(endpoint, ExchangePattern.InOut, createSetBodyProcessor(body), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - @Override - public T requestBodyAndHeader(Endpoint endpoint, Object body, String header, Object headerValue, Class type) { - Exchange exchange = send(endpoint, ExchangePattern.InOut, createBodyAndHeaderProcessor(body, header, headerValue), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - @Override - public T requestBodyAndHeader(String endpointUri, Object body, String header, Object headerValue, Class type) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - Exchange exchange = send(endpoint, ExchangePattern.InOut, createBodyAndHeaderProcessor(body, header, headerValue), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - @Override - public T requestBodyAndHeaders(String endpointUri, Object body, Map headers, Class type) { - Endpoint endpoint = resolveMandatoryEndpoint(endpointUri); - Exchange exchange = send(endpoint, ExchangePattern.InOut, createBodyAndHeaders(body, headers), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - @Override - public T requestBodyAndHeaders(Endpoint endpoint, Object body, Map headers, Class type) { - Exchange exchange = send(endpoint, ExchangePattern.InOut, createBodyAndHeaders(body, headers), createConvertBodyProcessor(type)); - Object answer = extractResultBody(exchange); - return camelContext.getTypeConverter().convertTo(type, answer); - } - - // Methods using the default endpoint - // ----------------------------------------------------------------------- - - @Override - public void sendBody(Object body) { - sendBody(getMandatoryDefaultEndpoint(), body); - } - - @Override - public Exchange send(Exchange exchange) { - return send(getMandatoryDefaultEndpoint(), exchange); - } - - @Override - public Exchange send(Processor processor) { - return send(getMandatoryDefaultEndpoint(), processor); - } - - @Override - public void sendBodyAndHeader(Object body, String header, Object headerValue) { - sendBodyAndHeader(getMandatoryDefaultEndpoint(), body, header, headerValue); - } - - @Override - public void sendBodyAndProperty(Object body, String property, Object propertyValue) { - sendBodyAndProperty(getMandatoryDefaultEndpoint(), body, property, propertyValue); - } - - @Override - public void sendBodyAndHeaders(Object body, Map headers) { - sendBodyAndHeaders(getMandatoryDefaultEndpoint(), body, headers); - } - - // Properties - // ----------------------------------------------------------------------- - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public Endpoint getDefaultEndpoint() { - return defaultEndpoint; - } - - @Override - public void setDefaultEndpoint(Endpoint defaultEndpoint) { - this.defaultEndpoint = defaultEndpoint; - } - - /** - * Sets the default endpoint to use if none is specified - */ - @Override - public void setDefaultEndpointUri(String endpointUri) { - setDefaultEndpoint(getCamelContext().getEndpoint(endpointUri)); - } - - // Implementation methods - // ----------------------------------------------------------------------- - - protected Processor createBodyAndHeaderProcessor(final Object body, final String header, final Object headerValue) { - return new Processor() { - public void process(Exchange exchange) { - Message in = exchange.getIn(); - in.setHeader(header, headerValue); - in.setBody(body); - } - }; - } - - protected Processor createBodyAndHeaders(final Object body, final Map headers) { - return new Processor() { - public void process(Exchange exchange) { - Message in = exchange.getIn(); - if (headers != null) { - for (Map.Entry header : headers.entrySet()) { - in.setHeader(header.getKey(), header.getValue()); - } - } - in.setBody(body); - } - }; - } - - protected Processor createBodyAndPropertyProcessor(final Object body, final String property, final Object propertyValue) { - return new Processor() { - public void process(Exchange exchange) { - exchange.setProperty(property, propertyValue); - Message in = exchange.getIn(); - in.setBody(body); - } - }; - } - - protected Processor createSetBodyProcessor(final Object body) { - return new Processor() { - public void process(Exchange exchange) { - Message in = exchange.getIn(); - in.setBody(body); - } - }; - } - - protected Processor createConvertBodyProcessor(final Class type) { - return new ConvertBodyProcessor(type); - } - - protected Function createCompletionFunction(Synchronization onCompletion) { - return answer -> { - // invoke callback before returning answer - // as it allows callback to be used without unit of work invoking it - // and thus it works directly from a producer template as well, as opposed - // to the unit of work that is injected in routes - if (answer.isFailed()) { - onCompletion.onFailure(answer); - } else { - onCompletion.onComplete(answer); - } - return answer; - }; - } - - protected Endpoint resolveMandatoryEndpoint(String endpointUri) { - Endpoint endpoint = camelContext.getEndpoint(endpointUri); - if (endpoint == null) { - throw new NoSuchEndpointException(endpointUri); - } - return endpoint; - } - - protected Endpoint getMandatoryDefaultEndpoint() { - Endpoint answer = getDefaultEndpoint(); - ObjectHelper.notNull(answer, "defaultEndpoint"); - return answer; - } - - protected Object extractResultBody(Exchange result) { - return extractResultBody(result, null); - } - - protected Object extractResultBody(Exchange result, ExchangePattern pattern) { - return ExchangeHelper.extractResultBody(result, pattern); - } - - @Override - public void setExecutorService(ExecutorService executorService) { - this.executor = executorService; - } - - @Override - public CompletableFuture asyncSend(final String uri, final Exchange exchange) { - return asyncSend(resolveMandatoryEndpoint(uri), exchange); - } - - @Override - public CompletableFuture asyncSend(final String uri, final Processor processor) { - return asyncSend(resolveMandatoryEndpoint(uri), processor); - } - - @Override - public CompletableFuture asyncSendBody(final String uri, final Object body) { - return asyncSendBody(resolveMandatoryEndpoint(uri), body); - } - - @Override - public CompletableFuture asyncRequestBody(final String uri, final Object body) { - return asyncRequestBody(resolveMandatoryEndpoint(uri), body); - } - - @Override - public CompletableFuture asyncRequestBody(final String uri, final Object body, final Class type) { - return asyncRequestBody(resolveMandatoryEndpoint(uri), createSetBodyProcessor(body), type); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeader(final String endpointUri, final Object body, final String header, final Object headerValue) { - return asyncRequestBodyAndHeader(resolveMandatoryEndpoint(endpointUri), body, header, headerValue); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeader(final String endpointUri, final Object body, final String header, final Object headerValue, final Class type) { - return asyncRequestBodyAndHeader(resolveMandatoryEndpoint(endpointUri), body, header, headerValue, type); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeaders(final String endpointUri, final Object body, final Map headers) { - return asyncRequestBodyAndHeaders(resolveMandatoryEndpoint(endpointUri), body, headers); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeaders(final String endpointUri, final Object body, final Map headers, final Class type) { - return asyncRequestBodyAndHeaders(resolveMandatoryEndpoint(endpointUri), body, headers, type); - } - - @Override - public T extractFutureBody(Future future, Class type) { - return ExchangeHelper.extractFutureBody(camelContext, future, type); - } - - @Override - public T extractFutureBody(Future future, long timeout, TimeUnit unit, Class type) throws TimeoutException { - return ExchangeHelper.extractFutureBody(camelContext, future, timeout, unit, type); - } - - @Override - public CompletableFuture asyncCallbackSendBody(String uri, Object body, Synchronization onCompletion) { - return asyncCallbackSendBody(resolveMandatoryEndpoint(uri), body, onCompletion); - } - - @Override - public CompletableFuture asyncCallbackSendBody(Endpoint endpoint, Object body, Synchronization onCompletion) { - return asyncCallback(endpoint, ExchangePattern.InOnly, body, onCompletion); - } - - @Override - public CompletableFuture asyncCallbackRequestBody(String uri, Object body, Synchronization onCompletion) { - return asyncCallbackRequestBody(resolveMandatoryEndpoint(uri), body, onCompletion); - } - - @Override - public CompletableFuture asyncCallbackRequestBody(Endpoint endpoint, Object body, Synchronization onCompletion) { - return asyncCallback(endpoint, ExchangePattern.InOut, body, onCompletion); - } - - @Override - public CompletableFuture asyncCallback(String uri, Exchange exchange, Synchronization onCompletion) { - return asyncCallback(resolveMandatoryEndpoint(uri), exchange, onCompletion); - } - - @Override - public CompletableFuture asyncCallback(String uri, Processor processor, Synchronization onCompletion) { - return asyncCallback(resolveMandatoryEndpoint(uri), processor, onCompletion); - } - - @Override - public CompletableFuture asyncRequestBody(final Endpoint endpoint, final Object body) { - return asyncRequestBody(endpoint, createSetBodyProcessor(body)); - } - - @Override - public CompletableFuture asyncRequestBody(Endpoint endpoint, Object body, Class type) { - return asyncRequestBody(endpoint, createSetBodyProcessor(body), type); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeader(final Endpoint endpoint, final Object body, final String header, - final Object headerValue) { - return asyncRequestBody(endpoint, createBodyAndHeaderProcessor(body, header, headerValue)); - } - - protected CompletableFuture asyncRequestBody(final Endpoint endpoint, Processor processor, final Class type) { - return asyncRequestBody(endpoint, processor, createConvertBodyProcessor(type)) - .thenApply(answer -> camelContext.getTypeConverter().convertTo(type, answer)); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeader(final Endpoint endpoint, final Object body, final String header, - final Object headerValue, final Class type) { - return asyncRequestBody(endpoint, createBodyAndHeaderProcessor(body, header, headerValue), type); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeaders(final Endpoint endpoint, final Object body, - final Map headers) { - return asyncRequestBody(endpoint, createBodyAndHeaders(body, headers)); - } - - @Override - public CompletableFuture asyncRequestBodyAndHeaders(final Endpoint endpoint, final Object body, - final Map headers, final Class type) { - return asyncRequestBody(endpoint, createBodyAndHeaders(body, headers), type); - } - - @Override - public CompletableFuture asyncSend(final Endpoint endpoint, final Exchange exchange) { - return asyncSendExchange(endpoint, null, null, null, exchange); - } - - @Override - public CompletableFuture asyncSend(final Endpoint endpoint, final Processor processor) { - return asyncSend(endpoint, null, processor, null); - } - - @Override - public CompletableFuture asyncSendBody(final Endpoint endpoint, final Object body) { - return asyncSend(endpoint, createSetBodyProcessor(body)) - .thenApply(this::extractResultBody); - } - - @Override - public CompletableFuture asyncCallback(final Endpoint endpoint, final Exchange exchange, final Synchronization onCompletion) { - return asyncSend(endpoint, exchange).thenApply(createCompletionFunction(onCompletion)); - } - - @Override - public CompletableFuture asyncCallback(final Endpoint endpoint, final Processor processor, final Synchronization onCompletion) { - return asyncSend(endpoint, processor).thenApply(createCompletionFunction(onCompletion)); - } - - protected CompletableFuture asyncRequestBody(final Endpoint endpoint, Processor processor) { - return asyncRequestBody(endpoint, processor, (Processor) null); - } - - protected CompletableFuture asyncRequestBody(final Endpoint endpoint, Processor processor, Processor resultProcessor) { - return asyncRequest(endpoint, processor, resultProcessor) - .thenApply(e -> extractResultBody(e, ExchangePattern.InOut)); - } - - protected CompletableFuture asyncRequest(Endpoint endpoint, Processor processor, - Processor resultProcessor) { - return asyncSend(endpoint, ExchangePattern.InOut, processor, resultProcessor); - } - - protected CompletableFuture asyncSend( - Endpoint endpoint, ExchangePattern pattern, Processor processor, Processor resultProcessor) { - return asyncSendExchange(endpoint, pattern, processor, resultProcessor, null); - } - - protected CompletableFuture asyncSendExchange( - Endpoint endpoint, ExchangePattern pattern, Processor processor, Processor resultProcessor, - Exchange inExchange) { - CompletableFuture exchangeFuture = new CompletableFuture<>(); - getExecutorService().submit(() -> getProducerCache().asyncSendExchange(endpoint, pattern, processor, - resultProcessor, inExchange, exchangeFuture)); - return exchangeFuture; - } - - protected CompletableFuture asyncCallback(final Endpoint endpoint, final ExchangePattern pattern, - final Object body, final Synchronization onCompletion) { - return asyncSend(endpoint, pattern, createSetBodyProcessor(body), null) - .thenApply(createCompletionFunction(onCompletion)) - .thenApply(answer -> { - Object result = extractResultBody(answer, pattern); - if (pattern == ExchangePattern.InOnly) { - // return null if not OUT capable - return null; - } else { - return result; - } - }); - } - - private ProducerCache getProducerCache() { - if (!isStarted()) { - throw new IllegalStateException("ProducerTemplate has not been started"); - } - return producerCache; - } - - private ExecutorService getExecutorService() { - if (!isStarted()) { - throw new IllegalStateException("ProducerTemplate has not been started"); - } - if (executor == null) { - // create a default executor which must be synchronized - synchronized (lock) { - if (executor == null) { - if (threadedAsyncMode) { - executor = ObjectHelper.notNull(camelContext.getExecutorServiceManager().newDefaultThreadPool(this, "ProducerTemplate"), - "ExecutorService"); - } else { - executor = new SynchronousExecutorService(); - } - } - } - } - return executor; - } - - @Override - protected void doInit() throws Exception { - // need to lookup default endpoint as it may have been intercepted - if (defaultEndpoint != null) { - defaultEndpoint = camelContext.getEndpoint(defaultEndpoint.getEndpointUri()); - } - producerCache = new DefaultProducerCache(this, camelContext, maximumCacheSize); - producerCache.setEventNotifierEnabled(isEventNotifierEnabled()); - ServiceHelper.initService(producerCache); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(producerCache); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producerCache); - if (executor != null) { - camelContext.getExecutorServiceManager().shutdownNow(executor); - executor = null; - } - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownService(producerCache); - producerCache = null; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java deleted file mode 100644 index 45421a5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java +++ /dev/null @@ -1,184 +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.impl.engine; - -import org.apache.camel.StaticService; -import org.apache.camel.api.management.ManagedAttribute; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; - -/** - * Default {@link ReactiveExecutor}. - */ -@ManagedResource(description = "Managed ReactiveExecutor") -public class DefaultReactiveExecutor extends ServiceSupport implements ReactiveExecutor, StaticService { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultReactiveExecutor.class); - - private final ThreadLocal workers = ThreadLocal.withInitial(new Supplier() { - @Override - public Worker get() { - int number = createdWorkers.incrementAndGet(); - return new Worker(number, DefaultReactiveExecutor.this); - } - }); - - // use for statistics so we have insights at runtime - private final AtomicInteger createdWorkers = new AtomicInteger(); - private final AtomicInteger runningWorkers = new AtomicInteger(); - private final AtomicInteger pendingTasks = new AtomicInteger(); - - @Override - public void schedule(Runnable runnable) { - workers.get().schedule(runnable, false, false, false); - } - - @Override - public void scheduleMain(Runnable runnable) { - workers.get().schedule(runnable, true, true, false); - } - - @Override - public void scheduleSync(Runnable runnable) { - workers.get().schedule(runnable, false, true, true); - } - - @Override - public boolean executeFromQueue() { - return workers.get().executeFromQueue(); - } - - @ManagedAttribute(description = "Number of created workers") - public int getCreatedWorkers() { - return createdWorkers.get(); - } - - @ManagedAttribute(description = "Number of running workers") - public int getRunningWorkers() { - return runningWorkers.get(); - } - - @ManagedAttribute(description = "Number of pending tasks") - public int getPendingTasks() { - return pendingTasks.get(); - } - - @Override - protected void doStop() throws Exception { - if (LOG.isDebugEnabled()) { - LOG.debug("Stopping DefaultReactiveExecutor [createdWorkers: {}, runningWorkers: {}, pendingTasks: {}]", - getCreatedWorkers(), getRunningWorkers(), getPendingTasks()); - } - } - - private static class Worker { - - private final int number; - private final DefaultReactiveExecutor executor; - private volatile Deque queue = new ArrayDeque<>(); - private volatile Deque> back; - private volatile boolean running; - - public Worker(int number, DefaultReactiveExecutor executor) { - this.number = number; - this.executor = executor; - } - - void schedule(Runnable runnable, boolean first, boolean main, boolean sync) { - if (LOG.isTraceEnabled()) { - LOG.trace("Schedule [first={}, main={}, sync={}]: {}", first, main, sync, runnable); - } - if (main) { - if (!queue.isEmpty()) { - if (back == null) { - back = new ArrayDeque<>(); - } - back.push(queue); - queue = new ArrayDeque<>(); - } - } - if (first) { - queue.addFirst(runnable); - executor.pendingTasks.incrementAndGet(); - } else { - queue.addLast(runnable); - executor.pendingTasks.incrementAndGet(); - } - if (!running || sync) { - running = true; - executor.runningWorkers.incrementAndGet(); - try { - for (;;) { - final Runnable polled = queue.pollFirst(); - if (polled == null) { - if (back != null && !back.isEmpty()) { - queue = back.pollFirst(); - continue; - } else { - break; - } - } - try { - executor.pendingTasks.decrementAndGet(); - if (LOG.isTraceEnabled()) { - LOG.trace("Worker #{} running: {}", number, runnable); - } - polled.run(); - } catch (Throwable t) { - LOG.warn("Error executing reactive work due to " + t.getMessage() + ". This exception is ignored.", t); - } - } - } finally { - running = false; - executor.runningWorkers.decrementAndGet(); - } - } else { - if (LOG.isTraceEnabled()) { - LOG.trace("Queuing reactive work: {}", runnable); - } - } - } - - boolean executeFromQueue() { - final Runnable polled = queue != null ? queue.pollFirst() : null; - if (polled == null) { - return false; - } - try { - executor.pendingTasks.decrementAndGet(); - if (LOG.isTraceEnabled()) { - LOG.trace("Running: {}", polled); - } - polled.run(); - } catch (Throwable t) { - // should not happen - LOG.warn("Error executing reactive work due to " + t.getMessage() + ". This exception is ignored.", t); - } - return true; - } - - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java deleted file mode 100644 index 3f78318..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java +++ /dev/null @@ -1,618 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.TimeUtils; - -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -/** - * Default implementation of {@link Route}. - *

- * Use the API from {@link CamelContext} to control the lifecycle of a route, - * such as starting and stopping using the {@link RouteController#startRoute(String)} - * and {@link RouteController#stopRoute(String)} methods. - */ -public class DefaultRoute extends ServiceSupport implements Route { - - private NamedNode route; - private String routeId; - private String routeDescription; - private final List eventDrivenProcessors = new ArrayList<>(); - private CamelContext camelContext; - private List interceptStrategies = new ArrayList<>(); - private ManagementInterceptStrategy managementInterceptStrategy; - private Boolean trace; - private Boolean backlogTrace; - private Boolean debug; - private Boolean messageHistory; - private Boolean logMask; - private Boolean logExhaustedMessageBody; - private Boolean streamCache; - private Long delay; - private Boolean autoStartup = Boolean.TRUE; - private final List routePolicyList = new ArrayList<>(); - private ShutdownRoute shutdownRoute; - private ShutdownRunningTask shutdownRunningTask; - private final Map onCompletions = new HashMap<>(); - private final Map onExceptions = new HashMap<>(); - private ErrorHandlerFactory errorHandlerFactory; - // must be concurrent as error handlers can be mutated concurrently via multicast/recipientlist EIPs - private ConcurrentMap> errorHandlers = new ConcurrentHashMap<>(); - - private final Endpoint endpoint; - private final Map properties = new HashMap<>(); - private final List services = new ArrayList<>(); - private Date startDate; - private RouteError routeError; - private Integer startupOrder; - private RouteController routeController; - - private Processor processor; - private Consumer consumer; - - public DefaultRoute(CamelContext camelContext, NamedNode route, String routeId, - String routeDescription, Endpoint endpoint) { - this.camelContext = camelContext; - this.route = route; - this.routeId = routeId; - this.routeDescription = routeDescription; - this.endpoint = endpoint; - } - - @Override - public Processor createErrorHandler(Processor processor) throws Exception { - return camelContext.adapt(ExtendedCamelContext.class).createErrorHandler(this, processor); - } - - @Override - public String getId() { - return routeId; - } - - @Override - public String getGroup() { - return (String) properties.get(Route.GROUP_PROPERTY); - } - - @Override - public String getUptime() { - long delta = getUptimeMillis(); - if (delta == 0) { - return ""; - } - return TimeUtils.printDuration(delta); - } - - @Override - public long getUptimeMillis() { - if (startDate == null) { - return 0; - } - return new Date().getTime() - startDate.getTime(); - } - - @Override - public Endpoint getEndpoint() { - return endpoint; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public Map getProperties() { - return properties; - } - - @Override - public String getDescription() { - Object value = properties.get(Route.DESCRIPTION_PROPERTY); - return value != null ? (String) value : null; - } - - @Override - public void onStartingServices(List services) throws Exception { - addServices(services); - } - - @Override - public List getServices() { - return services; - } - - @Override - public void addService(Service service) { - if (!services.contains(service)) { - services.add(service); - } - } - - @Override - public void warmUp() { - getServices().clear(); - } - - /** - * Do not invoke this method directly, use {@link RouteController#startRoute(String)} to start a route. - */ - @Override - public void start() { - super.start(); - } - - /** - * Do not invoke this method directly, use {@link RouteController#stopRoute(String)} to stop a route. - */ - @Override - public void stop() { - super.stop(); - } - - @Override - protected void doStart() throws Exception { - startDate = new Date(); - } - - @Override - protected void doStop() throws Exception { - // and clear start date - startDate = null; - } - - @Override - protected void doShutdown() throws Exception { - // clear services when shutting down - services.clear(); - } - - @Override - public RouteError getLastError() { - return routeError; - } - - @Override - public void setLastError(RouteError routeError) { - this.routeError = routeError; - } - - @Override - public Integer getStartupOrder() { - return startupOrder; - } - - @Override - public void setStartupOrder(Integer startupOrder) { - this.startupOrder = startupOrder; - } - - public RouteController getRouteController() { - return routeController; - } - - public void setRouteController(RouteController routeController) { - this.routeController = routeController; - } - - public Boolean isAutoStartup() { - return autoStartup; - } - - @Override - public void setAutoStartup(Boolean autoStartup) { - this.autoStartup = autoStartup; - } - - @Override - public NamedNode getRoute() { - return route; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public String getRouteDescription() { - return routeDescription; - } - - public List getEventDrivenProcessors() { - return eventDrivenProcessors; - } - - @Override - public List getInterceptStrategies() { - return interceptStrategies; - } - - @Override - public void setManagementInterceptStrategy(ManagementInterceptStrategy interceptStrategy) { - this.managementInterceptStrategy = interceptStrategy; - } - - @Override - public ManagementInterceptStrategy getManagementInterceptStrategy() { - return managementInterceptStrategy; - } - - @Override - public void setTracing(Boolean tracing) { - this.trace = tracing; - } - - @Override - public Boolean isTracing() { - if (trace != null) { - return trace; - } else { - // fallback to the option from camel context - return camelContext.isTracing(); - } - } - - @Override - public String getTracingPattern() { - // can only set this on context level - return camelContext.getTracingPattern(); - } - - @Override - public void setTracingPattern(String tracePattern) { - // can only set this on context level - camelContext.setTracingPattern(tracePattern); - } - - @Override - public void setBacklogTracing(Boolean backlogTrace) { - this.backlogTrace = backlogTrace; - } - - @Override - public Boolean isBacklogTracing() { - if (backlogTrace != null) { - return backlogTrace; - } else { - // fallback to the option from camel context - return camelContext.isBacklogTracing(); - } - } - - @Override - public void setDebugging(Boolean debugging) { - this.debug = debugging; - } - - @Override - public Boolean isDebugging() { - if (debug != null) { - return debug; - } else { - // fallback to the option from camel context - return camelContext.isDebugging(); - } - } - - @Override - public void setMessageHistory(Boolean messageHistory) { - this.messageHistory = messageHistory; - } - - @Override - public Boolean isMessageHistory() { - if (messageHistory != null) { - return messageHistory; - } else { - // fallback to the option from camel context - return camelContext.isMessageHistory(); - } - } - - @Override - public void setLogMask(Boolean logMask) { - this.logMask = logMask; - } - - @Override - public Boolean isLogMask() { - if (logMask != null) { - return logMask; - } else { - // fallback to the option from camel context - return camelContext.isLogMask(); - } - } - - @Override - public void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody) { - this.logExhaustedMessageBody = logExhaustedMessageBody; - } - - @Override - public Boolean isLogExhaustedMessageBody() { - if (logExhaustedMessageBody != null) { - return logExhaustedMessageBody; - } else { - // fallback to the option from camel context - return camelContext.isLogExhaustedMessageBody(); - } - } - - @Override - public void setStreamCaching(Boolean cache) { - this.streamCache = cache; - } - - @Override - public Boolean isStreamCaching() { - if (streamCache != null) { - return streamCache; - } else { - // fallback to the option from camel context - return camelContext.isStreamCaching(); - } - } - - @Override - public void setDelayer(Long delay) { - this.delay = delay; - } - - @Override - public Long getDelayer() { - if (delay != null) { - return delay; - } else { - // fallback to the option from camel context - return camelContext.getDelayer(); - } - } - - @Override - public void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory) { - this.errorHandlerFactory = errorHandlerFactory; - } - - @Override - public ErrorHandlerFactory getErrorHandlerFactory() { - return errorHandlerFactory; - } - - @Override - public void setShutdownRoute(ShutdownRoute shutdownRoute) { - this.shutdownRoute = shutdownRoute; - } - - @Override - public void setAllowUseOriginalMessage(Boolean allowUseOriginalMessage) { - // can only be configured on CamelContext - camelContext.setAllowUseOriginalMessage(allowUseOriginalMessage); - } - - @Override - public Boolean isAllowUseOriginalMessage() { - // can only be configured on CamelContext - return camelContext.isAllowUseOriginalMessage(); - } - - @Override - public Boolean isCaseInsensitiveHeaders() { - // can only be configured on CamelContext - return camelContext.isCaseInsensitiveHeaders(); - } - - @Override - public void setCaseInsensitiveHeaders(Boolean caseInsensitiveHeaders) { - // can only be configured on CamelContext - camelContext.setCaseInsensitiveHeaders(caseInsensitiveHeaders); - } - - @Override - public ShutdownRoute getShutdownRoute() { - if (shutdownRoute != null) { - return shutdownRoute; - } else { - // fallback to the option from camel context - return camelContext.getShutdownRoute(); - } - } - - @Override - public void setShutdownRunningTask(ShutdownRunningTask shutdownRunningTask) { - this.shutdownRunningTask = shutdownRunningTask; - } - - @Override - public ShutdownRunningTask getShutdownRunningTask() { - if (shutdownRunningTask != null) { - return shutdownRunningTask; - } else { - // fallback to the option from camel context - return camelContext.getShutdownRunningTask(); - } - } - - @Override - public List getRoutePolicyList() { - return routePolicyList; - } - - @Override - public Collection getOnCompletions() { - return onCompletions.values(); - } - - @Override - public Processor getOnCompletion(String onCompletionId) { - return onCompletions.get(onCompletionId); - } - - @Override - public void setOnCompletion(String onCompletionId, Processor processor) { - onCompletions.put(onCompletionId, processor); - } - - @Override - public Collection getOnExceptions() { - return onExceptions.values(); - } - - @Override - public Processor getOnException(String onExceptionId) { - return onExceptions.get(onExceptionId); - } - - @Override - public void setOnException(String onExceptionId, Processor processor) { - onExceptions.put(onExceptionId, processor); - } - - @Override - public Set getErrorHandlers(ErrorHandlerFactory factory) { - return errorHandlers.computeIfAbsent(factory, f -> new LinkedHashSet<>()); - } - - @Override - public void addErrorHandler(ErrorHandlerFactory factory, NamedNode onException) { - errorHandlers.computeIfAbsent(factory, f -> new LinkedHashSet<>()).add(onException); - } - - @Override - public void addErrorHandlerFactoryReference(ErrorHandlerFactory source, ErrorHandlerFactory target) { - Set list = errorHandlers.computeIfAbsent(source, f -> new LinkedHashSet<>()); - Set previous = errorHandlers.put(target, list); - if (list != previous && ObjectHelper.isNotEmpty(previous) && ObjectHelper.isNotEmpty(list)) { - throw new IllegalStateException("Multiple references with different handlers"); - } - } - - @Override - public String toString() { - return "Route[" + getEndpoint() + " -> " + processor + "]"; - } - - @Override - public Processor getProcessor() { - return processor; - } - - public void setProcessor(Processor processor) { - this.processor = processor; - } - - /** - * Factory method to lazily create the complete list of services required for this route - * such as adding the processor or consumer - */ - protected void addServices(List services) throws Exception { - Endpoint endpoint = getEndpoint(); - consumer = endpoint.createConsumer(processor); - if (consumer != null) { - services.add(consumer); - if (consumer instanceof RouteAware) { - ((RouteAware) consumer).setRoute(this); - } - if (consumer instanceof RouteIdAware) { - ((RouteIdAware) consumer).setRouteId(this.getId()); - } - } - if (processor instanceof Service) { - services.add((Service)processor); - } - for (Processor p : onCompletions.values()) { - if (processor instanceof Service) { - services.add((Service)p); - } - } - for (Processor p : onExceptions.values()) { - if (processor instanceof Service) { - services.add((Service)p); - } - } - } - - @Override - @SuppressWarnings("unchecked") - public Navigate navigate() { - Processor answer = getProcessor(); - - // we want navigating routes to be easy, so skip the initial channel - // and navigate to its output where it all starts from end user point of view - if (answer instanceof Navigate) { - Navigate nav = (Navigate) answer; - if (nav.next().size() == 1) { - Object first = nav.next().get(0); - if (first instanceof Navigate) { - return (Navigate) first; - } - } - return (Navigate) answer; - } - return null; - } - - @Override - public List filter(String pattern) { - List match = new ArrayList<>(); - doFilter(pattern, navigate(), match); - return match; - } - - @SuppressWarnings("unchecked") - private void doFilter(String pattern, Navigate nav, List match) { - List list = nav.next(); - if (list != null) { - for (Processor proc : list) { - String id = null; - if (proc instanceof IdAware) { - id = ((IdAware) proc).getId(); - } - if (PatternHelper.matchPattern(id, pattern)) { - match.add(proc); - } - if (proc instanceof Navigate) { - Navigate child = (Navigate) proc; - doFilter(pattern, child, match); - } - } - } - } - - @Override - public Consumer getConsumer() { - return consumer; - } - - @Override - public boolean supportsSuspension() { - return consumer instanceof Suspendable && consumer instanceof SuspendableService; - } - - public void clearModelReferences() { - route = null; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java deleted file mode 100644 index 0c2cc49..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteController.java +++ /dev/null @@ -1,158 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.RouteController; -import org.apache.camel.spi.SupervisingRouteController; -import org.apache.camel.support.service.ServiceSupport; - -import java.util.Collection; -import java.util.Collections; -import java.util.concurrent.TimeUnit; - -/** - * A default {@link RouteController} that starts the routes in a fail-fast mode, which means - * if any of the routes fail to startup then this causes Camel to fail to startup as well. - * - * @see org.apache.camel.impl.engine.DefaultSupervisingRouteController - */ -public class DefaultRouteController extends ServiceSupport implements RouteController, NonManagedService { - - // mark this as non managed service as its registered specially as a route controller - - private CamelContext camelContext; - - private LoggingLevel routeStartupLoggingLevel = LoggingLevel.INFO; - - public DefaultRouteController() { - this(null); - } - - public DefaultRouteController(CamelContext camelContext) { - this.camelContext = camelContext; - } - - // *************************************************** - // Properties - // *************************************************** - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public LoggingLevel getRouteStartupLoggingLevel() { - return routeStartupLoggingLevel; - } - - @Override - public void setRouteStartupLoggingLevel(LoggingLevel routeStartupLoggingLevel) { - this.routeStartupLoggingLevel = routeStartupLoggingLevel; - } - - // *************************************************** - // Route management - // *************************************************** - - protected RouteController getInternalRouteController() { - return camelContext.adapt(ExtendedCamelContext.class).getInternalRouteController(); - } - - @Override - public void startAllRoutes() throws Exception { - getInternalRouteController().startAllRoutes(); - } - - @Override - public boolean isStartingRoutes() { - return getInternalRouteController().isStartingRoutes(); - } - - @Override - public ServiceStatus getRouteStatus(String routeId) { - return getInternalRouteController().getRouteStatus(routeId); - } - - @Override - public void startRoute(String routeId) throws Exception { - getInternalRouteController().startRoute(routeId); - } - - @Override - public void stopRoute(String routeId) throws Exception { - getInternalRouteController().stopRoute(routeId); - } - - @Override - public void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - getInternalRouteController().stopRoute(routeId, timeout, timeUnit); - } - - @Override - public boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception { - return getInternalRouteController().stopRoute(routeId, timeout, timeUnit, abortAfterTimeout); - } - - @Override - public void suspendRoute(String routeId) throws Exception { - getInternalRouteController().suspendRoute(routeId); - } - - @Override - public void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - getInternalRouteController().suspendRoute(routeId, timeout, timeUnit); - } - - @Override - public void resumeRoute(String routeId) throws Exception { - getInternalRouteController().resumeRoute(routeId); - } - - // *************************************************** - // - // *************************************************** - - @Override - public T adapt(Class type) { - return type.cast(this); - } - - @Override - public SupervisingRouteController supervising() { - if (this instanceof SupervisingRouteController) { - return (SupervisingRouteController) this; - } else { - // change current route controller to be supervising - SupervisingRouteController src = new DefaultSupervisingRouteController(); - src.setCamelContext(camelContext); - camelContext.setRouteController(src); - return src; - } - } - - @Override - public Collection getControlledRoutes() { - return Collections.emptyList(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java deleted file mode 100644 index bd8c490..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteError.java +++ /dev/null @@ -1,77 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.Route; -import org.apache.camel.spi.RouteError; - -public class DefaultRouteError implements RouteError { - private final Phase phase; - private final Throwable throwable; - private final boolean unhealthy; - - public DefaultRouteError(Phase phase, Throwable throwable) { - this(phase, throwable, false); - } - - public DefaultRouteError(Phase phase, Throwable throwable, boolean unhealthy) { - this.phase = phase; - this.throwable = throwable; - this.unhealthy = unhealthy; - } - - @Override - public Phase getPhase() { - return phase; - } - - @Override - public Throwable getException() { - return throwable; - } - - @Override - public boolean isUnhealthy() { - return unhealthy; - } - - // *********************************** - // Helpers - // *********************************** - - public static void set(CamelContext context, String routeId, Phase phase, Throwable throwable) { - Route route = context.getRoute(routeId); - if (route != null) { - route.setLastError(new DefaultRouteError(phase, throwable)); - } - } - - public static void set(CamelContext context, String routeId, Phase phase, Throwable throwable, boolean unhealthy) { - Route route = context.getRoute(routeId); - if (route != null) { - route.setLastError(new DefaultRouteError(phase, throwable, unhealthy)); - } - } - - public static void reset(CamelContext context, String routeId) { - Route route = context.getRoute(routeId); - if (route != null) { - route.setLastError(null); - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.java deleted file mode 100644 index 72814ef..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteStartupOrder.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.impl.engine; - -import org.apache.camel.Consumer; -import org.apache.camel.Route; -import org.apache.camel.Service; -import org.apache.camel.spi.RouteStartupOrder; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Default implementation of {@link RouteStartupOrder}. - */ -public class DefaultRouteStartupOrder implements RouteStartupOrder { - - private final int startupOrder; - private final Route route; - private final org.apache.camel.impl.engine.RouteService routeService; - - public DefaultRouteStartupOrder(int startupOrder, Route route, org.apache.camel.impl.engine.RouteService routeService) { - this.startupOrder = startupOrder; - this.route = route; - this.routeService = routeService; - } - - @Override - public int getStartupOrder() { - return startupOrder; - } - - @Override - public Route getRoute() { - return route; - } - - @Override - public List getInputs() { - Map inputs = routeService.getInputs(); - return new ArrayList<>(inputs.values()); - } - - @Override - public List getServices() { - List services = routeService.getRoute().getServices(); - return new ArrayList<>(services); - } - - public RouteService getRouteService() { - return routeService; - } - - @Override - public String toString() { - return "Route " + route.getId() + " starts in order " + startupOrder; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java deleted file mode 100644 index 246d62f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java +++ /dev/null @@ -1,331 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.Endpoint; -import org.apache.camel.spi.CamelEvent; -import org.apache.camel.spi.CamelEvent.ExchangeCreatedEvent; -import org.apache.camel.spi.CamelEvent.ExchangeSendingEvent; -import org.apache.camel.spi.CamelEvent.RouteAddedEvent; -import org.apache.camel.spi.CamelEvent.RouteRemovedEvent; -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.spi.RuntimeEndpointRegistry; -import org.apache.camel.support.EventNotifierSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; - -public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport implements CamelContextAware, RuntimeEndpointRegistry { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultRuntimeEndpointRegistry.class); - - private CamelContext camelContext; - - // route id -> endpoint urls - private Map> inputs; - private Map> outputs; - private int limit = 1000; - private boolean enabled = true; - private volatile boolean extended; - private EndpointUtilizationStatistics inputUtilization; - private EndpointUtilizationStatistics outputUtilization; - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - @Override - public List getAllEndpoints(boolean includeInputs) { - List answer = new ArrayList<>(); - if (includeInputs) { - for (Map.Entry> entry : inputs.entrySet()) { - answer.addAll(entry.getValue()); - } - } - for (Map.Entry> entry : outputs.entrySet()) { - answer.addAll(entry.getValue().keySet()); - } - return Collections.unmodifiableList(answer); - } - - @Override - public List getEndpointsPerRoute(String routeId, boolean includeInputs) { - List answer = new ArrayList<>(); - if (includeInputs) { - Set uris = inputs.get(routeId); - if (uris != null) { - answer.addAll(uris); - } - } - Map uris = outputs.get(routeId); - if (uris != null) { - answer.addAll(uris.keySet()); - } - return Collections.unmodifiableList(answer); - } - - @Override - public List getEndpointStatistics() { - List answer = new ArrayList<>(); - - // inputs - for (Map.Entry> entry : inputs.entrySet()) { - String routeId = entry.getKey(); - for (String uri : entry.getValue()) { - Long hits = 0L; - if (extended) { - String key = asUtilizationKey(routeId, uri); - if (key != null) { - hits = inputUtilization.getStatistics().get(key); - if (hits == null) { - hits = 0L; - } - } - } - answer.add(new EndpointRuntimeStatistics(uri, routeId, "in", hits)); - } - } - - // outputs - for (Map.Entry> entry : outputs.entrySet()) { - String routeId = entry.getKey(); - for (String uri : entry.getValue().keySet()) { - Long hits = 0L; - if (extended) { - String key = asUtilizationKey(routeId, uri); - if (key != null) { - hits = outputUtilization.getStatistics().get(key); - if (hits == null) { - hits = 0L; - } - } - } - answer.add(new EndpointRuntimeStatistics(uri, routeId, "out", hits)); - } - } - - return answer; - } - - @Override - public int getLimit() { - return limit; - } - - @Override - public void setLimit(int limit) { - this.limit = limit; - } - - @Override - public void clear() { - inputs.clear(); - outputs.clear(); - reset(); - } - - @Override - public void reset() { - // its safe to call clear as reset - if (inputUtilization != null) { - inputUtilization.clear(); - } - if (outputUtilization != null) { - outputUtilization.clear(); - } - } - - @Override - public int size() { - int total = inputs.values().size(); - total += outputs.values().size(); - return total; - } - - @Override - protected void doInit() throws Exception { - ObjectHelper.notNull(camelContext, "camelContext", this); - - if (inputs == null) { - inputs = new HashMap<>(); - } - if (outputs == null) { - outputs = new HashMap<>(); - } - if (getCamelContext().getManagementStrategy() != null && getCamelContext().getManagementStrategy().getManagementAgent() != null) { - extended = getCamelContext().getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended(); - } - if (extended) { - inputUtilization = new org.apache.camel.impl.engine.DefaultEndpointUtilizationStatistics(limit); - outputUtilization = new DefaultEndpointUtilizationStatistics(limit); - } - if (extended) { - LOG.info("Runtime endpoint registry is in extended mode gathering usage statistics of all incoming and outgoing endpoints (cache limit: {})", limit); - } else { - LOG.info("Runtime endpoint registry is in normal mode gathering information of all incoming and outgoing endpoints (cache limit: {})", limit); - } - ServiceHelper.initService(inputUtilization, outputUtilization); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(inputUtilization, outputUtilization); - } - - @Override - protected void doStop() throws Exception { - clear(); - ServiceHelper.stopService(inputUtilization, outputUtilization); - } - - @Override - @SuppressWarnings("unchecked") - public void notify(CamelEvent event) throws Exception { - if (event instanceof RouteAddedEvent) { - RouteAddedEvent rse = (RouteAddedEvent) event; - Endpoint endpoint = rse.getRoute().getEndpoint(); - String routeId = rse.getRoute().getId(); - - // a HashSet is fine for inputs as we only have a limited number of those - Set uris = new HashSet<>(); - uris.add(endpoint.getEndpointUri()); - inputs.put(routeId, uris); - // use a LRUCache for outputs as we could potential have unlimited uris if dynamic routing is in use - // and therefore need to have the limit in use - outputs.put(routeId, LRUCacheFactory.newLRUCache(limit)); - } else if (event instanceof RouteRemovedEvent) { - RouteRemovedEvent rse = (RouteRemovedEvent) event; - String routeId = rse.getRoute().getId(); - inputs.remove(routeId); - outputs.remove(routeId); - if (extended) { - String uri = rse.getRoute().getEndpoint().getEndpointUri(); - String key = asUtilizationKey(routeId, uri); - if (key != null) { - inputUtilization.remove(key); - } - } - } else if (extended && event instanceof ExchangeCreatedEvent) { - // we only capture details in extended mode - ExchangeCreatedEvent ece = (ExchangeCreatedEvent) event; - Endpoint endpoint = ece.getExchange().getFromEndpoint(); - if (endpoint != null) { - String routeId = ece.getExchange().getFromRouteId(); - String uri = endpoint.getEndpointUri(); - String key = asUtilizationKey(routeId, uri); - if (key != null) { - inputUtilization.onHit(key); - } - } - } else if (event instanceof ExchangeSendingEvent) { - ExchangeSendingEvent ese = (ExchangeSendingEvent) event; - Endpoint endpoint = ese.getEndpoint(); - String routeId = ExchangeHelper.getRouteId(ese.getExchange()); - String uri = endpoint.getEndpointUri(); - - Map uris = outputs.get(routeId); - if (uris != null && !uris.containsKey(uri)) { - uris.put(uri, uri); - } - if (extended) { - String key = asUtilizationKey(routeId, uri); - if (key != null) { - outputUtilization.onHit(key); - } - } - } - } - - @Override - public boolean isDisabled() { - return !enabled; - } - - @Override - public boolean isEnabled(CamelEvent event) { - return enabled && event instanceof ExchangeCreatedEvent - || event instanceof ExchangeSendingEvent - || event instanceof RouteAddedEvent - || event instanceof RouteRemovedEvent; - } - - private static String asUtilizationKey(String routeId, String uri) { - if (routeId == null || uri == null) { - return null; - } else { - return routeId + "|" + uri; - } - } - - private static final class EndpointRuntimeStatistics implements Statistic { - - private final String uri; - private final String routeId; - private final String direction; - private final long hits; - - private EndpointRuntimeStatistics(String uri, String routeId, String direction, long hits) { - this.uri = uri; - this.routeId = routeId; - this.direction = direction; - this.hits = hits; - } - - @Override - public String getUri() { - return uri; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public String getDirection() { - return direction; - } - - @Override - public long getHits() { - return hits; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java deleted file mode 100644 index 2150eea..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java +++ /dev/null @@ -1,774 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.CollectionStringBuffer; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * Default {@link ShutdownStrategy} which uses graceful shutdown. - *

- * Graceful shutdown ensures that any inflight and pending messages will be taken into account - * and it will wait until these exchanges has been completed. - *

- * This strategy will perform graceful shutdown in two steps: - *

    - *
  • Graceful - By suspending/stopping consumers, and let any in-flight exchanges complete
    • - *
  • Forced - After a given period of time, a timeout occurred and if there are still pending - * exchanges to complete, then a more aggressive forced strategy is performed.
    • - *
- * The idea by the graceful shutdown strategy, is to stop taking in more new messages, - * and allow any existing inflight messages to complete. Then when there is no more inflight messages - * then the routes can be fully shutdown. This mean that if there is inflight messages then we will have - * to wait for these messages to complete. If they do not complete after a period of time, then a - * timeout triggers. And then a more aggressive strategy takes over. - *

- * The idea by the forced shutdown strategy, is to stop continue processing messages. - * And force routes and its services to shutdown now. There is a risk when shutting down now, - * that some resources is not properly shutdown, which can cause side effects. The timeout value - * is by default 45 seconds, but can be customized. - *

- * As this strategy will politely wait until all exchanges has been completed it can potential wait - * for a long time, and hence why a timeout value can be set. When the timeout triggers you can also - * specify whether the remainder consumers should be shutdown now or ignore. - *

- * Will by default use a timeout of 45 seconds by which it will shutdown now the remaining consumers. - * This ensures that when shutting down Camel it at some point eventually will shutdown. - * This behavior can of course be configured using the {@link #setTimeout(long)} and - * {@link #setShutdownNowOnTimeout(boolean)} methods. - *

- * Routes will by default be shutdown in the reverse order of which they where started. - * You can customize this using the {@link #setShutdownRoutesInReverseOrder(boolean)} method. - *

- * After route consumers have been shutdown, then any {@link ShutdownPrepared} services on the routes - * is being prepared for shutdown, by invoking {@link ShutdownPrepared#prepareShutdown(boolean,boolean)} which - * force=false. - *

- * Then if a timeout occurred and the strategy has been configured with shutdown-now on timeout, then - * the strategy performs a more aggressive forced shutdown, by forcing all consumers to shutdown - * and then invokes {@link ShutdownPrepared#prepareShutdown(boolean,boolean)} with force=true - * on the services. This allows the services to know they should force shutdown now. - *

- * When timeout occurred and a forced shutdown is happening, then there may be threads/tasks which are - * still inflight which may be rejected continued being routed. By default this can cause WARN and ERRORs - * to be logged. The option {@link #setSuppressLoggingOnTimeout(boolean)} can be used to suppress these - * logs, so they are logged at TRACE level instead. - *

- * Also when a timeout occurred then information about the inflight exchanges is logged, if {@link #isLogInflightExchangesOnTimeout()} - * is enabled (is by default). This allows end users to known where these inflight exchanges currently are in the route(s), - * and how long time they have been inflight. - *

- * This information can also be obtained from the {@link InflightRepository} - * at all time during runtime. - */ -public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownStrategy, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultShutdownStrategy.class); - - private CamelContext camelContext; - private ExecutorService executor; - private long timeout = 45; - private TimeUnit timeUnit = TimeUnit.SECONDS; - private boolean shutdownNowOnTimeout = true; - private boolean shutdownRoutesInReverseOrder = true; - private boolean suppressLoggingOnTimeout; - private boolean logInflightExchangesOnTimeout = true; - - private volatile boolean forceShutdown; - private final AtomicBoolean timeoutOccurred = new AtomicBoolean(); - private volatile Future currentShutdownTaskFuture; - - public DefaultShutdownStrategy() { - } - - public DefaultShutdownStrategy(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public void shutdown(CamelContext context, List routes) throws Exception { - shutdown(context, routes, getTimeout(), getTimeUnit()); - } - - @Override - public void shutdownForced(CamelContext context, List routes) throws Exception { - doShutdown(context, routes, getTimeout(), getTimeUnit(), false, false, true); - } - - @Override - public void suspend(CamelContext context, List routes) throws Exception { - doShutdown(context, routes, getTimeout(), getTimeUnit(), true, false, false); - } - - @Override - public void shutdown(CamelContext context, List routes, long timeout, TimeUnit timeUnit) throws Exception { - doShutdown(context, routes, timeout, timeUnit, false, false, false); - } - - @Override - public boolean shutdown(CamelContext context, RouteStartupOrder route, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception { - List routes = Collections.singletonList(route); - return doShutdown(context, routes, timeout, timeUnit, false, abortAfterTimeout, false); - } - - @Override - public void suspend(CamelContext context, List routes, long timeout, TimeUnit timeUnit) throws Exception { - doShutdown(context, routes, timeout, timeUnit, true, false, false); - } - - protected boolean doShutdown(CamelContext context, List routes, long timeout, TimeUnit timeUnit, - boolean suspendOnly, boolean abortAfterTimeout, boolean forceShutdown) throws Exception { - - // timeout must be a positive value - if (timeout <= 0) { - throw new IllegalArgumentException("Timeout must be a positive value"); - } - - // just return if no routes to shutdown - if (routes.isEmpty()) { - return true; - } - - StopWatch watch = new StopWatch(); - - // at first sort according to route startup order - Comparator comparator = Comparator.comparingInt(RouteStartupOrder::getStartupOrder); - if (shutdownRoutesInReverseOrder) { - comparator = comparator.reversed(); - } - List routesOrdered = new ArrayList<>(routes); - routesOrdered.sort(comparator); - - if (suspendOnly) { - LOG.info("Starting to graceful suspend {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH)); - } else { - LOG.info("Starting to graceful shutdown {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH)); - } - - // use another thread to perform the shutdowns so we can support timeout - timeoutOccurred.set(false); - currentShutdownTaskFuture = getExecutorService().submit(new ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly, - abortAfterTimeout, timeoutOccurred, isLogInflightExchangesOnTimeout())); - try { - currentShutdownTaskFuture.get(timeout, timeUnit); - } catch (ExecutionException e) { - // unwrap execution exception - throw RuntimeCamelException.wrapRuntimeCamelException(e.getCause()); - } catch (Exception e) { - // either timeout or interrupted exception was thrown so this is okay - // as interrupted would mean cancel was called on the currentShutdownTaskFuture to signal a forced timeout - - // we hit a timeout, so set the flag - timeoutOccurred.set(true); - - // timeout then cancel the task - currentShutdownTaskFuture.cancel(true); - - // signal we are forcing shutdown now, since timeout occurred - this.forceShutdown = forceShutdown; - - // if set, stop processing and return false to indicate that the shutdown is aborting - if (!forceShutdown && abortAfterTimeout) { - LOG.warn("Timeout occurred during graceful shutdown. Aborting the shutdown now." - + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); - - // we attempt to force shutdown so lets log the current inflight exchanges which are affected - logInflightExchanges(context, routes, isLogInflightExchangesOnTimeout()); - - return false; - } else { - if (forceShutdown || shutdownNowOnTimeout) { - LOG.warn("Timeout occurred during graceful shutdown. Forcing the routes to be shutdown now." - + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); - - // we attempt to force shutdown so lets log the current inflight exchanges which are affected - logInflightExchanges(context, routes, isLogInflightExchangesOnTimeout()); - - // force the routes to shutdown now - shutdownRoutesNow(routesOrdered); - - // now the route consumers has been shutdown, then prepare route services for shutdown now (forced) - for (RouteStartupOrder order : routes) { - for (Service service : order.getServices()) { - prepareShutdown(service, false, true, true, isSuppressLoggingOnTimeout()); - } - } - } else { - LOG.warn("Timeout occurred during graceful shutdown. Will ignore shutting down the remainder routes." - + " Notice: some resources may still be running as graceful shutdown did not complete successfully."); - - logInflightExchanges(context, routes, isLogInflightExchangesOnTimeout()); - } - } - } finally { - currentShutdownTaskFuture = null; - } - - // convert to seconds as its easier to read than a big milli seconds number - long seconds = TimeUnit.SECONDS.convert(watch.taken(), TimeUnit.MILLISECONDS); - - LOG.info("Graceful shutdown of {} routes completed in {} seconds", routesOrdered.size(), seconds); - return true; - } - - @Override - public boolean forceShutdown(Service service) { - return forceShutdown; - } - - @Override - public boolean hasTimeoutOccurred() { - return timeoutOccurred.get(); - } - - @Override - public void setTimeout(long timeout) { - if (timeout <= 0) { - throw new IllegalArgumentException("Timeout must be a positive value"); - } - this.timeout = timeout; - } - - @Override - public long getTimeout() { - return timeout; - } - - @Override - public void setTimeUnit(TimeUnit timeUnit) { - this.timeUnit = timeUnit; - } - - @Override - public TimeUnit getTimeUnit() { - return timeUnit; - } - - @Override - public void setShutdownNowOnTimeout(boolean shutdownNowOnTimeout) { - this.shutdownNowOnTimeout = shutdownNowOnTimeout; - } - - @Override - public boolean isShutdownNowOnTimeout() { - return shutdownNowOnTimeout; - } - - @Override - public boolean isShutdownRoutesInReverseOrder() { - return shutdownRoutesInReverseOrder; - } - - @Override - public void setShutdownRoutesInReverseOrder(boolean shutdownRoutesInReverseOrder) { - this.shutdownRoutesInReverseOrder = shutdownRoutesInReverseOrder; - } - - @Override - public boolean isSuppressLoggingOnTimeout() { - return suppressLoggingOnTimeout; - } - - @Override - public void setSuppressLoggingOnTimeout(boolean suppressLoggingOnTimeout) { - this.suppressLoggingOnTimeout = suppressLoggingOnTimeout; - } - - @Override - public boolean isLogInflightExchangesOnTimeout() { - return logInflightExchangesOnTimeout; - } - - @Override - public void setLogInflightExchangesOnTimeout(boolean logInflightExchangesOnTimeout) { - this.logInflightExchangesOnTimeout = logInflightExchangesOnTimeout; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public Future getCurrentShutdownTaskFuture() { - return currentShutdownTaskFuture; - } - - /** - * Shutdown all the consumers immediately. - * - * @param routes the routes to shutdown - */ - protected void shutdownRoutesNow(List routes) { - for (RouteStartupOrder order : routes) { - - // set the route to shutdown as fast as possible by stopping after - // it has completed its current task - ShutdownRunningTask current = order.getRoute().getShutdownRunningTask(); - if (current != ShutdownRunningTask.CompleteCurrentTaskOnly) { - LOG.debug("Changing shutdownRunningTask from {} to " + ShutdownRunningTask.CompleteCurrentTaskOnly - + " on route {} to shutdown faster", current, order.getRoute().getId()); - order.getRoute().setShutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly); - } - - for (Consumer consumer : order.getInputs()) { - shutdownNow(order.getRoute().getId(), consumer); - } - } - } - - /** - * Shutdown all the consumers immediately. - * - * @param routeId the route id to suspend - * @param consumers the consumers to shutdown - */ - protected void shutdownNow(String routeId, List consumers) { - for (Consumer consumer : consumers) { - shutdownNow(routeId, consumer); - } - } - - /** - * Shutdown the consumer immediately. - * - * @param routeId the route id to suspend - * @param consumer the consumer to shutdown - */ - protected void shutdownNow(String routeId, Consumer consumer) { - LOG.trace("Shutting down: {}", consumer); - - // allow us to do custom work before delegating to service helper - try { - ServiceHelper.stopService(consumer); - } catch (Throwable e) { - LOG.warn("Error occurred while shutting down route: " + routeId + ". This exception will be ignored.", e); - // fire event - EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e); - } - - LOG.trace("Shutdown complete for: {}", consumer); - } - - /** - * Suspends/stops the consumer immediately. - * - * @param routeId the route id to suspend - * @param consumer the consumer to suspend - */ - protected void suspendNow(String routeId, Consumer consumer) { - LOG.trace("Suspending: {}", consumer); - - // allow us to do custom work before delegating to service helper - try { - ServiceHelper.suspendService(consumer); - } catch (Throwable e) { - LOG.warn("Error occurred while suspending route: " + routeId + ". This exception will be ignored.", e); - // fire event - EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e); - } - - LOG.trace("Suspend complete for: {}", consumer); - } - - private ExecutorService getExecutorService() { - if (executor == null) { - // use a thread pool that allow to terminate idle threads so they do not hang around forever - executor = camelContext.getExecutorServiceManager().newThreadPool(this, "ShutdownTask", 0, 1); - } - return executor; - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext"); - // reset option - forceShutdown = false; - timeoutOccurred.set(false); - } - - @Override - protected void doStop() throws Exception { - // noop - } - - @Override - protected void doShutdown() throws Exception { - if (executor != null) { - // force shutting down as we are shutting down Camel - camelContext.getExecutorServiceManager().shutdownNow(executor); - // should clear executor so we can restart by creating a new thread pool - executor = null; - } - } - - /** - * Prepares the services for shutdown, by invoking the {@link ShutdownPrepared#prepareShutdown(boolean, boolean)} method - * on the service if it implement this interface. - * - * @param service the service - * @param forced whether to force shutdown - * @param includeChildren whether to prepare the child of the service as well - */ - private void prepareShutdown(Service service, boolean suspendOnly, boolean forced, boolean includeChildren, boolean suppressLogging) { - Set list; - if (includeChildren) { - // include error handlers as we want to prepare them for shutdown as well - list = ServiceHelper.getChildServices(service, true); - } else { - list = new LinkedHashSet<>(1); - list.add(service); - } - - for (Service child : list) { - if (child instanceof ShutdownPrepared) { - try { - LOG.trace("Preparing (forced: {}) shutdown on: {}", forced, child); - ((ShutdownPrepared) child).prepareShutdown(suspendOnly, forced); - } catch (Exception e) { - if (suppressLogging) { - LOG.trace("Error during prepare shutdown on " + child + ". This exception will be ignored.", e); - } else { - LOG.warn("Error during prepare shutdown on " + child + ". This exception will be ignored.", e); - } - } - } - } - } - - /** - * Holder for deferred consumers - */ - static class ShutdownDeferredConsumer { - private final Route route; - private final Consumer consumer; - - ShutdownDeferredConsumer(Route route, Consumer consumer) { - this.route = route; - this.consumer = consumer; - } - - Route getRoute() { - return route; - } - - Consumer getConsumer() { - return consumer; - } - } - - /** - * Shutdown task which shutdown all the routes in a graceful manner. - */ - class ShutdownTask implements Runnable { - - private final CamelContext context; - private final List routes; - private final boolean suspendOnly; - private final boolean abortAfterTimeout; - private final long timeout; - private final TimeUnit timeUnit; - private final AtomicBoolean timeoutOccurred; - private final boolean logInflightExchangesOnTimeout; - - ShutdownTask(CamelContext context, List routes, long timeout, TimeUnit timeUnit, - boolean suspendOnly, boolean abortAfterTimeout, AtomicBoolean timeoutOccurred, boolean logInflightExchangesOnTimeout) { - this.context = context; - this.routes = routes; - this.suspendOnly = suspendOnly; - this.abortAfterTimeout = abortAfterTimeout; - this.timeout = timeout; - this.timeUnit = timeUnit; - this.timeoutOccurred = timeoutOccurred; - this.logInflightExchangesOnTimeout = logInflightExchangesOnTimeout; - } - - @Override - public void run() { - // the strategy in this run method is to - // 1) go over the routes and shutdown those routes which can be shutdown asap - // some routes will be deferred to shutdown at the end, as they are needed - // by other routes so they can complete their tasks - // 2) wait until all inflight and pending exchanges has been completed - // 3) shutdown the deferred routes - - LOG.debug("There are {} routes to {}", routes.size(), suspendOnly ? "suspend" : "shutdown"); - - // list of deferred consumers to shutdown when all exchanges has been completed routed - // and thus there are no more inflight exchanges so they can be safely shutdown at that time - List deferredConsumers = new ArrayList<>(); - for (RouteStartupOrder order : routes) { - - ShutdownRoute shutdownRoute = order.getRoute().getShutdownRoute(); - ShutdownRunningTask shutdownRunningTask = order.getRoute().getShutdownRunningTask(); - - if (LOG.isTraceEnabled()) { - LOG.trace("{}{} with options [{},{}]", - suspendOnly ? "Suspending route: " : "Shutting down route: ", - order.getRoute().getId(), shutdownRoute, shutdownRunningTask); - } - - for (Consumer consumer : order.getInputs()) { - - boolean suspend = false; - - // assume we should shutdown if we are not deferred - boolean shutdown = shutdownRoute != ShutdownRoute.Defer; - - if (shutdown) { - // if we are to shutdown then check whether we can suspend instead as its a more - // gentle way to graceful shutdown - - // some consumers do not support shutting down so let them decide - // if a consumer is suspendable then prefer to use that and then shutdown later - if (consumer instanceof ShutdownAware) { - shutdown = !((ShutdownAware) consumer).deferShutdown(shutdownRunningTask); - } - if (shutdown && consumer instanceof Suspendable) { - // we prefer to suspend over shutdown - suspend = true; - } - } - - // log at info level when a route has been shutdown (otherwise log at debug level to not be too noisy) - if (suspend) { - // only suspend it and then later shutdown it - suspendNow(order.getRoute().getId(), consumer); - // add it to the deferred list so the route will be shutdown later - deferredConsumers.add(new ShutdownDeferredConsumer(order.getRoute(), consumer)); - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = order.getRoute().getEndpoint().getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - LOG.debug("Route: {} suspended and shutdown deferred, was consuming from: {}", order.getRoute().getId(), uri); - } else if (shutdown) { - shutdownNow(order.getRoute().getId(), consumer); - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = order.getRoute().getEndpoint().getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - LOG.info("Route: {} shutdown complete, was consuming from: {}", order.getRoute().getId(), uri); - } else { - // we will stop it later, but for now it must run to be able to help all inflight messages - // be safely completed - deferredConsumers.add(new ShutdownDeferredConsumer(order.getRoute(), consumer)); - LOG.debug("Route: " + order.getRoute().getId() + (suspendOnly ? " shutdown deferred." : " suspension deferred.")); - } - } - } - - // notify the services we intend to shutdown - for (RouteStartupOrder order : routes) { - for (Service service : order.getServices()) { - // skip the consumer as we handle that specially - if (service instanceof Consumer) { - continue; - } - prepareShutdown(service, suspendOnly, false, true, false); - } - } - - // wait till there are no more pending and inflight messages - boolean done = false; - long loopDelaySeconds = 1; - long loopCount = 0; - while (!done && !timeoutOccurred.get()) { - int size = 0; - // number of inflights per route - final Map routeInflight = new LinkedHashMap<>(); - - for (RouteStartupOrder order : routes) { - int inflight = context.getInflightRepository().size(order.getRoute().getId()); - inflight += getPendingInflightExchanges(order); - if (inflight > 0) { - String routeId = order.getRoute().getId(); - routeInflight.put(routeId, inflight); - size += inflight; - LOG.trace("{} inflight and pending exchanges for route: {}", inflight, routeId); - } - } - if (size > 0) { - try { - // build a message with inflight per route - CollectionStringBuffer csb = new CollectionStringBuffer(); - for (Map.Entry entry : routeInflight.entrySet()) { - String row = String.format("%s = %s", entry.getKey(), entry.getValue()); - csb.append(row); - } - - String msg = "Waiting as there are still " + size + " inflight and pending exchanges to complete, timeout in " - + (TimeUnit.SECONDS.convert(timeout, timeUnit) - (loopCount++ * loopDelaySeconds)) + " seconds."; - msg += " Inflights per route: [" + csb.toString() + "]"; - - LOG.info(msg); - - // log verbose if DEBUG logging is enabled - logInflightExchanges(context, routes, logInflightExchangesOnTimeout); - - Thread.sleep(loopDelaySeconds * 1000); - } catch (InterruptedException e) { - if (abortAfterTimeout) { - LOG.warn("Interrupted while waiting during graceful shutdown, will abort."); - return; - } else { - LOG.warn("Interrupted while waiting during graceful shutdown, will force shutdown now."); - break; - } - } - } else { - done = true; - } - } - - // prepare for shutdown - for (ShutdownDeferredConsumer deferred : deferredConsumers) { - Consumer consumer = deferred.getConsumer(); - if (consumer instanceof ShutdownAware) { - LOG.trace("Route: {} preparing to shutdown.", deferred.getRoute().getId()); - boolean forced = context.getShutdownStrategy().forceShutdown(consumer); - boolean suppress = context.getShutdownStrategy().isSuppressLoggingOnTimeout(); - prepareShutdown(consumer, suspendOnly, forced, false, suppress); - LOG.debug("Route: {} preparing to shutdown complete.", deferred.getRoute().getId()); - } - } - - // now all messages has been completed then stop the deferred consumers - for (ShutdownDeferredConsumer deferred : deferredConsumers) { - Consumer consumer = deferred.getConsumer(); - if (suspendOnly) { - suspendNow(deferred.getRoute().getId(), consumer); - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = deferred.getRoute().getEndpoint().getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - LOG.info("Route: {} suspend complete, was consuming from: {}", deferred.getRoute().getId(), uri); - } else { - shutdownNow(deferred.getRoute().getId(), consumer); - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = deferred.getRoute().getEndpoint().getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - LOG.info("Route: {} shutdown complete, was consuming from: {}", deferred.getRoute().getId(), uri); - } - } - - // now the route consumers has been shutdown, then prepare route services for shutdown - for (RouteStartupOrder order : routes) { - for (Service service : order.getServices()) { - boolean forced = context.getShutdownStrategy().forceShutdown(service); - boolean suppress = context.getShutdownStrategy().isSuppressLoggingOnTimeout(); - prepareShutdown(service, suspendOnly, forced, true, suppress); - } - } - } - - } - - /** - * Calculates the total number of inflight exchanges for the given route - * - * @param order the route - * @return number of inflight exchanges - */ - protected static int getPendingInflightExchanges(RouteStartupOrder order) { - int inflight = 0; - - // the consumer is the 1st service so we always get the consumer - // the child services are EIPs in the routes which may also have pending - // inflight exchanges (such as the aggregator) - for (Service service : order.getServices()) { - Set children = ServiceHelper.getChildServices(service); - for (Service child : children) { - if (child instanceof ShutdownAware) { - inflight += ((ShutdownAware) child).getPendingExchangesSize(); - } - } - } - - return inflight; - } - - /** - * Logs information about the inflight exchanges - * - * @param infoLevel true to log at INFO level, false to log at DEBUG level - */ - protected void logInflightExchanges(CamelContext camelContext, List routes, boolean infoLevel) { - // check if we need to log - if (!infoLevel && !LOG.isDebugEnabled()) { - return; - } - - Collection inflights = camelContext.getInflightRepository().browse(); - int size = inflights.size(); - if (size == 0) { - return; - } - - // filter so inflight must start from any of the routes - Set routeIds = new HashSet<>(); - for (RouteStartupOrder route : routes) { - routeIds.add(route.getRoute().getId()); - } - Collection filtered = new ArrayList<>(); - for (InflightRepository.InflightExchange inflight : inflights) { - String routeId = inflight.getExchange().getFromRouteId(); - if (routeIds.contains(routeId)) { - filtered.add(inflight); - } - } - - size = filtered.size(); - if (size == 0) { - return; - } - - StringBuilder sb = new StringBuilder("There are " + size + " inflight exchanges:"); - for (InflightRepository.InflightExchange inflight : filtered) { - sb.append("\n\tInflightExchange: [exchangeId=").append(inflight.getExchange().getExchangeId()) - .append(", fromRouteId=").append(inflight.getExchange().getFromRouteId()) - .append(", atRouteId=").append(inflight.getAtRouteId()) - .append(", nodeId=").append(inflight.getNodeId()) - .append(", elapsed=").append(inflight.getElapsed()) - .append(", duration=").append(inflight.getDuration()) - .append("]"); - } - - if (infoLevel) { - LOG.info(sb.toString()); - } else { - LOG.debug(sb.toString()); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java deleted file mode 100644 index 100d40a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java +++ /dev/null @@ -1,495 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.StreamCachingStrategy; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.FilePathResolver; -import org.apache.camel.util.FileUtil; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryMXBean; -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * Default implementation of {@link StreamCachingStrategy} - */ -public class DefaultStreamCachingStrategy extends ServiceSupport implements CamelContextAware, StreamCachingStrategy { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultStreamCachingStrategy.class); - - private CamelContext camelContext; - private boolean enabled; - private File spoolDirectory; - private transient String spoolDirectoryName = "${java.io.tmpdir}/camel/camel-tmp-#uuid#"; - private long spoolThreshold = StreamCache.DEFAULT_SPOOL_THRESHOLD; - private int spoolUsedHeapMemoryThreshold; - private SpoolUsedHeapMemoryLimit spoolUsedHeapMemoryLimit; - private String spoolCipher; - private int bufferSize = IOHelper.DEFAULT_BUFFER_SIZE; - private boolean removeSpoolDirectoryWhenStopping = true; - private final UtilizationStatistics statistics = new UtilizationStatistics(); - private final Set spoolRules = new LinkedHashSet<>(); - private boolean anySpoolRules; - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - @Override - public void setSpoolDirectory(String path) { - this.spoolDirectoryName = path; - } - - @Override - public void setSpoolDirectory(File path) { - this.spoolDirectory = path; - } - - @Override - public File getSpoolDirectory() { - return spoolDirectory; - } - - @Override - public long getSpoolThreshold() { - return spoolThreshold; - } - - @Override - public int getSpoolUsedHeapMemoryThreshold() { - return spoolUsedHeapMemoryThreshold; - } - - @Override - public void setSpoolUsedHeapMemoryThreshold(int spoolHeapMemoryWatermarkThreshold) { - this.spoolUsedHeapMemoryThreshold = spoolHeapMemoryWatermarkThreshold; - } - - @Override - public SpoolUsedHeapMemoryLimit getSpoolUsedHeapMemoryLimit() { - return spoolUsedHeapMemoryLimit; - } - - @Override - public void setSpoolUsedHeapMemoryLimit(SpoolUsedHeapMemoryLimit spoolUsedHeapMemoryLimit) { - this.spoolUsedHeapMemoryLimit = spoolUsedHeapMemoryLimit; - } - - @Override - public void setSpoolThreshold(long spoolThreshold) { - this.spoolThreshold = spoolThreshold; - } - - @Override - public String getSpoolCipher() { - return spoolCipher; - } - - @Override - public void setSpoolCipher(String spoolCipher) { - this.spoolCipher = spoolCipher; - } - - @Override - public int getBufferSize() { - return bufferSize; - } - - @Override - public void setBufferSize(int bufferSize) { - this.bufferSize = bufferSize; - } - - @Override - public boolean isRemoveSpoolDirectoryWhenStopping() { - return removeSpoolDirectoryWhenStopping; - } - - @Override - public void setRemoveSpoolDirectoryWhenStopping(boolean removeSpoolDirectoryWhenStopping) { - this.removeSpoolDirectoryWhenStopping = removeSpoolDirectoryWhenStopping; - } - - @Override - public boolean isAnySpoolRules() { - return anySpoolRules; - } - - @Override - public void setAnySpoolRules(boolean anySpoolTasks) { - this.anySpoolRules = anySpoolTasks; - } - - @Override - public Statistics getStatistics() { - return statistics; - } - - @Override - public boolean shouldSpoolCache(long length) { - if (!enabled || spoolRules.isEmpty()) { - return false; - } - - boolean all = true; - boolean any = false; - for (SpoolRule rule : spoolRules) { - boolean result = rule.shouldSpoolCache(length); - if (!result) { - all = false; - if (!anySpoolRules) { - // no need to check anymore - break; - } - } else { - any = true; - if (anySpoolRules) { - // no need to check anymore - break; - } - } - } - - boolean answer = anySpoolRules ? any : all; - LOG.debug("Should spool cache {} -> {}", length, answer); - return answer; - } - - @Override - public void addSpoolRule(SpoolRule rule) { - spoolRules.add(rule); - } - - @Override - public StreamCache cache(Exchange exchange) { - Message message = exchange.getMessage(); - StreamCache cache = message.getBody(StreamCache.class); - if (cache != null) { - if (LOG.isTraceEnabled()) { - LOG.trace("Cached stream to {} -> {}", cache.inMemory() ? "memory" : "spool", cache); - } - if (statistics.isStatisticsEnabled()) { - try { - if (cache.inMemory()) { - statistics.updateMemory(cache.length()); - } else { - statistics.updateSpool(cache.length()); - } - } catch (Exception e) { - LOG.debug("Error updating cache statistics. This exception is ignored.", e); - } - } - } - return cache; - } - - protected String resolveSpoolDirectory(String path) { - if (camelContext.getManagementNameStrategy() != null) { - String name = camelContext.getManagementNameStrategy().resolveManagementName(path, camelContext.getName(), false); - if (name != null) { - name = customResolveManagementName(name); - } - // and then check again with invalid check to ensure all ## is resolved - if (name != null) { - name = camelContext.getManagementNameStrategy().resolveManagementName(name, camelContext.getName(), true); - } - return name; - } else { - return defaultManagementName(path); - } - } - - protected String defaultManagementName(String path) { - // must quote the names to have it work as literal replacement - String name = camelContext.getName(); - - // replace tokens - String answer = path; - answer = StringHelper.replaceAll(answer, "#camelId#", name); - answer = StringHelper.replaceAll(answer, "#name#", name); - // replace custom - answer = customResolveManagementName(answer); - return answer; - } - - protected String customResolveManagementName(String pattern) { - if (pattern.contains("#uuid#")) { - String uuid = camelContext.getUuidGenerator().generateUuid(); - pattern = StringHelper.replaceAll(pattern, "#uuid#", uuid); - } - return FilePathResolver.resolvePath(pattern); - } - - @Override - protected void doStart() throws Exception { - if (!enabled) { - LOG.debug("StreamCaching is not enabled"); - return; - } - - if (spoolUsedHeapMemoryThreshold > 99) { - throw new IllegalArgumentException("SpoolHeapMemoryWatermarkThreshold must not be higher than 99, was: " + spoolUsedHeapMemoryThreshold); - } - - // if we can overflow to disk then make sure directory exists / is created - if (spoolThreshold > 0 || spoolUsedHeapMemoryThreshold > 0) { - - if (spoolDirectory == null && spoolDirectoryName == null) { - throw new IllegalArgumentException("SpoolDirectory must be configured when using SpoolThreshold > 0"); - } - - if (spoolDirectory == null) { - String name = resolveSpoolDirectory(spoolDirectoryName); - if (name != null) { - spoolDirectory = new File(name); - spoolDirectoryName = null; - } else { - throw new IllegalStateException("Cannot resolve spool directory from pattern: " + spoolDirectoryName); - } - } - - if (spoolDirectory.exists()) { - if (spoolDirectory.isDirectory()) { - LOG.debug("Using spool directory: {}", spoolDirectory); - } else { - LOG.warn("Spool directory: {} is not a directory. This may cause problems spooling to disk for the stream caching!", spoolDirectory); - } - } else { - boolean created = spoolDirectory.mkdirs(); - if (!created) { - LOG.warn("Cannot create spool directory: {}. This may cause problems spooling to disk for the stream caching!", spoolDirectory); - } else { - LOG.debug("Created spool directory: {}", spoolDirectory); - } - - } - - if (spoolThreshold > 0) { - spoolRules.add(new FixedThresholdSpoolRule()); - } - if (spoolUsedHeapMemoryThreshold > 0) { - if (spoolUsedHeapMemoryLimit == null) { - // use max by default - spoolUsedHeapMemoryLimit = SpoolUsedHeapMemoryLimit.Max; - } - spoolRules.add(new UsedHeapMemorySpoolRule(spoolUsedHeapMemoryLimit)); - } - } - - LOG.debug("StreamCaching configuration {}", this); - - if (spoolDirectory != null) { - LOG.info("StreamCaching in use with spool directory: {} and rules: {}", spoolDirectory.getPath(), spoolRules); - } else { - LOG.info("StreamCaching in use with rules: {}", spoolRules); - } - } - - @Override - protected void doStop() throws Exception { - if (spoolThreshold > 0 & spoolDirectory != null && isRemoveSpoolDirectoryWhenStopping()) { - LOG.debug("Removing spool directory: {}", spoolDirectory); - FileUtil.removeDir(spoolDirectory); - } - - if (LOG.isDebugEnabled() && statistics.isStatisticsEnabled()) { - LOG.debug("Stopping StreamCachingStrategy with statistics: {}", statistics); - } - - statistics.reset(); - } - - @Override - public String toString() { - return "DefaultStreamCachingStrategy[" - + "spoolDirectory=" + spoolDirectory - + ", spoolCipher=" + spoolCipher - + ", spoolThreshold=" + spoolThreshold - + ", spoolUsedHeapMemoryThreshold=" + spoolUsedHeapMemoryThreshold - + ", bufferSize=" + bufferSize - + ", anySpoolRules=" + anySpoolRules + "]"; - } - - private final class FixedThresholdSpoolRule implements SpoolRule { - - @Override - public boolean shouldSpoolCache(long length) { - if (spoolThreshold > 0 && length > spoolThreshold) { - LOG.trace("Should spool cache fixed threshold {} > {} -> true", length, spoolThreshold); - return true; - } - return false; - } - - @Override - public String toString() { - if (spoolThreshold < 1024) { - return "Spool > " + spoolThreshold + " bytes body size"; - } else { - return "Spool > " + (spoolThreshold >> 10) + "K body size"; - } - } - } - - private final class UsedHeapMemorySpoolRule implements SpoolRule { - - private final MemoryMXBean heapUsage; - private final SpoolUsedHeapMemoryLimit limit; - - private UsedHeapMemorySpoolRule(SpoolUsedHeapMemoryLimit limit) { - this.limit = limit; - this.heapUsage = ManagementFactory.getMemoryMXBean(); - } - - @Override - public boolean shouldSpoolCache(long length) { - if (spoolUsedHeapMemoryThreshold > 0) { - // must use double to calculate with decimals for the percentage - double used = heapUsage.getHeapMemoryUsage().getUsed(); - double upper = limit == SpoolUsedHeapMemoryLimit.Committed - ? heapUsage.getHeapMemoryUsage().getCommitted() : heapUsage.getHeapMemoryUsage().getMax(); - double calc = (used / upper) * 100; - int percentage = (int) calc; - - if (LOG.isTraceEnabled()) { - long u = heapUsage.getHeapMemoryUsage().getUsed(); - long c = heapUsage.getHeapMemoryUsage().getCommitted(); - long m = heapUsage.getHeapMemoryUsage().getMax(); - LOG.trace("Heap memory: [used={}M ({}%), committed={}M, max={}M]", u >> 20, percentage, c >> 20, m >> 20); - } - - if (percentage > spoolUsedHeapMemoryThreshold) { - LOG.trace("Should spool cache heap memory threshold {} > {} -> true", percentage, spoolUsedHeapMemoryThreshold); - return true; - } - } - return false; - } - - @Override - public String toString() { - return "Spool > " + spoolUsedHeapMemoryThreshold + "% used of " + limit + " heap memory"; - } - } - - /** - * Represents utilization statistics. - */ - private static final class UtilizationStatistics implements Statistics { - - private boolean statisticsEnabled; - private volatile long memoryCounter; - private volatile long memorySize; - private volatile long memoryAverageSize; - private volatile long spoolCounter; - private volatile long spoolSize; - private volatile long spoolAverageSize; - - synchronized void updateMemory(long size) { - memoryCounter++; - memorySize += size; - memoryAverageSize = memorySize / memoryCounter; - } - - synchronized void updateSpool(long size) { - spoolCounter++; - spoolSize += size; - spoolAverageSize = spoolSize / spoolCounter; - } - - @Override - public long getCacheMemoryCounter() { - return memoryCounter; - } - - @Override - public long getCacheMemorySize() { - return memorySize; - } - - @Override - public long getCacheMemoryAverageSize() { - return memoryAverageSize; - } - - @Override - public long getCacheSpoolCounter() { - return spoolCounter; - } - - @Override - public long getCacheSpoolSize() { - return spoolSize; - } - - @Override - public long getCacheSpoolAverageSize() { - return spoolAverageSize; - } - - @Override - public synchronized void reset() { - memoryCounter = 0; - memorySize = 0; - memoryAverageSize = 0; - spoolCounter = 0; - spoolSize = 0; - spoolAverageSize = 0; - } - - @Override - public boolean isStatisticsEnabled() { - return statisticsEnabled; - } - - @Override - public void setStatisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - - @Override - public String toString() { - return String.format("[memoryCounter=%s, memorySize=%s, memoryAverageSize=%s, spoolCounter=%s, spoolSize=%s, spoolAverageSize=%s]", - memoryCounter, memorySize, memoryAverageSize, spoolCounter, spoolSize, spoolAverageSize); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java deleted file mode 100644 index ea362a6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java +++ /dev/null @@ -1,785 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.support.RoutePolicySupport; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.backoff.BackOff; -import org.apache.camel.util.backoff.BackOffTimer; -import org.apache.camel.util.function.ThrowingConsumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.time.Duration; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -/** - * A supervising capable {@link RouteController} that delays the startup - * of the routes after the camel context startup and takes control of starting the routes in a safe manner. - * This controller is able to retry starting failing routes, and have various options to configure - * settings for backoff between restarting routes. - * - * @see DefaultRouteController - */ -public class DefaultSupervisingRouteController extends DefaultRouteController implements SupervisingRouteController { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultSupervisingRouteController.class); - private final Object lock; - private final AtomicBoolean contextStarted; - private final AtomicInteger routeCount; - private final Set routes; - private final Set nonSupervisedRoutes; - private final RouteManager routeManager; - private volatile CamelContextStartupListener listener; - private volatile BackOffTimer timer; - private volatile ScheduledExecutorService executorService; - private volatile BackOff backOff; - private String includeRoutes; - private String excludeRoutes; - private int threadPoolSize = 1; - private long initialDelay; - private long backOffDelay = 2000; - private long backOffMaxDelay; - private long backOffMaxElapsedTime; - private long backOffMaxAttempts; - private double backOffMultiplier = 1.0d; - private boolean unhealthyOnExhausted; - - public DefaultSupervisingRouteController() { - this.lock = new Object(); - this.contextStarted = new AtomicBoolean(false); - this.routeCount = new AtomicInteger(0); - this.routes = new TreeSet<>(); - this.nonSupervisedRoutes = new HashSet<>(); - this.routeManager = new RouteManager(); - } - - // ********************************* - // Properties - // ********************************* - - public String getIncludeRoutes() { - return includeRoutes; - } - - public void setIncludeRoutes(String includeRoutes) { - this.includeRoutes = includeRoutes; - } - - public String getExcludeRoutes() { - return excludeRoutes; - } - - public void setExcludeRoutes(String excludeRoutes) { - this.excludeRoutes = excludeRoutes; - } - - public int getThreadPoolSize() { - return threadPoolSize; - } - - public void setThreadPoolSize(int threadPoolSize) { - this.threadPoolSize = threadPoolSize; - } - - public long getInitialDelay() { - return initialDelay; - } - - public void setInitialDelay(long initialDelay) { - this.initialDelay = initialDelay; - } - - public long getBackOffDelay() { - return backOffDelay; - } - - public void setBackOffDelay(long backOffDelay) { - this.backOffDelay = backOffDelay; - } - - public long getBackOffMaxDelay() { - return backOffMaxDelay; - } - - public void setBackOffMaxDelay(long backOffMaxDelay) { - this.backOffMaxDelay = backOffMaxDelay; - } - - public long getBackOffMaxElapsedTime() { - return backOffMaxElapsedTime; - } - - public void setBackOffMaxElapsedTime(long backOffMaxElapsedTime) { - this.backOffMaxElapsedTime = backOffMaxElapsedTime; - } - - public long getBackOffMaxAttempts() { - return backOffMaxAttempts; - } - - public void setBackOffMaxAttempts(long backOffMaxAttempts) { - this.backOffMaxAttempts = backOffMaxAttempts; - } - - public double getBackOffMultiplier() { - return backOffMultiplier; - } - - public void setBackOffMultiplier(double backOffMultiplier) { - this.backOffMultiplier = backOffMultiplier; - } - - public boolean isUnhealthyOnExhausted() { - return unhealthyOnExhausted; - } - - public void setUnhealthyOnExhausted(boolean unhealthyOnExhausted) { - this.unhealthyOnExhausted = unhealthyOnExhausted; - } - - protected BackOff getBackOff(String id) { - // currently all routes use the same backoff - return backOff; - } - - // ********************************* - // Lifecycle - // ********************************* - - @Override - protected void doInit() throws Exception { - this.listener = new CamelContextStartupListener(); - - // prevent routes from automatic being started by default - CamelContext context = getCamelContext(); - context.setAutoStartup(false); - context.addRoutePolicyFactory(new ManagedRoutePolicyFactory()); - context.addStartupListener(this.listener); - } - - @Override - protected void doStart() throws Exception { - this.backOff = new BackOff( - Duration.ofMillis(backOffDelay), - backOffMaxDelay > 0 ? Duration.ofMillis(backOffMaxDelay) : Duration.ofMillis(Long.MAX_VALUE), - backOffMaxElapsedTime > 0 ? Duration.ofMillis(backOffMaxElapsedTime) : Duration.ofMillis(Long.MAX_VALUE), - backOffMaxAttempts > 0 ? backOffMaxAttempts : Long.MAX_VALUE, - backOffMultiplier); - - CamelContext context = getCamelContext(); - if (threadPoolSize == 1) { - executorService = context.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "SupervisingRouteController"); - } else { - executorService = context.getExecutorServiceManager().newScheduledThreadPool(this, "SupervisingRouteController", threadPoolSize); - } - timer = new BackOffTimer(executorService); - } - - @Override - protected void doStop() throws Exception { - if (getCamelContext() != null && executorService != null) { - getCamelContext().getExecutorServiceManager().shutdown(executorService); - executorService = null; - timer = null; - } - } - - // ********************************* - // Route management - // ********************************* - - @Override - public void startRoute(String routeId) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.startRoute(routeId); - } else { - doStartRoute(route.get(), true, r -> super.startRoute(routeId)); - } - } - - @Override - public void stopRoute(String routeId) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.stopRoute(routeId); - } else { - doStopRoute(route.get(), true, r -> super.stopRoute(routeId)); - } - } - - @Override - public void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.stopRoute(routeId, timeout, timeUnit); - } else { - doStopRoute(route.get(), true, r -> super.stopRoute(r.getId(), timeout, timeUnit)); - } - } - - @Override - public boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - return super.stopRoute(routeId, timeout, timeUnit, abortAfterTimeout); - } else { - final AtomicBoolean result = new AtomicBoolean(false); - - doStopRoute(route.get(), true, r -> result.set(super.stopRoute(r.getId(), timeout, timeUnit, abortAfterTimeout))); - return result.get(); - } - } - - @Override - public void suspendRoute(String routeId) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.suspendRoute(routeId); - } else { - doStopRoute(route.get(), true, r -> super.suspendRoute(r.getId())); - } - } - - @Override - public void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.suspendRoute(routeId, timeout, timeUnit); - } else { - doStopRoute(route.get(), true, r -> super.suspendRoute(r.getId(), timeout, timeUnit)); - } - } - - @Override - public void resumeRoute(String routeId) throws Exception { - final Optional route = routes.stream().filter(r -> r.getId().equals(routeId)).findFirst(); - - if (!route.isPresent()) { - // This route is unknown to this controller, apply default behaviour - // from super class. - super.resumeRoute(routeId); - } else { - doStartRoute(route.get(), true, r -> super.startRoute(routeId)); - } - } - - @Override - public Collection getControlledRoutes() { - return routes.stream() - .map(RouteHolder::get) - .collect(Collectors.toList()); - } - - @Override - public Collection getRestartingRoutes() { - return routeManager.routes.keySet().stream() - .map(RouteHolder::get) - .collect(Collectors.toList()); - } - - @Override - public Collection getExhaustedRoutes() { - return routeManager.exhausted.keySet().stream() - .map(RouteHolder::get) - .collect(Collectors.toList()); - } - - @Override - public BackOffTimer.Task getRestartingRouteState(String routeId) { - return routeManager.getBackOffContext(routeId).orElse(null); - } - - @Override - public Throwable getRestartException(String routeId) { - return routeManager.exceptions.get(routeId); - } - - // ********************************* - // Helpers - // ********************************* - - private void doStopRoute(RouteHolder route, boolean checker, ThrowingConsumer consumer) throws Exception { - synchronized (lock) { - if (checker) { - // remove it from checked routes so the route don't get started - // by the routes manager task as a manual operation on the routes - // indicates that the route is then managed manually - routeManager.release(route); - } - - LOG.debug("Route {} has been requested to stop", route.getId()); - - // Mark the route as un-managed - route.get().setRouteController(null); - - consumer.accept(route); - } - } - - private void doStartRoute(RouteHolder route, boolean checker, ThrowingConsumer consumer) throws Exception { - synchronized (lock) { - // If a manual start is triggered, then the controller should take - // care that the route is started - route.get().setRouteController(this); - - try { - if (checker) { - // remove it from checked routes as a manual start may trigger - // a new back off task if start fails - routeManager.release(route); - } - - consumer.accept(route); - } catch (Exception e) { - if (checker) { - // if start fails the route is moved to controller supervision - // so its get (eventually) restarted - routeManager.start(route); - } - - throw e; - } - } - } - - private void startNonSupervisedRoutes() throws Exception { - if (!isRunAllowed()) { - return; - } - - final List routeList; - - synchronized (lock) { - routeList = routes.stream() - .filter(r -> r.getStatus() == ServiceStatus.Stopped) - .filter(r -> !isSupervised(r.route)) - .map(RouteHolder::getId) - .collect(Collectors.toList()); - } - - for (String route : routeList) { - try { - // let non supervising controller start the route by calling super - LOG.debug("Starting non-supervised route {}", route); - super.startRoute(route); - } catch (Exception e) { - throw new FailedToStartRouteException(route, e.getMessage(), e); - } - } - } - - private void startSupervisedRoutes() { - if (!isRunAllowed()) { - return; - } - - final List routeList; - - synchronized (lock) { - routeList = routes.stream() - .filter(r -> r.getStatus() == ServiceStatus.Stopped) - .filter(r -> isSupervised(r.route)) - .map(RouteHolder::getId) - .collect(Collectors.toList()); - } - - LOG.debug("Starting {} supervised routes", routeList.size()); - for (String route: routeList) { - try { - startRoute(route); - } catch (Exception e) { - // ignored, exception handled by startRoute - } - } - - LOG.info("Total managed routes: {} of which {} successfully started (restarting: {}, exhausted: {})", - routes.size(), - routes.stream().filter(r -> r.getStatus() == ServiceStatus.Started).count(), - routeManager.routes.size(), - routeManager.exhausted.size() - ); - } - - private boolean isSupervised(Route route) { - return !nonSupervisedRoutes.contains(route.getId()); - } - - // ********************************* - // RouteChecker - // ********************************* - - private class RouteManager { - private final Logger logger; - private final ConcurrentMap routes; - private final ConcurrentMap exhausted; - private final ConcurrentMap exceptions; - - RouteManager() { - this.logger = LoggerFactory.getLogger(RouteManager.class); - this.routes = new ConcurrentHashMap<>(); - this.exhausted = new ConcurrentHashMap<>(); - this.exceptions = new ConcurrentHashMap<>(); - } - - void start(RouteHolder route) { - route.get().setRouteController(DefaultSupervisingRouteController.this); - - routes.computeIfAbsent( - route, - r -> { - BackOff backOff = getBackOff(r.getId()); - - logger.info("Start supervising route: {} with back-off: {}", r.getId(), backOff); - - BackOffTimer.Task task = timer.schedule(backOff, context -> { - final BackOffTimer.Task state = getBackOffContext(r.getId()).orElse(null); - long attempt = state != null ? state.getCurrentAttempts() : 0; - try { - logger.info("Restarting route: {} attempt: {}", r.getId(), attempt); - doStartRoute(r, false, rx -> DefaultSupervisingRouteController.super.startRoute(rx.getId())); - logger.info("Route: {} started after {} attempts", r.getId(), attempt); - return false; - } catch (Exception e) { - exceptions.put(r.getId(), e); - String cause = e.getClass().getName() + ": " + e.getMessage(); - logger.info("Failed restarting route: {} attempt: {} due: {} (stacktrace in debug log level)", r.getId(), attempt, cause); - logger.debug(" Error restarting route caused by: " + e.getMessage(), e); - return true; - } - }); - - task.whenComplete((backOffTask, throwable) -> { - if (backOffTask == null || backOffTask.getStatus() != BackOffTimer.Task.Status.Active) { - // This indicates that the task has been cancelled - // or that back-off retry is exhausted thus if the - // route is not started it is moved out of the - // supervisor control. - - synchronized (lock) { - final ServiceStatus status = route.getStatus(); - final boolean stopped = status.isStopped() || status.isStopping(); - - if (backOffTask != null && backOffTask.getStatus() == BackOffTimer.Task.Status.Exhausted && stopped) { - LOG.warn("Restarting route: {} is exhausted after {} attempts. No more attempts will be made" - + " and the route is no longer supervised by this route controller and remains as stopped.", - route.getId(), backOffTask.getCurrentAttempts() - 1); - r.get().setRouteController(null); - // remember exhausted routes - routeManager.exhausted.put(r, task); - - if (unhealthyOnExhausted) { - // store as last error on route as it was exhausted - Throwable t = getRestartException(route.getId()); - if (t != null) { - DefaultRouteError.set(getCamelContext(), r.getId(), RouteError.Phase.START, t, true); - } - } - } - } - } - - routes.remove(r); - }); - - return task; - } - ); - } - - boolean release(RouteHolder route) { - exceptions.remove(route.getId()); - BackOffTimer.Task task = routes.remove(route); - if (task != null) { - LOG.info("Cancelling restart task for route: {}", route.getId()); - task.cancel(); - } - - return task != null; - } - - public Optional getBackOffContext(String id) { - Optional answer = routes.entrySet().stream() - .filter(e -> ObjectHelper.equal(e.getKey().getId(), id)) - .findFirst() - .map(Map.Entry::getValue); - if (!answer.isPresent()) { - answer = exhausted.entrySet().stream() - .filter(e -> ObjectHelper.equal(e.getKey().getId(), id)) - .findFirst() - .map(Map.Entry::getValue); - } - return answer; - } - } - - // ********************************* - // - // ********************************* - - private static class RouteHolder implements HasId, Comparable { - private final int order; - private final Route route; - - RouteHolder(Route route, int order) { - this.route = route; - this.order = order; - } - - @Override - public String getId() { - return this.route.getId(); - } - - public Route get() { - return this.route; - } - - public ServiceStatus getStatus() { - return route.getCamelContext().getRouteController().getRouteStatus(getId()); - } - - int getInitializationOrder() { - return order; - } - - public int getStartupOrder() { - Integer order = route.getStartupOrder(); - if (order == null) { - order = Integer.MAX_VALUE; - } - - return order; - } - - @Override - public int compareTo(RouteHolder o) { - int answer = Integer.compare(getStartupOrder(), o.getStartupOrder()); - if (answer == 0) { - answer = Integer.compare(getInitializationOrder(), o.getInitializationOrder()); - } - - return answer; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - return this.route.equals(((RouteHolder)o).route); - } - - @Override - public int hashCode() { - return route.hashCode(); - } - } - - // ********************************* - // Policies - // ********************************* - - private class ManagedRoutePolicyFactory implements RoutePolicyFactory { - private final RoutePolicy policy = new ManagedRoutePolicy(); - - @Override - public RoutePolicy createRoutePolicy(CamelContext camelContext, String routeId, NamedNode route) { - return policy; - } - } - - private class ManagedRoutePolicy extends RoutePolicySupport implements NonManagedService { - - // we dont want this policy to be registed in JMX - - private void startRoute(RouteHolder holder) { - try { - DefaultSupervisingRouteController.this.doStartRoute( - holder, - true, - r -> DefaultSupervisingRouteController.super.startRoute(r.getId()) - ); - } catch (Exception e) { - throw new RuntimeCamelException(e); - } - } - - @Override - public void onInit(Route route) { - if (!route.isAutoStartup()) { - LOG.info("Route: {} will not be supervised (Reason: has explicit auto-startup flag set to false)", route.getId()); - return; - } - - // exclude takes precedence - if (excludeRoutes != null) { - for (String part : excludeRoutes.split(",")) { - String id = route.getRouteId(); - String uri = route.getEndpoint().getEndpointUri(); - boolean exclude = PatternHelper.matchPattern(id, part) || PatternHelper.matchPattern(uri, part); - if (exclude) { - LOG.debug("Route: {} excluded from being supervised", route.getId()); - RouteHolder holder = new RouteHolder(route, routeCount.incrementAndGet()); - if (routes.add(holder)) { - nonSupervisedRoutes.add(route.getId()); - holder.get().setRouteController(DefaultSupervisingRouteController.this); - // this route should be started - holder.get().setAutoStartup(true); - } - return; - } - } - } - if (includeRoutes != null) { - boolean include = false; - for (String part : includeRoutes.split(",")) { - String id = route.getRouteId(); - String uri = route.getEndpoint().getEndpointUri(); - include = PatternHelper.matchPattern(id, part) || PatternHelper.matchPattern(uri, part); - if (include) { - break; - } - } - if (!include) { - LOG.debug("Route: {} excluded from being supervised", route.getId()); - RouteHolder holder = new RouteHolder(route, routeCount.incrementAndGet()); - if (routes.add(holder)) { - nonSupervisedRoutes.add(route.getId()); - holder.get().setRouteController(DefaultSupervisingRouteController.this); - // this route should be started - holder.get().setAutoStartup(true); - } - return; - } - } - - RouteHolder holder = new RouteHolder(route, routeCount.incrementAndGet()); - if (routes.add(holder)) { - holder.get().setRouteController(DefaultSupervisingRouteController.this); - holder.get().setAutoStartup(false); - - if (contextStarted.get()) { - LOG.debug("Context is already started: attempt to start route {}", route.getId()); - - // Eventually delay the startup of the route a later time - if (initialDelay > 0) { - LOG.debug("Route {} will be started in {} millis", holder.getId(), initialDelay); - executorService.schedule(() -> startRoute(holder), initialDelay, TimeUnit.MILLISECONDS); - } else { - startRoute(holder); - } - } else { - LOG.debug("CamelContext is not yet started. Deferring staring route: {}", holder.getId()); - } - } - } - - @Override - public void onRemove(Route route) { - synchronized (lock) { - routes.removeIf( - r -> ObjectHelper.equal(r.get(), route) || ObjectHelper.equal(r.getId(), route.getId()) - ); - } - } - - } - - private class CamelContextStartupListener implements ExtendedStartupListener { - - @Override - public void onCamelContextStarting(CamelContext context, boolean alreadyStarted) throws Exception { - // noop - } - - @Override - public void onCamelContextStarted(CamelContext context, boolean alreadyStarted) throws Exception { - // noop - } - - @Override - public void onCamelContextFullyStarted(CamelContext context, boolean alreadyStarted) throws Exception { - if (alreadyStarted) { - // Invoke it only if the context was already started as this - // method is not invoked at last event as documented but after - // routes warm-up so this is useful for routes deployed after - // the camel context has been started-up. For standard routes - // configuration the notification of the camel context started - // is provided by EventNotifier. - // - // We should check why this callback is not invoked at latest - // stage, or maybe rename it as it is misleading and provide a - // better alternative for intercept camel events. - onCamelContextStarted(); - } - } - - private void onCamelContextStarted() throws Exception { - // Start managing the routes only when the camel context is started - // so start/stop of managed routes do not clash with CamelContext - // startup - if (contextStarted.compareAndSet(false, true)) { - // start non supervised routes first as if they fail then - // camel context fails to start which is the behaviour of non-supervised routes - startNonSupervisedRoutes(); - - // Eventually delay the startup of the routes a later time - if (initialDelay > 0) { - LOG.debug("Supervised routes will be started in {} millis", initialDelay); - executorService.schedule(DefaultSupervisingRouteController.this::startSupervisedRoutes, initialDelay, TimeUnit.MILLISECONDS); - } else { - startSupervisedRoutes(); - } - } - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java deleted file mode 100644 index 5b2d1d0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java +++ /dev/null @@ -1,259 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.ExchangeFormatter; -import org.apache.camel.spi.Tracer; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.support.builder.ExpressionBuilder; -import org.apache.camel.support.processor.DefaultExchangeFormatter; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.StringHelper; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Objects; - -/** - * Default {@link Tracer} implementation that will log traced messages - * to the logger named org.apache.camel.Tracing. - */ -public class DefaultTracer extends ServiceSupport implements CamelContextAware, Tracer { - - private static final String TRACING_OUTPUT = "%-4.4s [%-12.12s] [%-33.33s]"; - - // use a fixed logger name so its easy to spot - private static final Logger LOG = LoggerFactory.getLogger("org.apache.camel.Tracing"); - private CamelContext camelContext; - private boolean enabled = true; - private long traceCounter; - - private ExchangeFormatter exchangeFormatter; - private String tracePattern; - private transient String[] patterns; - private boolean traceBeforeAndAfterRoute = true; - - public DefaultTracer() { - DefaultExchangeFormatter formatter = new DefaultExchangeFormatter(); - formatter.setShowExchangeId(true); - formatter.setShowExchangePattern(false); - formatter.setMultiline(false); - formatter.setShowHeaders(false); - formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Default); - setExchangeFormatter(formatter); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - @SuppressWarnings("unchecked") - public void traceBeforeNode(NamedNode node, Exchange exchange) { - if (shouldTrace(node)) { - traceCounter++; - String routeId = ExpressionBuilder.routeIdExpression().evaluate(exchange, String.class); - - // we need to avoid leak the sensible information here - // the sanitizeUri takes a very long time for very long string and the format cuts this to - // 33 characters, anyway. Cut this to 50 characters. This will give enough space for removing - // characters in the sanitizeUri method and will be reasonably fast - String label = URISupport.sanitizeUri(StringHelper.limitLength(node.getLabel(), 50)); - - StringBuilder sb = new StringBuilder(); - sb.append(String.format(TRACING_OUTPUT, " ", routeId, label)); - sb.append(" "); - String data = exchangeFormatter.format(exchange); - sb.append(data); - String out = sb.toString(); - dumpTrace(out); - } - } - - @Override - public void traceAfterNode(NamedNode node, Exchange exchange) { - // noop - } - - @Override - public void traceBeforeRoute(NamedRoute route, Exchange exchange) { - if (!traceBeforeAndAfterRoute) { - return; - } - - // we need to avoid leak the sensible information here - // the sanitizeUri takes a very long time for very long string and the format cuts this to - // 33 characters, anyway. Cut this to 50 characters. This will give enough space for removing - // characters in the sanitizeUri method and will be reasonably fast - String uri = route.getEndpointUrl(); - String label = "from[" + URISupport.sanitizeUri(StringHelper.limitLength(uri, 50) + "]"); - - // the arrow has a * if its a new exchange that is starting - boolean original = route.getRouteId().equals(exchange.getFromRouteId()); - String arrow = original ? "*-->" : "--->"; - - StringBuilder sb = new StringBuilder(); - sb.append(String.format(TRACING_OUTPUT, arrow, route.getRouteId(), label)); - sb.append(" "); - String data = exchangeFormatter.format(exchange); - sb.append(data); - String out = sb.toString(); - dumpTrace(out); - } - - @Override - public void traceAfterRoute(Route route, Exchange exchange) { - if (!traceBeforeAndAfterRoute) { - return; - } - - // we need to avoid leak the sensible information here - // the sanitizeUri takes a very long time for very long string and the format cuts this to - // 33 characters, anyway. Cut this to 50 characters. This will give enough space for removing - // characters in the sanitizeUri method and will be reasonably fast - String uri = route.getConsumer().getEndpoint().getEndpointUri(); - String label = "from[" + URISupport.sanitizeUri(StringHelper.limitLength(uri, 50) + "]"); - - // the arrow has a * if its an exchange that is done - boolean original = route.getId().equals(exchange.getFromRouteId()); - String arrow = original ? "*<--" : "<---"; - - StringBuilder sb = new StringBuilder(); - sb.append(String.format(TRACING_OUTPUT, arrow, route.getId(), label)); - sb.append(" "); - String data = exchangeFormatter.format(exchange); - sb.append(data); - String out = sb.toString(); - dumpTrace(out); - } - - @Override - public boolean shouldTrace(NamedNode definition) { - if (!enabled) { - return false; - } - - boolean pattern = true; - - if (patterns != null) { - pattern = shouldTracePattern(definition); - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Should trace evaluated {} -> pattern: {}", definition.getId(), pattern); - } - return pattern; - } - - @Override - public long getTraceCounter() { - return traceCounter; - } - - @Override - public void resetTraceCounter() { - traceCounter = 0; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - @Override - public String getTracePattern() { - return tracePattern; - } - - @Override - public void setTracePattern(String tracePattern) { - this.tracePattern = tracePattern; - if (tracePattern != null) { - // the pattern can have multiple nodes separated by comma - this.patterns = tracePattern.split(","); - } else { - this.patterns = null; - } - } - - @Override - public boolean isTraceBeforeAndAfterRoute() { - return traceBeforeAndAfterRoute; - } - - @Override - public void setTraceBeforeAndAfterRoute(boolean traceBeforeAndAfterRoute) { - this.traceBeforeAndAfterRoute = traceBeforeAndAfterRoute; - } - - @Override - public ExchangeFormatter getExchangeFormatter() { - return exchangeFormatter; - } - - @Override - public void setExchangeFormatter(ExchangeFormatter exchangeFormatter) { - this.exchangeFormatter = exchangeFormatter; - } - - protected void dumpTrace(String out) { - LOG.info(out); - } - - protected boolean shouldTracePattern(NamedNode definition) { - for (String pattern : patterns) { - // match either route id, or node id - String id = definition.getId(); - // use matchPattern method from endpoint helper that has a good matcher we use in Camel - if (PatternHelper.matchPattern(id, pattern)) { - return true; - } - String routeId = CamelContextHelper.getRouteId(definition); - if (routeId != null && !Objects.equals(routeId, id)) { - if (PatternHelper.matchPattern(routeId, pattern)) { - return true; - } - } - } - // not matched the pattern - return false; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java deleted file mode 100644 index 1eec777..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java +++ /dev/null @@ -1,117 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.impl.transformer.TransformerKey; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Transformer; -import org.apache.camel.spi.TransformerRegistry; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Default implementation of {@link TransformerRegistry}. - */ -public class DefaultTransformerRegistry extends AbstractDynamicRegistry implements TransformerRegistry { - - private final Map aliasMap; - - public DefaultTransformerRegistry(CamelContext context) { - super(context, CamelContextHelper.getMaximumTransformerCacheSize(context)); - this.aliasMap = new ConcurrentHashMap<>(); - } - - @Override - public Transformer resolveTransformer(TransformerKey key) { - if (ObjectHelper.isEmpty(key.getScheme()) && key.getTo() == null) { - return null; - } - - // try exact match - Transformer answer = get(aliasMap.getOrDefault(key, key)); - if (answer != null || ObjectHelper.isNotEmpty(key.getScheme())) { - return answer; - } - - // try wildcard match for next - add an alias if matched - TransformerKey alias = null; - if (key.getFrom() != null && ObjectHelper.isNotEmpty(key.getFrom().getName())) { - alias = new TransformerKey(new DataType(key.getFrom().getModel()), key.getTo()); - answer = get(alias); - } - if (answer == null && ObjectHelper.isNotEmpty(key.getTo().getName())) { - alias = new TransformerKey(key.getFrom(), new DataType(key.getTo().getModel())); - answer = get(alias); - } - if (answer == null && key.getFrom() != null && ObjectHelper.isNotEmpty(key.getFrom().getName()) - && ObjectHelper.isNotEmpty(key.getTo().getName())) { - alias = new TransformerKey(new DataType(key.getFrom().getModel()), new DataType(key.getTo().getModel())); - answer = get(alias); - } - if (answer == null && key.getFrom() != null) { - alias = new TransformerKey(key.getFrom().getModel()); - answer = get(alias); - } - if (answer == null) { - alias = new TransformerKey(key.getTo().getModel()); - answer = get(alias); - } - if (answer != null) { - aliasMap.put(key, alias); - } - - return answer; - } - - @Override - public Transformer put(TransformerKey key, Transformer transformer) { - // ensure transformer is started before its being used - ServiceHelper.startService(transformer); - return super.put(key, transformer); - } - - @Override - public boolean isStatic(String scheme) { - return isStatic(new TransformerKey(scheme)); - } - - @Override - public boolean isStatic(DataType from, DataType to) { - return isStatic(new TransformerKey(from, to)); - } - - @Override - public boolean isDynamic(String scheme) { - return isDynamic(new TransformerKey(scheme)); - } - - @Override - public boolean isDynamic(DataType from, DataType to) { - return isDynamic(new TransformerKey(from, to)); - } - - @Override - public String toString() { - return "TransformerRegistry for " + context.getName() + ", capacity: " + maxCacheSize; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java deleted file mode 100644 index 950e642..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java +++ /dev/null @@ -1,318 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.InflightRepository; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.spi.SynchronizationVetoable; -import org.apache.camel.spi.UnitOfWork; -import org.apache.camel.support.DefaultMessage; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.MessageSupport; -import org.apache.camel.support.UnitOfWorkHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.function.Predicate; - -/** - * The default implementation of {@link UnitOfWork} - */ -public class DefaultUnitOfWork implements UnitOfWork, Service { - private static final Logger LOG = LoggerFactory.getLogger(DefaultUnitOfWork.class); - final InflightRepository inflightRepository; - final boolean allowUseOriginalMessage; - final boolean useBreadcrumb; - - // TODO: This implementation seems to have transformed itself into a to broad concern - // where unit of work is doing a bit more work than the transactional aspect that ties - // to its name. Maybe this implementation should be named ExchangeContext and we can - // introduce a simpler UnitOfWork concept. This would also allow us to refactor the - // SubUnitOfWork into a general parent/child unit of work concept. However this - // requires API changes and thus is best kept for future Camel work - private final Deque routes = new ArrayDeque<>(8); - private final Exchange exchange; - private final ExtendedCamelContext context; - private Logger log; - private List synchronizations; - private Message originalInMessage; - private Set transactedBy; - - public DefaultUnitOfWork(Exchange exchange) { - this(exchange, exchange.getContext().getInflightRepository(), exchange.getContext().isAllowUseOriginalMessage(), exchange.getContext().isUseBreadcrumb()); - } - - protected DefaultUnitOfWork(Exchange exchange, Logger logger, InflightRepository inflightRepository, - boolean allowUseOriginalMessage, boolean useBreadcrumb) { - this(exchange, inflightRepository, allowUseOriginalMessage, useBreadcrumb); - this.log = logger; - } - - public DefaultUnitOfWork(Exchange exchange, InflightRepository inflightRepository, boolean allowUseOriginalMessage, boolean useBreadcrumb) { - this.exchange = exchange; - this.log = LOG; - this.allowUseOriginalMessage = allowUseOriginalMessage; - this.useBreadcrumb = useBreadcrumb; - this.context = (ExtendedCamelContext) exchange.getContext(); - this.inflightRepository = inflightRepository; - - if (allowUseOriginalMessage) { - // special for JmsMessage as it can cause it to loose headers later. - if (exchange.getIn().getClass().getName().equals("org.apache.camel.component.jms.JmsMessage")) { - this.originalInMessage = new DefaultMessage(context); - this.originalInMessage.setBody(exchange.getIn().getBody()); - this.originalInMessage.getHeaders().putAll(exchange.getIn().getHeaders()); - } else { - this.originalInMessage = exchange.getIn().copy(); - } - // must preserve exchange on the original in message - if (this.originalInMessage instanceof MessageSupport) { - ((MessageSupport) this.originalInMessage).setExchange(exchange); - } - } - - // inject breadcrumb header if enabled - if (useBreadcrumb) { - // create or use existing breadcrumb - String breadcrumbId = exchange.getIn().getHeader(Exchange.BREADCRUMB_ID, String.class); - if (breadcrumbId == null) { - // no existing breadcrumb, so create a new one based on the exchange id - breadcrumbId = exchange.getExchangeId(); - exchange.getIn().setHeader(Exchange.BREADCRUMB_ID, breadcrumbId); - } - } - - // fire event - if (context.isEventNotificationApplicable()) { - try { - EventHelper.notifyExchangeCreated(context, exchange); - } catch (Throwable e) { - // must catch exceptions to ensure the exchange is not failing due to notification event failed - log.warn("Exception occurred during event notification. This exception will be ignored.", e); - } - } - - // register to inflight registry - inflightRepository.add(exchange); - } - - UnitOfWork newInstance(Exchange exchange) { - return new DefaultUnitOfWork(exchange, inflightRepository, allowUseOriginalMessage, useBreadcrumb); - } - - @Override - public void setParentUnitOfWork(UnitOfWork parentUnitOfWork) { - } - - @Override - public UnitOfWork createChildUnitOfWork(Exchange childExchange) { - // create a new child unit of work, and mark me as its parent - UnitOfWork answer = newInstance(childExchange); - answer.setParentUnitOfWork(this); - return answer; - } - - @Override - public void start() { - // noop - } - - @Override - public void stop() { - // noop - } - - @Override - public synchronized void addSynchronization(Synchronization synchronization) { - if (synchronizations == null) { - synchronizations = new ArrayList<>(8); - } - log.trace("Adding synchronization {}", synchronization); - synchronizations.add(synchronization); - } - - @Override - public synchronized void removeSynchronization(Synchronization synchronization) { - if (synchronizations != null) { - synchronizations.remove(synchronization); - } - } - - @Override - public synchronized boolean containsSynchronization(Synchronization synchronization) { - return synchronizations != null && synchronizations.contains(synchronization); - } - - @Override - public void handoverSynchronization(Exchange target) { - handoverSynchronization(target, null); - } - - @Override - public void handoverSynchronization(Exchange target, Predicate filter) { - if (synchronizations == null || synchronizations.isEmpty()) { - return; - } - - Iterator it = synchronizations.iterator(); - while (it.hasNext()) { - Synchronization synchronization = it.next(); - - boolean handover = true; - if (synchronization instanceof SynchronizationVetoable) { - SynchronizationVetoable veto = (SynchronizationVetoable) synchronization; - handover = veto.allowHandover(); - } - - if (handover && (filter == null || filter.test(synchronization))) { - log.trace("Handover synchronization {} to: {}", synchronization, target); - target.adapt(ExtendedExchange.class).addOnCompletion(synchronization); - // remove it if its handed over - it.remove(); - } else { - log.trace("Handover not allow for synchronization {}", synchronization); - } - } - } - - @Override - public void done(Exchange exchange) { - if (log.isTraceEnabled()) { - log.trace("UnitOfWork done for ExchangeId: {} with {}", exchange.getExchangeId(), exchange); - } - - boolean failed = exchange.isFailed(); - - // at first done the synchronizations - UnitOfWorkHelper.doneSynchronizations(exchange, synchronizations, log); - - // unregister from inflight registry, before signalling we are done - inflightRepository.remove(exchange); - - if (context.isEventNotificationApplicable()) { - // then fire event to signal the exchange is done - try { - if (failed) { - EventHelper.notifyExchangeFailed(exchange.getContext(), exchange); - } else { - EventHelper.notifyExchangeDone(exchange.getContext(), exchange); - } - } catch (Throwable e) { - // must catch exceptions to ensure synchronizations is also invoked - log.warn("Exception occurred during event notification. This exception will be ignored.", e); - } - } - } - - @Override - public void beforeRoute(Exchange exchange, Route route) { - if (log.isTraceEnabled()) { - log.trace("UnitOfWork beforeRoute: {} for ExchangeId: {} with {}", route.getId(), exchange.getExchangeId(), exchange); - } - if (synchronizations != null && !synchronizations.isEmpty()) { - UnitOfWorkHelper.beforeRouteSynchronizations(route, exchange, synchronizations, log); - } - } - - @Override - public void afterRoute(Exchange exchange, Route route) { - if (log.isTraceEnabled()) { - log.trace("UnitOfWork afterRoute: {} for ExchangeId: {} with {}", route.getId(), exchange.getExchangeId(), exchange); - } - if (synchronizations != null && !synchronizations.isEmpty()) { - UnitOfWorkHelper.afterRouteSynchronizations(route, exchange, synchronizations, log); - } - } - - @Override - public Message getOriginalInMessage() { - if (originalInMessage == null && !context.isAllowUseOriginalMessage()) { - throw new IllegalStateException("AllowUseOriginalMessage is disabled. Cannot access the original message."); - } - return originalInMessage; - } - - @Override - public boolean isTransacted() { - return transactedBy != null && !transactedBy.isEmpty(); - } - - @Override - public boolean isTransactedBy(Object key) { - return transactedBy != null && getTransactedBy().contains(key); - } - - @Override - public void beginTransactedBy(Object key) { - exchange.adapt(ExtendedExchange.class).setTransacted(true); - getTransactedBy().add(key); - } - - @Override - public void endTransactedBy(Object key) { - getTransactedBy().remove(key); - // we may still be transacted even if we end this section of transaction - boolean transacted = isTransacted(); - exchange.adapt(ExtendedExchange.class).setTransacted(transacted); - } - - @Override - public Route getRoute() { - return routes.peek(); - } - - @Override - public void pushRoute(Route route) { - routes.push(route); - } - - @Override - public Route popRoute() { - return routes.poll(); - } - - @Override - public boolean isBeforeAfterProcess() { - return false; - } - - @Override - public AsyncCallback beforeProcess(Processor processor, Exchange exchange, AsyncCallback callback) { - // no wrapping needed - return callback; - } - - @Override - public void afterProcess(Processor processor, Exchange exchange, AsyncCallback callback, boolean doneSync) { - // noop - } - - private Set getTransactedBy() { - if (transactedBy == null) { - // no need to take up so much space so use a lille set - transactedBy = new HashSet<>(4); - } - return transactedBy; - } - - @Override - public String toString() { - return "DefaultUnitOfWork"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java deleted file mode 100644 index 2f22f8a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWorkFactory.java +++ /dev/null @@ -1,57 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.spi.InflightRepository; -import org.apache.camel.spi.UnitOfWork; -import org.apache.camel.spi.UnitOfWorkFactory; - -/** - * Default {@link UnitOfWorkFactory} - */ -public class DefaultUnitOfWorkFactory implements UnitOfWorkFactory { - - private InflightRepository inflightRepository; - private boolean usedMDCLogging; - private String mdcLoggingKeysPattern; - private boolean allowUseOriginalMessage; - private boolean useBreadcrumb; - - @Override - public UnitOfWork createUnitOfWork(Exchange exchange) { - UnitOfWork answer; - if (usedMDCLogging) { - answer = new MDCUnitOfWork(exchange, inflightRepository, mdcLoggingKeysPattern, allowUseOriginalMessage, useBreadcrumb); - } else { - answer = new DefaultUnitOfWork(exchange, inflightRepository, allowUseOriginalMessage, useBreadcrumb); - } - return answer; - } - - @Override - public void afterPropertiesConfigured(CamelContext camelContext) { - // optimize to read configuration once - inflightRepository = camelContext.getInflightRepository(); - usedMDCLogging = camelContext.isUseMDCLogging() != null && camelContext.isUseMDCLogging(); - mdcLoggingKeysPattern = camelContext.getMDCLoggingKeysPattern(); - allowUseOriginalMessage = camelContext.isAllowUseOriginalMessage() != null ? camelContext.isAllowUseOriginalMessage() : false; - useBreadcrumb = camelContext.isUseBreadcrumb() != null ? camelContext.isUseBreadcrumb() : false; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUuidGenerator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUuidGenerator.java deleted file mode 100644 index b086ad6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUuidGenerator.java +++ /dev/null @@ -1,155 +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.impl.engine; - -import org.apache.camel.spi.UuidGenerator; -import org.apache.camel.util.InetAddressUtil; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.atomic.AtomicLong; - -/** - * Default {@link UuidGenerator} optimized for Camel usage. - */ -public class DefaultUuidGenerator implements UuidGenerator { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultUuidGenerator.class); - private static final String UNIQUE_STUB; - private static int instanceCount; - private static String hostName; - private String seed; - // must use AtomicLong to ensure atomic get and update operation that is thread-safe - private final AtomicLong sequence = new AtomicLong(1); - private final int length; - - static { - String stub = ""; - boolean canAccessSystemProps = true; - try { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPropertiesAccess(); - } - } catch (SecurityException se) { - canAccessSystemProps = false; - } - - if (canAccessSystemProps) { - try { - if (hostName == null) { - hostName = InetAddressUtil.getLocalHostName(); - } - stub = "-" + System.currentTimeMillis() + "-"; - } catch (Exception e) { - if (LOG.isTraceEnabled()) { - LOG.trace("Cannot generate unique stub by using DNS", e); - } else { - LOG.warn("Cannot generate unique stub by using DNS due {}. This exception is ignored.", e.getMessage()); - } - } - } - - // fallback to use localhost - if (hostName == null) { - hostName = "localhost"; - } - hostName = sanitizeHostName(hostName); - - if (ObjectHelper.isEmpty(stub)) { - stub = "-1-" + System.currentTimeMillis() + "-"; - } - UNIQUE_STUB = stub; - } - - public DefaultUuidGenerator(String prefix) { - synchronized (UNIQUE_STUB) { - this.seed = prefix + UNIQUE_STUB + (instanceCount++) + "-"; - // let the ID be friendly for URL and file systems - this.seed = generateSanitizedId(this.seed); - this.length = seed.length() + ("" + Long.MAX_VALUE).length(); - } - } - - public DefaultUuidGenerator() { - this("ID-" + hostName); - } - - /** - * As we have to find the hostname as a side-affect of generating a unique - * stub, we allow it's easy retrieval here - * - * @return the local host name - */ - public static String getHostName() { - return hostName; - } - - public static String sanitizeHostName(String hostName) { - boolean changed = false; - - StringBuilder sb = new StringBuilder(); - for (char ch : hostName.toCharArray()) { - // only include ASCII chars - if (ch < 127) { - sb.append(ch); - } else { - changed = true; - } - } - - if (changed) { - String newHost = sb.toString(); - LOG.info("Sanitized hostname from: {} to: {}", hostName, newHost); - return newHost; - } else { - return hostName; - } - } - - @Override - public String generateUuid() { - StringBuilder sb = new StringBuilder(length); - sb.append(seed); - sb.append(sequence.getAndIncrement()); - return sb.toString(); - } - - /** - * Generate a unique ID - that is friendly for a URL or file system - * - * @return a unique id - */ - public String generateSanitizedId() { - return generateSanitizedId(generateUuid()); - } - - /** - * Ensures that the id is friendly for a URL or file system - * - * @param id the unique id - * @return the id as file friendly id - */ - public static String generateSanitizedId(String id) { - id = id.replace(':', '-'); - id = id.replace('_', '-'); - id = id.replace('.', '-'); - id = id.replace('/', '-'); - return id; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java deleted file mode 100644 index 9737de9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.impl.validator.ValidatorKey; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Validator; -import org.apache.camel.spi.ValidatorRegistry; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; - -/** - * Default implementation of {@link ValidatorRegistry}. - */ -public class DefaultValidatorRegistry extends AbstractDynamicRegistry implements ValidatorRegistry { - - public DefaultValidatorRegistry(CamelContext context) { - super(context, CamelContextHelper.getMaximumValidatorCacheSize(context)); - } - - @Override - public Validator resolveValidator(ValidatorKey key) { - Validator answer = get(key); - if (answer == null && ObjectHelper.isNotEmpty(key.getType().getName())) { - answer = get(new ValidatorKey(new DataType(key.getType().getModel()))); - } - return answer; - } - - @Override - public boolean isStatic(DataType type) { - return isStatic(new ValidatorKey(type)); - } - - @Override - public boolean isDynamic(DataType type) { - return isDynamic(new ValidatorKey(type)); - } - - @Override - public String toString() { - return "ValidatorRegistry for " + context.getName() + ", capacity: " + maxCacheSize; - } - - @Override - public Validator put(ValidatorKey key, Validator validator) { - // ensure validator is started before its being used - ServiceHelper.startService(validator); - return super.put(key, validator); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferProducer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferProducer.java deleted file mode 100644 index 7ad46db..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferProducer.java +++ /dev/null @@ -1,121 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; - -import java.util.concurrent.CompletableFuture; - -/** - * A {@link Producer} that defers being started, until {@link org.apache.camel.CamelContext} has been started, this - * ensures that the producer is able to adapt to changes that may otherwise occur during starting - * CamelContext. If we do not defer starting the producer it may not adapt to those changes, and - * send messages to wrong endpoints. - */ -public class DeferProducer extends ServiceSupport implements Producer, AsyncProcessor { - - private Producer delegate; - private final Endpoint endpoint; - - public DeferProducer(Endpoint endpoint) { - this.endpoint = endpoint; - } - - @Override - public void process(Exchange exchange) throws Exception { - if (delegate == null) { - throw new IllegalStateException("Not started"); - } - delegate.process(exchange); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (delegate == null) { - exchange.setException(new IllegalStateException("Not started")); - callback.done(true); - return true; - } - - if (delegate instanceof AsyncProcessor) { - return ((AsyncProcessor) delegate).process(exchange, callback); - } - - // fallback to sync mode - try { - process(exchange); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public CompletableFuture processAsync(Exchange exchange) { - AsyncCallbackToCompletableFutureAdapter callback = new AsyncCallbackToCompletableFutureAdapter<>(exchange); - process(exchange, callback); - return callback.getFuture(); - } - - @Override - protected void doStart() throws Exception { - // need to lookup endpoint again as it may be intercepted - Endpoint lookup = endpoint.getCamelContext().getEndpoint(endpoint.getEndpointUri()); - - delegate = lookup.createProducer(); - ServiceHelper.startService(delegate); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(delegate); - } - - @Override - public boolean isSingleton() { - if (delegate != null) { - return delegate.isSingleton(); - } else { - // assume singleton by default - return true; - } - } - - @Override - public Endpoint getEndpoint() { - if (delegate != null) { - return delegate.getEndpoint(); - } else { - return endpoint; - } - } - - @Override - public String toString() { - if (delegate != null) { - return delegate.toString(); - } else { - return "DelegateProducer[" + endpoint + "]"; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java deleted file mode 100644 index f6d0c27..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DeferServiceStartupListener.java +++ /dev/null @@ -1,77 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.support.service.ServiceHelper; - -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; - -/** - * A {@link StartupListener} that defers starting {@link Service}s, until as late as possible during - * the startup process of {@link CamelContext}. - */ -public class DeferServiceStartupListener implements StartupListener, Ordered { - - private final Set earlyServices = new CopyOnWriteArraySet<>(); - private final Set services = new CopyOnWriteArraySet<>(); - - public void addService(Service service, boolean startEarly) { - if (startEarly) { - earlyServices.add(service); - } else { - services.add(service); - } - } - - @Override - public void onCamelContextStarting(CamelContext context, boolean alreadyStarted) throws Exception { - doStart(earlyServices, context, alreadyStarted); - } - - @Override - public void onCamelContextStarted(CamelContext context, boolean alreadyStarted) throws Exception { - doStart(services, context, alreadyStarted); - } - - protected void doStart(Set services, CamelContext context, boolean alreadyStarted) throws Exception { - // new services may be added while starting a service - // so use a while loop to get the newly added services as well - while (!services.isEmpty()) { - Service service = services.iterator().next(); - try { - ServiceHelper.startService(service); - } catch (Exception e) { - if (service instanceof Endpoint) { - Endpoint endpoint = (Endpoint) service; - throw new ResolveEndpointFailedException(endpoint.getEndpointUri(), e); - } else { - throw e; - } - } finally { - services.remove(service); - } - } - } - - @Override - public int getOrder() { - // we want to be last, so the other startup listeners run first - return Ordered.LOWEST; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java deleted file mode 100644 index 422462e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java +++ /dev/null @@ -1,193 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; -import org.apache.camel.Route; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * {@link org.apache.camel.spi.RoutePolicy} which executes for a duration and then triggers an action. - *

- * This can be used to stop the route after it has processed a number of messages, or has been running for N seconds. - */ -public class DurationRoutePolicy extends org.apache.camel.support.RoutePolicySupport implements CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(DurationRoutePolicy.class); - - enum Action { - STOP_CAMEL_CONTEXT, STOP_ROUTE, SUSPEND_ROUTE, SUSPEND_ALL_ROUTES - } - - private CamelContext camelContext; - private String routeId; - private ScheduledExecutorService executorService; - private volatile ScheduledFuture task; - private final AtomicInteger doneMessages = new AtomicInteger(); - private final AtomicBoolean actionDone = new AtomicBoolean(); - - private Action action = Action.STOP_ROUTE; - private int maxMessages; - private int maxSeconds; - - public DurationRoutePolicy() { - } - - public DurationRoutePolicy(CamelContext camelContext, String routeId) { - this.camelContext = camelContext; - this.routeId = routeId; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public int getMaxMessages() { - return maxMessages; - } - - /** - * Maximum number of messages to process before the action is triggered - */ - public void setMaxMessages(int maxMessages) { - this.maxMessages = maxMessages; - } - - public int getMaxSeconds() { - return maxSeconds; - } - - /** - * Maximum seconds Camel is running before the action is triggered - */ - public void setMaxSeconds(int maxSeconds) { - this.maxSeconds = maxSeconds; - } - - public Action getAction() { - return action; - } - - /** - * What action to perform when maximum is triggered. - */ - public void setAction(Action action) { - this.action = action; - } - - @Override - public void onInit(Route route) { - super.onInit(route); - - ObjectHelper.notNull(camelContext, "camelContext", this); - - if (maxMessages == 0 && maxSeconds == 0) { - throw new IllegalArgumentException("The options maxMessages or maxSeconds must be configured"); - } - - if (routeId == null) { - this.routeId = route.getId(); - } - - if (executorService == null) { - executorService = camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "DurationRoutePolicy[" + routeId + "]"); - } - - if (maxSeconds > 0) { - task = performMaxDurationAction(); - } - } - - @Override - public void onExchangeDone(Route route, Exchange exchange) { - int newDoneMessages = doneMessages.incrementAndGet(); - - if (maxMessages > 0 && newDoneMessages >= maxMessages) { - if (actionDone.compareAndSet(false, true)) { - performMaxMessagesAction(); - if (task != null && !task.isDone()) { - task.cancel(false); - } - } - } - } - - @Override - protected void doStop() throws Exception { - if (task != null && !task.isDone()) { - task.cancel(false); - } - - if (executorService != null) { - getCamelContext().getExecutorServiceManager().shutdownNow(executorService); - executorService = null; - } - } - - protected void performMaxMessagesAction() { - executorService.submit(createTask(true)); - } - - protected ScheduledFuture performMaxDurationAction() { - return executorService.schedule(createTask(false), maxSeconds, TimeUnit.SECONDS); - } - - private Runnable createTask(boolean maxMessagesHit) { - return () -> { - try { - String tail; - if (maxMessagesHit) { - tail = " due max messages " + getMaxMessages() + " processed"; - } else { - tail = " due max seconds " + getMaxSeconds(); - } - - if (action == Action.STOP_CAMEL_CONTEXT) { - LOG.info("Stopping CamelContext {}", tail); - camelContext.stop(); - } else if (action == Action.STOP_ROUTE) { - LOG.info("Stopping route: {}{}", routeId, tail); - camelContext.getRouteController().stopRoute(routeId); - } else if (action == Action.SUSPEND_ROUTE) { - LOG.info("Suspending route: {}{}", routeId, tail); - camelContext.getRouteController().suspendRoute(routeId); - } else if (action == Action.SUSPEND_ALL_ROUTES) { - LOG.info("Suspending all routes {}", tail); - camelContext.suspend(); - } - } catch (Throwable e) { - LOG.warn("Error performing action: {}", action, e); - } - }; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.java deleted file mode 100644 index 2ce2194..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicyFactory.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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.NamedNode; -import org.apache.camel.spi.RoutePolicy; -import org.apache.camel.spi.RoutePolicyFactory; -import org.apache.camel.support.PatternHelper; - -/** - * {@link RoutePolicyFactory} which executes for a duration and then triggers an action. - *

- * This can be used to stop a set of routes (or CamelContext) after it has processed a number of messages, or has been running for N seconds. - */ -public class DurationRoutePolicyFactory implements RoutePolicyFactory { - - private String fromRouteId; - private int maxMessages; - private int maxSeconds; - private DurationRoutePolicy.Action action = DurationRoutePolicy.Action.STOP_ROUTE; - - @Override - public RoutePolicy createRoutePolicy(CamelContext camelContext, String routeId, NamedNode route) { - DurationRoutePolicy policy = null; - - if (fromRouteId == null || PatternHelper.matchPattern(routeId, fromRouteId)) { - policy = new DurationRoutePolicy(camelContext, routeId); - policy.setMaxMessages(maxMessages); - policy.setMaxSeconds(maxSeconds); - policy.setAction(action); - } - - return policy; - } - - public String getFromRouteId() { - return fromRouteId; - } - - /** - * Limit the route policy to the route which matches this pattern - * - * @see PatternHelper#matchPattern(String, String) - */ - public void setFromRouteId(String fromRouteId) { - this.fromRouteId = fromRouteId; - } - - /** - * Maximum number of messages to process before the action is triggered - */ - public void setMaxMessages(int maxMessages) { - this.maxMessages = maxMessages; - } - - public int getMaxSeconds() { - return maxSeconds; - } - - /** - * Maximum seconds Camel is running before the action is triggered - */ - public void setMaxSeconds(int maxSeconds) { - this.maxSeconds = maxSeconds; - } - - public DurationRoutePolicy.Action getAction() { - return action; - } - - /** - * What action to perform when maximum is triggered. - */ - public void setAction(DurationRoutePolicy.Action action) { - this.action = action; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java deleted file mode 100644 index ac3514a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EmptyProducerCache.java +++ /dev/null @@ -1,72 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.support.service.ServiceHelper; - -public class EmptyProducerCache extends DefaultProducerCache { - - private final Object source; - private final ExtendedCamelContext ecc; - - public EmptyProducerCache(Object source, CamelContext camelContext) { - super(source, camelContext, -1); - this.source = source; - this.ecc = camelContext.adapt(ExtendedCamelContext.class); - setExtendedStatistics(false); - } - - @Override - public AsyncProducer acquireProducer(Endpoint endpoint) { - // always create a new producer - AsyncProducer answer; - try { - answer = endpoint.createAsyncProducer(); - boolean startingRoutes = ecc.isSetupRoutes() || ecc.getRouteController().isStartingRoutes(); - if (startingRoutes && answer.isSingleton()) { - // if we are currently starting a route, then add as service and enlist in JMX - // - but do not enlist non-singletons in JMX - // - note addService will also start the service - getCamelContext().addService(answer); - } else { - // must then start service so producer is ready to be used - ServiceHelper.startService(answer); - } - } catch (Exception e) { - throw new FailedToCreateProducerException(endpoint, e); - } - return answer; - } - - @Override - public void releaseProducer(Endpoint endpoint, AsyncProducer producer) { - // stop and shutdown the producer as its not cache or reused - ServiceHelper.stopAndShutdownService(producer); - } - - @Override - public int getCapacity() { - return 0; - } - - @Override - public String toString() { - return "EmptyProducerCache for source: " + source; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EndpointKey.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EndpointKey.java deleted file mode 100644 index 0082110..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EndpointKey.java +++ /dev/null @@ -1,52 +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.impl.engine; - -import org.apache.camel.ValueHolder; -import org.apache.camel.spi.NormalizedEndpointUri; -import org.apache.camel.support.EndpointHelper; -import org.apache.camel.util.StringHelper; - -/** - * Key used in {@link DefaultEndpointRegistry} in {@link AbstractCamelContext}, - * to ensure a consistent lookup. - */ -public final class EndpointKey extends ValueHolder implements NormalizedEndpointUri { - - public EndpointKey(String uri) { - this(uri, false); - } - - /** - * Optimized when the uri is already normalized. - */ - public EndpointKey(String uri, boolean normalized) { - super(normalized ? uri : EndpointHelper.normalizeEndpointUri(uri)); - StringHelper.notEmpty(uri, "uri"); - } - - @Override - public String getUri() { - return get(); - } - - @Override - public String toString() { - return get(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EventNotifierCallback.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EventNotifierCallback.java deleted file mode 100644 index acaeeb0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/EventNotifierCallback.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.impl.engine; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.support.EventHelper; -import org.apache.camel.util.StopWatch; - -/** - * Helper class to notify on exchange sending events in async engine - */ -public class EventNotifierCallback implements AsyncCallback { - private final AsyncCallback originalCallback; - private final StopWatch watch; - private final Exchange exchange; - private final Endpoint endpoint; - private final boolean sending; - - public EventNotifierCallback(AsyncCallback originalCallback, Exchange exchange, - Endpoint endpoint) { - this.originalCallback = originalCallback; - this.exchange = exchange; - this.endpoint = endpoint; - this.sending = EventHelper.notifyExchangeSending(exchange.getContext(), exchange, endpoint); - if (this.sending) { - this.watch = new StopWatch(); - } else { - this.watch = null; - } - } - - @Override - public void done(boolean doneSync) { - if (watch != null) { - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(exchange.getContext(), exchange, endpoint, timeTaken); - } - originalCallback.done(doneSync); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java deleted file mode 100644 index d66a088..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ExplicitCamelContextNameStrategy.java +++ /dev/null @@ -1,48 +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.impl.engine; - -import org.apache.camel.spi.CamelContextNameStrategy; -import org.apache.camel.util.StringHelper; - -/** - * Strategy to used an explicit (fixed) name for {@link org.apache.camel.CamelContext}. - */ -public class ExplicitCamelContextNameStrategy implements CamelContextNameStrategy { - - private final String name; - - public ExplicitCamelContextNameStrategy(String name) { - StringHelper.notEmpty(name, "CamelContext name "); - this.name = name; - } - - @Override - public String getName() { - return name; - } - - @Override - public String getNextName() { - return name; - } - - @Override - public boolean isFixedName() { - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java deleted file mode 100644 index a8a4516..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java +++ /dev/null @@ -1,291 +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.impl.engine; - -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.api.management.ManagedAttribute; -import org.apache.camel.api.management.ManagedOperation; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.spi.StateRepository; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.FileUtil; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.Scanner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * This {@link FileStateRepository} class is a file-based implementation of a {@link StateRepository}. - */ -@ManagedResource(description = "File based state repository") -public class FileStateRepository extends ServiceSupport implements StateRepository { - - private static final Logger LOG = LoggerFactory.getLogger(FileStateRepository.class); - - private static final String STORE_DELIMITER = "\n"; - private static final String KEY_VALUE_DELIMITER = "="; - private final AtomicBoolean init = new AtomicBoolean(); - private Map cache; - private File fileStore; - private long maxFileStoreSize = 1024 * 1000L; // 1mb store file - - public FileStateRepository() { - // default use a 1st level cache - this.cache = new HashMap<>(); - } - - public FileStateRepository(File fileStore, Map cache) { - this.fileStore = fileStore; - this.cache = cache; - } - - /** - * Creates a new file based repository using as 1st level cache - * - * @param fileStore the file store - */ - public static FileStateRepository fileStateRepository(File fileStore) { - return fileStateRepository(fileStore, new HashMap<>()); - } - - /** - * Creates a new file based repository using a {@link HashMap} as 1st level cache. - * - * @param fileStore the file store - * @param maxFileStoreSize the max size in bytes for the fileStore file - */ - public static FileStateRepository fileStateRepository(File fileStore, long maxFileStoreSize) { - FileStateRepository repository = new FileStateRepository(fileStore, new HashMap<>()); - repository.setMaxFileStoreSize(maxFileStoreSize); - return repository; - } - - /** - * Creates a new file based repository using the given {@link Map} as 1st level cache. - *

- * Care should be taken to use a suitable underlying {@link Map} to avoid this class being a - * memory leak. - * - * @param store the file store - * @param cache the cache to use as 1st level cache - */ - public static FileStateRepository fileStateRepository(File store, Map cache) { - return new FileStateRepository(store, cache); - } - - @Override - @ManagedOperation(description = "Adds the value of the given key to the store") - public void setState(String key, String value) { - if (key.contains(KEY_VALUE_DELIMITER)) { - throw new IllegalArgumentException("Key " + key + " contains illegal character: " + KEY_VALUE_DELIMITER); - } - if (key.contains(STORE_DELIMITER)) { - throw new IllegalArgumentException("Key " + key + " contains illegal character: "); - } - if (value.contains(STORE_DELIMITER)) { - throw new IllegalArgumentException("Value " + value + " contains illegal character: "); - } - synchronized (cache) { - cache.put(key, value); - if (fileStore.length() < maxFileStoreSize) { - // just append to store - appendToStore(key, value); - } else { - // trunk store and flush the cache - trunkStore(); - } - } - } - - @Override - @ManagedOperation(description = "Gets the value of the given key from store") - public String getState(String key) { - synchronized (cache) { - return cache.get(key); - } - } - - /** - * Resets and clears the store to force it to reload from file - */ - @ManagedOperation(description = "Reset and reloads the file store") - public synchronized void reset() throws IOException { - synchronized (cache) { - // trunk and clear, before we reload the store - trunkStore(); - cache.clear(); - loadStore(); - } - } - - /** - * Appends the {@code } pair to the file store - * - * @param key the state key - */ - private void appendToStore(String key, String value) { - if (LOG.isDebugEnabled()) { - LOG.debug("Appending {}={} to state filestore: {}", key, value, fileStore); - } - FileOutputStream fos = null; - try { - // create store parent directory if missing - File storeParentDirectory = fileStore.getParentFile(); - if (storeParentDirectory != null && !storeParentDirectory.exists()) { - LOG.info("Parent directory of file store {} doesn't exist. Creating.", fileStore); - if (fileStore.getParentFile().mkdirs()) { - LOG.info("Parent directory of file store {} successfully created.", fileStore); - } else { - LOG.warn("Parent directory of file store {} cannot be created.", fileStore); - } - } - // create store if missing - if (!fileStore.exists()) { - FileUtil.createNewFile(fileStore); - } - // append to store - fos = new FileOutputStream(fileStore, true); - fos.write(key.getBytes()); - fos.write(KEY_VALUE_DELIMITER.getBytes()); - fos.write(value.getBytes()); - fos.write(STORE_DELIMITER.getBytes()); - } catch (IOException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } finally { - IOHelper.close(fos, "Appending to file state repository", LOG); - } - } - - /** - * Trunks the file store when the max store size is hit by rewriting the 1st level cache - * to the file store. - */ - protected void trunkStore() { - LOG.info("Trunking state filestore: {}", fileStore); - FileOutputStream fos = null; - try { - fos = new FileOutputStream(fileStore); - for (Map.Entry entry : cache.entrySet()) { - fos.write(entry.getKey().getBytes()); - fos.write(KEY_VALUE_DELIMITER.getBytes()); - fos.write(entry.getValue().getBytes()); - fos.write(STORE_DELIMITER.getBytes()); - } - } catch (IOException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } finally { - IOHelper.close(fos, "Trunking file state repository", LOG); - } - } - - /** - * Loads the given file store into the 1st level cache - */ - protected void loadStore() throws IOException { - // auto create starting directory if needed - if (!fileStore.exists()) { - LOG.debug("Creating filestore: {}", fileStore); - File parent = fileStore.getParentFile(); - if (parent != null) { - parent.mkdirs(); - } - boolean created = FileUtil.createNewFile(fileStore); - if (!created) { - throw new IOException("Cannot create filestore: " + fileStore); - } - } - - LOG.trace("Loading to 1st level cache from state filestore: {}", fileStore); - - cache.clear(); - try (Scanner scanner = new Scanner(fileStore, null, STORE_DELIMITER)) { - while (scanner.hasNext()) { - String line = scanner.next(); - int separatorIndex = line.indexOf(KEY_VALUE_DELIMITER); - String key = line.substring(0, separatorIndex); - String value = line.substring(separatorIndex + KEY_VALUE_DELIMITER.length()); - cache.put(key, value); - } - } catch (IOException e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - - LOG.debug("Loaded {} to the 1st level cache from state filestore: {}", cache.size(), fileStore); - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(fileStore, "fileStore", this); - - // init store if not loaded before - if (init.compareAndSet(false, true)) { - loadStore(); - } - } - - @Override - protected void doStop() throws Exception { - // reset will trunk and clear the cache - trunkStore(); - cache.clear(); - init.set(false); - } - - public File getFileStore() { - return fileStore; - } - - public void setFileStore(File fileStore) { - this.fileStore = fileStore; - } - - @ManagedAttribute(description = "The file path for the store") - public String getFilePath() { - return fileStore.getPath(); - } - - public Map getCache() { - return cache; - } - - public void setCache(Map cache) { - this.cache = cache; - } - - @ManagedAttribute(description = "The maximum file size for the file store in bytes") - public long getMaxFileStoreSize() { - return maxFileStoreSize; - } - - /** - * Sets the maximum file size for the file store in bytes. - *

- * The default is 1mb. - */ - @ManagedAttribute(description = "The maximum file size for the file store in bytes") - public void setMaxFileStoreSize(long maxFileStoreSize) { - this.maxFileStoreSize = maxFileStoreSize; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java deleted file mode 100644 index f677754..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/HashMapHeadersMapFactory.java +++ /dev/null @@ -1,51 +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.impl.engine; - -import org.apache.camel.spi.HeadersMapFactory; - -import java.util.HashMap; -import java.util.Map; - -/** - * HashMap {@link HeadersMapFactory} which uses a plain {@link HashMap}. - * Important: The map is case sensitive which means headers such as content-type and Content-Type are - * two different keys which can be a problem for some protocols such as HTTP based. - * Therefore use this implementation with care. - */ -public class HashMapHeadersMapFactory implements HeadersMapFactory { - - @Override - public Map newMap() { - return new HashMap<>(); - } - - @Override - public Map newMap(Map map) { - return new HashMap<>(map); - } - - @Override - public boolean isInstanceOf(Map map) { - return map instanceof HashMap; - } - - @Override - public boolean isCaseInsensitive() { - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java deleted file mode 100644 index cdc6392..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java +++ /dev/null @@ -1,147 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.Pipeline; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultAsyncProducer; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Arrays; - -import static org.apache.camel.processor.PipelineHelper.continueProcessing; - -/** - * {@link org.apache.camel.Processor} used to interceptor and detour the routing - * when using the {@link DefaultInterceptSendToEndpoint} functionality. - */ -public class InterceptSendToEndpointProcessor extends DefaultAsyncProducer { - - private static final Logger LOG = LoggerFactory.getLogger(InterceptSendToEndpointProcessor.class); - - private final DefaultInterceptSendToEndpoint endpoint; - private final Endpoint delegate; - private final AsyncProducer producer; - private final boolean skip; - - public InterceptSendToEndpointProcessor(DefaultInterceptSendToEndpoint endpoint, Endpoint delegate, AsyncProducer producer, boolean skip) throws Exception { - super(delegate); - this.endpoint = endpoint; - this.delegate = delegate; - this.producer = producer; - this.skip = skip; - } - - @Override - public Endpoint getEndpoint() { - return producer.getEndpoint(); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - // process the detour so we do the detour routing - if (LOG.isDebugEnabled()) { - LOG.debug("Sending to endpoint: {} is intercepted and detoured to: {} for exchange: {}", getEndpoint(), endpoint.getBefore(), exchange); - } - // add header with the real endpoint uri - exchange.getIn().setHeader(Exchange.INTERCEPTED_ENDPOINT, delegate.getEndpointUri()); - - if (endpoint.getBefore() != null || endpoint.getAfter() != null) { - // detour the exchange using synchronous processing - AsyncProcessor before = null; - if (endpoint.getBefore() != null) { - before = AsyncProcessorConverterHelper.convert(endpoint.getBefore()); - } - AsyncProcessor ascb = new AsyncProcessorSupport() { - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - return callback(exchange, callback, true); - } - }; - AsyncProcessor after = null; - if (endpoint.getAfter() != null) { - after = AsyncProcessorConverterHelper.convert(endpoint.getAfter()); - } - - return new Pipeline(exchange.getContext(), Arrays.asList(before, ascb, after)).process(exchange, callback); - } - - return callback(exchange, callback, true); - } - - private boolean callback(Exchange exchange, AsyncCallback callback, boolean doneSync) { - // Decide whether to continue or not; similar logic to the Pipeline - // check for error if so we should break out - if (!continueProcessing(exchange, "skip sending to original intended destination: " + getEndpoint(), LOG)) { - callback.done(doneSync); - return doneSync; - } - - // determine if we should skip or not - boolean shouldSkip = skip; - - // if then interceptor had a when predicate, then we should only skip if it matched - Boolean whenMatches = (Boolean) exchange.removeProperty(Exchange.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED); - if (whenMatches != null) { - shouldSkip = skip && whenMatches; - } - - if (!shouldSkip) { - if (exchange.hasOut()) { - // replace OUT with IN as detour changed something - exchange.setIn(exchange.getOut()); - exchange.setOut(null); - } - - // route to original destination leveraging the asynchronous routing engine if possible - boolean s = producer.process(exchange, ds -> { - callback.done(doneSync && ds); - }); - return doneSync && s; - } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Stop() means skip sending exchange to original intended destination: {} for exchange: {}", getEndpoint(), exchange); - } - callback.done(doneSync); - return doneSync; - } - } - - @Override - public boolean isSingleton() { - return producer.isSingleton(); - } - - @Override - public void start() { - ServiceHelper.startService(endpoint.getBefore(), endpoint.getAfter()); - // here we also need to start the producer - ServiceHelper.startService(producer); - } - - @Override - public void stop() { - // do not stop before/after as it should only be stopped when the interceptor stops - // we should stop the producer here - ServiceHelper.stopService(producer); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToMockEndpointStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToMockEndpointStrategy.java deleted file mode 100644 index 6ae67dd..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToMockEndpointStrategy.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.impl.engine; - -import org.apache.camel.Endpoint; -import org.apache.camel.Producer; -import org.apache.camel.spi.EndpointStrategy; -import org.apache.camel.support.EndpointHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException; - -/** - * A {@link EndpointStrategy} which is capable of mocking endpoints. - *

- * This strategy will only apply when new endpoints are being created. If you want to replace - * existing endpoints, you will have to remove them from the {@link org.apache.camel.CamelContext} beforehand. - */ -public class InterceptSendToMockEndpointStrategy implements EndpointStrategy { - - private static final Logger LOG = LoggerFactory.getLogger(InterceptSendToMockEndpointStrategy.class); - private final String pattern; - private boolean skip; - - /** - * Mock all endpoints. - */ - public InterceptSendToMockEndpointStrategy() { - this(null); - } - - /** - * Mock endpoints based on the given pattern. - * - * @param pattern the pattern. - * @see EndpointHelper#matchEndpoint(org.apache.camel.CamelContext, String, String) - */ - public InterceptSendToMockEndpointStrategy(String pattern) { - this(pattern, false); - } - - /** - * Mock endpoints based on the given pattern. - * - * @param pattern the pattern. - * @param skip true to skip sending after the detour to the original endpoint - * @see EndpointHelper#matchEndpoint(org.apache.camel.CamelContext, String, String) - */ - public InterceptSendToMockEndpointStrategy(String pattern, boolean skip) { - this.pattern = pattern; - this.skip = skip; - } - - @Override - public Endpoint registerEndpoint(String uri, Endpoint endpoint) { - if (endpoint instanceof DefaultInterceptSendToEndpoint) { - // endpoint already decorated - return endpoint; - } else if (endpoint.getEndpointUri().startsWith("mock:")) { - // we should not intercept mock endpoints - return endpoint; - } else if (matchPattern(uri, endpoint, pattern)) { - // if pattern is null then it mean to match all - - // only proxy if the uri is matched decorate endpoint with our proxy - // should be false by default - DefaultInterceptSendToEndpoint proxy = new DefaultInterceptSendToEndpoint(endpoint, skip); - - // create mock endpoint which we will use as interceptor - // replace :// from scheme to make it easy to lookup the mock endpoint without having double :// in uri - String key = "mock:" + endpoint.getEndpointKey().replaceFirst("://", ":"); - // strip off parameters as well - if (key.contains("?")) { - key = StringHelper.before(key, "?"); - } - LOG.info("Adviced endpoint [{}] with mock endpoint [{}]", uri, key); - - Endpoint mock = endpoint.getCamelContext().getEndpoint(key, Endpoint.class); - Producer producer; - try { - producer = mock.createProducer(); - } catch (Exception e) { - throw wrapRuntimeCamelException(e); - } - - // allow custom logic - producer = onInterceptEndpoint(uri, endpoint, mock, producer); - proxy.setBefore(producer); - - return proxy; - } else { - // no proxy so return regular endpoint - return endpoint; - } - } - - /** - * Does the pattern match the endpoint? - * - * @param uri the uri - * @param endpoint the endpoint - * @param pattern the pattern - * @return true to match and therefore intercept, false if not matched and should not intercept - */ - protected boolean matchPattern(String uri, Endpoint endpoint, String pattern) { - return uri == null || pattern == null || EndpointHelper.matchEndpoint(endpoint.getCamelContext(), uri, pattern); - } - - /** - * Callback when an endpoint was intercepted with the given mock endpoint - * - * @param uri the uri - * @param endpoint the endpoint - * @param mockEndpoint the mocked endpoint - * @param mockProducer the mock producer - * @return the mock producer - */ - protected Producer onInterceptEndpoint(String uri, Endpoint endpoint, Endpoint mockEndpoint, Producer mockProducer) { - return mockProducer; - } - - @Override - public String toString() { - return "InterceptSendToMockEndpointStrategy"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java deleted file mode 100644 index a64328f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteController.java +++ /dev/null @@ -1,134 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.LoggingLevel; -import org.apache.camel.Route; -import org.apache.camel.ServiceStatus; -import org.apache.camel.spi.RouteController; -import org.apache.camel.spi.SupervisingRouteController; - -import java.util.Collection; -import java.util.concurrent.TimeUnit; - -/** - * Internal {@link RouteController} used internally by {@link AbstractCamelContext}. - */ -class InternalRouteController implements RouteController { - - private final AbstractCamelContext abstractCamelContext; - - public InternalRouteController(AbstractCamelContext abstractCamelContext) { - this.abstractCamelContext = abstractCamelContext; - } - - @Override - public LoggingLevel getRouteStartupLoggingLevel() { - throw new UnsupportedOperationException(); - } - - @Override - public void setRouteStartupLoggingLevel(LoggingLevel loggingLevel) { - throw new UnsupportedOperationException(); - } - - @Override - public SupervisingRouteController supervising() { - throw new UnsupportedOperationException(); - } - - @Override - public T adapt(Class type) { - return type.cast(this); - } - - @Override - public Collection getControlledRoutes() { - return abstractCamelContext.getRoutes(); - } - - @Override - public void startAllRoutes() throws Exception { - abstractCamelContext.startAllRoutes(); - } - - @Override - public boolean isStartingRoutes() { - return abstractCamelContext.isStartingRoutes(); - } - - @Override - public ServiceStatus getRouteStatus(String routeId) { - return abstractCamelContext.getRouteStatus(routeId); - } - - @Override - public void startRoute(String routeId) throws Exception { - abstractCamelContext.startRoute(routeId); - } - - @Override - public void stopRoute(String routeId) throws Exception { - abstractCamelContext.stopRoute(routeId); - } - - @Override - public void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - abstractCamelContext.stopRoute(routeId, timeout, timeUnit); - } - - @Override - public boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception { - return abstractCamelContext.stopRoute(routeId, timeout, timeUnit, abortAfterTimeout); - } - - @Override - public void suspendRoute(String routeId) throws Exception { - abstractCamelContext.suspendRoute(routeId); - } - - @Override - public void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - abstractCamelContext.suspendRoute(routeId, timeout, timeUnit); - } - - @Override - public void resumeRoute(String routeId) throws Exception { - abstractCamelContext.resumeRoute(routeId); - } - - @Override - public void setCamelContext(CamelContext camelContext) { - throw new UnsupportedOperationException(); - } - - @Override - public CamelContext getCamelContext() { - throw new UnsupportedOperationException(); - } - - @Override - public void start() { - throw new UnsupportedOperationException(); - } - - @Override - public void stop() { - throw new UnsupportedOperationException(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java deleted file mode 100644 index 094ca32..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java +++ /dev/null @@ -1,400 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.spi.CamelLogger; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.RouteStartupOrder; -import org.apache.camel.support.OrderedComparator; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; - -/** - * Internal route startup manager used by {@link AbstractCamelContext} to safely start internal route services - * during starting routes. - * - * This code has been refactored out of {@link AbstractCamelContext} to its own class. - */ -class InternalRouteStartupManager { - - private static final Logger LOG = LoggerFactory.getLogger(InternalRouteStartupManager.class); - - private final ThreadLocal setupRoute = new ThreadLocal<>(); - private final AbstractCamelContext abstractCamelContext; - private final CamelLogger routeLogger = new CamelLogger(LOG); - - public InternalRouteStartupManager(AbstractCamelContext abstractCamelContext) { - this.abstractCamelContext = abstractCamelContext; - } - - /** - * If Camel is currently starting up a route then this returns the route. - */ - public Route getSetupRoute() { - return setupRoute.get(); - } - - /** - * Starts or resumes the routes - * - * @param routeServices the routes to start (will only start a route if its - * not already started) - * @param checkClash whether to check for startup ordering clash - * @param startConsumer whether the route consumer should be started. Can be - * used to warmup the route without starting the consumer. - * @param resumeConsumer whether the route consumer should be resumed. - * @param addingRoutes whether we are adding new routes - * @throws Exception is thrown if error starting routes - */ - protected void doStartOrResumeRoutes(Map routeServices, boolean checkClash, boolean startConsumer, boolean resumeConsumer, boolean addingRoutes) - throws Exception { - abstractCamelContext.setStartingRoutes(true); - try { - // filter out already started routes - Map filtered = new LinkedHashMap<>(); - for (Map.Entry entry : routeServices.entrySet()) { - boolean startable = false; - - Consumer consumer = entry.getValue().getRoute().getConsumer(); - if (consumer instanceof SuspendableService) { - // consumer could be suspended, which is not reflected in - // the BaseRouteService status - startable = ((SuspendableService)consumer).isSuspended(); - } - - if (!startable && consumer instanceof StatefulService) { - // consumer could be stopped, which is not reflected in the - // BaseRouteService status - startable = ((StatefulService)consumer).getStatus().isStartable(); - } else if (!startable) { - // no consumer so use state from route service - startable = entry.getValue().getStatus().isStartable(); - } - - if (startable) { - filtered.put(entry.getKey(), entry.getValue()); - } - } - - // the context is in last phase of staring, so lets start the routes - safelyStartRouteServices(checkClash, startConsumer, resumeConsumer, addingRoutes, filtered.values()); - - } finally { - abstractCamelContext.setStartingRoutes(false); - } - } - - /** - * Starts the routes services in a proper manner which ensures the routes - * will be started in correct order, check for clash and that the routes - * will also be shutdown in correct order as well. - *

- * This method must be used to start routes in a safe manner. - * - * @param checkClash whether to check for startup order clash - * @param startConsumer whether the route consumer should be started. Can be - * used to warmup the route without starting the consumer. - * @param resumeConsumer whether the route consumer should be resumed. - * @param addingRoutes whether we are adding new routes - * @param routeServices the routes - * @throws Exception is thrown if error starting the routes - */ - protected synchronized void safelyStartRouteServices(boolean checkClash, boolean startConsumer, boolean resumeConsumer, boolean addingRoutes, - Collection routeServices) - throws Exception { - // list of inputs to start when all the routes have been prepared for - // starting - // we use a tree map so the routes will be ordered according to startup - // order defined on the route - Map inputs = new TreeMap<>(); - - // figure out the order in which the routes should be started - for (org.apache.camel.impl.engine.RouteService routeService : routeServices) { - DefaultRouteStartupOrder order = doPrepareRouteToBeStarted(routeService); - // check for clash before we add it as input - if (checkClash) { - doCheckStartupOrderClash(order, inputs); - } - inputs.put(order.getStartupOrder(), order); - } - - // warm up routes before we start them - doWarmUpRoutes(inputs, startConsumer); - - // sort the startup listeners so they are started in the right order - abstractCamelContext.getStartupListeners().sort(OrderedComparator.get()); - // now call the startup listeners where the routes has been warmed up - // (only the actual route consumer has not yet been started) - for (StartupListener startup : abstractCamelContext.getStartupListeners()) { - startup.onCamelContextStarted(abstractCamelContext.getCamelContextReference(), abstractCamelContext.isStarted()); - } - // because the consumers may also register startup listeners we need to - // reset - // the already started listeners - List backup = new ArrayList<>(abstractCamelContext.getStartupListeners()); - abstractCamelContext.getStartupListeners().clear(); - - // now start the consumers - if (startConsumer) { - if (resumeConsumer) { - // and now resume the routes - doResumeRouteConsumers(inputs, addingRoutes); - } else { - // and now start the routes - // and check for clash with multiple consumers of the same - // endpoints which is not allowed - doStartRouteConsumers(inputs, addingRoutes); - } - } - - // sort the startup listeners so they are started in the right order - abstractCamelContext.getStartupListeners().sort(OrderedComparator.get()); - // now the consumers that was just started may also add new - // StartupListeners (such as timer) - // so we need to ensure they get started as well - for (StartupListener startup : abstractCamelContext.getStartupListeners()) { - startup.onCamelContextStarted(abstractCamelContext.getCamelContextReference(), abstractCamelContext.isStarted()); - } - // and add the previous started startup listeners to the list so we have - // them all - abstractCamelContext.getStartupListeners().addAll(0, backup); - - // inputs no longer needed - inputs.clear(); - } - - /** - * @see #safelyStartRouteServices(boolean,boolean,boolean,boolean,Collection) - */ - protected synchronized void safelyStartRouteServices(boolean forceAutoStart, boolean checkClash, boolean startConsumer, boolean resumeConsumer, boolean addingRoutes, - org.apache.camel.impl.engine.RouteService... routeServices) - throws Exception { - safelyStartRouteServices(checkClash, startConsumer, resumeConsumer, addingRoutes, Arrays.asList(routeServices)); - } - - DefaultRouteStartupOrder doPrepareRouteToBeStarted(org.apache.camel.impl.engine.RouteService routeService) { - // add the inputs from this route service to the list to start - // afterwards - // should be ordered according to the startup number - Integer startupOrder = routeService.getRoute().getStartupOrder(); - if (startupOrder == null) { - // auto assign a default startup order - startupOrder = abstractCamelContext.defaultRouteStartupOrder++; - } - - // create holder object that contains information about this route to be - // started - Route route = routeService.getRoute(); - return new DefaultRouteStartupOrder(startupOrder, route, routeService); - } - - boolean doCheckStartupOrderClash(DefaultRouteStartupOrder answer, Map inputs) throws FailedToStartRouteException { - // check for clash by startupOrder id - DefaultRouteStartupOrder other = inputs.get(answer.getStartupOrder()); - if (other != null && answer != other) { - String otherId = other.getRoute().getId(); - throw new FailedToStartRouteException(answer.getRoute().getId(), "startupOrder clash. Route " + otherId + " already has startupOrder " + answer - .getStartupOrder() + " configured which this route have as well. Please correct startupOrder to be unique among all your routes."); - } - // check in existing already started as well - for (RouteStartupOrder order : abstractCamelContext.getRouteStartupOrder()) { - String otherId = order.getRoute().getId(); - if (answer.getRoute().getId().equals(otherId)) { - // its the same route id so skip clash check as its the same - // route (can happen when using suspend/resume) - } else if (answer.getStartupOrder() == order.getStartupOrder()) { - throw new FailedToStartRouteException(answer.getRoute().getId(), "startupOrder clash. Route " + otherId + " already has startupOrder " + answer - .getStartupOrder() + " configured which this route have as well. Please correct startupOrder to be unique among all your routes."); - } - } - return true; - } - - void doWarmUpRoutes(Map inputs, boolean autoStartup) throws FailedToStartRouteException { - // now prepare the routes by starting its services before we start the - // input - for (Map.Entry entry : inputs.entrySet()) { - // defer starting inputs till later as we want to prepare the routes - // by starting - // all their processors and child services etc. - // then later we open the floods to Camel by starting the inputs - // what this does is to ensure Camel is more robust on starting - // routes as all routes - // will then be prepared in time before we start inputs which will - // consume messages to be routed - org.apache.camel.impl.engine.RouteService routeService = entry.getValue().getRouteService(); - try { - LOG.debug("Warming up route id: {} having autoStartup={}", routeService.getId(), autoStartup); - setupRoute.set(routeService.getRoute()); - routeService.warmUp(); - } finally { - setupRoute.remove(); - } - } - } - - void doResumeRouteConsumers(Map inputs, boolean addingRoutes) throws Exception { - doStartOrResumeRouteConsumers(inputs, true, addingRoutes); - } - - void doStartRouteConsumers(Map inputs, boolean addingRoutes) throws Exception { - doStartOrResumeRouteConsumers(inputs, false, addingRoutes); - } - - private LoggingLevel getRouteLoggerLogLevel() { - return abstractCamelContext.getRouteController().getRouteStartupLoggingLevel(); - } - - private void doStartOrResumeRouteConsumers(Map inputs, boolean resumeOnly, boolean addingRoute) throws Exception { - List routeInputs = new ArrayList<>(); - - for (Map.Entry entry : inputs.entrySet()) { - Integer order = entry.getKey(); - Route route = entry.getValue().getRoute(); - RouteService routeService = entry.getValue().getRouteService(); - - // if we are starting camel, then skip routes which are configured - // to not be auto started - boolean autoStartup = routeService.isAutoStartup(); - if (addingRoute && !autoStartup) { - routeLogger.log("Skipping starting of route " + routeService.getId() + " as it's configured with autoStartup=false", getRouteLoggerLogLevel()); - continue; - } - - // start the service - for (Consumer consumer : routeService.getInputs().values()) { - Endpoint endpoint = consumer.getEndpoint(); - - // check multiple consumer violation, with the other routes to - // be started - if (!doCheckMultipleConsumerSupportClash(endpoint, routeInputs)) { - throw new FailedToStartRouteException(routeService.getId(), "Multiple consumers for the same endpoint is not allowed: " + endpoint); - } - - // check for multiple consumer violations with existing routes - // which - // have already been started, or is currently starting - List existingEndpoints = new ArrayList<>(); - for (Route existingRoute : abstractCamelContext.getRoutes()) { - if (route.getId().equals(existingRoute.getId())) { - // skip ourselves - continue; - } - Endpoint existing = existingRoute.getEndpoint(); - ServiceStatus status = abstractCamelContext.getRouteStatus(existingRoute.getId()); - if (status != null && (status.isStarted() || status.isStarting())) { - existingEndpoints.add(existing); - } - } - if (!doCheckMultipleConsumerSupportClash(endpoint, existingEndpoints)) { - throw new FailedToStartRouteException(routeService.getId(), "Multiple consumers for the same endpoint is not allowed: " + endpoint); - } - - // start the consumer on the route - LOG.debug("Route: {} >>> {}", route.getId(), route); - if (resumeOnly) { - LOG.debug("Resuming consumer (order: {}) on route: {}", order, route.getId()); - } else { - LOG.debug("Starting consumer (order: {}) on route: {}", order, route.getId()); - } - - if (resumeOnly && route.supportsSuspension()) { - // if we are resuming and the route can be resumed - ServiceHelper.resumeService(consumer); - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = endpoint.getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - routeLogger.log("Route: " + route.getId() + " resumed and consuming from: " + uri, getRouteLoggerLogLevel()); - } else { - // when starting we should invoke the lifecycle strategies - for (LifecycleStrategy strategy : abstractCamelContext.getLifecycleStrategies()) { - strategy.onServiceAdd(abstractCamelContext.getCamelContextReference(), consumer, route); - } - try { - abstractCamelContext.startService(consumer); - route.getProperties().remove("route.start.exception"); - } catch (Exception e) { - route.getProperties().put("route.start.exception", e); - throw e; - } - - // use basic endpoint uri to not log verbose details or potential sensitive data - String uri = endpoint.getEndpointBaseUri(); - uri = URISupport.sanitizeUri(uri); - routeLogger.log("Route: " + route.getId() + " started and consuming from: " + uri, getRouteLoggerLogLevel()); - } - - routeInputs.add(endpoint); - - // add to the order which they was started, so we know how to - // stop them in reverse order - // but only add if we haven't already registered it before (we - // dont want to double add when restarting) - boolean found = false; - for (RouteStartupOrder other : abstractCamelContext.getRouteStartupOrder()) { - if (other.getRoute().getId().equals(route.getId())) { - found = true; - break; - } - } - if (!found) { - abstractCamelContext.getRouteStartupOrder().add(entry.getValue()); - } - } - - if (resumeOnly) { - routeService.resume(); - } else { - // and start the route service (no need to start children as - // they are already warmed up) - try { - routeService.start(); - route.getProperties().remove("route.start.exception"); - } catch (Exception e) { - route.getProperties().put("route.start.exception", e); - throw e; - } - } - } - } - - private boolean doCheckMultipleConsumerSupportClash(Endpoint endpoint, List routeInputs) { - // is multiple consumers supported - boolean multipleConsumersSupported = false; - if (endpoint instanceof MultipleConsumersSupport) { - multipleConsumersSupported = ((MultipleConsumersSupport)endpoint).isMultipleConsumersSupported(); - } - - if (multipleConsumersSupported) { - // multiple consumer allowed, so return true - return true; - } - - // check in progress list - if (routeInputs.contains(endpoint)) { - return false; - } - - return true; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java deleted file mode 100644 index f1ef0de..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java +++ /dev/null @@ -1,123 +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.impl.engine; - -import org.apache.camel.Consumer; -import org.apache.camel.Endpoint; -import org.apache.camel.Service; -import org.apache.camel.support.DefaultPollingConsumerPollStrategy; -import org.apache.camel.support.service.ServiceHelper; - -import java.util.HashMap; -import java.util.Map; - -/** - * A {@link org.apache.camel.spi.PollingConsumerPollStrategy} which supports suspending consumers if they - * failed for X number of times in a row. - *

- * If Camel cannot successfully consumer from a given consumer, then after X consecutive failed attempts the consumer - * will be suspended/stopped. This prevents the log to get flooded with failed attempts, for example during nightly runs. - */ -public class LimitedPollingConsumerPollStrategy extends DefaultPollingConsumerPollStrategy implements Service { - - private final Map state = new HashMap<>(); - private int limit = 3; - - public int getLimit() { - return limit; - } - - /** - * Sets the limit for how many straight rollbacks causes this strategy to suspend the fault consumer. - *

- * When the consumer has been suspended, it has to be manually resumed/started to be active again. - * The limit is by default 3. - * - * @param limit the limit - */ - public void setLimit(int limit) { - this.limit = limit; - } - - @Override - public void commit(Consumer consumer, Endpoint endpoint, int polledMessages) { - // we could commit so clear state - state.remove(consumer); - } - - @Override - public boolean rollback(Consumer consumer, Endpoint endpoint, int retryCounter, Exception cause) throws Exception { - // keep track how many times in a row we have rolled back - Integer times = state.get(consumer); - if (times == null) { - times = 1; - } else { - times += 1; - } - log.debug("Rollback occurred after {} times when consuming {}", times, endpoint); - - boolean retry = false; - - if (times >= limit) { - // clear state when we suspend so if its restarted manually we start all over again - state.remove(consumer); - onSuspend(consumer, endpoint); - } else { - // error occurred - state.put(consumer, times); - retry = onRollback(consumer, endpoint); - } - - return retry; - } - - /** - * The consumer is to be suspended because it exceeded the limit - * - * @param consumer the consumer - * @param endpoint the endpoint - * @throws Exception is thrown if error suspending the consumer - */ - protected void onSuspend(Consumer consumer, Endpoint endpoint) throws Exception { - log.warn("Suspending consumer " + consumer + " after " + limit + " attempts to consume from " + endpoint - + ". You have to manually resume the consumer!"); - ServiceHelper.suspendService(consumer); - } - - /** - * Rollback occurred. - * - * @param consumer the consumer - * @param endpoint the endpoint - * @return whether or not to retry immediately, is default false - * @throws Exception can be thrown in case something goes wrong - */ - protected boolean onRollback(Consumer consumer, Endpoint endpoint) throws Exception { - // do not retry by default - return false; - } - - @Override - public void start() { - // noop - } - - @Override - public void stop() { - state.clear(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java deleted file mode 100644 index a318039..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java +++ /dev/null @@ -1,303 +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.impl.engine; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.Route; -import org.apache.camel.spi.InflightRepository; -import org.apache.camel.spi.UnitOfWork; -import org.apache.camel.support.PatternHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.MDC; - -import java.util.HashMap; -import java.util.Map; - -/** - * This unit of work supports MDC. - */ -public class MDCUnitOfWork extends DefaultUnitOfWork { - - private static final Logger LOG = LoggerFactory.getLogger(MDCUnitOfWork.class); - - private final String pattern; - - private final String originalBreadcrumbId; - private final String originalExchangeId; - private final String originalMessageId; - private final String originalCorrelationId; - private final String originalRouteId; - private final String originalStepId; - private final String originalCamelContextId; - private final String originalTransactionKey; - - public MDCUnitOfWork(Exchange exchange, InflightRepository inflightRepository, - String pattern, boolean allowUseOriginalMessage, boolean useBreadcrumb) { - super(exchange, LOG, inflightRepository, allowUseOriginalMessage, useBreadcrumb); - this.pattern = pattern; - - // remember existing values - this.originalExchangeId = MDC.get(MDC_EXCHANGE_ID); - this.originalMessageId = MDC.get(MDC_MESSAGE_ID); - this.originalBreadcrumbId = MDC.get(MDC_BREADCRUMB_ID); - this.originalCorrelationId = MDC.get(MDC_CORRELATION_ID); - this.originalRouteId = MDC.get(MDC_ROUTE_ID); - this.originalStepId = MDC.get(MDC_STEP_ID); - this.originalCamelContextId = MDC.get(MDC_CAMEL_CONTEXT_ID); - this.originalTransactionKey = MDC.get(MDC_TRANSACTION_KEY); - - // must add exchange and message id in constructor - MDC.put(MDC_EXCHANGE_ID, exchange.getExchangeId()); - String msgId = exchange.getMessage().getMessageId(); - MDC.put(MDC_MESSAGE_ID, msgId); - // the camel context id is from exchange - MDC.put(MDC_CAMEL_CONTEXT_ID, exchange.getContext().getName()); - // and add optional correlation id - String corrId = exchange.getProperty(Exchange.CORRELATION_ID, String.class); - if (corrId != null) { - MDC.put(MDC_CORRELATION_ID, corrId); - } - // and add optional breadcrumb id - String breadcrumbId = exchange.getIn().getHeader(Exchange.BREADCRUMB_ID, String.class); - if (breadcrumbId != null) { - MDC.put(MDC_BREADCRUMB_ID, breadcrumbId); - } - } - - @Override - public UnitOfWork newInstance(Exchange exchange) { - return new MDCUnitOfWork(exchange, inflightRepository, pattern, allowUseOriginalMessage, useBreadcrumb); - } - - @Override - public void stop() { - super.stop(); - // and remove when stopping - clear(); - } - - @Override - public void pushRoute(Route route) { - super.pushRoute(route); - if (route != null) { - MDC.put(MDC_ROUTE_ID, route.getRouteId()); - } else { - MDC.remove(MDC_ROUTE_ID); - } - } - - @Override - public Route popRoute() { - Route answer = super.popRoute(); - // restore old route id back again after we have popped - Route previous = getRoute(); - if (previous != null) { - // restore old route id back again - MDC.put(MDC_ROUTE_ID, previous.getRouteId()); - } else { - // not running in route, so clear (should ideally not happen) - MDC.remove(MDC_ROUTE_ID); - } - - return answer; - } - - @Override - public void beginTransactedBy(Object key) { - MDC.put(MDC_TRANSACTION_KEY, key.toString()); - super.beginTransactedBy(key); - } - - @Override - public void endTransactedBy(Object key) { - MDC.remove(MDC_TRANSACTION_KEY); - super.endTransactedBy(key); - } - - @Override - public boolean isBeforeAfterProcess() { - return true; - } - - @Override - public AsyncCallback beforeProcess(Processor processor, Exchange exchange, AsyncCallback callback) { - // add optional step id - String stepId = exchange.getProperty(Exchange.STEP_ID, String.class); - if (stepId != null) { - MDC.put(MDC_STEP_ID, stepId); - } - return new MDCCallback(callback, pattern); - } - - @Override - public void afterProcess(Processor processor, Exchange exchange, AsyncCallback callback, boolean doneSync) { - // if we are no longer under step then remove it - String stepId = exchange.getProperty(Exchange.STEP_ID, String.class); - if (stepId == null) { - MDC.remove(MDC_STEP_ID); - } - } - - /** - * Clears information put on the MDC by this {@link MDCUnitOfWork} - */ - public void clear() { - if (this.originalBreadcrumbId != null) { - MDC.put(MDC_BREADCRUMB_ID, originalBreadcrumbId); - } else { - MDC.remove(MDC_BREADCRUMB_ID); - } - if (this.originalExchangeId != null) { - MDC.put(MDC_EXCHANGE_ID, originalExchangeId); - } else { - MDC.remove(MDC_EXCHANGE_ID); - } - if (this.originalMessageId != null) { - MDC.put(MDC_MESSAGE_ID, originalMessageId); - } else { - MDC.remove(MDC_MESSAGE_ID); - } - if (this.originalCorrelationId != null) { - MDC.put(MDC_CORRELATION_ID, originalCorrelationId); - } else { - MDC.remove(MDC_CORRELATION_ID); - } - if (this.originalRouteId != null) { - MDC.put(MDC_ROUTE_ID, originalRouteId); - } else { - MDC.remove(MDC_ROUTE_ID); - } - if (this.originalStepId != null) { - MDC.put(MDC_STEP_ID, originalStepId); - } else { - MDC.remove(MDC_STEP_ID); - } - if (this.originalCamelContextId != null) { - MDC.put(MDC_CAMEL_CONTEXT_ID, originalCamelContextId); - } else { - MDC.remove(MDC_CAMEL_CONTEXT_ID); - } - if (this.originalTransactionKey != null) { - MDC.put(MDC_TRANSACTION_KEY, originalTransactionKey); - } else { - MDC.remove(MDC_TRANSACTION_KEY); - } - } - - @Override - public String toString() { - return "MDCUnitOfWork"; - } - - private static boolean matchPatterns(String value, String[] patterns) { - for (String pattern : patterns) { - if (PatternHelper.matchPattern(value, pattern)) { - return true; - } - } - return false; - } - - /** - * {@link AsyncCallback} which preserves {@link MDC} when - * the asynchronous routing engine is being used. - */ - private static final class MDCCallback implements AsyncCallback { - - private final AsyncCallback delegate; - private final String breadcrumbId; - private final String exchangeId; - private final String messageId; - private final String correlationId; - private final String routeId; - private final String camelContextId; - private final Map custom; - - private MDCCallback(AsyncCallback delegate, String pattern) { - this.delegate = delegate; - this.exchangeId = MDC.get(MDC_EXCHANGE_ID); - this.messageId = MDC.get(MDC_MESSAGE_ID); - this.breadcrumbId = MDC.get(MDC_BREADCRUMB_ID); - this.correlationId = MDC.get(MDC_CORRELATION_ID); - this.camelContextId = MDC.get(MDC_CAMEL_CONTEXT_ID); - this.routeId = MDC.get(MDC_ROUTE_ID); - - if (pattern != null) { - custom = new HashMap<>(); - Map mdc = MDC.getCopyOfContextMap(); - if (mdc != null) { - if ("*".equals(pattern)) { - custom.putAll(mdc); - } else { - final String[] patterns = pattern.split(","); - mdc.forEach((k, v) -> { - if (matchPatterns(k, patterns)) { - custom.put(k, v); - } - }); - } - } - } else { - custom = null; - } - } - - @Override - public void done(boolean doneSync) { - try { - if (!doneSync) { - // when done asynchronously then restore information from previous thread - if (breadcrumbId != null) { - MDC.put(MDC_BREADCRUMB_ID, breadcrumbId); - } - if (exchangeId != null) { - MDC.put(MDC_EXCHANGE_ID, exchangeId); - } - if (messageId != null) { - MDC.put(MDC_MESSAGE_ID, messageId); - } - if (correlationId != null) { - MDC.put(MDC_CORRELATION_ID, correlationId); - } - if (camelContextId != null) { - MDC.put(MDC_CAMEL_CONTEXT_ID, camelContextId); - } - if (custom != null) { - custom.forEach(MDC::put); - } - } - // need to setup the routeId finally - if (routeId != null) { - MDC.put(MDC_ROUTE_ID, routeId); - } - - } finally { - // muse ensure delegate is invoked - delegate.done(doneSync); - } - } - - @Override - public String toString() { - return delegate.toString(); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java deleted file mode 100644 index 472a2da..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.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.impl.engine; - -import org.apache.camel.api.management.ManagedOperation; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.spi.StateRepository; -import org.apache.camel.support.service.ServiceSupport; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -/** - * This {@link MemoryStateRepository} class is a memory-based implementation of a {@link StateRepository}. - */ -@ManagedResource(description = "Memory based state repository") -public class MemoryStateRepository extends ServiceSupport implements StateRepository { - - private final ConcurrentMap cache = new ConcurrentHashMap<>(); - - @Override - @ManagedOperation(description = "Adds the value of the given key to the store") - public void setState(String key, String value) { - cache.put(key, value); - } - - @Override - @ManagedOperation(description = "Gets the value of the given key from store") - public String getState(String key) { - return cache.get(key); - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - cache.clear(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java deleted file mode 100644 index e420fb1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java +++ /dev/null @@ -1,70 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.VetoCamelContextStartException; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.OnCamelContextInitialized; -import org.apache.camel.spi.OnCamelContextStart; -import org.apache.camel.spi.OnCamelContextStop; -import org.apache.camel.support.LifecycleStrategySupport; - -/** - * {@link LifecycleStrategy} for invoking callbacks {@link OnCamelContextInitialized}, {@link OnCamelContextStart}, and {@link OnCamelContextStop} - * which has been registered in the Camel {@link org.apache.camel.spi.Registry}. - */ -class OnCamelContextLifecycleStrategy extends LifecycleStrategySupport { - - @Override - public void onContextInitialized(CamelContext context) throws VetoCamelContextStartException { - for (OnCamelContextInitialized handler : context.getRegistry().findByType(OnCamelContextInitialized.class)) { - // RoutesBuilder should register them-self to the camel context - // to avoid invoking them multiple times if routes are discovered - // from the registry (i.e. camel-main) - if (!(handler instanceof RoutesBuilder)) { - handler.onContextInitialized(context); - } - } - } - - @Override - public void onContextStart(CamelContext context) throws VetoCamelContextStartException { - for (OnCamelContextStart handler : context.getRegistry().findByType(OnCamelContextStart.class)) { - // RoutesBuilder should register them-self to the camel context - // to avoid invoking them multiple times if routes are discovered - // from the registry (i.e. camel-main) - if (!(handler instanceof RoutesBuilder)) { - handler.onContextStart(context); - } - } - } - - @Override - public void onContextStop(CamelContext context) { - for (OnCamelContextStop handler : context.getRegistry().findByType(OnCamelContextStop.class)) { - // RoutesBuilder should register them-self to the camel context - // to avoid invoking them multiple times if routes are discovered - // from the registry (i.e. camel-main) - if (!(handler instanceof RoutesBuilder)) { - handler.onContextStop(context); - } - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/PollingConsumerServicePool.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/PollingConsumerServicePool.java deleted file mode 100644 index d21cc75..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/PollingConsumerServicePool.java +++ /dev/null @@ -1,33 +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.impl.engine; - -import org.apache.camel.Endpoint; -import org.apache.camel.PollingConsumer; -import org.apache.camel.util.function.ThrowingFunction; - -import java.util.function.Function; - -/** - * {@link PollingConsumer} pool. - */ -public class PollingConsumerServicePool extends ServicePool { - - public PollingConsumerServicePool(ThrowingFunction creator, Function getEndpoint, int capacity) { - super(creator, getEndpoint, capacity); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProducerServicePool.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProducerServicePool.java deleted file mode 100644 index 07139b4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProducerServicePool.java +++ /dev/null @@ -1,33 +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.impl.engine; - -import org.apache.camel.AsyncProducer; -import org.apache.camel.Endpoint; -import org.apache.camel.util.function.ThrowingFunction; - -import java.util.function.Function; - -/** - * {@link org.apache.camel.Producer} pool. - */ -public class ProducerServicePool extends ServicePool { - - public ProducerServicePool(ThrowingFunction creator, Function getEndpoint, int capacity) { - super(creator, getEndpoint, capacity); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java deleted file mode 100644 index 87e5600..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java +++ /dev/null @@ -1,75 +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.impl.engine; - -import org.apache.camel.Endpoint; -import org.apache.camel.spi.EndpointRegistry; -import org.apache.camel.support.LRUCacheFactory; - -import java.util.HashMap; - -/** - * A provisional (temporary) {@link EndpointRegistry} that is only used during startup of Apache Camel to - * make starting Camel faster while {@link LRUCacheFactory} is warming up etc. - */ -class ProvisionalEndpointRegistry extends HashMap implements EndpointRegistry { - - @Override - public void start() { - // noop - } - - @Override - public void stop() { - // noop - } - - @Override - public int staticSize() { - return 0; - } - - @Override - public int dynamicSize() { - return 0; - } - - @Override - public int getMaximumCacheSize() { - return 0; - } - - @Override - public void purge() { - // noop - } - - @Override - public boolean isStatic(String key) { - return false; - } - - @Override - public boolean isDynamic(String key) { - return false; - } - - @Override - public void cleanUp() { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/RouteService.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/RouteService.java deleted file mode 100644 index 2e98f29..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/RouteService.java +++ /dev/null @@ -1,422 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.ErrorHandler; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.RoutePolicy; -import org.apache.camel.support.ChildServiceSupport; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.MDC; - -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; - -import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID; -import static org.apache.camel.spi.UnitOfWork.MDC_ROUTE_ID; - -/** - * Represents the runtime objects for a given route so that it can be stopped independently - * of other routes - */ -public class RouteService extends ChildServiceSupport { - - private final CamelContext camelContext; - private final Route route; - private boolean removingRoutes; - private final Map inputs = new HashMap<>(); - private final AtomicBoolean warmUpDone = new AtomicBoolean(false); - private final AtomicBoolean endpointDone = new AtomicBoolean(false); - - public RouteService(Route route) { - this.route = route; - this.camelContext = this.route.getCamelContext(); - } - - public String getId() { - return route.getId(); - } - - public CamelContext getCamelContext() { - return camelContext; - } - - public Route getRoute() { - return route; - } - - /** - * Gather all the endpoints this route service uses - *

- * This implementation finds the endpoints by searching all the child services - * for {@link EndpointAware} processors which uses an endpoint. - */ - public Set gatherEndpoints() { - Set answer = new LinkedHashSet<>(); - Set services = gatherChildServices(); - for (Service service : services) { - if (service instanceof EndpointAware) { - Endpoint endpoint = ((EndpointAware) service).getEndpoint(); - if (endpoint != null) { - answer.add(endpoint); - } - } - } - return answer; - } - - /** - * Gets the inputs to the routes. - * - * @return list of {@link Consumer} as inputs for the routes - */ - public Map getInputs() { - return inputs; - } - - public boolean isRemovingRoutes() { - return removingRoutes; - } - - public void setRemovingRoutes(boolean removingRoutes) { - this.removingRoutes = removingRoutes; - } - - public void warmUp() throws FailedToStartRouteException { - try { - doWarmUp(); - } catch (Exception e) { - throw new FailedToStartRouteException(getId(), route.getDescription(), e); - } - } - - public boolean isAutoStartup() { - if (!getCamelContext().isAutoStartup()) { - return false; - } - return getRoute().isAutoStartup(); - } - - protected synchronized void doWarmUp() throws Exception { - if (endpointDone.compareAndSet(false, true)) { - // endpoints should only be started once as they can be reused on other routes - // and whatnot, thus their lifecycle is to start once, and only to stop when Camel shutdown - // ensure endpoint is started first (before the route services, such as the consumer) - ServiceHelper.startService(route.getEndpoint()); - } - - if (warmUpDone.compareAndSet(false, true)) { - - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - // warm up the route first - route.warmUp(); - - List services = route.getServices(); - - // callback that we are staring these services - route.onStartingServices(services); - - // gather list of services to start as we need to start child services as well - Set list = new LinkedHashSet<>(); - for (Service service : services) { - list.addAll(ServiceHelper.getChildServices(service)); - } - - // split into consumers and child services as we need to start the consumers - // afterwards to avoid them being active while the others start - List childServices = new ArrayList<>(); - for (Service service : list) { - - // inject the route - if (service instanceof RouteAware) { - ((RouteAware) service).setRoute(route); - } - if (service instanceof RouteIdAware) { - ((RouteIdAware) service).setRouteId(route.getId()); - } - // inject camel context - if (service instanceof CamelContextAware) { - ((CamelContextAware) service).setCamelContext(camelContext); - } - - if (service instanceof Consumer) { - inputs.put(route, (Consumer) service); - } else { - childServices.add(service); - } - } - startChildService(route, childServices); - - // fire event - EventHelper.notifyRouteAdded(camelContext, route); - } - - // ensure lifecycle strategy is invoked which among others enlist the route in JMX - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - strategy.onRoutesAdd(Collections.singletonList(route)); - } - - // add routes to camel context - camelContext.adapt(ExtendedCamelContext.class).addRoute(route); - - // add the routes to the inflight registry so they are pre-installed - camelContext.getInflightRepository().addRoute(route.getId()); - } - } - - @Override - protected void doStart() { - try { - warmUp(); - } catch (FailedToStartRouteException e) { - throw RuntimeCamelException.wrapRuntimeException(e); - } - - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - // start the route itself - ServiceHelper.startService(route); - - // invoke callbacks on route policy - routePolicyCallback(RoutePolicy::onStart); - - // fire event - EventHelper.notifyRouteStarted(camelContext, route); - } - } - - @Override - protected void doStop() { - - // if we are stopping CamelContext then we are shutting down - boolean isShutdownCamelContext = camelContext.isStopping(); - - if (isShutdownCamelContext || isRemovingRoutes()) { - // need to call onRoutesRemove when the CamelContext is shutting down or Route is shutdown - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - strategy.onRoutesRemove(Collections.singletonList(route)); - } - } - - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - // gather list of services to stop as we need to start child services as well - Set services = gatherChildServices(); - - // stop services - stopChildService(route, services, isShutdownCamelContext); - - // stop the route itself - if (isShutdownCamelContext) { - ServiceHelper.stopAndShutdownServices(route); - } else { - ServiceHelper.stopService(route); - } - - // invoke callbacks on route policy - routePolicyCallback(RoutePolicy::onStop); - - // fire event - EventHelper.notifyRouteStopped(camelContext, route); - } - if (isRemovingRoutes()) { - camelContext.adapt(ExtendedCamelContext.class).removeRoute(route); - } - // need to warm up again - warmUpDone.set(false); - } - - @Override - protected void doShutdown() { - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - // gather list of services to stop as we need to start child services as well - Set services = gatherChildServices(); - - // shutdown services - stopChildService(route, services, true); - - // shutdown the route itself - ServiceHelper.stopAndShutdownServices(route); - - // endpoints should only be stopped when Camel is shutting down - // see more details in the warmUp method - ServiceHelper.stopAndShutdownServices(route.getEndpoint()); - - // invoke callbacks on route policy - routePolicyCallback(RoutePolicy::onRemove); - - // fire event - EventHelper.notifyRouteRemoved(camelContext, route); - } - - // need to call onRoutesRemove when the CamelContext is shutting down or Route is shutdown - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - strategy.onRoutesRemove(Collections.singletonList(route)); - } - - // remove the routes from the inflight registry - camelContext.getInflightRepository().removeRoute(route.getId()); - - // remove the routes from the collections - camelContext.adapt(ExtendedCamelContext.class).removeRoute(route); - - // clear inputs on shutdown - inputs.clear(); - warmUpDone.set(false); - endpointDone.set(false); - } - - @Override - protected void doSuspend() { - // suspend and resume logic is provided by DefaultCamelContext which leverages ShutdownStrategy - // to safely suspend and resume - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - routePolicyCallback(RoutePolicy::onSuspend); - } - } - - @Override - protected void doResume() { - // suspend and resume logic is provided by DefaultCamelContext which leverages ShutdownStrategy - // to safely suspend and resume - try (MDCHelper mdcHelper = new MDCHelper(route.getId())) { - routePolicyCallback(RoutePolicy::onResume); - } - } - - private void routePolicyCallback(java.util.function.BiConsumer callback) { - if (route.getRoutePolicyList() != null) { - for (RoutePolicy routePolicy : route.getRoutePolicyList()) { - callback.accept(routePolicy, route); - } - } - } - - protected void startChildService(Route route, List services) { - for (Service service : services) { - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - strategy.onServiceAdd(camelContext, service, route); - } - ServiceHelper.startService(service); - addChildService(service); - } - } - - protected void stopChildService(Route route, Set services, boolean shutdown) { - for (Service service : services) { - if (service instanceof ErrorHandler) { - // special for error handlers - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - ErrorHandlerFactory errorHandlerFactory = route.getErrorHandlerFactory(); - strategy.onErrorHandlerRemove(route, (Processor) service, errorHandlerFactory); - } - } else { - for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) { - strategy.onServiceRemove(camelContext, service, route); - } - } - if (shutdown) { - ServiceHelper.stopAndShutdownService(service); - } else { - ServiceHelper.stopService(service); - } - removeChildService(service); - } - } - - /** - * Gather all child services - */ - private Set gatherChildServices() { - // gather list of services to stop as we need to start child services as well - List services = new ArrayList<>(route.getServices()); - // also get route scoped services - doGetRouteServices(services); - Set list = new LinkedHashSet<>(); - for (Service service : services) { - list.addAll(ServiceHelper.getChildServices(service)); - } - // also get route scoped error handler (which must be done last) - doGetErrorHandler(list); - return list; - } - - /** - * Gather the route scoped error handler from the given route - */ - private void doGetErrorHandler(Set services) { - // only include error handlers if they are route scoped - List extra = new ArrayList<>(); - for (Service service : services) { - if (service instanceof Channel) { - Processor eh = ((Channel) service).getErrorHandler(); - if (eh instanceof Service) { - extra.add((Service) eh); - } - } - } - if (!extra.isEmpty()) { - services.addAll(extra); - } - } - - /** - * Gather all other kind of route services from the given route, - * except error handler - */ - protected void doGetRouteServices(List services) { - for (Processor proc : getRoute().getOnExceptions()) { - if (proc instanceof Service) { - services.add((Service) proc); - } - } - for (Processor proc : getRoute().getOnCompletions()) { - if (proc instanceof Service) { - services.add((Service) proc); - } - } - } - - - class MDCHelper implements AutoCloseable { - final Map originalContextMap; - - MDCHelper(String routeId) { - if (getCamelContext().isUseMDCLogging()) { - originalContextMap = MDC.getCopyOfContextMap(); - MDC.put(MDC_CAMEL_CONTEXT_ID, getCamelContext().getName()); - MDC.put(MDC_ROUTE_ID, routeId); - } else { - originalContextMap = null; - } - } - - @Override - public void close() { - if (getCamelContext().isUseMDCLogging()) { - if (originalContextMap != null) { - MDC.setContextMap(originalContextMap); - } else { - MDC.clear(); - } - } - } - - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java deleted file mode 100644 index 2555a71..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java +++ /dev/null @@ -1,359 +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.impl.engine; - -import org.apache.camel.Endpoint; -import org.apache.camel.NonManagedService; -import org.apache.camel.Service; -import org.apache.camel.support.LRUCache; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.function.ThrowingFunction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.function.Function; - -/** - * A base class for a pool for either producers or consumers used by - * {@link org.apache.camel.spi.ProducerCache} and {@link org.apache.camel.spi.ConsumerCache}. - */ -abstract class ServicePool extends ServiceSupport implements NonManagedService { - - private static final Logger LOG = LoggerFactory.getLogger(ServicePool.class); - - private final ThrowingFunction creator; - private final Function getEndpoint; - private final ConcurrentMap> pool = new ConcurrentHashMap<>(); - // keep track of all singleton endpoints with a pooled producer that are evicted - // for multi pool then they have their own house-keeping for evictions (more complex) - private final ConcurrentMap> singlePoolEvicted = new ConcurrentHashMap<>(); - private int capacity; - private Map cache; - - private interface Pool { - S acquire() throws Exception; - void release(S s); - int size(); - void stop(); - void evict(S s); - void cleanUp(); - } - - public ServicePool(ThrowingFunction creator, Function getEndpoint, int capacity) { - this.creator = creator; - this.getEndpoint = getEndpoint; - this.capacity = capacity; - // only use a LRU cache if capacity is more than one - // the LRU cache is a facade that handles the logic to know which producers/consumers to evict/remove - // when we hit max capacity. Then we remove them in the associated pool ConcurrentMap instance. - this.cache = capacity > 1 ? LRUCacheFactory.newLRUCache(capacity, this::onEvict) : null; - } - - /** - * This callback is invoked by LRUCache from a separate background cleanup thread. - * Therefore we mark the entries to be evicted from this thread only, - * and then let SinglePool and MultiPool handle the evictions (stop the producer/consumer safely) - * when they are acquiring/releases producers/consumers. If we sop the producer/consumer from the - * LRUCache background thread we can have a race condition with a pooled producer may have been - * acquired at the same time its being evicted. - */ - protected void onEvict(S s) { - Endpoint e = getEndpoint.apply(s); - Pool p = pool.get(e); - if (p != null) { - p.evict(s); - } else { - // service no longer in a pool (such as being released twice, or can happen during shutdown of Camel etc) - ServicePool.stop(s); - try { - e.getCamelContext().removeService(s); - } catch (Exception ex) { - LOG.debug("Error removing service: {}", s, ex); - } - } - } - - /** - * Tries to acquire the producer/consumer with the given key - * - * @param endpoint the endpoint - * @return the acquired producer/consumer - */ - public S acquire(Endpoint endpoint) throws Exception { - if (!isStarted()) { - return null; - } - S s = getOrCreatePool(endpoint).acquire(); - if (s != null && cache != null) { - cache.putIfAbsent(s, s); - } - return s; - } - - /** - * Releases the producer/consumer back to the pool - * - * @param endpoint the endpoint - * @param s the producer/consumer - */ - public void release(Endpoint endpoint, S s) { - Pool p = pool.get(endpoint); - if (p != null) { - p.release(s); - } - } - - private Pool getOrCreatePool(Endpoint endpoint) { - return pool.computeIfAbsent(endpoint, this::createPool); - } - - private Pool createPool(Endpoint endpoint) { - boolean singleton = endpoint.isSingletonProducer(); - if (singleton) { - return new SinglePool(endpoint); - } else { - return new MultiplePool(endpoint); - } - } - - /** - * Returns the current size of the pool - */ - public int size() { - return pool.values().stream().mapToInt(Pool::size).sum(); - } - - /** - * Cleanup the pool (removing stale instances that should be evicted) - */ - public void cleanUp() { - if (cache instanceof LRUCache) { - ((LRUCache) cache).cleanUp(); - } - pool.values().forEach(Pool::cleanUp); - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - cleanUp(); - - pool.values().forEach(Pool::stop); - pool.clear(); - if (cache != null) { - cache.values().forEach(ServicePool::stop); - cache.clear(); - } - singlePoolEvicted.values().forEach(Pool::stop); - singlePoolEvicted.clear(); - } - - /** - * Stosp the service safely - */ - private static void stop(S s) { - try { - s.stop(); - } catch (Exception e) { - LOG.debug("Error stopping service: {}", s, e); - } - } - - /** - * Pool used for singleton producers or consumers which are thread-safe - * and can be shared by multiple worker threads at any given time. - */ - private class SinglePool implements Pool { - private final Endpoint endpoint; - private volatile S s; - - SinglePool(Endpoint endpoint) { - this.endpoint = endpoint; - } - - @Override - public S acquire() throws Exception { - cleanupEvicts(); - - if (s == null) { - synchronized (this) { - if (s == null) { - LOG.trace("Creating service from endpoint: {}", endpoint); - S tempS = creator.apply(endpoint); - endpoint.getCamelContext().addService(tempS, true, true); - s = tempS; - } - } - } - LOG.trace("Acquired service: {}", s); - return s; - } - - @Override - public void release(S s) { - cleanupEvicts(); - - // noop - LOG.trace("Released service: {}", s); - } - - @Override - public int size() { - return s != null ? 1 : 0; - } - - @Override - public void stop() { - S toStop; - synchronized (this) { - toStop = s; - s = null; - } - doStop(toStop); - pool.remove(endpoint); - } - - @Override - public void evict(S s) { - singlePoolEvicted.putIfAbsent(endpoint, this); - } - - @Override - public void cleanUp() { - cleanupEvicts(); - } - - private void cleanupEvicts() { - singlePoolEvicted.forEach((e, p) -> { - doStop(e); - p.stop(); - singlePoolEvicted.remove(e); - }); - } - - void doStop(Service s) { - if (s != null) { - ServicePool.stop(s); - try { - endpoint.getCamelContext().removeService(s); - } catch (Exception e) { - LOG.debug("Error removing service: {}", s, e); - } - } - } - } - - /** - * Pool used for non-singleton producers or consumers which are not thread-safe - * and can only be used by one worker thread at any given time. - */ - private class MultiplePool implements Pool { - private final Endpoint endpoint; - private final BlockingQueue queue; - private final List evicts; - - MultiplePool(Endpoint endpoint) { - this.endpoint = endpoint; - this.queue = new ArrayBlockingQueue<>(capacity); - this.evicts = new ArrayList<>(); - } - - private void cleanupEvicts() { - if (!evicts.isEmpty()) { - synchronized (this) { - if (!evicts.isEmpty()) { - evicts.forEach(this::doStop); - evicts.forEach(queue::remove); - evicts.clear(); - if (queue.isEmpty()) { - pool.remove(endpoint); - } - } - } - } - } - - @Override - public S acquire() throws Exception { - cleanupEvicts(); - - S s = queue.poll(); - if (s == null) { - s = creator.apply(endpoint); - s.start(); - } - return s; - } - - @Override - public void release(S s) { - cleanupEvicts(); - - if (!queue.offer(s)) { - // there is no room so lets just stop and discard this - doStop(s); - } - } - - @Override - public int size() { - return queue.size(); - } - - @Override - public void stop() { - queue.forEach(this::doStop); - queue.clear(); - pool.remove(endpoint); - } - - @Override - public void evict(S s) { - // to be evicted - evicts.add(s); - } - - @Override - public void cleanUp() { - cleanupEvicts(); - } - - void doStop(Service s) { - if (s != null) { - ServicePool.stop(s); - try { - endpoint.getCamelContext().removeService(s); - } catch (Exception e) { - LOG.debug("Error removing service: {}", s, e); - } - } - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java deleted file mode 100644 index 9607107..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java +++ /dev/null @@ -1,359 +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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.catalog.RuntimeCamelCatalog; -import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.converter.DefaultTypeConverter; -import org.apache.camel.impl.transformer.TransformerKey; -import org.apache.camel.impl.validator.ValidatorKey; -import org.apache.camel.processor.MulticastProcessor; -import org.apache.camel.spi.*; -import org.apache.camel.support.DefaultRegistry; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ExecutorService; - -/** - * Represents the context used to configure routes and the policies to use. - */ -public class SimpleCamelContext extends AbstractCamelContext { - - private static final Logger LOG = LoggerFactory.getLogger(SimpleCamelContext.class); - - /** - * Creates the {@link CamelContext} using {@link DefaultRegistry} as - * registry. - *

- * Use one of the other constructors to force use an explicit registry. - */ - public SimpleCamelContext() { - this(true); - } - - /** - * Creates the {@link CamelContext} and allows to control whether the - * context should automatic initialize or not. - *

- * This is used by some Camel components such as camel-cdi and - * camel-blueprint, however this constructor is not intended for regular - * Camel end users. - * - * @param init whether to automatic initialize. - */ - public SimpleCamelContext(boolean init) { - super(init); - } - - @Override - protected HealthCheckRegistry createHealthCheckRegistry() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(HealthCheckRegistry.FACTORY, HealthCheckRegistry.class) - .resolve(getCamelContextReference()).orElse(null); - } - - @Override - protected TypeConverter createTypeConverter() { - return new DefaultTypeConverter(getCamelContextReference(), getPackageScanClassResolver(), getInjector(), - getDefaultFactoryFinder(), isLoadTypeConverters()); - } - - @Override - protected TypeConverterRegistry createTypeConverterRegistry() { - TypeConverter typeConverter = getTypeConverter(); - // type converter is also registry so create type converter - if (typeConverter == null) { - typeConverter = createTypeConverter(); - } - if (typeConverter instanceof TypeConverterRegistry) { - return (TypeConverterRegistry)typeConverter; - } - return null; - } - - @Override - protected Injector createInjector() { - FactoryFinder finder = getDefaultFactoryFinder(); - return finder.newInstance("Injector", Injector.class).orElse(new DefaultInjector(getCamelContextReference())); - } - - @Override - protected PropertiesComponent createPropertiesComponent() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(PropertiesComponent.FACTORY, PropertiesComponent.class) - .resolve(getCamelContextReference()) - .orElseGet(org.apache.camel.component.properties.PropertiesComponent::new); - } - - @Override - protected CamelBeanPostProcessor createBeanPostProcessor() { - return new DefaultCamelBeanPostProcessor(getCamelContextReference()); - } - - @Override - protected ComponentResolver createComponentResolver() { - return new DefaultComponentResolver(); - } - - @Override - protected ComponentNameResolver createComponentNameResolver() { - return new DefaultComponentNameResolver(); - } - - @Override - protected Registry createRegistry() { - return new DefaultRegistry(); - } - - @Override - protected UuidGenerator createUuidGenerator() { - return new DefaultUuidGenerator(); - } - - @Override - protected ModelJAXBContextFactory createModelJAXBContextFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(ModelJAXBContextFactory.FACTORY, ModelJAXBContextFactory.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find ModelJAXBContextFactory on classpath. " - + "Add camel-xml-jaxb to classpath.")); - } - - @Override - protected NodeIdFactory createNodeIdFactory() { - return new DefaultNodeIdFactory(); - } - - @Override - protected FactoryFinderResolver createFactoryFinderResolver() { - return new DefaultFactoryFinderResolver(); - } - - @Override - protected ClassResolver createClassResolver() { - return new DefaultClassResolver(getCamelContextReference()); - } - - @Override - protected ProcessorFactory createProcessorFactory() { - return new DefaultProcessorFactory(); - } - - @Override - protected DataFormatResolver createDataFormatResolver() { - return new DefaultDataFormatResolver(); - } - - @Override - protected MessageHistoryFactory createMessageHistoryFactory() { - return new DefaultMessageHistoryFactory(); - } - - @Override - protected InflightRepository createInflightRepository() { - return new DefaultInflightRepository(); - } - - @Override - protected AsyncProcessorAwaitManager createAsyncProcessorAwaitManager() { - return new DefaultAsyncProcessorAwaitManager(); - } - - @Override - protected RouteController createRouteController() { - return new DefaultRouteController(getCamelContextReference()); - } - - @Override - protected ShutdownStrategy createShutdownStrategy() { - return new DefaultShutdownStrategy(getCamelContextReference()); - } - - @Override - protected PackageScanClassResolver createPackageScanClassResolver() { - PackageScanClassResolver packageScanClassResolver; - // use WebSphere specific resolver if running on WebSphere - if (WebSpherePackageScanClassResolver.isWebSphereClassLoader(this.getClass().getClassLoader())) { - LOG.info("Using WebSphere specific PackageScanClassResolver"); - packageScanClassResolver = new WebSpherePackageScanClassResolver("META-INF/services/org/apache/camel/TypeConverter"); - } else { - packageScanClassResolver = new DefaultPackageScanClassResolver(); - } - return packageScanClassResolver; - } - - @Override - protected PackageScanResourceResolver createPackageScanResourceResolver() { - return new DefaultPackageScanResourceResolver(); - } - - @Override - protected UnitOfWorkFactory createUnitOfWorkFactory() { - return new DefaultUnitOfWorkFactory(); - } - - @Override - protected RuntimeCamelCatalog createRuntimeCamelCatalog() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(RuntimeCamelCatalog.FACTORY, RuntimeCamelCatalog.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find RuntimeCamelCatalog on classpath. " - + "Add camel-core-catalog to classpath.")); - } - - @Override - protected CamelContextNameStrategy createCamelContextNameStrategy() { - return new DefaultCamelContextNameStrategy(); - } - - @Override - protected ManagementNameStrategy createManagementNameStrategy() { - return new DefaultManagementNameStrategy(getCamelContextReference()); - } - - @Override - protected HeadersMapFactory createHeadersMapFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(HeadersMapFactory.FACTORY, HeadersMapFactory.class) - .resolve(getCamelContextReference()) - .orElseGet(DefaultHeadersMapFactory::new); - } - - @Override - protected BeanProxyFactory createBeanProxyFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find BeanProxyFactory on classpath. " - + "Add camel-bean to classpath.")); - } - - @Override - protected BeanProcessorFactory createBeanProcessorFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(BeanProcessorFactory.FACTORY, BeanProcessorFactory.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find BeanProcessorFactory on classpath. " - + "Add camel-bean to classpath.")); - } - - @Override - protected BeanIntrospection createBeanIntrospection() { - return new DefaultBeanIntrospection(); - } - - @Override - protected XMLRoutesDefinitionLoader createXMLRoutesDefinitionLoader() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(XMLRoutesDefinitionLoader.FACTORY, XMLRoutesDefinitionLoader.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find XMLRoutesDefinitionLoader on classpath. " - + "Add either camel-xml-io or camel-xml-jaxb to classpath.")); - } - - @Override - protected ModelToXMLDumper createModelToXMLDumper() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(ModelToXMLDumper.FACTORY, ModelToXMLDumper.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find ModelToXMLDumper on classpath. " - + "Add camel-xml-jaxb to classpath.")); - } - - @Override - protected RestBindingJaxbDataFormatFactory createRestBindingJaxbDataFormatFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(RestBindingJaxbDataFormatFactory.FACTORY, RestBindingJaxbDataFormatFactory.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find RestBindingJaxbDataFormatFactory on classpath. " - + "Add camel-jaxb to classpath.")); - } - - @Override - protected Tracer createTracer() { - Tracer tracer = null; - if (getRegistry() != null) { - // lookup in registry - Map map = getRegistry().findByTypeWithName(Tracer.class); - if (map.size() == 1) { - tracer = map.values().iterator().next(); - } - } - if (tracer == null) { - tracer = getExtension(Tracer.class); - } - if (tracer == null) { - tracer = new DefaultTracer(); - setExtension(Tracer.class, tracer); - } - return tracer; - } - - @Override - protected LanguageResolver createLanguageResolver() { - return new DefaultLanguageResolver(); - } - - @Override - protected ConfigurerResolver createConfigurerResolver() { - return new DefaultConfigurerResolver(); - } - - @Override - protected RestRegistryFactory createRestRegistryFactory() { - return new org.apache.camel.impl.engine.BaseServiceResolver<>(RestRegistryFactory.FACTORY, RestRegistryFactory.class) - .resolve(getCamelContextReference()) - .orElseThrow(() -> new IllegalArgumentException("Cannot find RestRegistryFactory on classpath. " - + "Add camel-rest to classpath.")); - } - - @Override - protected EndpointRegistry createEndpointRegistry(Map endpoints) { - return new DefaultEndpointRegistry(getCamelContextReference(), endpoints); - } - - @Override - protected StreamCachingStrategy createStreamCachingStrategy() { - return new DefaultStreamCachingStrategy(); - } - - @Override - protected ReactiveExecutor createReactiveExecutor() { - return new BaseServiceResolver<>(ReactiveExecutor.FACTORY, ReactiveExecutor.class) - .resolve(getCamelContextReference()) - .orElseGet(DefaultReactiveExecutor::new); - } - - @Override - public AsyncProcessor createMulticast(Collection processors, ExecutorService executor, boolean shutdownExecutorService) { - return new MulticastProcessor(getCamelContextReference(), null, processors, null, true, executor, shutdownExecutorService, false, false, 0, null, false, false); - } - - @Override - protected ValidatorRegistry createValidatorRegistry() { - return new DefaultValidatorRegistry(getCamelContextReference()); - } - - @Override - protected TransformerRegistry createTransformerRegistry() { - return new DefaultTransformerRegistry(getCamelContextReference()); - } - - @Override - protected ExecutorServiceManager createExecutorServiceManager() { - return new BaseExecutorServiceManager(getCamelContextReference()); - } - - @Override - public Processor createErrorHandler(Route route, Processor processor) throws Exception { - throw new UnsupportedOperationException(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java deleted file mode 100644 index ab36949..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.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.impl.engine; - -import org.apache.camel.*; -import org.apache.camel.processor.CamelInternalProcessor; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.builder.PredicateBuilder; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * A {@link Processor} which is used for POJO @Consume where you can have multiple @Consume on the same endpoint/consumer - * and via predicate's can filter and call different methods. - */ -public final class SubscribeMethodProcessor extends AsyncProcessorSupport implements Navigate { - - private final Endpoint endpoint; - private final Map methods = new LinkedHashMap<>(); - - public SubscribeMethodProcessor(Endpoint endpoint) { - this.endpoint = endpoint; - } - - public Endpoint getEndpoint() { - return endpoint; - } - - public void addMethod(final Object pojo, final Method method, final Endpoint endpoint, String predicate) throws Exception { - Processor answer = endpoint.getCamelContext().adapt(ExtendedCamelContext.class) - .getBeanProcessorFactory().createBeanProcessor(endpoint.getCamelContext(), pojo, method); - // must ensure the consumer is being executed in an unit of work so synchronization callbacks etc is invoked - CamelInternalProcessor internal = new CamelInternalProcessor(endpoint.getCamelContext(), answer); - internal.addAdvice(new CamelInternalProcessor.UnitOfWorkProcessorAdvice(null, endpoint.getCamelContext())); - - Predicate p; - if (ObjectHelper.isEmpty(predicate)) { - p = PredicateBuilder.constant(true); - } else { - p = endpoint.getCamelContext().resolveLanguage("simple").createPredicate(predicate); - } - methods.put(internal, p); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - // evaluate which predicate matches and call the method - for (Map.Entry entry : methods.entrySet()) { - Predicate predicate = entry.getValue(); - if (predicate.matches(exchange)) { - return entry.getKey().process(exchange, callback); - } - } - } catch (Throwable e) { - exchange.setException(e); - } - callback.done(true); - return true; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(methods.keySet()); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(methods.keySet()); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(methods.keySet()); - } - - @Override - public String toString() { - return "SubscribeMethodProcessor[" + endpoint + "]"; - } - - @Override - public List next() { - return new ArrayList<>(methods.keySet()); - } - - @Override - public boolean hasNext() { - return !methods.isEmpty(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/TypedProcessorFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/TypedProcessorFactory.java deleted file mode 100644 index 846aba7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/TypedProcessorFactory.java +++ /dev/null @@ -1,64 +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.impl.engine; - -import org.apache.camel.CamelContext; -import org.apache.camel.NamedNode; -import org.apache.camel.Processor; -import org.apache.camel.Route; -import org.apache.camel.spi.ProcessorFactory; - -import java.util.Map; - -public class TypedProcessorFactory implements ProcessorFactory { - private final Class type; - - protected TypedProcessorFactory(Class type) { - this.type = type; - } - - @Override - public Processor createChildProcessor(Route route, NamedNode definition, boolean mandatory) throws Exception { - if (type.isInstance(definition)) { - return doCreateChildProcessor(route, type.cast(definition), mandatory); - } - - return null; - } - - @Override - public Processor createProcessor(Route route, NamedNode definition) throws Exception { - if (type.isInstance(definition)) { - return doCreateProcessor(route, type.cast(definition)); - } - - return null; - } - - @Override - public Processor createProcessor(CamelContext camelContext, String definitionName, Map args) throws Exception { - return null; - } - - protected Processor doCreateChildProcessor(Route route, T definition, boolean mandatory) throws Exception { - return null; - } - - public Processor doCreateProcessor(Route route, T definition) throws Exception { - return null; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java deleted file mode 100644 index 8a0b84e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/engine/WebSpherePackageScanClassResolver.java +++ /dev/null @@ -1,77 +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.impl.engine; - -import java.io.IOException; -import java.net.URL; -import java.util.Enumeration; - -/** - * WebSphere specific resolver to handle loading annotated resources in JAR files. - */ -public class WebSpherePackageScanClassResolver extends DefaultPackageScanClassResolver { - - private final String resourcePath; - - /** - * Constructor. - * - * @param resourcePath the fixed resource path to use for fetching camel jars in WebSphere. - */ - public WebSpherePackageScanClassResolver(String resourcePath) { - this.resourcePath = resourcePath; - } - - /** - * Is the classloader from IBM and thus the WebSphere platform? - * - * @param loader the classloader - * @return true if IBM classloader, false otherwise. - */ - public static boolean isWebSphereClassLoader(ClassLoader loader) { - return loader != null ? loader.getClass().getName().startsWith("com.ibm.") : false; - } - - /** - * Overloaded to handle specific problem with getting resources on the IBM WebSphere platform. - *

- * WebSphere can not load resources if the resource to load is a folder name, such as a - * packagename, you have to explicit name a resource that is a file. - * - * @param loader the classloader - * @param packageName the packagename for the package to load - * @return URL's for the given package - * @throws IOException is thrown by the classloader - */ - @Override - protected Enumeration getResources(ClassLoader loader, String packageName) throws IOException { - // try super first, just in vase - Enumeration enumeration = super.getResources(loader, packageName); - if (!enumeration.hasMoreElements()) { - log.trace("Using WebSphere workaround to load the camel jars with the annotated converters."); - // Special WebSphere trick to load a file that exists in the JAR and then let it go from there. - // The trick is that we just need the URL's for the .jars that contains the type - // converters that is annotated. So by searching for this resource WebSphere is able to find - // it and return the URL to the .jar file with the resource. Then the DefaultPackageScanClassResolver - // can take it from there and find the classes that are annotated. - enumeration = loader.getResources(resourcePath); - } - - return enumeration; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java deleted file mode 100644 index 39e8602..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java +++ /dev/null @@ -1,40 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent.CamelContextEvent; - -import java.util.EventObject; - -/** - * Base class for {@link CamelContext} events. - */ -public abstract class AbstractContextEvent extends EventObject implements CamelContextEvent { - private static final long serialVersionUID = 1L; - private CamelContext context; - - public AbstractContextEvent(CamelContext source) { - super(source); - this.context = source; - } - - @Override - public CamelContext getContext() { - return context; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java deleted file mode 100644 index c4f2304..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java +++ /dev/null @@ -1,40 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent.ExchangeEvent; - -import java.util.EventObject; - -/** - * Base class for {@link Exchange} events. - */ -public abstract class AbstractExchangeEvent extends EventObject implements ExchangeEvent { - private static final long serialVersionUID = 1L; - private final Exchange exchange; - - public AbstractExchangeEvent(Exchange source) { - super(source); - this.exchange = source; - } - - @Override - public Exchange getExchange() { - return exchange; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java deleted file mode 100644 index ffacab5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.Route; -import org.apache.camel.spi.CamelEvent.RouteEvent; - -import java.util.EventObject; - -/** - * Base class for {@link CamelContext} events. - */ -public abstract class AbstractRouteEvent extends EventObject implements RouteEvent { - private static final long serialVersionUID = 1L; - private Route route; - - public AbstractRouteEvent(Route source) { - super(source); - this.route = source; - } - - @Override - public Route getRoute() { - return route; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractStepEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractStepEvent.java deleted file mode 100644 index 344f8da..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractStepEvent.java +++ /dev/null @@ -1,37 +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.impl.event; - -import org.apache.camel.Exchange; - -/** - * Base class for step events. - */ -public abstract class AbstractStepEvent extends AbstractExchangeEvent { - private static final long serialVersionUID = 1L; - - private final String stepId; - - public AbstractStepEvent(Exchange source, String stepId) { - super(source); - this.stepId = stepId; - } - - public String getStepId() { - return stepId; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java deleted file mode 100644 index a277459..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextInitializedEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartingEvent { - private static final long serialVersionUID = -3416082218670845373L; - - public CamelContextInitializedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Initialized CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java deleted file mode 100644 index 9674817..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextInitializingEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartingEvent { - private static final long serialVersionUID = 3931186946570864733L; - - public CamelContextInitializingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Initializing CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java deleted file mode 100644 index 5adac86..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextResumeFailureEvent extends AbstractContextEvent implements CamelEvent.CamelContextResumeFailureEvent { - private static final long serialVersionUID = -4271899927507894566L; - - private Throwable cause; - - public CamelContextResumeFailureEvent(CamelContext context, Throwable cause) { - super(context); - this.cause = cause; - } - - @Override - public Throwable getCause() { - return cause; - } - - @Override - public String toString() { - return "Failed to resume Camel: " + getContext().getName() + " due to " + cause.getMessage(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java deleted file mode 100644 index 428ebab..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextResumedEvent extends AbstractContextEvent implements CamelEvent.CamelContextResumedEvent { - private static final long serialVersionUID = 6761726800283234512L; - - public CamelContextResumedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Resumed CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java deleted file mode 100644 index 6ca44ad..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextResumingEvent extends AbstractContextEvent implements CamelEvent.CamelContextResumingEvent { - private static final long serialVersionUID = 6761726800283234511L; - - public CamelContextResumingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Resuming CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartedEvent.java deleted file mode 100644 index cded744..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextRoutesStartedEvent extends AbstractContextEvent implements CamelEvent.CamelContextRoutesStartedEvent { - private static final long serialVersionUID = -1120225323715688981L; - - public CamelContextRoutesStartedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Started routes on CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartingEvent.java deleted file mode 100644 index 76a0e60..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStartingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextRoutesStartingEvent extends AbstractContextEvent implements CamelEvent.CamelContextRoutesStartingEvent { - private static final long serialVersionUID = -1120225323715688981L; - - public CamelContextRoutesStartingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Starting routes on CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppedEvent.java deleted file mode 100644 index 7c37a5b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextRoutesStoppedEvent extends AbstractContextEvent implements CamelEvent.CamelContextRoutesStoppedEvent { - private static final long serialVersionUID = -1120225323715688981L; - - public CamelContextRoutesStoppedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Stopped routes on CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppingEvent.java deleted file mode 100644 index 8e80ced..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextRoutesStoppingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextRoutesStoppingEvent extends AbstractContextEvent implements CamelEvent.CamelContextRoutesStoppingEvent { - private static final long serialVersionUID = -1120225323715688981L; - - public CamelContextRoutesStoppingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Stopping routes on CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java deleted file mode 100644 index e2bd0eb..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStartedEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartedEvent { - private static final long serialVersionUID = 6761726800283073490L; - - public CamelContextStartedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Started CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java deleted file mode 100644 index 7c0511b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStartingEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartingEvent { - private static final long serialVersionUID = -1120225323715688981L; - - public CamelContextStartingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Starting CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java deleted file mode 100644 index 4981211..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStartupFailureEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartupFailureEvent { - private static final long serialVersionUID = -4271899927507894567L; - - private Throwable cause; - - public CamelContextStartupFailureEvent(CamelContext context, Throwable cause) { - super(context); - this.cause = cause; - } - - @Override - public Throwable getCause() { - return cause; - } - - @Override - public String toString() { - return "Failed to start Camel: " + getContext().getName() + " due to " + cause.getMessage(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java deleted file mode 100644 index f5d44f6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStopFailureEvent extends AbstractContextEvent implements CamelEvent.CamelContextStopFailureEvent { - private static final long serialVersionUID = -802046840118188292L; - - private Throwable cause; - - public CamelContextStopFailureEvent(CamelContext context, Throwable cause) { - super(context); - this.cause = cause; - } - - @Override - public Throwable getCause() { - return cause; - } - - @Override - public String toString() { - return "Failed to stop Camel: " + getContext().getName() + " due to " + cause.getMessage(); - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java deleted file mode 100644 index b2bbbb6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStoppedEvent extends AbstractContextEvent implements CamelEvent.CamelContextStoppedEvent { - private static final long serialVersionUID = -8406258841784891998L; - - public CamelContextStoppedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Stopped CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java deleted file mode 100644 index 7f03a09..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextStoppingEvent extends AbstractContextEvent implements CamelEvent.CamelContextStoppingEvent { - private static final long serialVersionUID = -1074581102102126334L; - - public CamelContextStoppingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Stopping CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java deleted file mode 100644 index 99d4e56..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextSuspendedEvent extends AbstractContextEvent implements CamelEvent.CamelContextSuspendedEvent { - private static final long serialVersionUID = 6761726800283072242L; - - public CamelContextSuspendedEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Suspended CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java deleted file mode 100644 index a7eccf2..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -public class CamelContextSuspendingEvent extends AbstractContextEvent implements CamelEvent.CamelContextSuspendingEvent { - private static final long serialVersionUID = 6761726800283072241L; - - public CamelContextSuspendingEvent(CamelContext source) { - super(source); - } - - @Override - public String toString() { - return "Suspending CamelContext: " + getContext().getName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java deleted file mode 100644 index cf48dbe..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java +++ /dev/null @@ -1,208 +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.impl.event; - -import org.apache.camel.*; -import org.apache.camel.spi.CamelEvent; -import org.apache.camel.spi.EventFactory; - -/** - * Default implementation of the {@link EventFactory}. - */ -public class DefaultEventFactory implements EventFactory { - - @Override - public CamelEvent createCamelContextInitializingEvent(CamelContext context) { - return new CamelContextInitializingEvent(context); - } - - @Override - public CamelEvent createCamelContextInitializedEvent(CamelContext context) { - return new CamelContextInitializedEvent(context); - } - - @Override - public CamelEvent createCamelContextStartingEvent(CamelContext context) { - return new CamelContextStartingEvent(context); - } - - @Override - public CamelEvent createCamelContextStartedEvent(CamelContext context) { - return new CamelContextStartedEvent(context); - } - - @Override - public CamelEvent createCamelContextStoppingEvent(CamelContext context) { - return new CamelContextStoppingEvent(context); - } - - @Override - public CamelEvent createCamelContextStoppedEvent(CamelContext context) { - return new CamelContextStoppedEvent(context); - } - - @Override - public CamelEvent createCamelContextRoutesStartingEvent(CamelContext context) { - return new CamelContextRoutesStartingEvent(context); - } - - @Override - public CamelEvent createCamelContextRoutesStartedEvent(CamelContext context) { - return new CamelContextRoutesStartedEvent(context); - } - - @Override - public CamelEvent createCamelContextRoutesStoppingEvent(CamelContext context) { - return new CamelContextRoutesStoppingEvent(context); - } - - @Override - public CamelEvent createCamelContextRoutesStoppedEvent(CamelContext context) { - return new CamelContextRoutesStoppedEvent(context); - } - - @Override - public CamelEvent createCamelContextStartupFailureEvent(CamelContext context, Throwable cause) { - return new CamelContextStartupFailureEvent(context, cause); - } - - @Override - public CamelEvent createCamelContextStopFailureEvent(CamelContext context, Throwable cause) { - return new CamelContextStopFailureEvent(context, cause); - } - - @Override - public CamelEvent createServiceStartupFailureEvent(CamelContext context, Object service, Throwable cause) { - return new ServiceStartupFailureEvent(context, service, cause); - } - - @Override - public CamelEvent createServiceStopFailureEvent(CamelContext context, Object service, Throwable cause) { - return new ServiceStopFailureEvent(context, service, cause); - } - - @Override - public CamelEvent createRouteStartedEvent(Route route) { - return new RouteStartedEvent(route); - } - - @Override - public CamelEvent createRouteStoppedEvent(Route route) { - return new RouteStoppedEvent(route); - } - - @Override - public CamelEvent createRouteAddedEvent(Route route) { - return new RouteAddedEvent(route); - } - - @Override - public CamelEvent createRouteRemovedEvent(Route route) { - return new RouteRemovedEvent(route); - } - - @Override - public CamelEvent createExchangeCreatedEvent(Exchange exchange) { - return new ExchangeCreatedEvent(exchange); - } - - @Override - public CamelEvent createExchangeCompletedEvent(Exchange exchange) { - return new ExchangeCompletedEvent(exchange); - } - - @Override - public CamelEvent createExchangeFailedEvent(Exchange exchange) { - return new ExchangeFailedEvent(exchange); - } - - @Override - public CamelEvent createExchangeFailureHandlingEvent(Exchange exchange, Processor failureHandler, boolean deadLetterChannel, String deadLetterUri) { - // unwrap delegate processor - Processor handler = failureHandler; - if (handler instanceof DelegateProcessor) { - handler = ((DelegateProcessor) handler).getProcessor(); - } - return new ExchangeFailureHandlingEvent(exchange, handler, deadLetterChannel, deadLetterUri); - } - - @Override - public CamelEvent createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, - boolean deadLetterChannel, String deadLetterUri) { - // unwrap delegate processor - Processor handler = failureHandler; - if (handler instanceof DelegateProcessor) { - handler = ((DelegateProcessor) handler).getProcessor(); - } - return new ExchangeFailureHandledEvent(exchange, handler, deadLetterChannel, deadLetterUri); - } - - @Override - public CamelEvent createExchangeRedeliveryEvent(Exchange exchange, int attempt) { - return new ExchangeRedeliveryEvent(exchange, attempt); - } - - @Override - public CamelEvent createExchangeSendingEvent(Exchange exchange, Endpoint endpoint) { - return new ExchangeSendingEvent(exchange, endpoint); - } - - @Override - public CamelEvent createExchangeSentEvent(Exchange exchange, Endpoint endpoint, long timeTaken) { - return new ExchangeSentEvent(exchange, endpoint, timeTaken); - } - - @Override - public CamelEvent createStepStartedEvent(Exchange exchange, String stepId) { - return new StepStartedEvent(exchange, stepId); - } - - @Override - public CamelEvent createStepCompletedEvent(Exchange exchange, String stepId) { - return new StepCompletedEvent(exchange, stepId); - } - - @Override - public CamelEvent createStepFailedEvent(Exchange exchange, String stepId) { - return new StepFailedEvent(exchange, stepId); - } - - @Override - public CamelEvent createCamelContextSuspendingEvent(CamelContext context) { - return new CamelContextSuspendingEvent(context); - } - - @Override - public CamelEvent createCamelContextSuspendedEvent(CamelContext context) { - return new CamelContextSuspendedEvent(context); - } - - @Override - public CamelEvent createCamelContextResumingEvent(CamelContext context) { - return new CamelContextResumingEvent(context); - } - - @Override - public CamelEvent createCamelContextResumedEvent(CamelContext context) { - return new CamelContextResumedEvent(context); - } - - @Override - public CamelEvent createCamelContextResumeFailureEvent(CamelContext context, Throwable cause) { - return new CamelContextResumeFailureEvent(context, cause); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java deleted file mode 100644 index eb34246..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -public class ExchangeCompletedEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeCompletedEvent { - private static final long serialVersionUID = -3231801412021356098L; - - public ExchangeCompletedEvent(Exchange source) { - super(source); - } - - @Override - public String toString() { - return getExchange().getExchangeId() + " exchange completed: " + getExchange(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java deleted file mode 100644 index 2205081..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java +++ /dev/null @@ -1,40 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event after an {@link Exchange} has been created. - *

- * Notice: This event may be emitted after an {@link ExchangeSendingEvent}, and - * therefore its not guaranteed this event is the first event being send for a given {@link Exchange} - * lifecycle. - */ -public class ExchangeCreatedEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeCreatedEvent { - private static final long serialVersionUID = -19248832613958243L; - - public ExchangeCreatedEvent(Exchange source) { - super(source); - } - - @Override - public String toString() { - return getExchange().getExchangeId() + " exchange created: " + getExchange(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java deleted file mode 100644 index 27ae7f9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java +++ /dev/null @@ -1,44 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -public class ExchangeFailedEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeFailedEvent { - private static final long serialVersionUID = -8484326904627268101L; - - public ExchangeFailedEvent(Exchange source) { - super(source); - } - - @Override - public Throwable getCause() { - return getExchange().getException(); - } - - @Override - public String toString() { - Exception cause = getExchange().getException(); - if (cause != null) { - return getExchange().getExchangeId() + " exchange failure: " + getExchange() + " cause " + cause; - } else { - return getExchange().getExchangeId() + " exchange failure: " + getExchange(); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java deleted file mode 100644 index 08fe6fc..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; -import org.apache.camel.Processor; -import org.apache.camel.spi.CamelEvent; -import org.apache.camel.util.URISupport; - -public class ExchangeFailureHandledEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeFailureHandledEvent { - private static final long serialVersionUID = -7554809462006009548L; - - private final transient Processor failureHandler; - private final boolean deadLetterChannel; - private final String deadLetterUri; - private final boolean handled; - - public ExchangeFailureHandledEvent(Exchange source, Processor failureHandler, boolean deadLetterChannel, String deadLetterUri) { - super(source); - this.failureHandler = failureHandler; - this.deadLetterChannel = deadLetterChannel; - this.deadLetterUri = deadLetterUri; - this.handled = source.adapt(ExtendedExchange.class).getErrorHandlerHandled() != null && source.adapt(ExtendedExchange.class).getErrorHandlerHandled(); - } - - @Override - public Processor getFailureHandler() { - return failureHandler; - } - - @Override - public boolean isDeadLetterChannel() { - return deadLetterChannel; - } - - @Override - public String getDeadLetterUri() { - return deadLetterUri; - } - - public boolean isHandled() { - return handled; - } - - public boolean isContinued() { - return !handled; - } - - @Override - public String toString() { - if (isDeadLetterChannel()) { - String uri = URISupport.sanitizeUri(deadLetterUri); - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was handled by dead letter channel: " + uri; - } else { - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but was processed by failure processor: " + failureHandler; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java deleted file mode 100644 index 075a70d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.spi.CamelEvent; -import org.apache.camel.util.URISupport; - -public class ExchangeFailureHandlingEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeFailureHandlingEvent { - private static final long serialVersionUID = -7554809462006009549L; - - private final transient Processor failureHandler; - private final boolean deadLetterChannel; - private final String deadLetterUri; - - public ExchangeFailureHandlingEvent(Exchange source, Processor failureHandler, boolean deadLetterChannel, String deadLetterUri) { - super(source); - this.failureHandler = failureHandler; - this.deadLetterChannel = deadLetterChannel; - this.deadLetterUri = deadLetterUri; - } - - @Override - public Processor getFailureHandler() { - return failureHandler; - } - - @Override - public boolean isDeadLetterChannel() { - return deadLetterChannel; - } - - @Override - public String getDeadLetterUri() { - return deadLetterUri; - } - - @Override - public String toString() { - if (isDeadLetterChannel()) { - String uri = URISupport.sanitizeUri(deadLetterUri); - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but is being handled by dead letter channel: " + uri; - } else { - return getExchange().getExchangeId() + " exchange failed: " + getExchange() + " but is being processed by failure processor: " + failureHandler; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java deleted file mode 100644 index 952551a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -public class ExchangeRedeliveryEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeRedeliveryEvent { - private static final long serialVersionUID = -19248832613958122L; - - private final int attempt; - - public ExchangeRedeliveryEvent(Exchange source, int attempt) { - super(source); - this.attempt = attempt; - } - - @Override - public int getAttempt() { - return attempt; - } - - @Override - public String toString() { - Exception cause = getExchange().getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); - if (cause != null) { - return getExchange().getExchangeId() + " exchange redelivery: " + getExchange() + " attempt " + attempt + " cause " + cause; - } else { - return getExchange().getExchangeId() + " exchange redelivery: " + getExchange() + " attempt " + attempt; - } - } - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java deleted file mode 100644 index 5eb8075..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java +++ /dev/null @@ -1,59 +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.impl.event; - -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event for before sending an {@link Exchange} to an {@link Endpoint}. - *

- * This event is emitted before attempting to send the {@link Exchange} to an {@link Endpoint}. - * There is still some internal processing done before the actual sending takes places, and - * therefore it is not 100% guaranteed that the sending actually happens, as an - * internal error may occur. - *

- * The {@link ExchangeSentEvent} is an event which is emitted after the sending is done. - *

- * These two events (sending and sent) come in a pair, and therefore you need to make sure to return - * true for both events in the {@link org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} - * method to receive events for either of them. - * - * @see ExchangeSentEvent - */ -public class ExchangeSendingEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeSendingEvent { - private static final long serialVersionUID = -19248832613958122L; - - private final Endpoint endpoint; - - public ExchangeSendingEvent(Exchange source, Endpoint endpoint) { - super(source); - this.endpoint = endpoint; - } - - @Override - public Endpoint getEndpoint() { - return endpoint; - } - - @Override - public String toString() { - return getExchange().getExchangeId() + " exchange " + getExchange() + " sending to: " + endpoint; - } - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java deleted file mode 100644 index 3a6bce7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java +++ /dev/null @@ -1,60 +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.impl.event; - -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event for after an {@link Exchange} has been sent to an {@link Endpoint}. - * The {@link ExchangeSentEvent} is an event which is emitted after the sending is done. - *

- * These two events (sending and sent) come in a pair, and therefore you need to make sure to return - * true for both events in the {@link org.apache.camel.spi.EventNotifier#isEnabled(CamelEvent)} - * method to receive events for either of them. - * - * @see ExchangeSendingEvent - */ -public class ExchangeSentEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeSentEvent { - private static final long serialVersionUID = -19248832613958123L; - - private final Endpoint endpoint; - private final long timeTaken; - - public ExchangeSentEvent(Exchange source, Endpoint endpoint, long timeTaken) { - super(source); - this.endpoint = endpoint; - this.timeTaken = timeTaken; - } - - @Override - public Endpoint getEndpoint() { - return endpoint; - } - - @Override - public long getTimeTaken() { - return timeTaken; - } - - @Override - public String toString() { - return getExchange().getExchangeId() + " exchange " + getExchange() + " sent to: " + endpoint + " took: " + timeTaken + " ms."; - } - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java deleted file mode 100644 index 8f39424..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java +++ /dev/null @@ -1,34 +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.impl.event; - -import org.apache.camel.Route; -import org.apache.camel.spi.CamelEvent; - -public class RouteAddedEvent extends AbstractRouteEvent implements CamelEvent.RouteAddedEvent { - - private static final long serialVersionUID = 9155960708789798708L; - - public RouteAddedEvent(Route source) { - super(source); - } - - @Override - public String toString() { - return "Added route: " + getRoute().getId(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java deleted file mode 100644 index 0cceaac..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java +++ /dev/null @@ -1,34 +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.impl.event; - -import org.apache.camel.Route; -import org.apache.camel.spi.CamelEvent; - -public class RouteRemovedEvent extends AbstractRouteEvent implements CamelEvent.RouteRemovedEvent { - - private static final long serialVersionUID = 7966471393751298719L; - - public RouteRemovedEvent(Route source) { - super(source); - } - - @Override - public String toString() { - return "Removed route: " + getRoute().getId(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java deleted file mode 100644 index 2a2ad1e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.Route; -import org.apache.camel.spi.CamelEvent; - -public class RouteStartedEvent extends AbstractRouteEvent implements CamelEvent.RouteStartedEvent { - private static final long serialVersionUID = 1330257282431407329L; - - public RouteStartedEvent(Route source) { - super(source); - } - - @Override - public String toString() { - return "Started route: " + getRoute().getId(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java deleted file mode 100644 index 4dc0008..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java +++ /dev/null @@ -1,33 +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.impl.event; - -import org.apache.camel.Route; -import org.apache.camel.spi.CamelEvent; - -public class RouteStoppedEvent extends AbstractRouteEvent implements CamelEvent.RouteStoppedEvent { - private static final long serialVersionUID = -4466503512787398888L; - - public RouteStoppedEvent(Route source) { - super(source); - } - - @Override - public String toString() { - return "Stopped route: " + getRoute().getId(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java deleted file mode 100644 index ac8f8bd..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -import java.util.EventObject; - -public class ServiceStartupFailureEvent extends EventObject implements CamelEvent.ServiceStartupFailureEvent { - private static final long serialVersionUID = -9171964933795931862L; - - private CamelContext context; - private Object service; - private Throwable cause; - - public ServiceStartupFailureEvent(CamelContext context, Object service, Throwable cause) { - super(service); - this.context = context; - this.service = service; - this.cause = cause; - } - - public CamelContext getContext() { - return context; - } - - @Override - public Object getService() { - return service; - } - - @Override - public Throwable getCause() { - return cause; - } - - @Override - public String toString() { - return "Failure to start service: " + service + " due to " + cause.getMessage(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java deleted file mode 100644 index 1bcb8d8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.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.impl.event; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.CamelEvent; - -import java.util.EventObject; - -public class ServiceStopFailureEvent extends EventObject implements CamelEvent.ServiceStopFailureEvent { - private static final long serialVersionUID = 4139591666998762617L; - - private CamelContext context; - private Object service; - private Throwable cause; - - public ServiceStopFailureEvent(CamelContext context, Object service, Throwable cause) { - super(service); - this.context = context; - this.service = service; - this.cause = cause; - } - - public CamelContext getContext() { - return context; - } - - @Override - public Object getService() { - return service; - } - - @Override - public Throwable getCause() { - return cause; - } - - @Override - public String toString() { - return "Failure to stop service: " + service + " due to " + cause.getMessage(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java deleted file mode 100644 index d90b195..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java +++ /dev/null @@ -1,35 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event after a step has been completed successfully. - */ -public class StepCompletedEvent extends AbstractStepEvent implements CamelEvent.StepCompletedEvent { - - public StepCompletedEvent(Exchange source, String stepId) { - super(source, stepId); - } - - @Override - public String toString() { - return "Step[" + getStepId() + "] completed"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java deleted file mode 100644 index 89f1df0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java +++ /dev/null @@ -1,40 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event after a step has failed. - */ -public class StepFailedEvent extends AbstractStepEvent implements CamelEvent.StepFailedEvent { - - public StepFailedEvent(Exchange source, String stepId) { - super(source, stepId); - } - - @Override - public Throwable getCause() { - return getExchange().getException(); - } - - @Override - public String toString() { - return "Step[" + getStepId() + "] failed"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java deleted file mode 100644 index 8c3c645..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java +++ /dev/null @@ -1,35 +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.impl.event; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.CamelEvent; - -/** - * Event after a step has been created. - */ -public class StepStartedEvent extends AbstractStepEvent implements CamelEvent.StepStartedEvent { - - public StepStartedEvent(Exchange source, String stepId) { - super(source, stepId); - } - - @Override - public String toString() { - return "Step[" + getStepId() + "] started"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/package.html deleted file mode 100644 index 8b6e219..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/event/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Camel management events - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java deleted file mode 100644 index 9552575..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java +++ /dev/null @@ -1,226 +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.impl.saga; - -import org.apache.camel.*; -import org.apache.camel.saga.CamelSagaCoordinator; -import org.apache.camel.saga.CamelSagaStep; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; - -/** - * A in-memory implementation of a saga coordinator. - */ -public class InMemorySagaCoordinator implements CamelSagaCoordinator { - - private enum Status { - RUNNING, - COMPENSATING, - COMPENSATED, - COMPLETING, - COMPLETED - } - - private static final Logger LOG = LoggerFactory.getLogger(InMemorySagaCoordinator.class); - - private CamelContext camelContext; - private org.apache.camel.impl.saga.InMemorySagaService sagaService; - private String sagaId; - private List steps; - private Map> optionValues; - private AtomicReference currentStatus; - - public InMemorySagaCoordinator(CamelContext camelContext, InMemorySagaService sagaService, String sagaId) { - this.camelContext = ObjectHelper.notNull(camelContext, "camelContext"); - this.sagaService = ObjectHelper.notNull(sagaService, "sagaService"); - this.sagaId = ObjectHelper.notNull(sagaId, "sagaId"); - this.steps = new CopyOnWriteArrayList<>(); - this.optionValues = new ConcurrentHashMap<>(); - this.currentStatus = new AtomicReference<>(Status.RUNNING); - } - - @Override - public String getId() { - return sagaId; - } - - @Override - public CompletableFuture beginStep(Exchange exchange, CamelSagaStep step) { - this.steps.add(step); - - if (!step.getOptions().isEmpty()) { - optionValues.putIfAbsent(step, new ConcurrentHashMap<>()); - Map values = optionValues.get(step); - for (String option : step.getOptions().keySet()) { - Expression expression = step.getOptions().get(option); - try { - values.put(option, expression.evaluate(exchange, Object.class)); - } catch (Exception ex) { - return CompletableFuture.supplyAsync(() -> { - throw new RuntimeCamelException("Cannot evaluate saga option '" + option + "'", ex); - }); - } - } - } - - if (step.getTimeoutInMilliseconds().isPresent()) { - sagaService.getExecutorService().schedule(() -> { - boolean doAction = currentStatus.compareAndSet(Status.RUNNING, Status.COMPENSATING); - if (doAction) { - doCompensate(); - } - }, step.getTimeoutInMilliseconds().get(), TimeUnit.MILLISECONDS); - } - - return CompletableFuture.completedFuture(null); - } - - @Override - public CompletableFuture compensate() { - boolean doAction = currentStatus.compareAndSet(Status.RUNNING, Status.COMPENSATING); - - if (doAction) { - doCompensate(); - } else { - Status status = currentStatus.get(); - if (status != Status.COMPENSATING && status != Status.COMPENSATED) { - CompletableFuture res = new CompletableFuture<>(); - res.completeExceptionally(new IllegalStateException("Cannot compensate: status is " + status)); - return res; - } - } - - return CompletableFuture.completedFuture(null); - } - - - @Override - public CompletableFuture complete() { - boolean doAction = currentStatus.compareAndSet(Status.RUNNING, Status.COMPLETING); - - if (doAction) { - doComplete(); - } else { - Status status = currentStatus.get(); - if (status != Status.COMPLETING && status != Status.COMPLETED) { - CompletableFuture res = new CompletableFuture<>(); - res.completeExceptionally(new IllegalStateException("Cannot complete: status is " + status)); - return res; - } - } - - return CompletableFuture.completedFuture(null); - } - - public CompletableFuture doCompensate() { - return doFinalize(CamelSagaStep::getCompensation, "compensation") - .thenApply(res -> { - currentStatus.set(Status.COMPENSATED); - return res; - }); - } - - public CompletableFuture doComplete() { - return doFinalize(CamelSagaStep::getCompletion, "completion") - .thenApply(res -> { - currentStatus.set(Status.COMPLETED); - return res; - }); - } - - public CompletableFuture doFinalize(Function> endpointExtractor, String description) { - CompletableFuture result = CompletableFuture.completedFuture(true); - for (CamelSagaStep step : reversed(steps)) { - Optional endpoint = endpointExtractor.apply(step); - if (endpoint.isPresent()) { - result = result.thenCompose(prevResult -> - doFinalize(endpoint.get(), step, 0, description).thenApply(res -> prevResult && res)); - } - } - return result.whenComplete((done, ex) -> { - if (ex != null) { - LOG.error("Cannot finalize " + description + " the saga", ex); - } else if (!done) { - LOG.warn("Unable to finalize " + description + " for all required steps of the saga " + sagaId); - } - }); - } - - private CompletableFuture doFinalize(Endpoint endpoint, CamelSagaStep step, int doneAttempts, String description) { - Exchange exchange = createExchange(endpoint, step); - - return CompletableFuture.supplyAsync(() -> { - Exchange res = camelContext.createFluentProducerTemplate().to(endpoint).withExchange(exchange).send(); - Exception ex = res.getException(); - if (ex != null) { - throw new RuntimeCamelException(res.getException()); - } - return true; - }, sagaService.getExecutorService()).exceptionally(ex -> { - LOG.warn("Exception thrown during " + description + " at " + endpoint.getEndpointUri() - + ". Attempt " + (doneAttempts + 1) + " of " + sagaService.getMaxRetryAttempts(), ex); - return false; - }).thenCompose(executed -> { - int currentAttempt = doneAttempts + 1; - if (executed) { - return CompletableFuture.completedFuture(true); - } else if (currentAttempt >= sagaService.getMaxRetryAttempts()) { - return CompletableFuture.completedFuture(false); - } else { - CompletableFuture future = new CompletableFuture<>(); - sagaService.getExecutorService().schedule(() -> { - doFinalize(endpoint, step, currentAttempt, description).whenComplete((res, ex) -> { - if (ex != null) { - future.completeExceptionally(ex); - } else { - future.complete(res); - } - }); - }, sagaService.getRetryDelayInMilliseconds(), TimeUnit.MILLISECONDS); - return future; - } - }); - } - - private Exchange createExchange(Endpoint endpoint, CamelSagaStep step) { - Exchange exchange = endpoint.createExchange(); - exchange.getIn().setHeader(Exchange.SAGA_LONG_RUNNING_ACTION, getId()); - - Map values = optionValues.get(step); - if (values != null) { - for (Map.Entry entry : values.entrySet()) { - exchange.getIn().setHeader(entry.getKey(), entry.getValue()); - } - } - return exchange; - } - - private List reversed(List list) { - List reversed = new ArrayList<>(list); - Collections.reverse(reversed); - return reversed; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java deleted file mode 100644 index 25361e9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java +++ /dev/null @@ -1,117 +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.impl.saga; - -import org.apache.camel.CamelContext; -import org.apache.camel.saga.CamelSagaCoordinator; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; - -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; - -/** - * A in-memory implementation of a saga service. - */ -public class InMemorySagaService extends ServiceSupport implements CamelSagaService { - - public static final int DEFAULT_MAX_RETRY_ATTEMPTS = 5; - - public static final long DEFAULT_RETRY_DELAY_IN_MILLISECONDS = 5000; - - private CamelContext camelContext; - - private Map coordinators = new ConcurrentHashMap<>(); - - private ScheduledExecutorService executorService; - - private int maxRetryAttempts = DEFAULT_MAX_RETRY_ATTEMPTS; - - private long retryDelayInMilliseconds = DEFAULT_RETRY_DELAY_IN_MILLISECONDS; - - @Override - public CompletableFuture newSaga() { - ObjectHelper.notNull(camelContext, "camelContext"); - - String uuid = camelContext.getUuidGenerator().generateUuid(); - CamelSagaCoordinator coordinator = new InMemorySagaCoordinator(camelContext, this, uuid); - coordinators.put(uuid, coordinator); - - return CompletableFuture.completedFuture(coordinator); - } - - @Override - public CompletableFuture getSaga(String id) { - return CompletableFuture.completedFuture(coordinators.get(id)); - } - - @Override - public void registerStep(CamelSagaStep step) { - // do nothing - } - - @Override - protected void doStart() throws Exception { - if (this.executorService == null) { - this.executorService = camelContext.getExecutorServiceManager() - .newDefaultScheduledThreadPool(this, "saga"); - } - } - - @Override - protected void doStop() throws Exception { - if (this.executorService != null) { - camelContext.getExecutorServiceManager().shutdownGraceful(this.executorService); - this.executorService = null; - } - } - - public ScheduledExecutorService getExecutorService() { - return executorService; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - public int getMaxRetryAttempts() { - return maxRetryAttempts; - } - - public void setMaxRetryAttempts(int maxRetryAttempts) { - this.maxRetryAttempts = maxRetryAttempts; - } - - public long getRetryDelayInMilliseconds() { - return retryDelayInMilliseconds; - } - - public void setRetryDelayInMilliseconds(long retryDelayInMilliseconds) { - this.retryDelayInMilliseconds = retryDelayInMilliseconds; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/package.html deleted file mode 100644 index e485288..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/saga/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -In-memory Saga coordinator. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java deleted file mode 100644 index 9cd9a28..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.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.impl.scan; - -import org.apache.camel.spi.PackageScanFilter; -import org.apache.camel.util.ObjectHelper; - -import java.lang.annotation.Annotation; -import java.util.Set; - -/** - * Package scan filter for testing if a given class is annotated with any of the annotations. - */ -public class AnnotatedWithAnyPackageScanFilter implements PackageScanFilter { - private Set> annotations; - private boolean checkMetaAnnotations; - - public AnnotatedWithAnyPackageScanFilter(Set> annotations) { - this(annotations, false); - } - - public AnnotatedWithAnyPackageScanFilter(Set> annotations, boolean checkMetaAnnotations) { - this.annotations = annotations; - this.checkMetaAnnotations = checkMetaAnnotations; - } - - @Override - public boolean matches(Class type) { - if (type == null) { - return false; - } - for (Class annotation : annotations) { - if (ObjectHelper.hasAnnotation(type, annotation, checkMetaAnnotations)) { - return true; - } - } - return false; - } - - @Override - public String toString() { - return "annotated with any @[" + annotations + "]"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java deleted file mode 100644 index 153f4ba..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.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.impl.scan; - -import org.apache.camel.spi.PackageScanFilter; -import org.apache.camel.util.ObjectHelper; - -import java.lang.annotation.Annotation; - -/** - * Package scan filter for testing if a given class is annotated with a certain annotation. - */ -public class AnnotatedWithPackageScanFilter implements PackageScanFilter { - - private Class annotation; - private boolean checkMetaAnnotations; - - public AnnotatedWithPackageScanFilter(Class annotation) { - this(annotation, false); - } - - public AnnotatedWithPackageScanFilter(Class annotation, boolean checkMetaAnnotations) { - this.annotation = annotation; - this.checkMetaAnnotations = checkMetaAnnotations; - } - - @Override - public boolean matches(Class type) { - return type != null && ObjectHelper.hasAnnotation(type, annotation, checkMetaAnnotations); - } - - @Override - public String toString() { - return "annotated with @" + annotation.getSimpleName(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java deleted file mode 100644 index ca26e86..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java +++ /dev/null @@ -1,66 +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.impl.scan; - -import org.apache.camel.spi.PackageScanFilter; - -import java.util.HashSet; -import java.util.Set; - -/** - * Package scan filter for testing if a given class is assignable to another class. - */ -public class AssignableToPackageScanFilter implements PackageScanFilter { - private final Set> parents = new HashSet<>(); - - public AssignableToPackageScanFilter() { - } - - public AssignableToPackageScanFilter(Class parentType) { - parents.add(parentType); - } - - public AssignableToPackageScanFilter(Set> parents) { - this.parents.addAll(parents); - } - - public void addParentType(Class parentType) { - parents.add(parentType); - } - - @Override - public boolean matches(Class type) { - if (parents.size() > 0) { - for (Class parent : parents) { - if (parent.isAssignableFrom(type)) { - return true; - } - } - } - return false; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - for (Class parent : parents) { - sb.append(parent.getSimpleName()).append(", "); - } - sb.setLength(sb.length() > 0 ? sb.length() - 2 : 0); - return "is assignable to any of " + sb; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java deleted file mode 100644 index 23fe42f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.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.impl.scan; - -import org.apache.camel.spi.PackageScanFilter; - -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * CompositePackageScanFilter allows multiple - * {@link PackageScanFilter}s to be composed into a single filter. For a - * {@link Class} to match a {@link CompositePackageScanFilter} it must match - * each of the filters the composite contains - */ -public class CompositePackageScanFilter implements PackageScanFilter { - private Set filters; - - public CompositePackageScanFilter() { - filters = new LinkedHashSet<>(); - } - - public CompositePackageScanFilter(Set filters) { - this.filters = new LinkedHashSet<>(filters); - } - - public void addFilter(PackageScanFilter filter) { - filters.add(filter); - } - - @Override - public boolean matches(Class type) { - for (PackageScanFilter filter : filters) { - if (!filter.matches(type)) { - return false; - } - } - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java deleted file mode 100644 index 97d4b7c..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.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.impl.scan; - -import org.apache.camel.spi.PackageScanFilter; - -/** - * Package scan filter for inverting the match result of a subfilter. If the - * subfilter would match and return true this filter will invert that - * match and return false. - */ - -public class InvertingPackageScanFilter implements PackageScanFilter { - - private PackageScanFilter filter; - - public InvertingPackageScanFilter(PackageScanFilter filter) { - this.filter = filter; - } - - @Override - public boolean matches(Class type) { - return !filter.matches(type); - } - - @Override - public String toString() { - return "![" + filter.toString() + "]"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html deleted file mode 100644 index 4b17e11..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Package scan classes. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java deleted file mode 100644 index 3a4b117..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java +++ /dev/null @@ -1,124 +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.impl.transformer; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Transformer; -import org.apache.camel.support.builder.OutputStreamBuilder; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.InputStream; - -/** - * A {@link Transformer} implementation which leverages {@link DataFormat} to perform transformation. - * - * {@see Transformer} - */ -public class DataFormatTransformer extends Transformer { - - private static final Logger LOG = LoggerFactory.getLogger(DataFormatTransformer.class); - - private DataFormat dataFormat; - private String transformerString; - - public DataFormatTransformer(CamelContext context) { - setCamelContext(context); - } - - /** - * Perform data transformation with specified from/to type using DataFormat. - * @param message message to apply transformation - * @param from 'from' data type - * @param to 'to' data type - */ - @Override - public void transform(Message message, DataType from, DataType to) throws Exception { - Exchange exchange = message.getExchange(); - CamelContext context = exchange.getContext(); - - // Unmarshaling into Java Object - if ((to == null || to.isJavaType()) && (from.equals(getFrom()) || from.getModel().equals(getModel()))) { - LOG.debug("Unmarshaling with: {}", dataFormat); - Object answer = dataFormat.unmarshal(exchange, message.getBody(InputStream.class)); - if (to != null && to.getName() != null) { - Class toClass = context.getClassResolver().resolveClass(to.getName()); - if (!toClass.isAssignableFrom(answer.getClass())) { - LOG.debug("Converting to: {}", toClass.getName()); - answer = context.getTypeConverter().mandatoryConvertTo(toClass, answer); - } - } - message.setBody(answer); - - // Marshaling from Java Object - } else if ((from == null || from.isJavaType()) && (to.equals(getTo()) || to.getModel().equals(getModel()))) { - Object input = message.getBody(); - if (from != null && from.getName() != null) { - Class fromClass = context.getClassResolver().resolveClass(from.getName()); - if (!fromClass.isAssignableFrom(input.getClass())) { - LOG.debug("Converting to: {}", fromClass.getName()); - input = context.getTypeConverter().mandatoryConvertTo(fromClass, input); - } - } - OutputStreamBuilder osb = OutputStreamBuilder.withExchange(exchange); - LOG.debug("Marshaling with: {}", dataFormat); - dataFormat.marshal(exchange, message.getBody(), osb); - message.setBody(osb.build()); - - } else { - throw new IllegalArgumentException("Unsupported transformation: from='" + from + ", to='" + to + "'"); - } - } - - /** - * Set DataFormat. - * @return this DataFormatTransformer instance - */ - public DataFormatTransformer setDataFormat(DataFormat dataFormat) { - this.dataFormat = dataFormat; - this.transformerString = null; - return this; - } - - @Override - public String toString() { - if (transformerString == null) { - transformerString = - String.format("DataFormatTransformer[scheme='%s', from='%s', to='%s', dataFormat='%s']", - getModel(), getFrom(), getTo(), dataFormat); - } - return transformerString; - } - - @Override - public void doStart() throws Exception { - ObjectHelper.notNull(dataFormat, "dataFormat"); - getCamelContext().addService(dataFormat, false); - } - - @Override - public void doStop() throws Exception { - ServiceHelper.stopService(dataFormat); - getCamelContext().removeService(dataFormat); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java deleted file mode 100644 index 6855e44..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java +++ /dev/null @@ -1,116 +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.impl.transformer; - -import org.apache.camel.*; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Transformer; -import org.apache.camel.support.DefaultExchange; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A {@link Transformer} implementation which leverages {@link Processor} to perform transformation. - * - * {@see Transformer} - */ -public class ProcessorTransformer extends Transformer { - - private static final Logger LOG = LoggerFactory.getLogger(ProcessorTransformer.class); - - private Processor processor; - private String transformerString; - - public ProcessorTransformer(CamelContext context) { - setCamelContext(context); - } - - /** - * Perform data transformation with specified from/to type using Processor. - * @param message message to apply transformation - * @param from 'from' data type - * @param to 'to' data type - */ - @Override - public void transform(Message message, DataType from, DataType to) throws Exception { - Exchange exchange = message.getExchange(); - CamelContext context = exchange.getContext(); - if (from.isJavaType()) { - Object input = message.getBody(); - Class fromClass = context.getClassResolver().resolveClass(from.getName()); - if (!fromClass.isAssignableFrom(input.getClass())) { - LOG.debug("Converting to: {}", fromClass.getName()); - input = context.getTypeConverter().mandatoryConvertTo(fromClass, input); - message.setBody(input); - } - } - - LOG.debug("Sending to transform processor: {}", processor); - Exchange transformExchange = new DefaultExchange(exchange); - transformExchange.setIn(message); - transformExchange.adapt(ExtendedExchange.class).setProperties(exchange.getProperties()); - processor.process(transformExchange); - Message answer = transformExchange.getMessage(); - - if (to.isJavaType()) { - Object answerBody = answer.getBody(); - Class toClass = context.getClassResolver().resolveClass(to.getName()); - if (!toClass.isAssignableFrom(answerBody.getClass())) { - LOG.debug("Converting to: {}", toClass.getName()); - answerBody = context.getTypeConverter().mandatoryConvertTo(toClass, answerBody); - answer.setBody(answerBody); - } - } - - message.copyFrom(answer); - } - - /** - * Set processor to use - * - * @param processor Processor - * @return this ProcessorTransformer instance - */ - public ProcessorTransformer setProcessor(Processor processor) { - this.processor = processor; - this.transformerString = null; - return this; - } - - @Override - public String toString() { - if (transformerString == null) { - transformerString = - String.format("ProcessorTransformer[scheme='%s', from='%s', to='%s', processor='%s']", - getModel(), getFrom(), getTo(), processor); - } - return transformerString; - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(processor, "processor", this); - ServiceHelper.startService(this.processor); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(this.processor); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java deleted file mode 100644 index de7f399..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java +++ /dev/null @@ -1,66 +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.impl.transformer; - -import org.apache.camel.ValueHolder; -import org.apache.camel.spi.DataType; -import org.apache.camel.util.StringHelper; - -/** - * Key used in {@link org.apache.camel.spi.TransformerRegistry} in {@link org.apache.camel.impl.engine.AbstractCamelContext}, - * to ensure a consistent lookup. - */ -public final class TransformerKey extends ValueHolder { - - private String scheme; - private DataType from; - private DataType to; - - public TransformerKey(String scheme) { - super(scheme); - StringHelper.notEmpty(scheme, "scheme"); - this.scheme = scheme; - } - - public TransformerKey(DataType from, DataType to) { - super(createKeyString(from, to)); - this.from = from; - this.to = to; - } - - private static String createKeyString(DataType from, DataType to) { - return from + "/" + to; - } - - public String getScheme() { - return scheme; - } - - public DataType getFrom() { - return from; - } - - public DataType getTo() { - return to; - } - - @Override - public String toString() { - return get(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/package.html deleted file mode 100644 index 8c7f9bf..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/transformer/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Transformer implementation classes. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java deleted file mode 100644 index 7197dce..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java +++ /dev/null @@ -1,110 +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.impl.validator; - -import org.apache.camel.*; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Validator; -import org.apache.camel.support.DefaultExchange; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A {@link Validator} implementation which leverages {@link Processor} to perform validation. - * - * {@see Validator} - */ -public class ProcessorValidator extends Validator { - private static final Logger LOG = LoggerFactory.getLogger(ProcessorValidator.class); - - private Processor processor; - private String validatorString; - - public ProcessorValidator(CamelContext context) { - setCamelContext(context); - } - - /** - * Perform content validation with specified type using Processor. - * - * @param message message to apply validation - * @param type 'from' data type - */ - @Override - public void validate(Message message, DataType type) throws ValidationException { - Exchange exchange = message.getExchange(); - - LOG.debug("Sending to validate processor '{}'", processor); - // create a new exchange to use during validation to avoid side-effects on original exchange - Exchange validateExchange = new DefaultExchange(exchange); - validateExchange.setIn(message); - validateExchange.adapt(ExtendedExchange.class).setProperties(exchange.getProperties()); - try { - processor.process(validateExchange); - - // if the validation failed then propagate the exception - if (validateExchange.getException() != null) { - exchange.setException(validateExchange.getException()); - } else { - // success copy result - ExchangeHelper.copyResults(exchange, validateExchange); - } - - } catch (Exception e) { - if (e instanceof ValidationException) { - throw (ValidationException)e; - } else { - throw new ValidationException(String.format("Validation failed for '%s'", type), exchange, e); - } - } - } - - /** - * Set processor to use - * - * @param processor Processor - * @return this ProcessorTransformer instance - */ - public ProcessorValidator setProcessor(Processor processor) { - this.processor = processor; - this.validatorString = null; - return this; - } - - @Override - public String toString() { - if (validatorString == null) { - validatorString = - String.format("ProcessorValidator[type='%s', processor='%s']", getType(), processor); - } - return validatorString; - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(processor, "processor", this); - ServiceHelper.startService(this.processor); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(this.processor); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java deleted file mode 100644 index 33e1f81..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.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.impl.validator; - -import org.apache.camel.CamelContext; -import org.apache.camel.ValueHolder; -import org.apache.camel.spi.DataType; - -/** - * Key used in {@link org.apache.camel.spi.ValidatorRegistry} in {@link CamelContext}, - * to ensure a consistent lookup. - */ -public final class ValidatorKey extends ValueHolder { - - private DataType type; - - public ValidatorKey(DataType type) { - super(type.toString()); - this.type = type; - } - - public DataType getType() { - return type; - } - - @Override - public String toString() { - return get(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html deleted file mode 100644 index b1e7f1a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Validator implementation classes. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java deleted file mode 100644 index bb3730a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java +++ /dev/null @@ -1,953 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.processor.interceptor.BacklogDebugger; -import org.apache.camel.processor.interceptor.BacklogTracer; -import org.apache.camel.processor.interceptor.DefaultBacklogTracerEventMessage; -import org.apache.camel.spi.*; -import org.apache.camel.spi.ManagementInterceptStrategy.InstrumentationProcessor; -import org.apache.camel.support.*; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.util.StopWatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.RejectedExecutionException; - -/** - * Internal {@link Processor} that Camel routing engine used during routing for cross cutting functionality such as: - *

    - *
  • Execute {@link UnitOfWork}
    • - *
  • Keeping track which route currently is being routed
    • - *
  • Execute {@link RoutePolicy}
    • - *
  • Gather JMX performance statics
    • - *
  • Tracing
    • - *
  • Debugging
    • - *
  • Message History
    • - *
  • Stream Caching
    • - *
  • {@link Transformer}
    • - *
- * ... and more. - *

- * This implementation executes this cross cutting functionality as a {@link CamelInternalProcessorAdvice} advice (before and after advice) - * by executing the {@link CamelInternalProcessorAdvice#before(Exchange)} and - * {@link CamelInternalProcessorAdvice#after(Exchange, Object)} callbacks in correct order during routing. - * This reduces number of stack frames needed during routing, and reduce the number of lines in stacktraces, as well - * makes debugging the routing engine easier for end users. - *

- * Debugging tips: Camel end users whom want to debug their Camel applications with the Camel source code, then make sure to - * read the source code of this class about the debugging tips, which you can find in the - * {@link #process(Exchange, AsyncCallback)} method. - *

- * The added advices can implement {@link Ordered} to control in which order the advices are executed. - */ -public class CamelInternalProcessor extends DelegateAsyncProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(CamelInternalProcessor.class); - - private static final Object[] EMPTY_STATES = new Object[0]; - - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final ShutdownStrategy shutdownStrategy; - private final List> advices = new ArrayList<>(); - private byte statefulAdvices; - - public CamelInternalProcessor(CamelContext camelContext) { - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.shutdownStrategy = camelContext.getShutdownStrategy(); - } - - public CamelInternalProcessor(CamelContext camelContext, Processor processor) { - super(processor); - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.shutdownStrategy = camelContext.getShutdownStrategy(); - } - - /** - * Adds an {@link CamelInternalProcessorAdvice} advice to the list of advices to execute by this internal processor. - * - * @param advice the advice to add - */ - public void addAdvice(CamelInternalProcessorAdvice advice) { - advices.add(advice); - // ensure advices are sorted so they are in the order we want - advices.sort(OrderedComparator.get()); - - if (advice.hasState()) { - statefulAdvices++; - } - } - - /** - * Gets the advice with the given type. - * - * @param type the type of the advice - * @return the advice if exists, or null if no advices has been added with the given type. - */ - public T getAdvice(Class type) { - for (CamelInternalProcessorAdvice task : advices) { - Object advice = unwrap(task); - if (type.isInstance(advice)) { - return type.cast(advice); - } - } - return null; - } - - /** - * Callback task to process the advices after processing. - */ - private final class AsyncAfterTask implements AsyncCallback { - - private final Object[] states; - private final Exchange exchange; - private final AsyncCallback originalCallback; - - private AsyncAfterTask(Object[] states, Exchange exchange, AsyncCallback originalCallback) { - this.states = states; - this.exchange = exchange; - this.originalCallback = originalCallback; - } - - @Override - public void done(boolean doneSync) { - try { - for (int i = advices.size() - 1, j = states.length - 1; i >= 0; i--) { - CamelInternalProcessorAdvice task = advices.get(i); - Object state = null; - if (task.hasState()) { - state = states[j--]; - } - try { - task.after(exchange, state); - } catch (Throwable e) { - exchange.setException(e); - // allow all advices to complete even if there was an exception - } - } - } finally { - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - // callback must be called - if (originalCallback != null) { - reactiveExecutor.schedule(originalCallback); - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - } - } - } - - @Override - @SuppressWarnings("unchecked") - public boolean process(Exchange exchange, AsyncCallback originalCallback) { - // ---------------------------------------------------------- - // CAMEL END USER - READ ME FOR DEBUGGING TIPS - // ---------------------------------------------------------- - // If you want to debug the Camel routing engine, then there is a lot of internal functionality - // the routing engine executes during routing messages. You can skip debugging this internal - // functionality and instead debug where the routing engine continues routing to the next node - // in the routes. The CamelInternalProcessor is a vital part of the routing engine, as its - // being used in between the nodes. As an end user you can just debug the code in this class - // in between the: - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // you can see in the code below. - // ---------------------------------------------------------- - - if (processor == null || exchange.isRouteStop()) { - // no processor or we should not continue then we are done - originalCallback.done(true); - return true; - } - - boolean forceShutdown = shutdownStrategy.forceShutdown(this); - if (forceShutdown) { - String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange; - LOG.debug(msg); - if (exchange.getException() == null) { - exchange.setException(new RejectedExecutionException(msg)); - } - // force shutdown so we should not continue - originalCallback.done(true); - return true; - - } - - // optimise to use object array for states, and only for the number of advices that keep state - final Object[] states = statefulAdvices > 0 ? new Object[statefulAdvices] : EMPTY_STATES; - // optimise for loop using index access to avoid creating iterator object - for (int i = 0, j = 0; i < advices.size(); i++) { - CamelInternalProcessorAdvice task = advices.get(i); - try { - Object state = task.before(exchange); - if (task.hasState()) { - states[j++] = state; - } - } catch (Throwable e) { - exchange.setException(e); - originalCallback.done(true); - return true; - } - } - - // create internal callback which will execute the advices in reverse order when done - AsyncCallback callback = new AsyncAfterTask(states, exchange, originalCallback); - - if (exchange.isTransacted()) { - // must be synchronized for transacted exchanges - if (LOG.isTraceEnabled()) { - LOG.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - try { - processor.process(exchange); - } catch (Throwable e) { - exchange.setException(e); - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - callback.done(true); - return true; - } else { - final UnitOfWork uow = exchange.getUnitOfWork(); - - // do uow before processing and if a value is returned the the uow wants to be processed after - // was well in the same thread - AsyncCallback async = callback; - boolean beforeAndAfter = uow != null && uow.isBeforeAfterProcess(); - if (beforeAndAfter) { - async = uow.beforeProcess(processor, exchange, async); - } - - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchange for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - } - processor.process(exchange, async); - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - - // optimize to only do after uow processing if really needed - if (beforeAndAfter) { - reactiveExecutor.schedule(() -> { - // execute any after processor work (in current thread, not in the callback) - uow.afterProcess(processor, exchange, callback, false); - }); - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Exchange processed and is continued routed asynchronously for exchangeId: {} -> {}", - exchange.getExchangeId(), exchange); - } - // must return false - return false; - } - } - - @Override - public String toString() { - return processor != null ? processor.toString() : super.toString(); - } - - /** - * Advice to invoke callbacks for before and after routing. - */ - public static class RouteLifecycleAdvice implements CamelInternalProcessorAdvice { - - private Route route; - - public void setRoute(Route route) { - this.route = route; - } - - @Override - public Object before(Exchange exchange) throws Exception { - UnitOfWork uow = exchange.getUnitOfWork(); - if (uow != null) { - uow.beforeRoute(exchange, route); - } - return null; - } - - @Override - public void after(Exchange exchange, Object object) throws Exception { - UnitOfWork uow = exchange.getUnitOfWork(); - if (uow != null) { - uow.afterRoute(exchange, route); - } - } - - @Override - public boolean hasState() { - return false; - } - } - - /** - * Advice to keep the {@link InflightRepository} up to date. - */ - public static class RouteInflightRepositoryAdvice implements CamelInternalProcessorAdvice { - - private final InflightRepository inflightRepository; - private final String id; - - public RouteInflightRepositoryAdvice(InflightRepository inflightRepository, String id) { - this.inflightRepository = inflightRepository; - this.id = id; - } - - @Override - public Object before(Exchange exchange) throws Exception { - inflightRepository.add(exchange, id); - return null; - } - - @Override - public void after(Exchange exchange, Object state) throws Exception { - inflightRepository.remove(exchange, id); - } - - @Override - public boolean hasState() { - return false; - } - } - - /** - * Advice to execute any {@link RoutePolicy} a route may have been configured with. - */ - public static class RoutePolicyAdvice implements CamelInternalProcessorAdvice { - - private final Logger log = LoggerFactory.getLogger(getClass()); - private final List routePolicies; - private Route route; - - public RoutePolicyAdvice(List routePolicies) { - this.routePolicies = routePolicies; - } - - public void setRoute(Route route) { - this.route = route; - } - - /** - * Strategy to determine if this policy is allowed to run - * - * @param policy the policy - * @return true to run - */ - boolean isRoutePolicyRunAllowed(RoutePolicy policy) { - if (policy instanceof StatefulService) { - StatefulService ss = (StatefulService) policy; - return ss.isRunAllowed(); - } - return true; - } - - @Override - public Object before(Exchange exchange) throws Exception { - // invoke begin - for (RoutePolicy policy : routePolicies) { - try { - if (isRoutePolicyRunAllowed(policy)) { - policy.onExchangeBegin(route, exchange); - } - } catch (Exception e) { - log.warn("Error occurred during onExchangeBegin on RoutePolicy: " + policy - + ". This exception will be ignored", e); - } - } - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - // do not invoke it if Camel is stopping as we don't want - // the policy to start a consumer during Camel is stopping - if (isCamelStopping(exchange.getContext())) { - return; - } - - for (RoutePolicy policy : routePolicies) { - try { - if (isRoutePolicyRunAllowed(policy)) { - policy.onExchangeDone(route, exchange); - } - } catch (Exception e) { - log.warn("Error occurred during onExchangeDone on RoutePolicy: " + policy - + ". This exception will be ignored", e); - } - } - } - - private static boolean isCamelStopping(CamelContext context) { - if (context != null) { - return context.isStopping() || context.isStopped(); - } - return false; - } - - @Override - public boolean hasState() { - return false; - } - } - - /** - * Advice to execute the {@link BacklogTracer} if enabled. - */ - public static final class BacklogTracerAdvice implements CamelInternalProcessorAdvice, Ordered { - - private final BacklogTracer backlogTracer; - private final NamedNode processorDefinition; - private final NamedRoute routeDefinition; - private final boolean first; - - public BacklogTracerAdvice(BacklogTracer backlogTracer, NamedNode processorDefinition, - NamedRoute routeDefinition, boolean first) { - this.backlogTracer = backlogTracer; - this.processorDefinition = processorDefinition; - this.routeDefinition = routeDefinition; - this.first = first; - } - - @Override - public Object before(Exchange exchange) throws Exception { - if (backlogTracer.shouldTrace(processorDefinition, exchange)) { - long timestamp = System.currentTimeMillis(); - String toNode = processorDefinition.getId(); - String exchangeId = exchange.getExchangeId(); - String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 4, - backlogTracer.isBodyIncludeStreams(), backlogTracer.isBodyIncludeFiles(), backlogTracer.getBodyMaxChars()); - - // if first we should add a pseudo trace message as well, so we have a starting message (eg from the route) - String routeId = routeDefinition != null ? routeDefinition.getRouteId() : null; - if (first) { - long created = exchange.getCreated(); - DefaultBacklogTracerEventMessage pseudo = new DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(), created, routeId, null, exchangeId, messageAsXml); - backlogTracer.traceEvent(pseudo); - } - DefaultBacklogTracerEventMessage event = new DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(), timestamp, routeId, toNode, exchangeId, messageAsXml); - backlogTracer.traceEvent(event); - } - - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - // noop - } - - @Override - public boolean hasState() { - return false; - } - - @Override - public int getOrder() { - // we want tracer just before calling the processor - return Ordered.LOWEST - 1; - } - } - - /** - * Advice to execute the {@link BacklogDebugger} if enabled. - */ - public static final class BacklogDebuggerAdvice implements CamelInternalProcessorAdvice, Ordered { - - private final BacklogDebugger backlogDebugger; - private final Processor target; - private final NamedNode definition; - private final String nodeId; - - public BacklogDebuggerAdvice(BacklogDebugger backlogDebugger, Processor target, NamedNode definition) { - this.backlogDebugger = backlogDebugger; - this.target = target; - this.definition = definition; - this.nodeId = definition.getId(); - } - - @Override - public StopWatch before(Exchange exchange) throws Exception { - if (backlogDebugger.isEnabled() && (backlogDebugger.hasBreakpoint(nodeId) || backlogDebugger.isSingleStepMode())) { - StopWatch watch = new StopWatch(); - backlogDebugger.beforeProcess(exchange, target, definition); - return watch; - } else { - return null; - } - } - - @Override - public void after(Exchange exchange, StopWatch stopWatch) throws Exception { - if (stopWatch != null) { - backlogDebugger.afterProcess(exchange, target, definition, stopWatch.taken()); - } - } - - @Override - public int getOrder() { - // we want debugger just before calling the processor - return Ordered.LOWEST; - } - } - - /** - * Advice to execute when using custom debugger. - */ - public static final class DebuggerAdvice implements CamelInternalProcessorAdvice, Ordered { - - private final Debugger debugger; - private final Processor target; - private final NamedNode definition; - - public DebuggerAdvice(Debugger debugger, Processor target, NamedNode definition) { - this.debugger = debugger; - this.target = target; - this.definition = definition; - } - - @Override - public StopWatch before(Exchange exchange) throws Exception { - debugger.beforeProcess(exchange, target, definition); - return new StopWatch(); - } - - @Override - public void after(Exchange exchange, StopWatch stopWatch) throws Exception { - debugger.afterProcess(exchange, target, definition, stopWatch.taken()); - } - - @Override - public int getOrder() { - // we want debugger just before calling the processor - return Ordered.LOWEST; - } - } - - /** - * Advice to inject new {@link UnitOfWork} to the {@link Exchange} if needed, and as well to ensure - * the {@link UnitOfWork} is done and stopped. - */ - public static class UnitOfWorkProcessorAdvice implements CamelInternalProcessorAdvice { - - private final Route route; - private String routeId; - private UnitOfWorkFactory uowFactory; - - public UnitOfWorkProcessorAdvice(Route route, CamelContext camelContext) { - this.route = route; - if (route != null) { - this.routeId = route.getRouteId(); - } - this.uowFactory = camelContext.adapt(ExtendedCamelContext.class).getUnitOfWorkFactory(); - // optimize uow factory to initialize it early and once per advice - this.uowFactory.afterPropertiesConfigured(camelContext); - } - - @Override - public UnitOfWork before(Exchange exchange) throws Exception { - // if the exchange doesn't have from route id set, then set it if it originated - // from this unit of work - if (route != null && exchange.getFromRouteId() == null) { - if (routeId == null) { - this.routeId = route.getRouteId(); - } - ExtendedExchange ee = (ExtendedExchange) exchange; - ee.setFromRouteId(routeId); - } - - // only return UnitOfWork if we created a new as then its us that handle the lifecycle to done the created UoW - UnitOfWork created = null; - - if (exchange.getUnitOfWork() == null) { - // If there is no existing UoW, then we should start one and - // terminate it once processing is completed for the exchange. - created = createUnitOfWork(exchange); - ExtendedExchange ee = (ExtendedExchange) exchange; - ee.setUnitOfWork(created); - created.start(); - } - - // for any exchange we should push/pop route context so we can keep track of which route we are routing - if (route != null) { - UnitOfWork existing = exchange.getUnitOfWork(); - if (existing != null) { - existing.pushRoute(route); - } - } - - return created; - } - - @Override - public void after(Exchange exchange, UnitOfWork uow) throws Exception { - UnitOfWork existing = exchange.getUnitOfWork(); - - // execute done on uow if we created it, and the consumer is not doing it - if (uow != null) { - UnitOfWorkHelper.doneUow(uow, exchange); - } - - // after UoW is done lets pop the route context which must be done on every existing UoW - if (route != null && existing != null) { - existing.popRoute(); - } - } - - protected UnitOfWork createUnitOfWork(Exchange exchange) { - if (uowFactory != null) { - return uowFactory.createUnitOfWork(exchange); - } else { - return exchange.getContext().adapt(ExtendedCamelContext.class).getUnitOfWorkFactory().createUnitOfWork(exchange); - } - } - - } - - /** - * Advice when an EIP uses the shareUnitOfWork functionality. - */ - public static class ChildUnitOfWorkProcessorAdvice extends UnitOfWorkProcessorAdvice { - - private final UnitOfWork parent; - - public ChildUnitOfWorkProcessorAdvice(Route route, CamelContext camelContext, UnitOfWork parent) { - super(route, camelContext); - this.parent = parent; - } - - @Override - protected UnitOfWork createUnitOfWork(Exchange exchange) { - // let the parent create a child unit of work to be used - return parent.createChildUnitOfWork(exchange); - } - - } - - /** - * Advice when Message History has been enabled. - */ - @SuppressWarnings("unchecked") - public static class MessageHistoryAdvice implements CamelInternalProcessorAdvice { - - private final MessageHistoryFactory factory; - private final NamedNode definition; - private final String routeId; - - public MessageHistoryAdvice(MessageHistoryFactory factory, NamedNode definition) { - this.factory = factory; - this.definition = definition; - this.routeId = CamelContextHelper.getRouteId(definition); - } - - @Override - public MessageHistory before(Exchange exchange) throws Exception { - // we may be routing outside a route in an onException or interceptor and if so then grab - // route id from the exchange UoW state - String targetRouteId = this.routeId; - if (targetRouteId == null) { - targetRouteId = ExchangeHelper.getRouteId(exchange); - } - - MessageHistory history = factory.newMessageHistory(targetRouteId, definition, System.currentTimeMillis(), exchange); - if (history != null) { - List list = exchange.getProperty(Exchange.MESSAGE_HISTORY, List.class); - if (list == null) { - list = new LinkedList<>(); - exchange.setProperty(Exchange.MESSAGE_HISTORY, list); - } - list.add(history); - } - return history; - } - - @Override - public void after(Exchange exchange, MessageHistory history) throws Exception { - if (history != null) { - history.nodeProcessingDone(); - } - } - } - - /** - * Advice that stores the node id and label of the processor that is processing the exchange. - */ - public static class NodeHistoryAdvice implements CamelInternalProcessorAdvice { - - private final String id; - private final String label; - - public NodeHistoryAdvice(NamedNode definition) { - this.id = definition.getId(); - this.label = definition.getLabel(); - } - - @Override - public String before(Exchange exchange) throws Exception { - ExtendedExchange ee = (ExtendedExchange) exchange; - ee.setHistoryNodeId(id); - ee.setHistoryNodeLabel(label); - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - ExtendedExchange ee = (ExtendedExchange) exchange; - ee.setHistoryNodeId(null); - ee.setHistoryNodeLabel(null); - } - - @Override - public boolean hasState() { - return false; - } - } - - /** - * Advice for {@link StreamCachingStrategy} - */ - public static class StreamCachingAdvice implements CamelInternalProcessorAdvice, Ordered { - - private final StreamCachingStrategy strategy; - - public StreamCachingAdvice(StreamCachingStrategy strategy) { - this.strategy = strategy; - } - - @Override - public StreamCache before(Exchange exchange) throws Exception { - // check if body is already cached - Object body = exchange.getIn().getBody(); - if (body == null) { - return null; - } else if (body instanceof StreamCache) { - StreamCache sc = (StreamCache) body; - // reset so the cache is ready to be used before processing - sc.reset(); - return sc; - } - // cache the body and if we could do that replace it as the new body - StreamCache sc = strategy.cache(exchange); - if (sc != null) { - exchange.getIn().setBody(sc); - } - return sc; - } - - @Override - public void after(Exchange exchange, StreamCache sc) throws Exception { - Object body = exchange.getMessage().getBody(); - if (body instanceof StreamCache) { - // reset so the cache is ready to be reused after processing - ((StreamCache) body).reset(); - } - } - - @Override - public int getOrder() { - // we want stream caching first - return Ordered.HIGHEST; - } - } - - /** - * Advice for delaying - */ - public static class DelayerAdvice implements CamelInternalProcessorAdvice { - - private final Logger log = LoggerFactory.getLogger(getClass()); - private final long delay; - - public DelayerAdvice(long delay) { - this.delay = delay; - } - - @Override - public Object before(Exchange exchange) throws Exception { - try { - log.trace("Sleeping for: {} millis", delay); - Thread.sleep(delay); - } catch (InterruptedException e) { - log.debug("Sleep interrupted"); - Thread.currentThread().interrupt(); - throw e; - } - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - // noop - } - - @Override - public boolean hasState() { - return false; - } - } - - /** - * Advice for tracing - */ - public static class TracingAdvice implements CamelInternalProcessorAdvice { - - private final Tracer tracer; - private final NamedNode processorDefinition; - private final NamedRoute routeDefinition; - private final Synchronization tracingAfterRoute; - private boolean added; - - public TracingAdvice(Tracer tracer, NamedNode processorDefinition, NamedRoute routeDefinition, boolean first) { - this.tracer = tracer; - this.processorDefinition = processorDefinition; - this.routeDefinition = routeDefinition; - this.tracingAfterRoute = routeDefinition != null ? new TracingAfterRoute(tracer, routeDefinition.getRouteId()) : null; - } - - @Override - public Object before(Exchange exchange) throws Exception { - if (!added && tracingAfterRoute != null) { - // add before route and after route tracing but only once per route, so check if there is already an existing - boolean contains = exchange.getUnitOfWork().containsSynchronization(tracingAfterRoute); - if (!contains) { - added = true; - tracer.traceBeforeRoute(routeDefinition, exchange); - exchange.adapt(ExtendedExchange.class).addOnCompletion(tracingAfterRoute); - } - } - - tracer.traceBeforeNode(processorDefinition, exchange); - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - tracer.traceAfterNode(processorDefinition, exchange); - } - - @Override - public boolean hasState() { - return false; - } - - private static final class TracingAfterRoute extends SynchronizationAdapter { - - private final Tracer tracer; - private final String routeId; - - private TracingAfterRoute(Tracer tracer, String routeId) { - this.tracer = tracer; - this.routeId = routeId; - } - - @Override - public void onAfterRoute(Route route, Exchange exchange) { - if (routeId.equals(route.getId())) { - tracer.traceAfterRoute(route, exchange); - } - } - - @Override - public boolean equals(Object o) { - // only match equals on route id so we can check this from containsSynchronization - // to avoid adding multiple times for the same route id - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TracingAfterRoute that = (TracingAfterRoute) o; - return routeId.equals(that.routeId); - } - - @Override - public int hashCode() { - return Objects.hash(routeId); - } - } - } - - /** - * Wrap an InstrumentationProcessor into a CamelInternalProcessorAdvice - */ - public static CamelInternalProcessorAdvice wrap(InstrumentationProcessor instrumentationProcessor) { - - if (instrumentationProcessor instanceof CamelInternalProcessor) { - return (CamelInternalProcessorAdvice) instrumentationProcessor; - } else { - return new CamelInternalProcessorAdviceWrapper<>(instrumentationProcessor); - } - } - - public static Object unwrap(CamelInternalProcessorAdvice advice) { - if (advice instanceof CamelInternalProcessorAdviceWrapper) { - return ((CamelInternalProcessorAdviceWrapper) advice).unwrap(); - } else { - return advice; - } - } - - static class CamelInternalProcessorAdviceWrapper implements CamelInternalProcessorAdvice, Ordered { - - final InstrumentationProcessor instrumentationProcessor; - - public CamelInternalProcessorAdviceWrapper(InstrumentationProcessor instrumentationProcessor) { - this.instrumentationProcessor = instrumentationProcessor; - } - - InstrumentationProcessor unwrap() { - return instrumentationProcessor; - } - - @Override - public int getOrder() { - return instrumentationProcessor.getOrder(); - } - - @Override - public T before(Exchange exchange) throws Exception { - return instrumentationProcessor.before(exchange); - } - - @Override - public void after(Exchange exchange, T data) throws Exception { - instrumentationProcessor.after(exchange, data); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java deleted file mode 100644 index 9a228f4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java +++ /dev/null @@ -1,180 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -/** - * A processor which catches exceptions. - */ -public class CatchProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(CatchProcessor.class); - - private String id; - private String routeId; - private final List> exceptions; - private final Predicate onWhen; - - public CatchProcessor(List> exceptions, Processor processor, Predicate onWhen, Predicate handled) { - super(processor); - this.exceptions = exceptions; - this.onWhen = onWhen; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - return "catch"; - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - Exception e = exchange.getException(); - Throwable caught = catches(exchange, e); - // If a previous catch clause handled the exception or if this clause does not match, exit - if (exchange.getProperty(Exchange.EXCEPTION_HANDLED) != null || caught == null) { - callback.done(true); - return true; - } - if (LOG.isTraceEnabled()) { - LOG.trace("This CatchProcessor catches the exception: {} caused by: {}", caught.getClass().getName(), e.getMessage()); - } - - // store the last to endpoint as the failure endpoint - if (exchange.getProperty(Exchange.FAILURE_ENDPOINT) == null) { - exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT)); - } - // give the rest of the pipeline another chance - exchange.setProperty(Exchange.EXCEPTION_HANDLED, true); - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, e); - exchange.setException(null); - // and we should not be regarded as exhausted as we are in a try .. catch block - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - - if (LOG.isDebugEnabled()) { - LOG.debug("The exception is handled for the exception: {} caused by: {}", - new Object[]{e.getClass().getName(), e.getMessage()}); - } - - // emit event that the failure is being handled - EventHelper.notifyExchangeFailureHandling(exchange.getContext(), exchange, processor, false, null); - - boolean sync = processor.process(exchange, new AsyncCallback() { - public void done(boolean doneSync) { - // emit event that the failure was handled - EventHelper.notifyExchangeFailureHandled(exchange.getContext(), exchange, processor, false, null); - - // always clear redelivery exhausted in a catch clause - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - - if (!doneSync) { - // signal callback to continue routing async - ExchangeHelper.prepareOutToIn(exchange); - } - - callback.done(doneSync); - } - }); - - return sync; - } - - /** - * Returns with the exception that is caught by this processor. - * - * This method traverses exception causes, so sometimes the exception - * returned from this method might be one of causes of the parameter - * passed. - * - * @param exchange the current exchange - * @param exception the thrown exception - * @return Throwable that this processor catches. null if nothing matches. - */ - protected Throwable catches(Exchange exchange, Throwable exception) { - // use the exception iterator to walk the caused by hierarchy - for (final Throwable e : ObjectHelper.createExceptionIterable(exception)) { - // see if we catch this type - for (final Class type : exceptions) { - if (type.isInstance(e) && matchesWhen(exchange)) { - return e; - } - } - } - - // not found - return null; - } - - public List> getExceptions() { - return exceptions; - } - - /** - * Strategy method for matching the exception type with the current exchange. - *

- * This default implementation will match as: - *

    - *
  • Always true if no when predicate on the exception type - *
  • Otherwise the when predicate is matches against the current exchange - *
- * - * @param exchange the current {@link Exchange} - * @return true if matched, false otherwise. - */ - protected boolean matchesWhen(Exchange exchange) { - if (onWhen == null) { - // if no predicate then it's always a match - return true; - } - return onWhen.matches(exchange); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java deleted file mode 100644 index a6e7a78..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java +++ /dev/null @@ -1,203 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import static org.apache.camel.processor.PipelineHelper.continueProcessing; - -/** - * Implements a Choice structure where one or more predicates are used which if - * they are true their processors are used, with a default otherwise clause used - * if none match. - */ -public class ChoiceProcessor extends AsyncProcessorSupport implements Navigate, Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(ChoiceProcessor.class); - - private String id; - private String routeId; - private final List filters; - private final Processor otherwise; - private transient long notFiltered; - - public ChoiceProcessor(List filters, Processor otherwise) { - this.filters = filters; - this.otherwise = otherwise; - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - Iterator processors = next().iterator(); - - // callback to restore existing FILTER_MATCHED property on the Exchange - final Object existing = exchange.getProperty(Exchange.FILTER_MATCHED); - final AsyncCallback choiceCallback = new AsyncCallback() { - @Override - public void done(boolean doneSync) { - if (existing != null) { - exchange.setProperty(Exchange.FILTER_MATCHED, existing); - } else { - exchange.removeProperty(Exchange.FILTER_MATCHED); - } - callback.done(doneSync); - } - }; - - // as we only pick one processor to process, then no need to have async callback that has a while loop as well - // as this should not happen, eg we pick the first filter processor that matches, or the otherwise (if present) - // and if not, we just continue without using any processor - while (processors.hasNext()) { - // get the next processor - Processor processor = processors.next(); - - // evaluate the predicate on filter predicate early to be faster - // and avoid issues when having nested choices - // as we should only pick one processor - boolean matches = false; - if (processor instanceof FilterProcessor) { - FilterProcessor filter = (FilterProcessor) processor; - try { - matches = filter.matches(exchange); - // as we have pre evaluated the predicate then use its processor directly when routing - processor = filter.getProcessor(); - } catch (Throwable e) { - exchange.setException(e); - } - } else { - // its the otherwise processor, so its a match - notFiltered++; - matches = true; - } - - // check for error if so we should break out - if (!continueProcessing(exchange, "so breaking out of choice", LOG)) { - break; - } - - // if we did not match then continue to next filter - if (!matches) { - continue; - } - - // okay we found a filter or its the otherwise we are processing - AsyncProcessor async = AsyncProcessorConverterHelper.convert(processor); - return async.process(exchange, choiceCallback); - } - - // when no filter matches and there is no otherwise, then just continue - choiceCallback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "choice"; - } - - public List getFilters() { - return filters; - } - - public Processor getOtherwise() { - return otherwise; - } - - /** - * Gets the number of Exchanges that did not match any predicate and are routed using otherwise - */ - public long getNotFilteredCount() { - return notFiltered; - } - - /** - * Reset counters. - */ - public void reset() { - for (FilterProcessor filter : getFilters()) { - filter.reset(); - } - notFiltered = 0; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(); - if (filters != null) { - answer.addAll(filters); - } - if (otherwise != null) { - answer.add(otherwise); - } - return answer; - } - - @Override - public boolean hasNext() { - return otherwise != null || (filters != null && !filters.isEmpty()); - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(filters, otherwise); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(otherwise, filters); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java deleted file mode 100644 index e421047..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java +++ /dev/null @@ -1,285 +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.processor; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.Exchange; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * Default {@link AggregationStrategy} used by the {@link ClaimCheckProcessor} EIP. - *

- * This strategy supports the following include rules syntax: - *

    - *
  • body
    • - to aggregate the message body - *
  • headers
    • - to aggregate all the message headers - *
  • header:pattern
    • - to aggregate all the message headers that matches the pattern. - * The pattern syntax is documented by: {@link PatternHelper#matchPattern(String, String)}. - *
- * You can specify multiple rules separated by comma. For example to include the message body and all headers starting with foo - * body,header:foo*. - * If the include rule is specified as empty or as wildcard then everything is merged. - * If you have configured both include and exclude then exclude take precedence over include. - */ -public class ClaimCheckAggregationStrategy implements AggregationStrategy { - - private static final Logger LOG = LoggerFactory.getLogger(ClaimCheckAggregationStrategy.class); - private String filter; - - public ClaimCheckAggregationStrategy() { - } - - public String getFilter() { - return filter; - } - - public void setFilter(String filter) { - this.filter = filter; - } - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (newExchange == null) { - return oldExchange; - } - - if (org.apache.camel.util.ObjectHelper.isEmpty(filter) || "*".equals(filter)) { - // grab everything - oldExchange.getMessage().setBody(newExchange.getMessage().getBody()); - LOG.trace("Including: body"); - if (newExchange.getMessage().hasHeaders()) { - oldExchange.getMessage().getHeaders().putAll(newExchange.getMessage().getHeaders()); - LOG.trace("Including: headers"); - } - return oldExchange; - } - - // body is by default often included - if (isBodyEnabled()) { - oldExchange.getMessage().setBody(newExchange.getMessage().getBody()); - LOG.trace("Including: body"); - } - - // headers is by default often included - if (isHeadersEnabled()) { - if (newExchange.getMessage().hasHeaders()) { - oldExchange.getMessage().getHeaders().putAll(newExchange.getMessage().getHeaders()); - LOG.trace("Including: headers"); - } - } - - // filter specific header if they are somehow enabled by the filter - if (hasHeaderPatterns()) { - boolean excludeOnly = isExcludeOnlyHeaderPatterns(); - for (Map.Entry header : newExchange.getMessage().getHeaders().entrySet()) { - String key = header.getKey(); - if (hasHeaderPattern(key)) { - boolean include = isIncludedHeader(key); - boolean exclude = isExcludedHeader(key); - if (include) { - LOG.trace("Including: header:{}", key); - oldExchange.getMessage().getHeaders().put(key, header.getValue()); - } else if (exclude) { - LOG.trace("Excluding: header:{}", key); - } else { - LOG.trace("Skipping: header:{}", key); - } - } else if (excludeOnly) { - LOG.trace("Including: header:{}", key); - oldExchange.getMessage().getHeaders().put(key, header.getValue()); - } - } - } - - // filter body and all headers - if (org.apache.camel.util.ObjectHelper.isNotEmpty(filter)) { - Iterable it = ObjectHelper.createIterable(filter, ","); - for (Object k : it) { - String part = k.toString(); - if (("body".equals(part) || "+body".equals(part)) && !"-body".equals(part)) { - oldExchange.getMessage().setBody(newExchange.getMessage().getBody()); - LOG.trace("Including: body"); - } else if (("headers".equals(part) || "+headers".equals(part)) && !"-headers".equals(part)) { - oldExchange.getMessage().getHeaders().putAll(newExchange.getMessage().getHeaders()); - LOG.trace("Including: headers"); - } - } - } - - // filter with remove (--) take precedence at the end - Iterable it = ObjectHelper.createIterable(filter, ","); - for (Object k : it) { - String part = k.toString(); - if ("--body".equals(part)) { - oldExchange.getMessage().setBody(null); - } else if ("--headers".equals(part)) { - oldExchange.getMessage().getHeaders().clear(); - } else if (part.startsWith("--header:")) { - // pattern matching for headers, eg header:foo, header:foo*, header:(foo|bar) - String after = StringHelper.after(part, "--header:"); - Iterable i = ObjectHelper.createIterable(after, ","); - Set toRemoveKeys = new HashSet<>(); - for (Object o : i) { - String pattern = o.toString(); - for (Map.Entry header : oldExchange.getMessage().getHeaders().entrySet()) { - String key = header.getKey(); - boolean matched = PatternHelper.matchPattern(key, pattern); - if (matched) { - toRemoveKeys.add(key); - } - } - } - for (String key : toRemoveKeys) { - LOG.trace("Removing: header:{}", key); - oldExchange.getMessage().removeHeader(key); - } - } - } - - return oldExchange; - } - - private boolean hasHeaderPatterns() { - String[] parts = filter.split(","); - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - if (pattern.startsWith("header:") || pattern.startsWith("+header:") || pattern.startsWith("-header:")) { - return true; - } - } - return false; - } - - private boolean isExcludeOnlyHeaderPatterns() { - String[] parts = filter.split(","); - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - if (pattern.startsWith("header:") || pattern.startsWith("+header:")) { - return false; - } - } - return true; - } - - private boolean hasHeaderPattern(String key) { - String[] parts = filter.split(","); - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - String header = null; - if (pattern.startsWith("header:") || pattern.startsWith("+header:")) { - header = StringHelper.after(pattern, "header:"); - } else if (pattern.startsWith("-header:")) { - header = StringHelper.after(pattern, "-header:"); - } - if (header != null && PatternHelper.matchPattern(key, header)) { - return true; - } - } - return false; - } - - private boolean isIncludedHeader(String key) { - String[] parts = filter.split(","); - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - if (pattern.startsWith("header:") || pattern.startsWith("+header:")) { - pattern = StringHelper.after(pattern, "header:"); - } - if (PatternHelper.matchPattern(key, pattern)) { - return true; - } - } - return false; - } - - private boolean isExcludedHeader(String key) { - String[] parts = filter.split(","); - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - if (pattern.startsWith("-header:")) { - pattern = StringHelper.after(pattern, "-header:"); - } - if (PatternHelper.matchPattern(key, pattern)) { - return true; - } - } - return false; - } - - private boolean isBodyEnabled() { - // body is always enabled unless excluded - String[] parts = filter.split(","); - - boolean onlyExclude = true; - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - if ("body".equals(pattern) || "+body".equals(pattern)) { - return true; - } else if ("-body".equals(pattern)) { - return false; - } - onlyExclude &= pattern.startsWith("-"); - } - // body is enabled if we only have exclude patterns - return onlyExclude; - } - - private boolean isHeadersEnabled() { - // headers may be enabled unless excluded - String[] parts = filter.split(","); - - boolean onlyExclude = true; - for (String pattern : parts) { - if (pattern.startsWith("--")) { - continue; - } - // if there is individual header filters then we cannot rely on this - if (pattern.startsWith("header:") || pattern.startsWith("+header:") || pattern.startsWith("-header:")) { - return false; - } - if ("headers".equals(pattern) || "+headers".equals(pattern)) { - return true; - } else if ("-headers".equals(pattern)) { - return false; - } - onlyExclude &= pattern.startsWith("-"); - } - // headers is enabled if we only have exclude patterns - return onlyExclude; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java deleted file mode 100644 index eb7550f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java +++ /dev/null @@ -1,216 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultClaimCheckRepository; -import org.apache.camel.spi.ClaimCheckRepository; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.LanguageSupport; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * ClaimCheck EIP implementation. - *

- * The current Claim Check EIP implementation in Camel is only intended for temporary memory repository. Likewise - * the repository is not shared among {@link Exchange}s, but a private instance is created per {@link Exchange}. - * This guards against concurrent and thread-safe issues. For off-memory persistent storage of data, then use - * any of the many Camel components that support persistent storage, and do not use this Claim Check EIP implementation. - */ -public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(ClaimCheckProcessor.class); - - private CamelContext camelContext; - private String id; - private String routeId; - private String operation; - private AggregationStrategy aggregationStrategy; - private String key; - private Expression keyExpression; - private String filter; - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getFilter() { - return filter; - } - - public void setFilter(String filter) { - this.filter = filter; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - // the repository is scoped per exchange - ClaimCheckRepository repo = exchange.getProperty(Exchange.CLAIM_CHECK_REPOSITORY, ClaimCheckRepository.class); - if (repo == null) { - repo = new DefaultClaimCheckRepository(); - exchange.setProperty(Exchange.CLAIM_CHECK_REPOSITORY, repo); - } - - try { - String claimKey = keyExpression.evaluate(exchange, String.class); - - if ("Set".equals(operation)) { - // copy exchange, and do not share the unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - boolean addedNew = repo.add(claimKey, copy); - if (addedNew) { - LOG.debug("Add: {} -> {}", claimKey, copy); - } else { - LOG.debug("Override: {} -> {}", claimKey, copy); - } - } else if ("Get".equals(operation)) { - Exchange copy = repo.get(claimKey); - LOG.debug("Get: {} -> {}", claimKey, exchange); - if (copy != null) { - Exchange result = aggregationStrategy.aggregate(exchange, copy); - if (result != null) { - ExchangeHelper.copyResultsPreservePattern(exchange, result); - } - } - } else if ("GetAndRemove".equals(operation)) { - Exchange copy = repo.getAndRemove(claimKey); - LOG.debug("GetAndRemove: {} -> {}", claimKey, exchange); - if (copy != null) { - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(exchange, copy); - Exchange result = aggregationStrategy.aggregate(exchange, copy); - if (result != null) { - ExchangeHelper.copyResultsPreservePattern(exchange, result); - } - } - } else if ("Push".equals(operation)) { - // copy exchange, and do not share the unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - LOG.debug("Push: {} -> {}", claimKey, copy); - repo.push(copy); - } else if ("Pop".equals(operation)) { - Exchange copy = repo.pop(); - LOG.debug("Pop: {} -> {}", claimKey, exchange); - if (copy != null) { - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(exchange, copy); - Exchange result = aggregationStrategy.aggregate(exchange, copy); - if (result != null) { - ExchangeHelper.copyResultsPreservePattern(exchange, result); - } - } - } - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(operation, "operation", this); - - if (aggregationStrategy == null) { - aggregationStrategy = createAggregationStrategy(); - } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - - if (LanguageSupport.hasSimpleFunction(key)) { - keyExpression = camelContext.resolveLanguage("simple").createExpression(key); - } else { - keyExpression = camelContext.resolveLanguage("constant").createExpression(key); - } - - ServiceHelper.startService(aggregationStrategy); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(aggregationStrategy); - } - - @Override - public String toString() { - return id; - } - - protected AggregationStrategy createAggregationStrategy() { - ClaimCheckAggregationStrategy answer = new ClaimCheckAggregationStrategy(); - answer.setFilter(filter); - return answer; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java deleted file mode 100644 index 7abfdd1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java +++ /dev/null @@ -1,199 +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.processor; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.ValidationException; -import org.apache.camel.spi.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A {@link CamelInternalProcessorAdvice} which applies {@link Transformer} and {@link Validator} - * according to the data type Contract. - *

- * The default camel {@link Message} implements {@link DataTypeAware} which - * holds a {@link DataType} to indicate current message type. If the input type - * declared by {@link org.apache.camel.model.InputTypeDefinition} is different from current IN message type, - * camel internal processor look for a Transformer which transforms from the current - * message type to the expected message type before routing. - * After routing, if the output type declared by {@link org.apache.camel.model.OutputTypeDefinition} is different - * from current OUT message (or IN message if no OUT), camel look for a Transformer and apply. - * - * @see Transformer - * @see Validator - * @see org.apache.camel.model.InputTypeDefinition - * @see org.apache.camel.model.OutputTypeDefinition - */ -public class ContractAdvice implements CamelInternalProcessorAdvice { - private static final Logger LOG = LoggerFactory.getLogger(ContractAdvice.class); - - private Contract contract; - - public ContractAdvice(Contract contract) { - this.contract = contract; - } - - @Override - public Object before(Exchange exchange) throws Exception { - if (!(exchange.getIn() instanceof DataTypeAware)) { - return null; - } - try { - DataType to = contract.getInputType(); - if (to != null) { - DataTypeAware target = (DataTypeAware) exchange.getIn(); - DataType from = target.getDataType(); - if (!to.equals(from)) { - LOG.debug("Looking for transformer for INPUT: from='{}', to='{}'", from, to); - doTransform(exchange.getIn(), from, to); - target.setDataType(to); - } - if (contract.isValidateInput()) { - doValidate(exchange.getIn(), to); - } - } - } catch (Exception e) { - exchange.setException(e); - } - - return null; - } - - @Override - public void after(Exchange exchange, Object data) throws Exception { - if (exchange.isFailed()) { - // TODO can we add FAULT_TYPE processing? - return; - } - - Message target = exchange.getMessage(); - if (!(target instanceof DataTypeAware)) { - return; - } - try { - DataType to = contract.getOutputType(); - if (to != null) { - DataTypeAware typeAwareTarget = (DataTypeAware)target; - DataType from = typeAwareTarget.getDataType(); - if (!to.equals(from)) { - LOG.debug("Looking for transformer for OUTPUT: from='{}', to='{}'", from, to); - doTransform(target, from, to); - typeAwareTarget.setDataType(to); - } - if (contract.isValidateOutput()) { - doValidate(target, to); - } - } - } catch (Exception e) { - exchange.setException(e); - } - } - - @Override - public boolean hasState() { - return false; - } - - private void doTransform(Message message, DataType from, DataType to) throws Exception { - if (from == null) { - // If 'from' is null, only Java-Java convertion is performed. - // It means if 'to' is other than Java, it's assumed to be already in expected type. - convertIfRequired(message, to); - return; - } - - // transform into 'from' type before performing declared transformation - convertIfRequired(message, from); - - if (applyMatchedTransformer(message, from, to)) { - // Found matched transformer. Java-Java transformer is also allowed. - return; - } else if (from.isJavaType()) { - // Try TypeConverter as a fallback for Java->Java transformation - convertIfRequired(message, to); - // If Java->Other transformation required but no transformer matched, - // then assume it's already in expected type, i.e. do nothing. - return; - } else if (applyTransformerChain(message, from, to)) { - // Other->Other transformation - found a transformer chain - return; - } - - throw new IllegalArgumentException("No Transformer found for [from='" + from + "', to='" + to + "']"); - } - - private boolean convertIfRequired(Message message, DataType type) throws Exception { - // TODO for better performance it may be better to add TypeConverterTransformer - // into transformer registry automatically to avoid unnecessary scan in transformer registry - if (type != null && type.isJavaType() && type.getName() != null && message != null && message.getBody() != null) { - CamelContext context = message.getExchange().getContext(); - Class typeJava = getClazz(type.getName(), context); - if (!typeJava.isAssignableFrom(message.getBody().getClass())) { - LOG.debug("Converting to '{}'", typeJava.getName()); - message.setBody(message.getMandatoryBody(typeJava)); - return true; - } - } - return false; - } - - private boolean applyTransformer(Transformer transformer, Message message, DataType from, DataType to) throws Exception { - if (transformer != null) { - LOG.debug("Applying transformer: from='{}', to='{}', transformer='{}'", from, to, transformer); - transformer.transform(message, from, to); - return true; - } - return false; - } - - private boolean applyMatchedTransformer(Message message, DataType from, DataType to) throws Exception { - Transformer transformer = message.getExchange().getContext().resolveTransformer(from, to); - return applyTransformer(transformer, message, from, to); - } - - private boolean applyTransformerChain(Message message, DataType from, DataType to) throws Exception { - CamelContext context = message.getExchange().getContext(); - Transformer fromTransformer = context.resolveTransformer(from.getModel()); - Transformer toTransformer = context.resolveTransformer(to.getModel()); - if (fromTransformer != null && toTransformer != null) { - LOG.debug("Applying transformer 1/2: from='{}', to='{}', transformer='{}'", from, to, fromTransformer); - fromTransformer.transform(message, from, new DataType(Object.class)); - LOG.debug("Applying transformer 2/2: from='{}', to='{}', transformer='{}'", from, to, toTransformer); - toTransformer.transform(message, new DataType(Object.class), to); - return true; - } - return false; - } - - private Class getClazz(String type, CamelContext context) throws Exception { - return context.getClassResolver().resolveMandatoryClass(type); - } - - private void doValidate(Message message, DataType type) throws ValidationException { - Validator validator = message.getExchange().getContext().resolveValidator(type); - if (validator != null) { - LOG.debug("Applying validator: type='{}', validator='{}'", type, validator); - validator.validate(message, type); - } else { - throw new ValidationException(message.getExchange(), String.format("No Validator found for '%s'", type)); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java deleted file mode 100644 index 226f660..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; -import org.apache.camel.support.DefaultMessage; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; - -import java.util.concurrent.CompletableFuture; - -/** - * A processor which converts the payload of the input message to be of the given type - *

- * If the conversion fails an {@link org.apache.camel.InvalidPayloadException} is thrown. - */ -public class ConvertBodyProcessor extends ServiceSupport implements AsyncProcessor, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Class type; - private final String charset; - - public ConvertBodyProcessor(Class type) { - ObjectHelper.notNull(type, "type", this); - this.type = type; - this.charset = null; - } - - public ConvertBodyProcessor(Class type, String charset) { - ObjectHelper.notNull(type, "type", this); - this.type = type; - this.charset = IOHelper.normalizeCharset(charset); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public void process(Exchange exchange) throws Exception { - Message old = exchange.getMessage(); - - if (old.getBody() == null) { - // only convert if there is a body - return; - } - - if (exchange.getException() != null) { - // do not convert if an exception has been thrown as if we attempt to convert and it also fails with a new - // exception then it will override the existing exception - return; - } - - String originalCharsetName = null; - if (charset != null) { - originalCharsetName = exchange.getProperty(Exchange.CHARSET_NAME, String.class); - // override existing charset with configured charset as that is what the user - // have explicit configured and expects to be used - exchange.setProperty(Exchange.CHARSET_NAME, charset); - } - // use mandatory conversion - Object value = old.getMandatoryBody(type); - - // create a new message container so we do not drag specialized message objects along - // but that is only needed if the old message is a specialized message - boolean copyNeeded = !(old.getClass().equals(DefaultMessage.class)); - - if (copyNeeded) { - Message msg = new DefaultMessage(exchange.getContext()); - msg.copyFromWithNewBody(old, value); - - // replace message on exchange - ExchangeHelper.replaceMessage(exchange, msg, false); - } else { - // no copy needed so set replace value directly - old.setBody(value); - } - - // remove or restore charset when we are done as we should not propagate that, - // as that can lead to double converting later on - if (charset != null) { - if (originalCharsetName != null && !originalCharsetName.isEmpty()) { - exchange.setProperty(Exchange.CHARSET_NAME, originalCharsetName); - } else { - exchange.removeProperty(Exchange.CHARSET_NAME); - } - } - } - - @Override - public CompletableFuture processAsync(Exchange exchange) { - AsyncCallbackToCompletableFutureAdapter callback = new AsyncCallbackToCompletableFutureAdapter<>(exchange); - process(exchange, callback); - return callback.getFuture(); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - process(exchange); - } catch (Exception e) { - exchange.setException(e); - } - callback.done(true); - return true; - } - - public Class getType() { - return type; - } - - public String getCharset() { - return charset; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java deleted file mode 100644 index 56a3f21..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java +++ /dev/null @@ -1,278 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * A useful base class for any processor which provides some kind of throttling - * or delayed processing. - *

- * This implementation will block while waiting. - */ -public abstract class DelayProcessorSupport extends DelegateAsyncProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(DelayProcessorSupport.class); - - private final CamelContext camelContext; - private final ScheduledExecutorService executorService; - private final boolean shutdownExecutorService; - private boolean asyncDelayed = true; - private boolean callerRunsWhenRejected = true; - private final AtomicInteger delayedCount = new AtomicInteger(0); - - // TODO: Add option to cancel tasks on shutdown so we can stop fast - - private final class ProcessCall implements Runnable { - private final Exchange exchange; - private final AsyncCallback callback; - - ProcessCall(Exchange exchange, AsyncCallback callback) { - this.exchange = exchange; - this.callback = callback; - } - - @Override - public void run() { - // we are running now so decrement the counter - delayedCount.decrementAndGet(); - - if (LOG.isTraceEnabled()) { - LOG.trace("Delayed task woke up and continues routing for exchangeId: {}", exchange.getExchangeId()); - } - if (!isRunAllowed()) { - exchange.setException(new RejectedExecutionException("Run is not allowed")); - } - - // process the exchange now that we woke up - DelayProcessorSupport.this.processor.process(exchange, new AsyncCallback() { - @Override - public void done(boolean doneSync) { - if (LOG.isTraceEnabled()) { - LOG.trace("Delayed task done for exchangeId: {}", exchange.getExchangeId()); - } - // we must done the callback from this async callback as well, to ensure callback is done correctly - // must invoke done on callback with false, as that is what the original caller would - // expect as we returned false in the process method - callback.done(false); - } - }); - } - } - - public DelayProcessorSupport(CamelContext camelContext, Processor processor) { - this(camelContext, processor, null, false); - } - - public DelayProcessorSupport(CamelContext camelContext, Processor processor, ScheduledExecutorService executorService, boolean shutdownExecutorService) { - super(processor); - this.camelContext = camelContext; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - } - - protected boolean processDelay(Exchange exchange, AsyncCallback callback, long delay) { - if (!isAsyncDelayed() || exchange.isTransacted()) { - // use synchronous delay (also required if using transactions) - try { - delay(delay, exchange); - // then continue routing - return processor.process(exchange, callback); - } catch (Exception e) { - // exception occurred so we are done - exchange.setException(e); - callback.done(true); - return true; - } - } else { - // asynchronous delay so schedule a process call task - // and increment the counter (we decrement the counter when we run the ProcessCall) - delayedCount.incrementAndGet(); - ProcessCall call = new ProcessCall(exchange, callback); - try { - if (LOG.isTraceEnabled()) { - LOG.trace("Scheduling delayed task to run in {} millis for exchangeId: {}", - delay, exchange.getExchangeId()); - } - executorService.schedule(call, delay, TimeUnit.MILLISECONDS); - // tell Camel routing engine we continue routing asynchronous - return false; - } catch (RejectedExecutionException e) { - // we were not allowed to run the ProcessCall, so need to decrement the counter here - delayedCount.decrementAndGet(); - if (isCallerRunsWhenRejected()) { - if (!isRunAllowed()) { - exchange.setException(new RejectedExecutionException()); - } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Scheduling rejected task, so letting caller run, delaying at first for {} millis for exchangeId: {}", delay, exchange.getExchangeId()); - } - // let caller run by processing - try { - delay(delay, exchange); - } catch (InterruptedException ie) { - exchange.setException(ie); - } - // then continue routing - return processor.process(exchange, callback); - } - } else { - exchange.setException(e); - } - // caller don't run the task so we are done - callback.done(true); - return true; - } - } - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (!isRunAllowed()) { - exchange.setException(new RejectedExecutionException("Run is not allowed")); - callback.done(true); - return true; - } - - // calculate delay and wait - long delay; - try { - delay = calculateDelay(exchange); - if (delay <= 0) { - // no delay then continue routing - if (LOG.isTraceEnabled()) { - LOG.trace("No delay for exchangeId: {}", exchange.getExchangeId()); - } - return processor.process(exchange, callback); - } - } catch (Throwable e) { - exchange.setException(e); - callback.done(true); - return true; - } - - return processDelay(exchange, callback, delay); - } - - public boolean isAsyncDelayed() { - return asyncDelayed; - } - - public void setAsyncDelayed(boolean asyncDelayed) { - this.asyncDelayed = asyncDelayed; - } - - public boolean isCallerRunsWhenRejected() { - return callerRunsWhenRejected; - } - - public void setCallerRunsWhenRejected(boolean callerRunsWhenRejected) { - this.callerRunsWhenRejected = callerRunsWhenRejected; - } - - protected abstract long calculateDelay(Exchange exchange); - - /** - * Gets the current number of {@link Exchange}s being delayed (hold back due throttle limit hit) - */ - public int getDelayedCount() { - return delayedCount.get(); - } - - /** - * Delays the given time before continuing. - *

- * This implementation will block while waiting - * - * @param delay the delay time in millis - * @param exchange the exchange being processed - */ - protected void delay(long delay, Exchange exchange) throws InterruptedException { - // only run is we are started - if (!isRunAllowed()) { - return; - } - - if (delay < 0) { - return; - } else { - try { - // keep track on delayer counter while we sleep - delayedCount.incrementAndGet(); - sleep(delay); - } catch (InterruptedException e) { - handleSleepInterruptedException(e, exchange); - } finally { - delayedCount.decrementAndGet(); - } - } - } - - /** - * Called when a sleep is interrupted; allows derived classes to handle this case differently - */ - protected void handleSleepInterruptedException(InterruptedException e, Exchange exchange) throws InterruptedException { - if (LOG.isDebugEnabled()) { - LOG.debug("Sleep interrupted, are we stopping? {}", isStopping() || isStopped()); - } - Thread.currentThread().interrupt(); - throw e; - } - - protected long currentSystemTime() { - return System.currentTimeMillis(); - } - - private void sleep(long delay) throws InterruptedException { - if (delay <= 0) { - return; - } - LOG.trace("Sleeping for: {} millis", delay); - Thread.sleep(delay); - } - - @Override - protected void doStart() throws Exception { - if (isAsyncDelayed()) { - ObjectHelper.notNull(executorService, "executorService", this); - } else if (executorService != null) { - asyncDelayed = true; - } - super.doStart(); - } - - @Override - protected void doShutdown() throws Exception { - if (shutdownExecutorService && executorService != null) { - camelContext.getExecutorServiceManager().shutdownNow(executorService); - } - super.doShutdown(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java deleted file mode 100644 index ca6b8be..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java +++ /dev/null @@ -1,109 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; - -import java.util.concurrent.ScheduledExecutorService; - -/** - * A Delayer which - * delays processing the exchange until the correct amount of time has elapsed - * using an expression to determine the delivery time. - *

- * This implementation will block while waiting. - */ -public class Delayer extends DelayProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String routeId; - private String id; - private Expression delay; - private long delayValue; - - public Delayer(CamelContext camelContext, Processor processor, Expression delay, - ScheduledExecutorService executorService, boolean shutdownExecutorService) { - super(camelContext, processor, executorService, shutdownExecutorService); - this.delay = delay; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - return "delay[" + delay + "]"; - } - - public Expression getDelay() { - return delay; - } - - public long getDelayValue() { - return delayValue; - } - - public void setDelay(Expression delay) { - this.delay = delay; - } - - // Implementation methods - // ------------------------------------------------------------------------- - - @Override - protected long calculateDelay(Exchange exchange) { - long time = 0; - if (delay != null) { - Long longValue = delay.evaluate(exchange, Long.class); - if (longValue != null) { - delayValue = longValue; - time = longValue; - } else { - delayValue = 0; - } - } - if (time <= 0) { - // no delay - return 0; - } - - return time; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DynamicRouter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DynamicRouter.java deleted file mode 100644 index 19254be..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/DynamicRouter.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.processor; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.support.ObjectHelper; - -import java.util.Iterator; - -/** - * Implements a Dynamic Router pattern - * where the destination(s) is computed at runtime. - *

- * This implementation builds on top of {@link org.apache.camel.processor.RoutingSlip} which contains - * the most logic. - */ -public class DynamicRouter extends RoutingSlip { - - public DynamicRouter(CamelContext camelContext) { - super(camelContext); - } - - public DynamicRouter(CamelContext camelContext, Expression expression, String uriDelimiter) { - super(camelContext, expression, uriDelimiter); - } - - @Override - protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, Expression expression) throws Exception { - return new DynamicRoutingSlipIterator(expression); - } - - /** - * The dynamic routing slip iterator. - */ - private final class DynamicRoutingSlipIterator implements RoutingSlipIterator { - - private final Expression slip; - private Iterator current; - - private DynamicRoutingSlipIterator(Expression slip) { - this.slip = slip; - } - - @Override - public boolean hasNext(Exchange exchange) { - if (current != null && current.hasNext()) { - return true; - } - // evaluate next slip - Object routingSlip = slip.evaluate(exchange, Object.class); - if (routingSlip == null) { - return false; - } - current = ObjectHelper.createIterator(routingSlip, uriDelimiter); - return current.hasNext(); - } - - @Override - public Object next(Exchange exchange) { - return current.next(); - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java deleted file mode 100644 index 48690e1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java +++ /dev/null @@ -1,435 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultProducerCache; -import org.apache.camel.impl.engine.EmptyProducerCache; -import org.apache.camel.spi.*; -import org.apache.camel.support.*; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.StopWatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern; - -/** - * A content enricher that enriches input data by first obtaining additional - * data from a resource represented by an endpoint producer - * and second by aggregating input data and additional data. Aggregation of - * input data and additional data is delegated to an {@link AggregationStrategy} - * object. - *

- * Uses a {@link org.apache.camel.Producer} to obtain the additional data as opposed to {@link org.apache.camel.processor.PollEnricher} - * that uses a {@link org.apache.camel.PollingConsumer}. - * - * @see PollEnricher - */ -public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(Enricher.class); - - private CamelContext camelContext; - private String id; - private String routeId; - private ProducerCache producerCache; - private final Expression expression; - private AggregationStrategy aggregationStrategy; - private boolean aggregateOnException; - private boolean shareUnitOfWork; - private int cacheSize; - private boolean ignoreInvalidEndpoint; - - public Enricher(Expression expression) { - this.expression = expression; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return producerCache.getEndpointUtilizationStatistics(); - } - - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public boolean isAggregateOnException() { - return aggregateOnException; - } - - public void setAggregateOnException(boolean aggregateOnException) { - this.aggregateOnException = aggregateOnException; - } - - public boolean isShareUnitOfWork() { - return shareUnitOfWork; - } - - public void setShareUnitOfWork(boolean shareUnitOfWork) { - this.shareUnitOfWork = shareUnitOfWork; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public boolean isIgnoreInvalidEndpoint() { - return ignoreInvalidEndpoint; - } - - public void setIgnoreInvalidEndpoint(boolean ignoreInvalidEndpoint) { - this.ignoreInvalidEndpoint = ignoreInvalidEndpoint; - } - - /** - * Enriches the input data (exchange) by first obtaining - * additional data from an endpoint represented by an endpoint - * producer and second by aggregating input data and additional - * data. Aggregation of input data and additional data is delegated to an - * {@link AggregationStrategy} object set at construction time. If the - * message exchange with the resource endpoint fails then no aggregation - * will be done and the failed exchange content is copied over to the - * original message exchange. - * - * @param exchange input data. - */ - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - // which producer to use - final AsyncProducer producer; - final Endpoint endpoint; - - // use dynamic endpoint so calculate the endpoint to use - Object recipient = null; - boolean prototype = cacheSize < 0; - try { - recipient = expression.evaluate(exchange, Object.class); - recipient = prepareRecipient(exchange, recipient); - Endpoint existing = getExistingEndpoint(exchange, recipient); - if (existing == null) { - endpoint = resolveEndpoint(exchange, recipient, prototype); - } else { - endpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - // acquire the producer from the cache - producer = producerCache.acquireProducer(endpoint); - } catch (Throwable e) { - if (isIgnoreInvalidEndpoint()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e); - } - } else { - exchange.setException(e); - } - callback.done(true); - return true; - } - - final Exchange resourceExchange = createResourceExchange(exchange, ExchangePattern.InOut); - final Endpoint destination = producer.getEndpoint(); - - StopWatch sw = null; - boolean sending = EventHelper.notifyExchangeSending(exchange.getContext(), resourceExchange, destination); - if (sending) { - sw = new StopWatch(); - } - // record timing for sending the exchange using the producer - final StopWatch watch = sw; - final boolean prototypeEndpoint = prototype; - AsyncProcessor ap = AsyncProcessorConverterHelper.convert(producer); - boolean sync = ap.process(resourceExchange, new AsyncCallback() { - public void done(boolean doneSync) { - // we only have to handle async completion - if (doneSync) { - return; - } - - // emit event that the exchange was sent to the endpoint - if (watch != null) { - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(resourceExchange.getContext(), resourceExchange, destination, timeTaken); - } - - if (!isAggregateOnException() && resourceExchange.isFailed()) { - // copy resource exchange onto original exchange (preserving pattern) - copyResultsPreservePattern(exchange, resourceExchange); - } else { - prepareResult(exchange); - try { - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(exchange, resourceExchange); - MessageHelper.resetStreamCache(exchange.getIn()); - - Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); - if (aggregatedExchange != null) { - // copy aggregation result onto original exchange (preserving pattern) - copyResultsPreservePattern(exchange, aggregatedExchange); - } - } catch (Throwable e) { - // if the aggregationStrategy threw an exception, set it on the original exchange - exchange.setException(new CamelExchangeException("Error occurred during aggregation", exchange, e)); - callback.done(false); - // we failed so break out now - return; - } - } - - // set property with the uri of the endpoint enriched so we can use that for tracing etc - exchange.setProperty(Exchange.TO_ENDPOINT, producer.getEndpoint().getEndpointUri()); - - // return the producer back to the cache - try { - producerCache.releaseProducer(endpoint, producer); - } catch (Exception e) { - // ignore - } - // and stop prototype endpoints - if (prototypeEndpoint) { - ServiceHelper.stopAndShutdownService(endpoint); - } - - callback.done(false); - } - }); - - if (!sync) { - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId()); - } - // the remainder of the routing slip will be completed async - // so we break out now, then the callback will be invoked which then continue routing from where we left here - return false; - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId()); - } - - if (watch != null) { - // emit event that the exchange was sent to the endpoint - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(resourceExchange.getContext(), resourceExchange, destination, timeTaken); - } - - if (!isAggregateOnException() && resourceExchange.isFailed()) { - // copy resource exchange onto original exchange (preserving pattern) - copyResultsPreservePattern(exchange, resourceExchange); - } else { - prepareResult(exchange); - - try { - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(exchange, resourceExchange); - MessageHelper.resetStreamCache(exchange.getIn()); - - Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); - if (aggregatedExchange != null) { - // copy aggregation result onto original exchange (preserving pattern) - copyResultsPreservePattern(exchange, aggregatedExchange); - } - } catch (Throwable e) { - // if the aggregationStrategy threw an exception, set it on the original exchange - exchange.setException(new CamelExchangeException("Error occurred during aggregation", exchange, e)); - callback.done(true); - // we failed so break out now - return true; - } - } - - // set property with the uri of the endpoint enriched so we can use that for tracing etc - exchange.setProperty(Exchange.TO_ENDPOINT, producer.getEndpoint().getEndpointUri()); - - // return the producer back to the cache - try { - producerCache.releaseProducer(endpoint, producer); - } catch (Exception e) { - // ignore - } - // and stop prototype endpoints - if (prototypeEndpoint) { - ServiceHelper.stopAndShutdownService(endpoint); - } - - callback.done(true); - return true; - } - - protected static Object prepareRecipient(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient instanceof Endpoint || recipient instanceof NormalizedEndpointUri) { - return recipient; - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - recipient = ((String) recipient).trim(); - } - if (recipient != null) { - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - String uri; - if (recipient instanceof String) { - uri = (String) recipient; - } else { - // convert to a string type we can work with - uri = ecc.getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - // optimize and normalize endpoint - return ecc.normalizeUri(uri); - } - return null; - } - - protected static Endpoint getExistingEndpoint(Exchange exchange, Object recipient) { - if (recipient instanceof Endpoint) { - return (Endpoint) recipient; - } - if (recipient != null) { - if (recipient instanceof NormalizedEndpointUri) { - NormalizedEndpointUri nu = (NormalizedEndpointUri) recipient; - ExtendedCamelContext ecc = exchange.getContext().adapt(ExtendedCamelContext.class); - return ecc.hasEndpoint(nu); - } else { - String uri = recipient.toString(); - return exchange.getContext().hasEndpoint(uri); - } - } - return null; - } - - protected static Endpoint resolveEndpoint(Exchange exchange, Object recipient, boolean prototype) { - return prototype ? ExchangeHelper.resolvePrototypeEndpoint(exchange, recipient) : ExchangeHelper.resolveEndpoint(exchange, recipient); - } - - /** - * Creates a new {@link DefaultExchange} instance from the given - * exchange. The resulting exchange's pattern is defined by - * pattern. - * - * @param source exchange to copy from. - * @param pattern exchange pattern to set. - * @return created exchange. - */ - protected Exchange createResourceExchange(Exchange source, ExchangePattern pattern) { - // copy exchange, and do not share the unit of work - Exchange target = ExchangeHelper.createCorrelatedCopy(source, false); - target.setPattern(pattern); - - // if we share unit of work, we need to prepare the resource exchange - if (isShareUnitOfWork()) { - target.setProperty(Exchange.PARENT_UNIT_OF_WORK, source.getUnitOfWork()); - // and then share the unit of work - target.adapt(ExtendedExchange.class).setUnitOfWork(source.getUnitOfWork()); - } - return target; - } - - private static void prepareResult(Exchange exchange) { - if (exchange.getPattern().isOutCapable()) { - exchange.getOut().copyFrom(exchange.getIn()); - } - } - - private static AggregationStrategy defaultAggregationStrategy() { - return new CopyAggregationStrategy(); - } - - @Override - public String toString() { - return id; - } - - @Override - protected void doStart() throws Exception { - if (aggregationStrategy == null) { - aggregationStrategy = defaultAggregationStrategy(); - } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - - if (producerCache == null) { - if (cacheSize < 0) { - producerCache = new EmptyProducerCache(this, camelContext); - LOG.debug("Enricher {} is not using ProducerCache", this); - } else { - producerCache = new DefaultProducerCache(this, camelContext, cacheSize); - LOG.debug("Enricher {} using ProducerCache with cacheSize={}", this, cacheSize); - } - } - - ServiceHelper.startService(producerCache, aggregationStrategy); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(aggregationStrategy, producerCache); - } - - private static class CopyAggregationStrategy implements AggregationStrategy { - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (newExchange != null) { - copyResultsPreservePattern(oldExchange, newExchange); - } - return oldExchange; - } - - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ErrorHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ErrorHandler.java deleted file mode 100644 index e53c621..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ErrorHandler.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.processor; - -import org.apache.camel.Processor; - -/** - * An interface used to represent an error handler - */ -public interface ErrorHandler extends Processor { -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java deleted file mode 100644 index e111cf7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java +++ /dev/null @@ -1,64 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Traceable; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * A {@link org.apache.camel.Processor} which evaluates an {@link Expression} - * and stores the result as a property on the {@link Exchange} with the key - * {@link Exchange#EVALUATE_EXPRESSION_RESULT}. - *

- * This processor will in case of evaluation exceptions, set the caused exception - * on the {@link Exchange}. - */ -public class EvaluateExpressionProcessor extends AsyncProcessorSupport implements Traceable { - - private final Expression expression; - - public EvaluateExpressionProcessor(Expression expression) { - this.expression = expression; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - Object result = expression.evaluate(exchange, Object.class); - exchange.setProperty(Exchange.EVALUATE_EXPRESSION_RESULT, result); - } catch (Throwable e) { - exchange.setException(e); - } finally { - callback.done(true); - } - return true; - } - - @Override - public String toString() { - return "EvalExpression[" + expression + "]"; - } - - @Override - public String getTraceLabel() { - return "eval[" + expression + "]"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java deleted file mode 100644 index d2fd8e8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java +++ /dev/null @@ -1,108 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.DefaultAsyncProducer; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.StopWatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Ensures a {@link Producer} do send {@link org.apache.camel.spi.EventNotifier} notifications when - * sending. - */ -public final class EventNotifierProducer extends DefaultAsyncProducer { - - private static final Logger LOG = LoggerFactory.getLogger(EventNotifierProducer.class); - - private final AsyncProducer producer; - - /** - * The producer which should be executed and emit {@link org.apache.camel.spi.EventNotifier} notifications. - * - * @param producer the producer - */ - public EventNotifierProducer(Producer producer) { - super(producer.getEndpoint()); - this.producer = AsyncProcessorConverterHelper.convert(producer); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (!isStarted()) { - exchange.setException(new IllegalStateException("Producer has not been started: " + this)); - callback.done(true); - return true; - } - - final boolean sending = EventHelper.notifyExchangeSending(exchange.getContext(), exchange, getEndpoint()); - // record timing for sending the exchange using the producer - StopWatch watch; - if (sending) { - watch = new StopWatch(); - } else { - watch = null; - } - - try { - LOG.debug(">>>> {} {}", getEndpoint(), exchange); - return producer.process(exchange, new AsyncCallback() { - @Override - public void done(boolean doneSync) { - try { - // emit event that the exchange was sent to the endpoint - if (watch != null) { - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(exchange.getContext(), exchange, getEndpoint(), timeTaken); - } - } finally { - callback.done(doneSync); - } - } - }); - } catch (Throwable throwable) { - exchange.setException(throwable); - callback.done(true); - } - - return true; - } - - @Override - public Endpoint getEndpoint() { - return producer.getEndpoint(); - } - - @Override - public boolean isSingleton() { - return producer.isSingleton(); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(producer); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producer); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java deleted file mode 100644 index aadae7d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java +++ /dev/null @@ -1,90 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * Processor to set {@link ExchangePattern} on the {@link Exchange}. - */ -public class ExchangePatternProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware { - private String id; - private String routeId; - private ExchangePattern exchangePattern = ExchangePattern.InOnly; - - public ExchangePatternProcessor() { - } - - public ExchangePatternProcessor(ExchangePattern ep) { - setExchangePattern(ep); - } - - public void setExchangePattern(ExchangePattern ep) { - exchangePattern = ep; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public ExchangePattern getExchangePattern() { - return exchangePattern; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - exchange.setPattern(exchangePattern); - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java deleted file mode 100644 index 7a05059..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java +++ /dev/null @@ -1,183 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; -import org.apache.camel.Processor; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayDeque; -import java.util.Deque; - -import static org.apache.camel.support.builder.ExpressionBuilder.routeIdExpression; - -/** - * An {@link org.apache.camel.processor.ErrorHandler} used as a safe fallback when - * processing by other error handlers such as the {@link org.apache.camel.model.OnExceptionDefinition}. - *

- * This error handler is used as a fail-safe to ensure that error handling does not run in endless recursive looping - * which potentially can happen if a new exception is thrown while error handling a previous exception which then - * cause new error handling to process and this then keep on failing with new exceptions in an endless loop. - */ -public class FatalFallbackErrorHandler extends DelegateAsyncProcessor implements ErrorHandler { - - private static final Logger LOG = LoggerFactory.getLogger(FatalFallbackErrorHandler.class); - - private boolean deadLetterChannel; - - public FatalFallbackErrorHandler(Processor processor) { - this(processor, false); - } - - public FatalFallbackErrorHandler(Processor processor, boolean isDeadLetterChannel) { - super(processor); - this.deadLetterChannel = isDeadLetterChannel; - } - - @Override - @SuppressWarnings("unchecked") - public boolean process(final Exchange exchange, final AsyncCallback callback) { - // get the current route id we use - final String id = routeIdExpression().evaluate(exchange, String.class); - - // prevent endless looping if we end up coming back to ourself - Deque fatals = exchange.getProperty(Exchange.FATAL_FALLBACK_ERROR_HANDLER, null, Deque.class); - if (fatals == null) { - fatals = new ArrayDeque<>(); - exchange.setProperty(Exchange.FATAL_FALLBACK_ERROR_HANDLER, fatals); - } - if (fatals.contains(id)) { - LOG.warn("Circular error-handler detected at route: {} - breaking out processing Exchange: {}", id, exchange); - // mark this exchange as already been error handler handled (just by having this property) - // the false value mean the caught exception will be kept on the exchange, causing the - // exception to be propagated back to the caller, and to break out routing - exchange.adapt(ExtendedExchange.class).setErrorHandlerHandled(false); - exchange.setProperty(Exchange.ERRORHANDLER_CIRCUIT_DETECTED, true); - callback.done(true); - return true; - } - - // okay we run under this fatal error handler now - fatals.push(id); - - // support the asynchronous routing engine - boolean sync = processor.process(exchange, new AsyncCallback() { - public void done(boolean doneSync) { - try { - if (exchange.getException() != null) { - // an exception occurred during processing onException - - // log detailed error message with as much detail as possible - Throwable previous = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); - - // check if previous and this exception are set as the same exception - // which happens when using global scoped onException and you call a direct route that causes the 2nd exception - // then we need to find the original previous exception as the suppressed exception - if (previous != null && previous == exchange.getException()) { - previous = null; - // maybe previous was suppressed? - if (exchange.getException().getSuppressed().length > 0) { - previous = exchange.getException().getSuppressed()[0]; - } - } - - String msg = "Exception occurred while trying to handle previously thrown exception on exchangeId: " - + exchange.getExchangeId() + " using: [" + processor + "]."; - if (previous != null) { - msg += " The previous and the new exception will be logged in the following."; - log(msg); - log("\\--> Previous exception on exchangeId: " + exchange.getExchangeId(), previous); - log("\\--> New exception on exchangeId: " + exchange.getExchangeId(), exchange.getException()); - } else { - log(msg); - log("\\--> New exception on exchangeId: " + exchange.getExchangeId(), exchange.getException()); - } - - // add previous as suppressed to exception if not already there - if (previous != null) { - Throwable[] suppressed = exchange.getException().getSuppressed(); - boolean found = false; - for (Throwable t : suppressed) { - if (t == previous) { - found = true; - } - } - if (!found) { - exchange.getException().addSuppressed(previous); - } - } - - // we can propagated that exception to the caught property on the exchange - // which will shadow any previously caught exception and cause this new exception - // to be visible in the error handler - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, exchange.getException()); - - if (deadLetterChannel) { - // special for dead letter channel as we want to let it determine what to do, depending how - // it has been configured - exchange.adapt(ExtendedExchange.class).setErrorHandlerHandled(null); - } else { - // mark this exchange as already been error handler handled (just by having this property) - // the false value mean the caught exception will be kept on the exchange, causing the - // exception to be propagated back to the caller, and to break out routing - exchange.adapt(ExtendedExchange.class).setErrorHandlerHandled(false); - } - } - } finally { - // no longer running under this fatal fallback error handler - Deque fatals = exchange.getProperty(Exchange.FATAL_FALLBACK_ERROR_HANDLER, null, Deque.class); - if (fatals != null) { - fatals.removeLastOccurrence(id); - } - callback.done(doneSync); - } - } - }); - - return sync; - } - - private void log(String message) { - log(message, null); - } - - private void log(String message, Throwable t) { - // when using dead letter channel we only want to log at WARN level - if (deadLetterChannel) { - if (t != null) { - LOG.warn(message, t); - } else { - LOG.warn(message); - } - } else { - if (t != null) { - LOG.error(message, t); - } else { - LOG.error(message); - } - } - } - - @Override - public String toString() { - return "FatalFallbackErrorHandler[" + processor + "]"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java deleted file mode 100644 index 50a6ff8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java +++ /dev/null @@ -1,147 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The processor which implements the - * Message Filter EIP pattern. - */ -public class FilterProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(FilterProcessor.class); - - private final CamelContext context; - private String id; - private String routeId; - private final Predicate predicate; - private transient long filtered; - - public FilterProcessor(CamelContext context, Predicate predicate, Processor processor) { - super(processor); - this.context = context; - this.predicate = predicate; - } - - @Override - protected void doInit() throws Exception { - super.doInit(); - predicate.init(context); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - boolean matches = false; - - try { - matches = matches(exchange); - } catch (Exception e) { - exchange.setException(e); - } - - if (matches) { - return processor.process(exchange, callback); - } else { - callback.done(true); - return true; - } - } - - public boolean matches(Exchange exchange) { - boolean matches = predicate.matches(exchange); - - LOG.debug("Filter matches: {} for exchange: {}", matches, exchange); - - // set property whether the filter matches or not - exchange.setProperty(Exchange.FILTER_MATCHED, matches); - - if (matches) { - filtered++; - } - - return matches; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - return "filter[if: " + predicate + "]"; - } - - public Predicate getPredicate() { - return predicate; - } - - /** - * Gets the number of Exchanges that matched the filter predicate and therefore as filtered. - */ - public long getFilteredCount() { - return filtered; - } - - /** - * Reset counters. - */ - public void reset() { - filtered = 0; - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - // restart counter - reset(); - ServiceHelper.startService(predicate); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(predicate); - super.doStop(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java deleted file mode 100644 index 447dff3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java +++ /dev/null @@ -1,134 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Processor to handle do finally supporting asynchronous routing engine - */ -public class FinallyProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(FinallyProcessor.class); - - private String id; - private String routeId; - - public FinallyProcessor(Processor processor) { - super(processor); - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - Exception exception = exchange.getException(); - exchange.setException(null); - // but store the caught exception as a property - if (exception != null) { - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, exception); - } - - // store the last to endpoint as the failure endpoint - if (exchange.getProperty(Exchange.FAILURE_ENDPOINT) == null) { - exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT)); - } - - // continue processing - return processor.process(exchange, new FinallyAsyncCallback(exchange, callback, exception)); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "finally"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - private final class FinallyAsyncCallback implements AsyncCallback { - - private final Exchange exchange; - private final AsyncCallback callback; - private final Exception exception; - - FinallyAsyncCallback(Exchange exchange, AsyncCallback callback, Exception exception) { - this.exchange = exchange; - this.callback = callback; - this.exception = exception; - } - - @Override - public void done(boolean doneSync) { - try { - if (exception == null) { - exchange.removeProperty(Exchange.FAILURE_ENDPOINT); - } else { - // set exception back on exchange - exchange.setException(exception); - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, exception); - } - - if (!doneSync) { - // signal callback to continue routing async - ExchangeHelper.prepareOutToIn(exchange); - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - } - } finally { - // callback must always be called - callback.done(doneSync); - } - } - - @Override - public String toString() { - return "FinallyAsyncCallback"; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java deleted file mode 100644 index 8457464..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java +++ /dev/null @@ -1,39 +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.processor; - -import org.apache.camel.Processor; -import org.apache.camel.support.processor.DelegateAsyncProcessor; - -/** - * Endpoint intercept processor so we know the processor is supposed to intercept an endpoint. - */ -public class InterceptEndpointProcessor extends DelegateAsyncProcessor { - - private final String uri; - - public InterceptEndpointProcessor(String uri, Processor processor) { - super(processor); - this.uri = uri; - } - - @Override - public String toString() { - return "InterceptEndpointProcessor[" + uri + " -> " + processor + "]"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java deleted file mode 100644 index 1d85b9b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Traceable; -import org.apache.camel.spi.*; -import org.apache.camel.support.AsyncProcessorSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Set; - -/** - * A processor which evaluates an {@link Expression} and logs it. - */ -public class LogProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(LogProcessor.class); - - private String id; - private String routeId; - private final Expression expression; - private final CamelLogger logger; - private final MaskingFormatter formatter; - private final Set listeners; - - public LogProcessor(Expression expression, CamelLogger logger, MaskingFormatter formatter, Set listeners) { - this.expression = expression; - this.logger = logger; - this.formatter = formatter; - this.listeners = listeners; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - if (logger.shouldLog()) { - String msg = expression.evaluate(exchange, String.class); - if (formatter != null) { - msg = formatter.format(msg); - } - msg = fireListeners(exchange, msg); - logger.doLog(msg); - } - } catch (Exception e) { - exchange.setException(e); - } finally { - // callback must be invoked - callback.done(true); - } - return true; - } - - private String fireListeners(Exchange exchange, String message) { - if (listeners == null) { - return message; - } - for (LogListener listener : listeners) { - if (listener == null) { - continue; - } - try { - String output = listener.onLog(exchange, logger, message); - message = output != null ? output : message; - } catch (Throwable t) { - LOG.warn("Ignoring an exception thrown by {}: {}", listener.getClass().getName(), t.getMessage()); - if (LOG.isDebugEnabled()) { - LOG.debug("", t); - } - } - } - return message; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "log[" + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - public CamelLogger getLogger() { - return logger; - } - - public MaskingFormatter getLogFormatter() { - return formatter; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java deleted file mode 100644 index c3fdba9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java +++ /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. - */ -package org.apache.camel.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.processor.PipelineHelper.continueProcessing; - -/** - * The processor which sends messages in a loop. - */ -public class LoopProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(LoopProcessor.class); - - private String id; - private String routeId; - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final Expression expression; - private final Predicate predicate; - private final boolean copy; - - public LoopProcessor(CamelContext camelContext, Processor processor, Expression expression, Predicate predicate, boolean copy) { - super(processor); - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.expression = expression; - this.predicate = predicate; - this.copy = copy; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - LoopState state = new LoopState(exchange, callback); - - if (exchange.isTransacted()) { - reactiveExecutor.scheduleSync(state); - } else { - reactiveExecutor.scheduleMain(state); - } - return false; - } catch (Exception e) { - exchange.setException(e); - callback.done(true); - return true; - } - } - - /** - * Class holding state for loop processing - */ - class LoopState implements Runnable { - - final Exchange exchange; - final AsyncCallback callback; - Exchange current; - int index; - int count; - - public LoopState(Exchange exchange, AsyncCallback callback) throws NoTypeConversionAvailableException { - this.exchange = exchange; - this.callback = callback; - this.current = exchange; - - // evaluate expression / predicate - if (expression != null) { - // Intermediate conversion to String is needed when direct conversion to Integer is not available - // but evaluation result is a textual representation of a numeric value. - String text = expression.evaluate(exchange, String.class); - count = ExchangeHelper.convertToMandatoryType(exchange, Integer.class, text); - exchange.setProperty(Exchange.LOOP_SIZE, count); - } - } - - @Override - public void run() { - try { - // check for error if so we should break out - boolean cont = continueProcessing(current, "so breaking out of loop", LOG); - boolean doWhile = predicate == null || predicate.matches(current); - boolean doLoop = expression == null || index < count; - - // iterate - if (cont && doWhile && doLoop) { - // and prepare for next iteration - current = prepareExchange(exchange, index); - - // set current index as property - LOG.debug("LoopProcessor: iteration #{}", index); - current.setProperty(Exchange.LOOP_INDEX, index); - - processor.process(current, doneSync -> { - // increment counter after done - index++; - reactiveExecutor.schedule(this); - }); - } else { - // we are done so prepare the result - ExchangeHelper.copyResults(exchange, current); - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - callback.done(false); - } - } catch (Exception e) { - if (LOG.isTraceEnabled()) { - LOG.trace("Processing failed for exchangeId: {} >>> {}", exchange.getExchangeId(), e.getMessage()); - } - exchange.setException(e); - callback.done(false); - } - } - - @Override - public String toString() { - return "LoopState"; - } - } - - /** - * Prepares the exchange for the next iteration - * - * @param exchange the exchange - * @param index the index of the next iteration - * @return the exchange to use - */ - protected Exchange prepareExchange(Exchange exchange, int index) { - if (copy) { - // use a copy but let it reuse the same exchange id so it appear as one exchange - // use the original exchange rather than the looping exchange (esp. with the async routing engine) - return ExchangeHelper.createCopy(exchange, true); - } else { - ExchangeHelper.prepareOutToIn(exchange); - return exchange; - } - } - - public Expression getExpression() { - return expression; - } - - public Predicate getPredicate() { - return predicate; - } - - public boolean isCopy() { - return copy; - } - - @Override - public String getTraceLabel() { - if (predicate != null) { - return "loopWhile[" + predicate + "]"; - } else { - return "loop[" + expression + "]"; - } - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String toString() { - return id; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java deleted file mode 100644 index e586cc1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ /dev/null @@ -1,976 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.UnitOfWork; -import org.apache.camel.support.*; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.CastUtils; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.KeyValueHolder; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.concurrent.AsyncCompletionService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.Closeable; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import static org.apache.camel.util.ObjectHelper.notNull; - -/** - * Implements the Multicast pattern to send a message exchange to a number of - * endpoints, each endpoint receiving a copy of the message exchange. - */ -public class MulticastProcessor extends AsyncProcessorSupport implements Navigate, Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(MulticastProcessor.class); - - /** - * Class that represent each step in the multicast route to do - */ - static final class DefaultProcessorExchangePair implements ProcessorExchangePair { - private final int index; - private final Processor processor; - private final Processor prepared; - private final Exchange exchange; - - private DefaultProcessorExchangePair(int index, Processor processor, Processor prepared, Exchange exchange) { - this.index = index; - this.processor = processor; - this.prepared = prepared; - this.exchange = exchange; - } - - @Override - public int getIndex() { - return index; - } - - @Override - public Exchange getExchange() { - return exchange; - } - - @Override - public Producer getProducer() { - if (processor instanceof Producer) { - return (Producer) processor; - } - return null; - } - - @Override - public Processor getProcessor() { - return prepared; - } - - @Override - public void begin() { - // noop - } - - @Override - public void done() { - // noop - } - - } - - /** - * Class that represents prepared fine grained error handlers when processing multicasted/splitted exchanges - *

- * See the createProcessorExchangePair and createErrorHandler methods. - */ - static final class ErrorHandlerKey extends KeyValueHolder { - - ErrorHandlerKey(Route key, Processor value) { - super(key, value); - } - - } - - protected final Processor onPrepare; - private final CamelContext camelContext; - private final Route route; - private final ReactiveExecutor reactiveExecutor; - private String id; - private String routeId; - private Collection processors; - private final AggregationStrategy aggregationStrategy; - private final boolean parallelProcessing; - private final boolean streaming; - private final boolean parallelAggregate; - private final boolean stopOnAggregateException; - private final boolean stopOnException; - private final ExecutorService executorService; - private final boolean shutdownExecutorService; - private ExecutorService aggregateExecutorService; - private boolean shutdownAggregateExecutorService; - private final long timeout; - private final ConcurrentMap errorHandlers = new ConcurrentHashMap<>(); - private final boolean shareUnitOfWork; - - public MulticastProcessor(CamelContext camelContext, Route route, Collection processors) { - this(camelContext, route, processors, null); - } - - public MulticastProcessor(CamelContext camelContext, Route route, Collection processors, AggregationStrategy aggregationStrategy) { - this(camelContext, route, processors, aggregationStrategy, false, null, false, false, false, 0, null, false, false); - } - - public MulticastProcessor(CamelContext camelContext, Route route, Collection processors, AggregationStrategy aggregationStrategy, boolean parallelProcessing, - ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, long timeout, Processor onPrepare, - boolean shareUnitOfWork, boolean parallelAggregate) { - this(camelContext, route, processors, aggregationStrategy, parallelProcessing, executorService, shutdownExecutorService, streaming, stopOnException, timeout, onPrepare, - shareUnitOfWork, parallelAggregate, false); - } - - public MulticastProcessor(CamelContext camelContext, Route route, Collection processors, AggregationStrategy aggregationStrategy, - boolean parallelProcessing, ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, - boolean stopOnException, long timeout, Processor onPrepare, boolean shareUnitOfWork, - boolean parallelAggregate, boolean stopOnAggregateException) { - notNull(camelContext, "camelContext"); - this.camelContext = camelContext; - this.route = route; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.processors = processors; - this.aggregationStrategy = aggregationStrategy; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.streaming = streaming; - this.stopOnException = stopOnException; - // must enable parallel if executor service is provided - this.parallelProcessing = parallelProcessing || executorService != null; - this.timeout = timeout; - this.onPrepare = onPrepare; - this.shareUnitOfWork = shareUnitOfWork; - this.parallelAggregate = parallelAggregate; - this.stopOnAggregateException = stopOnAggregateException; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - return "multicast"; - } - - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - protected void doInit() throws Exception { - if (route != null) { - Exchange exchange = new DefaultExchange(getCamelContext()); - for (Processor processor : getProcessors()) { - createErrorHandler(route, exchange, processor); - } - } - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - Iterable pairs; - try { - pairs = createProcessorExchangePairs(exchange); - } catch (Throwable e) { - exchange.setException(e); - // unexpected exception was thrown, maybe from iterator etc. so do not regard as exhausted - // and do the done work - doDone(exchange, null, null, callback, true, false); - return true; - } - - MulticastTask state = new MulticastTask(exchange, pairs, callback); - if (isParallelProcessing()) { - executorService.submit(() -> reactiveExecutor.schedule(state)); - } else { - if (exchange.isTransacted()) { - reactiveExecutor.scheduleSync(state); - } else { - reactiveExecutor.scheduleMain(state); - } - } - - // the remainder of the multicast will be completed async - // so we break out now, then the callback will be invoked which then - // continue routing from where we left here - return false; - } - - protected void schedule(Runnable runnable) { - if (isParallelProcessing()) { - executorService.submit(() -> reactiveExecutor.schedule(runnable)); - } else { - reactiveExecutor.schedule(runnable); - } - } - - protected class MulticastTask implements Runnable { - - final Exchange original; - final Iterable pairs; - final AsyncCallback callback; - final Iterator iterator; - final ReentrantLock lock; - final AsyncCompletionService completion; - final AtomicReference result; - final AtomicInteger nbExchangeSent = new AtomicInteger(); - final AtomicInteger nbAggregated = new AtomicInteger(); - final AtomicBoolean allSent = new AtomicBoolean(); - final AtomicBoolean done = new AtomicBoolean(); - - MulticastTask(Exchange original, Iterable pairs, AsyncCallback callback) { - this.original = original; - this.pairs = pairs; - this.callback = callback; - this.iterator = pairs.iterator(); - this.lock = new ReentrantLock(); - this.completion = new AsyncCompletionService<>(MulticastProcessor.this::schedule, !isStreaming(), lock); - this.result = new AtomicReference<>(); - if (timeout > 0) { - schedule(aggregateExecutorService, this::timeout, timeout, TimeUnit.MILLISECONDS); - } - } - - @Override - public String toString() { - return "MulticastTask"; - } - - @Override - public void run() { - try { - if (done.get()) { - return; - } - - // Check if the iterator is empty - // This can happen the very first time we check the existence - // of an item before queuing the run. - // or some iterators may return true for hasNext() but then null in next() - if (!iterator.hasNext()) { - doDone(result.get(), true); - return; - } - - ProcessorExchangePair pair = iterator.next(); - boolean hasNext = iterator.hasNext(); - // some iterators may return true for hasNext() but then null in next() - if (pair == null && !hasNext) { - doDone(result.get(), true); - return; - } - - Exchange exchange = pair.getExchange(); - int index = nbExchangeSent.getAndIncrement(); - updateNewExchange(exchange, index, pairs, hasNext); - - // Schedule the processing of the next pair - if (hasNext) { - if (isParallelProcessing()) { - schedule(this); - } - } else { - allSent.set(true); - } - - completion.submit(exchangeResult -> { - // compute time taken if sending to another endpoint - StopWatch watch = beforeSend(pair); - - AsyncProcessor async = AsyncProcessorConverterHelper.convert(pair.getProcessor()); - async.process(exchange, doneSync -> { - afterSend(pair, watch); - - // Decide whether to continue with the multicast or not; similar logic to the Pipeline - // remember to test for stop on exception and aggregate before copying back results - boolean continueProcessing = PipelineHelper.continueProcessing(exchange, "Multicast processing failed for number " + index, LOG); - if (stopOnException && !continueProcessing) { - if (exchange.getException() != null) { - // wrap in exception to explain where it failed - exchange.setException(new CamelExchangeException("Multicast processing failed for number " + index, exchange, exchange.getException())); - } else { - // we want to stop on exception, and the exception was handled by the error handler - // this is similar to what the pipeline does, so we should do the same to not surprise end users - // so we should set the failed exchange as the result and be done - result.set(exchange); - } - // and do the done work - doDone(exchange, true); - return; - } - - exchangeResult.accept(exchange); - - // aggregate exchanges if any - aggregate(); - - // next step - if (hasNext && !isParallelProcessing()) { - schedule(this); - } - }); - }); - } catch (Exception e) { - original.setException(e); - doDone(null, false); - } - } - - protected void aggregate() { - Lock lock = this.lock; - if (lock.tryLock()) { - try { - Exchange exchange; - while (!done.get() && (exchange = completion.poll()) != null) { - doAggregate(result, exchange, original); - if (nbAggregated.incrementAndGet() >= nbExchangeSent.get() && allSent.get()) { - doDone(result.get(), true); - } - } - } catch (Throwable e) { - original.setException(e); - // and do the done work - doDone(null, false); - } finally { - lock.unlock(); - } - } - } - - protected void timeout() { - Lock lock = this.lock; - if (lock.tryLock()) { - try { - while (nbAggregated.get() < nbExchangeSent.get()) { - Exchange exchange = completion.pollUnordered(); - int index = exchange != null ? getExchangeIndex(exchange) : nbExchangeSent.get(); - while (nbAggregated.get() < index) { - AggregationStrategy strategy = getAggregationStrategy(null); - strategy.timeout(result.get() != null ? result.get() : original, - nbAggregated.getAndIncrement(), nbExchangeSent.get(), timeout); - } - if (exchange != null) { - doAggregate(result, exchange, original); - nbAggregated.incrementAndGet(); - } - } - doDone(result.get(), true); - } catch (Throwable e) { - original.setException(e); - // and do the done work - doDone(null, false); - } finally { - lock.unlock(); - } - } - } - - protected void doDone(Exchange exchange, boolean forceExhaust) { - if (done.compareAndSet(false, true)) { - MulticastProcessor.this.doDone(original, exchange, pairs, callback, false, forceExhaust); - } - } - } - - protected void schedule(Executor executor, Runnable runnable, long delay, TimeUnit unit) { - if (executor instanceof ScheduledExecutorService) { - ((ScheduledExecutorService) executor).schedule(runnable, delay, unit); - } else { - executor.execute(() -> { - try { - Thread.sleep(delay); - } catch (InterruptedException e) { - // ignore - } - runnable.run(); - }); - } - } - - protected StopWatch beforeSend(ProcessorExchangePair pair) { - StopWatch watch; - final Exchange e = pair.getExchange(); - final Producer p = pair.getProducer(); - if (p != null) { - boolean sending = EventHelper.notifyExchangeSending(e.getContext(), e, p.getEndpoint()); - if (sending) { - watch = new StopWatch(); - } else { - watch = null; - } - } else { - watch = null; - } - - // let the prepared process it, remember to begin the exchange pair - pair.begin(); - - // return the watch - return watch; - } - - protected void afterSend(ProcessorExchangePair pair, StopWatch watch) { - // we are done with the exchange pair - pair.done(); - - // okay we are done, so notify the exchange was sent - final Producer producer = pair.getProducer(); - if (producer != null && watch != null) { - long timeTaken = watch.taken(); - final Exchange e = pair.getExchange(); - Endpoint endpoint = producer.getEndpoint(); - // emit event that the exchange was sent to the endpoint - EventHelper.notifyExchangeSent(e.getContext(), e, endpoint, timeTaken); - } - } - - /** - * Common work which must be done when we are done multicasting. - *

- * This logic applies for both running synchronous and asynchronous as there are multiple exist points - * when using the asynchronous routing engine. And therefore we want the logic in one method instead - * of being scattered. - * - * @param original the original exchange - * @param subExchange the current sub exchange, can be null for the synchronous part - * @param pairs the pairs with the exchanges to process - * @param callback the callback - * @param doneSync the doneSync parameter to call on callback - * @param forceExhaust whether or not error handling is exhausted - */ - protected void doDone(Exchange original, Exchange subExchange, final Iterable pairs, - AsyncCallback callback, boolean doneSync, boolean forceExhaust) { - - // we are done so close the pairs iterator - if (pairs instanceof Closeable) { - IOHelper.close((Closeable) pairs, "pairs", LOG); - } - - AggregationStrategy strategy = getAggregationStrategy(subExchange); - // invoke the on completion callback - if (strategy != null) { - strategy.onCompletion(subExchange); - } - - // cleanup any per exchange aggregation strategy - removeAggregationStrategyFromExchange(original); - - // we need to know if there was an exception, and if the stopOnException option was enabled - // also we would need to know if any error handler has attempted redelivery and exhausted - boolean stoppedOnException = false; - boolean exception = false; - ExtendedExchange see = (ExtendedExchange) subExchange; - boolean exhaust = forceExhaust || see != null && (see.getException() != null || see.isRedeliveryExhausted()); - if (original.getException() != null || subExchange != null && subExchange.getException() != null) { - // there was an exception and we stopped - stoppedOnException = isStopOnException(); - exception = true; - } - - // must copy results at this point - if (subExchange != null) { - if (stoppedOnException) { - // if we stopped due an exception then only propagate the exception - original.setException(subExchange.getException()); - } else { - // copy the current result to original so it will contain this result of this eip - ExchangeHelper.copyResults(original, subExchange); - } - } - - // .. and then if there was an exception we need to configure the redelivery exhaust - // for example the noErrorHandler will not cause redelivery exhaust so if this error - // handled has been in use, then the exhaust would be false (if not forced) - if (exception) { - // multicast uses error handling on its output processors and they have tried to redeliver - // so we shall signal back to the other error handlers that we are exhausted and they should not - // also try to redeliver as we would then do that twice - original.adapt(ExtendedExchange.class).setRedeliveryExhausted(exhaust); - } - - reactiveExecutor.schedule(callback); - } - - /** - * Aggregate the {@link Exchange} with the current result. - * This method is synchronized and is called directly when parallelAggregate is disabled (by default). - * - * @param result the current result - * @param exchange the exchange to be added to the result - * @param inputExchange the input exchange that was sent as input to this EIP - */ - protected void doAggregate(AtomicReference result, Exchange exchange, Exchange inputExchange) { - if (parallelAggregate) { - doAggregateInternal(getAggregationStrategy(exchange), result, exchange, inputExchange); - } else { - doAggregateSync(getAggregationStrategy(exchange), result, exchange, inputExchange); - } - } - - /** - * Aggregate the {@link Exchange} with the current result. - * This method is synchronized and is called directly when parallelAggregate is disabled (by default). - * - * @param strategy the aggregation strategy to use - * @param result the current result - * @param exchange the exchange to be added to the result - * @param inputExchange the input exchange that was sent as input to this EIP - */ - private synchronized void doAggregateSync(AggregationStrategy strategy, AtomicReference result, Exchange exchange, Exchange inputExchange) { - doAggregateInternal(strategy, result, exchange, inputExchange); - } - - /** - * Aggregate the {@link Exchange} with the current result. - * This method is unsynchronized and is called directly when parallelAggregate is enabled. - * In all other cases, this method is called from the doAggregate which is a synchronized method - * - * @param strategy the aggregation strategy to use - * @param result the current result - * @param exchange the exchange to be added to the result - * @param inputExchange the input exchange that was sent as input to this EIP - */ - private void doAggregateInternal(AggregationStrategy strategy, AtomicReference result, Exchange exchange, Exchange inputExchange) { - if (strategy != null) { - // prepare the exchanges for aggregation - Exchange oldExchange = result.get(); - ExchangeHelper.prepareAggregation(oldExchange, exchange); - result.set(strategy.aggregate(oldExchange, exchange, inputExchange)); - } - } - - protected void updateNewExchange(Exchange exchange, int index, Iterable allPairs, boolean hasNext) { - exchange.setProperty(Exchange.MULTICAST_INDEX, index); - if (hasNext) { - exchange.setProperty(Exchange.MULTICAST_COMPLETE, Boolean.FALSE); - } else { - exchange.setProperty(Exchange.MULTICAST_COMPLETE, Boolean.TRUE); - } - } - - protected Integer getExchangeIndex(Exchange exchange) { - return exchange.getProperty(Exchange.MULTICAST_INDEX, Integer.class); - } - - protected Iterable createProcessorExchangePairs(Exchange exchange) throws Exception { - List result = new ArrayList<>(processors.size()); - - StreamCache streamCache = null; - if (isParallelProcessing() && exchange.getIn().getBody() instanceof StreamCache) { - // in parallel processing case, the stream must be copied, therefore get the stream - streamCache = (StreamCache) exchange.getIn().getBody(); - } - - int index = 0; - for (Processor processor : processors) { - // copy exchange, and do not share the unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - - if (streamCache != null) { - if (index > 0) { - // copy it otherwise parallel processing is not possible, - // because streams can only be read once - StreamCache copiedStreamCache = streamCache.copy(copy); - if (copiedStreamCache != null) { - copy.getIn().setBody(copiedStreamCache); - } - } - } - - // If the multi-cast processor has an aggregation strategy - // then the StreamCache created by the child routes must not be - // closed by the unit of work of the child route, but by the unit of - // work of the parent route or grand parent route or grand grand parent route ...(in case of nesting). - // Set therefore the unit of work of the parent route as stream cache unit of work, - // if it is not already set. - if (copy.getProperty(Exchange.STREAM_CACHE_UNIT_OF_WORK) == null) { - copy.setProperty(Exchange.STREAM_CACHE_UNIT_OF_WORK, exchange.getUnitOfWork()); - } - // if we share unit of work, we need to prepare the child exchange - if (isShareUnitOfWork()) { - prepareSharedUnitOfWork(copy, exchange); - } - - // and add the pair - Route route = ExchangeHelper.getRoute(exchange); - result.add(createProcessorExchangePair(index++, processor, copy, route)); - } - - if (exchange.getException() != null) { - // force any exceptions occurred during creation of exchange paris to be thrown - // before returning the answer; - throw exchange.getException(); - } - - return result; - } - - /** - * Creates the {@link ProcessorExchangePair} which holds the processor and exchange to be send out. - *

- * You must use this method to create the instances of {@link ProcessorExchangePair} as they - * need to be specially prepared before use. - * - * @param index the index - * @param processor the processor - * @param exchange the exchange - * @param route the route context - * @return prepared for use - */ - protected ProcessorExchangePair createProcessorExchangePair(int index, Processor processor, Exchange exchange, - Route route) { - Processor prepared = processor; - - // set property which endpoint we send to - setToEndpoint(exchange, prepared); - - // rework error handling to support fine grained error handling - prepared = createErrorHandler(route, exchange, prepared); - - // invoke on prepare on the exchange if specified - if (onPrepare != null) { - try { - onPrepare.process(exchange); - } catch (Exception e) { - exchange.setException(e); - } - } - return new DefaultProcessorExchangePair(index, processor, prepared, exchange); - } - - protected Processor createErrorHandler(Route route, Exchange exchange, Processor processor) { - Processor answer; - - if (route != this.route && this.route != null) { - throw new UnsupportedOperationException("Is this really correct ?"); - } - boolean tryBlock = exchange.getProperty(Exchange.TRY_ROUTE_BLOCK, false, boolean.class); - - // do not wrap in error handler if we are inside a try block - if (!tryBlock && route != null) { - // wrap the producer in error handler so we have fine grained error handling on - // the output side instead of the input side - // this is needed to support redelivery on that output alone and not doing redelivery - // for the entire multicast block again which will start from scratch again - - // create key for cache - final ErrorHandlerKey key = new ErrorHandlerKey(route, processor); - - // lookup cached first to reuse and preserve memory - answer = errorHandlers.get(key); - if (answer != null) { - LOG.trace("Using existing error handler for: {}", processor); - return answer; - } - - LOG.trace("Creating error handler for: {}", processor); - // create error handler (create error handler directly to keep it light weight, - // instead of using ProcessorReifier.wrapInErrorHandler) - try { - processor = route.createErrorHandler(processor); - - // and wrap in unit of work processor so the copy exchange also can run under UoW - answer = createUnitOfWorkProcessor(route, processor, exchange); - - boolean child = exchange.getProperty(Exchange.PARENT_UNIT_OF_WORK, UnitOfWork.class) != null; - - // must start the error handler - ServiceHelper.startService(answer); - - // here we don't cache the child unit of work - if (!child) { - // add to cache - errorHandlers.putIfAbsent(key, answer); - } - - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } else { - // and wrap in unit of work processor so the copy exchange also can run under UoW - answer = createUnitOfWorkProcessor(route, processor, exchange); - } - - return answer; - } - - /** - * Strategy to create the unit of work to be used for the sub route - * - * @param processor the processor - * @param exchange the exchange - * @return the unit of work processor - */ - protected Processor createUnitOfWorkProcessor(Route route, Processor processor, Exchange exchange) { - CamelInternalProcessor internal = new CamelInternalProcessor(exchange.getContext(), processor); - - // and wrap it in a unit of work so the UoW is on the top, so the entire route will be in the same UoW - UnitOfWork parent = exchange.getProperty(Exchange.PARENT_UNIT_OF_WORK, UnitOfWork.class); - if (parent != null) { - internal.addAdvice(new CamelInternalProcessor.ChildUnitOfWorkProcessorAdvice(route, exchange.getContext(), parent)); - } else { - internal.addAdvice(new CamelInternalProcessor.UnitOfWorkProcessorAdvice(route, exchange.getContext())); - } - - return internal; - } - - /** - * Prepares the exchange for participating in a shared unit of work - *

- * This ensures a child exchange can access its parent {@link UnitOfWork} when it participate - * in a shared unit of work. - * - * @param childExchange the child exchange - * @param parentExchange the parent exchange - */ - protected void prepareSharedUnitOfWork(Exchange childExchange, Exchange parentExchange) { - childExchange.setProperty(Exchange.PARENT_UNIT_OF_WORK, parentExchange.getUnitOfWork()); - } - - @Override - protected void doStart() throws Exception { - if (isParallelProcessing() && executorService == null) { - throw new IllegalArgumentException("ParallelProcessing is enabled but ExecutorService has not been set"); - } - if (timeout > 0 && aggregateExecutorService == null) { - // use unbounded thread pool so we ensure the aggregate on-the-fly task always will have assigned a thread - // and run the tasks when the task is submitted. If not then the aggregate task may not be able to run - // and signal completion during processing, which would lead to what would appear as a dead-lock or a slow processing - String name = getClass().getSimpleName() + "-AggregateTask"; - aggregateExecutorService = createAggregateExecutorService(name); - shutdownAggregateExecutorService = true; - } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - - ServiceHelper.startService(aggregationStrategy, processors); - } - - /** - * Strategy to create the thread pool for the aggregator background task which waits for and aggregates - * completed tasks when running in parallel mode. - * - * @param name the suggested name for the background thread - * @return the thread pool - */ - protected synchronized ExecutorService createAggregateExecutorService(String name) { - // use a cached thread pool so we each on-the-fly task has a dedicated thread to process completions as they come in - return camelContext.getExecutorServiceManager().newScheduledThreadPool(this, name, 0); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(processors, errorHandlers, aggregationStrategy); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(processors, errorHandlers, aggregationStrategy); - // only clear error handlers when shutting down - errorHandlers.clear(); - - if (shutdownExecutorService && executorService != null) { - getCamelContext().getExecutorServiceManager().shutdownNow(executorService); - } - if (shutdownAggregateExecutorService && aggregateExecutorService != null) { - getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService); - } - } - - protected static void setToEndpoint(Exchange exchange, Processor processor) { - if (processor instanceof Producer) { - Producer producer = (Producer) processor; - exchange.setProperty(Exchange.TO_ENDPOINT, producer.getEndpoint().getEndpointUri()); - } - } - - protected AggregationStrategy getAggregationStrategy(Exchange exchange) { - AggregationStrategy answer = null; - - // prefer to use per Exchange aggregation strategy over a global strategy - if (exchange != null) { - Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class); - Map map = CastUtils.cast(property); - if (map != null) { - answer = map.get(this); - } - } - if (answer == null) { - // fallback to global strategy - answer = getAggregationStrategy(); - } - return answer; - } - - /** - * Sets the given {@link AggregationStrategy} on the {@link Exchange}. - * - * @param exchange the exchange - * @param aggregationStrategy the strategy - */ - protected void setAggregationStrategyOnExchange(Exchange exchange, AggregationStrategy aggregationStrategy) { - Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class); - Map map = CastUtils.cast(property); - if (map == null) { - map = new ConcurrentHashMap<>(); - } else { - // it is not safe to use the map directly as the exchange doesn't have the deep copy of it's properties - // we just create a new copy if we need to change the map - map = new ConcurrentHashMap<>(map); - } - // store the strategy using this processor as the key - // (so we can store multiple strategies on the same exchange) - map.put(this, aggregationStrategy); - exchange.setProperty(Exchange.AGGREGATION_STRATEGY, map); - } - - /** - * Removes the associated {@link AggregationStrategy} from the {@link Exchange} - * which must be done after use. - * - * @param exchange the current exchange - */ - protected void removeAggregationStrategyFromExchange(Exchange exchange) { - Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class); - Map map = CastUtils.cast(property); - if (map == null) { - return; - } - // remove the strategy using this processor as the key - map.remove(this); - } - - /** - * Is the multicast processor working in streaming mode? - *

- * In streaming mode: - *

    - *
  • we use {@link Iterable} to ensure we can send messages as soon as the data becomes available
    • - *
  • for parallel processing, we start aggregating responses as they get send back to the processor; - * this means the {@link AggregationStrategy} has to take care of handling out-of-order arrival of exchanges
    • - *
- */ - public boolean isStreaming() { - return streaming; - } - - /** - * Should the multicast processor stop processing further exchanges in case of an exception occurred? - */ - public boolean isStopOnException() { - return stopOnException; - } - - /** - * Returns the producers to multicast to - */ - public Collection getProcessors() { - return processors; - } - - /** - * An optional timeout in millis when using parallel processing - */ - public long getTimeout() { - return timeout; - } - - /** - * Use {@link #getAggregationStrategy(Exchange)} instead. - */ - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public boolean isParallelProcessing() { - return parallelProcessing; - } - - public boolean isParallelAggregate() { - return parallelAggregate; - } - - public boolean isStopOnAggregateException() { - return stopOnAggregateException; - } - - public boolean isShareUnitOfWork() { - return shareUnitOfWork; - } - - public ExecutorService getAggregateExecutorService() { - return aggregateExecutorService; - } - - public void setAggregateExecutorService(ExecutorService aggregateExecutorService) { - this.aggregateExecutorService = aggregateExecutorService; - // we use a custom executor so do not shutdown - this.shutdownAggregateExecutorService = false; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - return new ArrayList<>(processors); - } - - @Override - public boolean hasNext() { - return processors != null && !processors.isEmpty(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java deleted file mode 100644 index 893a44e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java +++ /dev/null @@ -1,361 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.SynchronizationAdapter; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; - -import static org.apache.camel.util.ObjectHelper.notNull; - -/** - * Processor implementing onCompletion. - */ -public class OnCompletionProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(OnCompletionProcessor.class); - - private final CamelContext camelContext; - private String id; - private String routeId; - private final Processor processor; - private final ExecutorService executorService; - private final boolean shutdownExecutorService; - private final boolean onCompleteOnly; - private final boolean onFailureOnly; - private final Predicate onWhen; - private final boolean useOriginalBody; - private final boolean afterConsumer; - - public OnCompletionProcessor(CamelContext camelContext, Processor processor, ExecutorService executorService, boolean shutdownExecutorService, - boolean onCompleteOnly, boolean onFailureOnly, Predicate onWhen, boolean useOriginalBody, boolean afterConsumer) { - notNull(camelContext, "camelContext"); - notNull(processor, "processor"); - this.camelContext = camelContext; - this.processor = processor; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.onCompleteOnly = onCompleteOnly; - this.onFailureOnly = onFailureOnly; - this.onWhen = onWhen; - this.useOriginalBody = useOriginalBody; - this.afterConsumer = afterConsumer; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(processor); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(processor); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownService(processor); - if (shutdownExecutorService) { - getCamelContext().getExecutorServiceManager().shutdownNow(executorService); - } - } - - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (processor != null) { - // register callback - if (afterConsumer) { - exchange.getUnitOfWork().addSynchronization(new OnCompletionSynchronizationAfterConsumer()); - } else { - exchange.getUnitOfWork().addSynchronization(new OnCompletionSynchronizationBeforeConsumer()); - } - } - - callback.done(true); - return true; - } - - protected boolean isCreateCopy() { - // we need to create a correlated copy if we run in parallel mode or is in after consumer mode (as the UoW would be done on the original exchange otherwise) - return executorService != null || afterConsumer; - } - - /** - * Processes the exchange by the processors - * - * @param processor the processor - * @param exchange the exchange - */ - protected static void doProcess(Processor processor, Exchange exchange) { - ExtendedExchange ee = (ExtendedExchange) exchange; - // must remember some properties which we cannot use during onCompletion processing - // as otherwise we may cause issues - // but keep the caused exception stored as a property (Exchange.EXCEPTION_CAUGHT) on the exchange - boolean stop = ee.isRouteStop(); - ee.setRouteStop(false); - Object failureHandled = ee.removeProperty(Exchange.FAILURE_HANDLED); - Boolean errorhandlerHandled = ee.getErrorHandlerHandled(); - ee.setErrorHandlerHandled(null); - boolean rollbackOnly = ee.isRollbackOnly(); - ee.setRollbackOnly(false); - boolean rollbackOnlyLast = ee.isRollbackOnlyLast(); - ee.setRollbackOnlyLast(false); - // and we should not be regarded as exhausted as we are in a onCompletion block - boolean exhausted = ee.adapt(ExtendedExchange.class).isRedeliveryExhausted(); - ee.setRedeliveryExhausted(false); - - Exception cause = ee.getException(); - ee.setException(null); - - try { - processor.process(exchange); - } catch (Exception e) { - exchange.setException(e); - } finally { - // restore the options - ee.setRouteStop(stop); - if (failureHandled != null) { - ee.setProperty(Exchange.FAILURE_HANDLED, failureHandled); - } - if (errorhandlerHandled != null) { - ee.setErrorHandlerHandled(errorhandlerHandled); - } - ee.setRollbackOnly(rollbackOnly); - ee.setRollbackOnlyLast(rollbackOnlyLast); - ee.setRedeliveryExhausted(exhausted); - if (cause != null) { - ee.setException(cause); - } - } - } - - /** - * Prepares the {@link Exchange} to send as onCompletion. - * - * @param exchange the current exchange - * @return the exchange to be routed in onComplete - */ - protected Exchange prepareExchange(Exchange exchange) { - Exchange answer; - - if (isCreateCopy()) { - // for asynchronous routing we must use a copy as we dont want it - // to cause side effects of the original exchange - // (the original thread will run in parallel) - answer = ExchangeHelper.createCorrelatedCopy(exchange, false); - if (answer.hasOut()) { - // move OUT to IN (pipes and filters) - answer.setIn(answer.getOut()); - answer.setOut(null); - } - // set MEP to InOnly as this onCompletion is a fire and forget - answer.setPattern(ExchangePattern.InOnly); - } else { - // use the exchange as-is - answer = exchange; - } - - if (useOriginalBody) { - LOG.trace("Using the original IN message instead of current"); - - Message original = ExchangeHelper.getOriginalInMessage(exchange); - answer.setIn(original); - } - - // add a header flag to indicate its a on completion exchange - answer.setProperty(Exchange.ON_COMPLETION, Boolean.TRUE); - - return answer; - } - - private final class OnCompletionSynchronizationAfterConsumer extends SynchronizationAdapter implements Ordered { - - @Override - public int getOrder() { - // we want to be last - return Ordered.LOWEST; - } - - @Override - public void onComplete(final Exchange exchange) { - if (onFailureOnly) { - return; - } - - if (onWhen != null && !onWhen.matches(exchange)) { - // predicate did not match so do not route the onComplete - return; - } - - // must use a copy as we dont want it to cause side effects of the original exchange - final Exchange copy = prepareExchange(exchange); - - if (executorService != null) { - executorService.submit(new Callable() { - public Exchange call() throws Exception { - LOG.debug("Processing onComplete: {}", copy); - doProcess(processor, copy); - return copy; - } - }); - } else { - // run without thread-pool - LOG.debug("Processing onComplete: {}", copy); - doProcess(processor, copy); - } - } - - @Override - public void onFailure(final Exchange exchange) { - if (onCompleteOnly) { - return; - } - - if (onWhen != null && !onWhen.matches(exchange)) { - // predicate did not match so do not route the onComplete - return; - } - - - // must use a copy as we dont want it to cause side effects of the original exchange - final Exchange copy = prepareExchange(exchange); - final Exception original = copy.getException(); - // must remove exception otherwise onFailure routing will fail as well - // the caused exception is stored as a property (Exchange.EXCEPTION_CAUGHT) on the exchange - copy.setException(null); - - if (executorService != null) { - executorService.submit(new Callable() { - public Exchange call() throws Exception { - LOG.debug("Processing onFailure: {}", copy); - doProcess(processor, copy); - // restore exception after processing - copy.setException(original); - return null; - } - }); - } else { - // run without thread-pool - LOG.debug("Processing onFailure: {}", copy); - doProcess(processor, copy); - // restore exception after processing - copy.setException(original); - } - } - - @Override - public String toString() { - if (!onCompleteOnly && !onFailureOnly) { - return "onCompleteOrFailure"; - } else if (onCompleteOnly) { - return "onCompleteOnly"; - } else { - return "onFailureOnly"; - } - } - } - - private final class OnCompletionSynchronizationBeforeConsumer extends SynchronizationAdapter implements Ordered { - - @Override - public int getOrder() { - // we want to be last - return Ordered.LOWEST; - } - - @Override - public void onAfterRoute(Route route, Exchange exchange) { - if (exchange.isFailed() && onCompleteOnly) { - return; - } - - if (!exchange.isFailed() && onFailureOnly) { - return; - } - - if (onWhen != null && !onWhen.matches(exchange)) { - // predicate did not match so do not route the onComplete - return; - } - - // must use a copy as we dont want it to cause side effects of the original exchange - final Exchange copy = prepareExchange(exchange); - - if (executorService != null) { - executorService.submit(new Callable() { - public Exchange call() throws Exception { - LOG.debug("Processing onAfterRoute: {}", copy); - doProcess(processor, copy); - return copy; - } - }); - } else { - // run without thread-pool - LOG.debug("Processing onAfterRoute: {}", copy); - doProcess(processor, copy); - } - } - - @Override - public String toString() { - return "onAfterRoute"; - } - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "onCompletion"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java deleted file mode 100644 index 3c8d5e6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java +++ /dev/null @@ -1,197 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -import static org.apache.camel.processor.PipelineHelper.continueProcessing; - -/** - * Creates a Pipeline pattern where the output of the previous step is sent as - * input to the next step, reusing the same message exchanges - */ -public class Pipeline extends AsyncProcessorSupport implements Navigate, Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(Pipeline.class); - - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final List processors; - private final int size; - private String id; - private String routeId; - - private final class PipelineTask implements Runnable { - - private final Exchange exchange; - private final AsyncCallback callback; - private final AtomicInteger index; - - PipelineTask(Exchange exchange, AsyncCallback callback, AtomicInteger index) { - this.exchange = exchange; - this.callback = callback; - this.index = index; - } - - @Override - public void run() { - boolean stop = exchange.isRouteStop(); - int num = index.get(); - boolean more = num < size; - boolean first = num == 0; - - if (!stop && more && (first || continueProcessing(exchange, "so breaking out of pipeline", LOG))) { - - // prepare for next run - if (exchange.hasOut()) { - exchange.setIn(exchange.getOut()); - exchange.setOut(null); - } - - // get the next processor - AsyncProcessor processor = processors.get(index.getAndIncrement()); - - processor.process(exchange, doneSync -> reactiveExecutor.schedule(this)); - } else { - ExchangeHelper.copyResults(exchange, exchange); - - // logging nextExchange as it contains the exchange that might have altered the payload and since - // we are logging the completion if will be confusing if we log the original instead - // we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - - reactiveExecutor.schedule(callback); - } - } - } - - public Pipeline(CamelContext camelContext, Collection processors) { - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.processors = processors.stream().map(AsyncProcessorConverterHelper::convert).collect(Collectors.toList()); - this.size = processors.size(); - } - - public static Processor newInstance(CamelContext camelContext, List processors) { - if (processors.isEmpty()) { - return null; - } else if (processors.size() == 1) { - return processors.get(0); - } - return new Pipeline(camelContext, processors); - } - - public static Processor newInstance(final CamelContext camelContext, final Processor... processors) { - if (processors == null || processors.length == 0) { - return null; - } else if (processors.length == 1) { - return processors[0]; - } - - final List toBeProcessed = new ArrayList<>(processors.length); - for (Processor processor : processors) { - if (processor != null) { - toBeProcessed.add(processor); - } - } - - return new Pipeline(camelContext, toBeProcessed); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - // create task which has state used during routing - PipelineTask task = new PipelineTask(exchange, callback, new AtomicInteger()); - - if (exchange.isTransacted()) { - reactiveExecutor.scheduleSync(task); - } else { - reactiveExecutor.scheduleMain(task); - } - return false; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(processors); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(processors); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "pipeline"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - return new ArrayList<>(processors); - } - - @Override - public boolean hasNext() { - return processors != null && !processors.isEmpty(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java deleted file mode 100644 index 88b5402..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java +++ /dev/null @@ -1,74 +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.processor; - -import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; -import org.slf4j.Logger; - -/** - * Helper for processing {@link Exchange} in a - * pipeline. - */ -public final class PipelineHelper { - - private PipelineHelper() { - } - - /** - * Should we continue processing the exchange? - * - * @param exchange the next exchange - * @param message a message to use when logging that we should not continue processing - * @param log a logger - * @return true to continue processing, false to break out, for example if an exception occurred. - */ - public static boolean continueProcessing(Exchange exchange, String message, Logger log) { - ExtendedExchange ee = (ExtendedExchange) exchange; - if (ee.isFailed() || ee.isRollbackOnly() || ee.isRollbackOnlyLast() || ee.isErrorHandlerHandled()) { - // The errorErrorHandler is only set if satisfactory handling was done - // by the error handler. It's still an exception, the exchange still failed. - if (log.isDebugEnabled()) { - StringBuilder sb = new StringBuilder(); - sb.append("Message exchange has failed: ").append(message).append(" for exchange: ").append(exchange); - if (exchange.isRollbackOnly() || exchange.isRollbackOnlyLast()) { - sb.append(" Marked as rollback only."); - } - if (exchange.getException() != null) { - sb.append(" Exception: ").append(exchange.getException()); - } - if (ee.isErrorHandlerHandled()) { - sb.append(" Handled by the error handler."); - } - log.debug(sb.toString()); - } - - return false; - } - - // check for stop - if (ee.isRouteStop()) { - if (log.isDebugEnabled()) { - log.debug("ExchangeId: {} is marked to stop routing: {}", exchange.getExchangeId(), exchange); - } - return false; - } - - return true; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java deleted file mode 100644 index a69e5e0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java +++ /dev/null @@ -1,467 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultConsumerCache; -import org.apache.camel.spi.*; -import org.apache.camel.support.*; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern; - -/** - * A content enricher that enriches input data by first obtaining additional - * data from a resource represented by an endpoint producer - * and second by aggregating input data and additional data. Aggregation of - * input data and additional data is delegated to an {@link AggregationStrategy} - * object. - *

- * Uses a {@link PollingConsumer} to obtain the additional data as opposed to {@link Enricher} - * that uses a {@link org.apache.camel.Producer}. - * - * @see Enricher - */ -public class PollEnricher extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(PollEnricher.class); - - private CamelContext camelContext; - private ConsumerCache consumerCache; - private String id; - private String routeId; - private AggregationStrategy aggregationStrategy; - private final Expression expression; - private final String destination; - private long timeout; - private boolean aggregateOnException; - private int cacheSize; - private boolean ignoreInvalidEndpoint; - - /** - * Creates a new {@link PollEnricher}. - * - * @param expression expression to use to compute the endpoint to poll from. - * @param timeout timeout in millis - */ - public PollEnricher(Expression expression, long timeout) { - this.expression = expression; - this.destination = null; - this.timeout = timeout; - } - - /** - * Creates a new {@link PollEnricher}. - * - * @param destination the endpoint to poll from. - * @param timeout timeout in millis - */ - public PollEnricher(String destination, long timeout) { - this.expression = null; - this.destination = destination; - this.timeout = timeout; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return consumerCache.getEndpointUtilizationStatistics(); - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - /** - * Sets the aggregation strategy for this poll enricher. - * - * @param aggregationStrategy the aggregationStrategy to set - */ - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public long getTimeout() { - return timeout; - } - - /** - * Sets the timeout to use when polling. - *

- * Use 0 to use receiveNoWait, - * Use -1 to use receive with no timeout (which will block until data is available). - * - * @param timeout timeout in millis. - */ - public void setTimeout(long timeout) { - this.timeout = timeout; - } - - public boolean isAggregateOnException() { - return aggregateOnException; - } - - public void setAggregateOnException(boolean aggregateOnException) { - this.aggregateOnException = aggregateOnException; - } - - /** - * Sets the default aggregation strategy for this poll enricher. - */ - public void setDefaultAggregationStrategy() { - this.aggregationStrategy = defaultAggregationStrategy(); - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public boolean isIgnoreInvalidEndpoint() { - return ignoreInvalidEndpoint; - } - - public void setIgnoreInvalidEndpoint(boolean ignoreInvalidEndpoint) { - this.ignoreInvalidEndpoint = ignoreInvalidEndpoint; - } - - @Override - protected void doInit() throws Exception { - if (destination != null) { - Endpoint endpoint = getExistingEndpoint(camelContext, destination); - if (endpoint == null) { - endpoint = resolveEndpoint(camelContext, destination, cacheSize < 0); - } - } else if (expression != null) { - expression.init(camelContext); - } - } - - /** - * Enriches the input data (exchange) by first obtaining - * additional data from an endpoint represented by an endpoint - * producer and second by aggregating input data and additional - * data. Aggregation of input data and additional data is delegated to an - * {@link AggregationStrategy} object set at construction time. If the - * message exchange with the resource endpoint fails then no aggregation - * will be done and the failed exchange content is copied over to the - * original message exchange. - * - * @param exchange input data. - */ - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - preCheckPoll(exchange); - } catch (Exception e) { - exchange.setException(new CamelExchangeException("Error during pre poll check", exchange, e)); - callback.done(true); - return true; - } - - // which consumer to use - PollingConsumer consumer; - Endpoint endpoint; - - // use dynamic endpoint so calculate the endpoint to use - Object recipient = null; - boolean prototype = cacheSize < 0; - try { - recipient = destination != null ? destination : expression.evaluate(exchange, Object.class); - recipient = prepareRecipient(exchange, recipient); - Endpoint existing = getExistingEndpoint(camelContext, recipient); - if (existing == null) { - endpoint = resolveEndpoint(camelContext, recipient, prototype); - } else { - endpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - // acquire the consumer from the cache - consumer = consumerCache.acquirePollingConsumer(endpoint); - } catch (Throwable e) { - if (isIgnoreInvalidEndpoint()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e); - } - } else { - exchange.setException(e); - } - callback.done(true); - return true; - } - - // grab the real delegate consumer that performs the actual polling - Consumer delegate = consumer; - if (consumer instanceof EventDrivenPollingConsumer) { - delegate = ((EventDrivenPollingConsumer) consumer).getDelegateConsumer(); - } - - // is the consumer bridging the error handler? - boolean bridgeErrorHandler = false; - if (delegate instanceof DefaultConsumer) { - ExceptionHandler handler = ((DefaultConsumer) delegate).getExceptionHandler(); - if (handler instanceof BridgeExceptionHandlerToErrorHandler) { - bridgeErrorHandler = true; - } - } - - Exchange resourceExchange; - try { - if (timeout < 0) { - LOG.debug("Consumer receive: {}", consumer); - resourceExchange = consumer.receive(); - } else if (timeout == 0) { - LOG.debug("Consumer receiveNoWait: {}", consumer); - resourceExchange = consumer.receiveNoWait(); - } else { - LOG.debug("Consumer receive with timeout: {} ms. {}", timeout, consumer); - resourceExchange = consumer.receive(timeout); - } - - if (resourceExchange == null) { - LOG.debug("Consumer received no exchange"); - } else { - LOG.debug("Consumer received: {}", resourceExchange); - } - } catch (Exception e) { - exchange.setException(new CamelExchangeException("Error during poll", exchange, e)); - callback.done(true); - return true; - } finally { - // return the consumer back to the cache - consumerCache.releasePollingConsumer(endpoint, consumer); - // and stop prototype endpoints - if (prototype) { - ServiceHelper.stopAndShutdownService(endpoint); - } - } - - // remember current redelivery stats - Object redeliveried = exchange.getIn().getHeader(Exchange.REDELIVERED); - Object redeliveryCounter = exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER); - Object redeliveryMaxCounter = exchange.getIn().getHeader(Exchange.REDELIVERY_MAX_COUNTER); - - // if we are bridging error handler and failed then remember the caused exception - Throwable cause = null; - if (resourceExchange != null && bridgeErrorHandler) { - cause = resourceExchange.getException(); - } - - try { - if (!isAggregateOnException() && (resourceExchange != null && resourceExchange.isFailed())) { - // copy resource exchange onto original exchange (preserving pattern) - // and preserve redelivery headers - copyResultsPreservePattern(exchange, resourceExchange); - } else { - prepareResult(exchange); - - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(exchange, resourceExchange); - // must catch any exception from aggregation - Exchange aggregatedExchange = aggregationStrategy.aggregate(exchange, resourceExchange); - if (aggregatedExchange != null) { - // copy aggregation result onto original exchange (preserving pattern) - copyResultsPreservePattern(exchange, aggregatedExchange); - // handover any synchronization - if (resourceExchange != null) { - resourceExchange.adapt(ExtendedExchange.class).handoverCompletions(exchange); - } - } - } - - // if we failed then restore caused exception - if (cause != null) { - // restore caused exception - exchange.setException(cause); - // remove the exhausted marker as we want to be able to perform redeliveries with the error handler - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - - // preserve the redelivery stats - if (redeliveried != null) { - exchange.getMessage().setHeader(Exchange.REDELIVERED, redeliveried); - } - if (redeliveryCounter != null) { - exchange.getMessage().setHeader(Exchange.REDELIVERY_COUNTER, redeliveryCounter); - } - if (redeliveryMaxCounter != null) { - exchange.getMessage().setHeader(Exchange.REDELIVERY_MAX_COUNTER, redeliveryMaxCounter); - } - } - - // set header with the uri of the endpoint enriched so we can use that for tracing etc - exchange.getMessage().setHeader(Exchange.TO_ENDPOINT, consumer.getEndpoint().getEndpointUri()); - } catch (Throwable e) { - exchange.setException(new CamelExchangeException("Error occurred during aggregation", exchange, e)); - callback.done(true); - return true; - } - - callback.done(true); - return true; - } - - protected static Object prepareRecipient(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient instanceof Endpoint || recipient instanceof NormalizedEndpointUri) { - return recipient; - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - recipient = ((String) recipient).trim(); - } - if (recipient != null) { - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - String uri; - if (recipient instanceof String) { - uri = (String) recipient; - } else { - // convert to a string type we can work with - uri = ecc.getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - // optimize and normalize endpoint - return ecc.normalizeUri(uri); - } - return null; - } - - protected static Endpoint getExistingEndpoint(CamelContext context, Object recipient) { - if (recipient instanceof Endpoint) { - return (Endpoint) recipient; - } - if (recipient != null) { - if (recipient instanceof NormalizedEndpointUri) { - NormalizedEndpointUri nu = (NormalizedEndpointUri) recipient; - ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class); - return ecc.hasEndpoint(nu); - } else { - String uri = recipient.toString(); - return context.hasEndpoint(uri); - } - } - return null; - } - - protected static Endpoint resolveEndpoint(CamelContext camelContext, Object recipient, boolean prototype) { - return prototype ? ExchangeHelper.resolvePrototypeEndpoint(camelContext, recipient) - : ExchangeHelper.resolveEndpoint(camelContext, recipient); - } - - /** - * Strategy to pre check polling. - *

- * Is currently used to prevent doing poll enrich from a file based endpoint when the current route also - * started from a file based endpoint as that is not currently supported. - * - * @param exchange the current exchange - */ - protected void preCheckPoll(Exchange exchange) throws Exception { - // noop - } - - private static void prepareResult(Exchange exchange) { - if (exchange.getPattern().isOutCapable()) { - exchange.getOut().copyFrom(exchange.getIn()); - } - } - - private static AggregationStrategy defaultAggregationStrategy() { - return new CopyAggregationStrategy(); - } - - @Override - public String toString() { - return id; - } - - @Override - protected void doStart() throws Exception { - if (consumerCache == null) { - // create consumer cache if we use dynamic expressions for computing the endpoints to poll - consumerCache = new DefaultConsumerCache(this, camelContext, cacheSize); - LOG.debug("PollEnrich {} using ConsumerCache with cacheSize={}", this, cacheSize); - } - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - ServiceHelper.startService(consumerCache, aggregationStrategy); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(aggregationStrategy, consumerCache); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(aggregationStrategy, consumerCache); - } - - private static class CopyAggregationStrategy implements AggregationStrategy { - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (newExchange != null) { - copyResultsPreservePattern(oldExchange, newExchange); - } else { - // if no newExchange then there was no message from the external resource - // and therefore we should set an empty body to indicate this fact - // but keep headers/attachments as we want to propagate those - oldExchange.getIn().setBody(null); - oldExchange.setOut(null); - } - return oldExchange; - } - - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java deleted file mode 100644 index 82cea8d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java +++ /dev/null @@ -1,40 +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.processor; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.Producer; - -/** - * Exchange pair to be executed by {@link org.apache.camel.processor.MulticastProcessor}. - */ -public interface ProcessorExchangePair { - - int getIndex(); - - Exchange getExchange(); - - Producer getProducer(); - - Processor getProcessor(); - - void begin(); - - void done(); - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java deleted file mode 100644 index 5153177..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java +++ /dev/null @@ -1,357 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultProducerCache; -import org.apache.camel.impl.engine.EmptyProducerCache; -import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ProducerCache; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.Iterator; -import java.util.concurrent.ExecutorService; - -import static org.apache.camel.util.ObjectHelper.notNull; - -/** - * Implements a dynamic Recipient List - * pattern where the list of actual endpoints to send a message exchange to are - * dependent on some dynamic expression. - */ -public class RecipientList extends AsyncProcessorSupport implements IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(RecipientList.class); - - private static final String IGNORE_DELIMITER_MARKER = "false"; - private final CamelContext camelContext; - private String id; - private String routeId; - private ProducerCache producerCache; - private Expression expression; - private final String delimiter; - private boolean parallelProcessing; - private boolean parallelAggregate; - private boolean stopOnAggregateException; - private boolean stopOnException; - private boolean ignoreInvalidEndpoints; - private boolean streaming; - private long timeout; - private int cacheSize; - private Processor onPrepare; - private boolean shareUnitOfWork; - private ExecutorService executorService; - private boolean shutdownExecutorService; - private volatile ExecutorService aggregateExecutorService; - private AggregationStrategy aggregationStrategy = new UseLatestAggregationStrategy(); - - public RecipientList(CamelContext camelContext) { - // use comma by default as delimiter - this(camelContext, ","); - } - - public RecipientList(CamelContext camelContext, String delimiter) { - notNull(camelContext, "camelContext"); - StringHelper.notEmpty(delimiter, "delimiter"); - this.camelContext = camelContext; - this.delimiter = delimiter; - } - - public RecipientList(CamelContext camelContext, Expression expression) { - // use comma by default as delimiter - this(camelContext, expression, ","); - } - - public RecipientList(CamelContext camelContext, Expression expression, String delimiter) { - notNull(camelContext, "camelContext"); - org.apache.camel.util.ObjectHelper.notNull(expression, "expression"); - StringHelper.notEmpty(delimiter, "delimiter"); - this.camelContext = camelContext; - this.expression = expression; - this.delimiter = delimiter; - } - - /** - * Wrap {@link RecipientList} in {@link Pipeline}. - */ - private final class RecipientListPipeline extends Pipeline { - - private final RecipientList recipientList; - - public RecipientListPipeline(RecipientList recipientList, CamelContext camelContext, Collection processors) { - super(camelContext, processors); - this.recipientList = recipientList; - } - - @Override - public void setId(String id) { - // we want to set the id on the recipient list and not this wrapping pipeline - recipientList.setId(id); - } - - @Override - public String getId() { - return null; - } - - @Override - public String toString() { - return null; - } - } - - public Processor newPipeline(CamelContext camelContext, Collection processors) { - return new RecipientListPipeline(this, camelContext, processors); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (!isStarted()) { - throw new IllegalStateException("RecipientList has not been started: " + this); - } - - // use the evaluate expression result if exists - Object recipientList = exchange.removeProperty(Exchange.EVALUATE_EXPRESSION_RESULT); - if (recipientList == null && expression != null) { - // fallback and evaluate the expression - recipientList = expression.evaluate(exchange, Object.class); - } - - return sendToRecipientList(exchange, recipientList, callback); - } - - /** - * Sends the given exchange to the recipient list - */ - public boolean sendToRecipientList(Exchange exchange, Object recipientList, AsyncCallback callback) { - Iterator iter; - - if (delimiter != null && delimiter.equalsIgnoreCase(IGNORE_DELIMITER_MARKER)) { - iter = ObjectHelper.createIterator(recipientList, null); - } else { - iter = ObjectHelper.createIterator(recipientList, delimiter); - } - - RecipientListProcessor rlp = new RecipientListProcessor(exchange.getContext(), null, producerCache, iter, getAggregationStrategy(), - isParallelProcessing(), getExecutorService(), isShutdownExecutorService(), - isStreaming(), isStopOnException(), getTimeout(), getOnPrepare(), isShareUnitOfWork(), isParallelAggregate(), - isStopOnAggregateException()); - rlp.setAggregateExecutorService(aggregateExecutorService); - rlp.setIgnoreInvalidEndpoints(isIgnoreInvalidEndpoints()); - rlp.setCacheSize(getCacheSize()); - rlp.setId(getId()); - rlp.setRouteId(getRouteId()); - - // start ourselves - try { - ServiceHelper.startService(rlp); - } catch (Exception e) { - exchange.setException(e); - callback.done(true); - return true; - } - - // now let the multicast process the exchange - return rlp.process(exchange, callback); - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return producerCache.getEndpointUtilizationStatistics(); - } - - @Override - protected void doStart() throws Exception { - if (producerCache == null) { - if (cacheSize < 0) { - producerCache = new EmptyProducerCache(this, camelContext); - LOG.debug("RecipientList {} is not using ProducerCache", this); - } else { - producerCache = new DefaultProducerCache(this, camelContext, cacheSize); - LOG.debug("RecipientList {} using ProducerCache with cacheSize={}", this, cacheSize); - } - } - if (timeout > 0) { - // use a cached thread pool so we each on-the-fly task has a dedicated thread to process completions as they come in - aggregateExecutorService = camelContext.getExecutorServiceManager().newScheduledThreadPool(this, "RecipientList-AggregateTask", 0); - } - ServiceHelper.startService(aggregationStrategy, producerCache); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producerCache, aggregationStrategy); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(producerCache, aggregationStrategy); - - if (aggregateExecutorService != null) { - camelContext.getExecutorServiceManager().shutdownNow(aggregateExecutorService); - } - if (shutdownExecutorService && executorService != null) { - camelContext.getExecutorServiceManager().shutdownNow(executorService); - } - } - - public Expression getExpression() { - return expression; - } - - public String getDelimiter() { - return delimiter; - } - - public boolean isStreaming() { - return streaming; - } - - public void setStreaming(boolean streaming) { - this.streaming = streaming; - } - - public boolean isIgnoreInvalidEndpoints() { - return ignoreInvalidEndpoints; - } - - public void setIgnoreInvalidEndpoints(boolean ignoreInvalidEndpoints) { - this.ignoreInvalidEndpoints = ignoreInvalidEndpoints; - } - - public boolean isParallelProcessing() { - return parallelProcessing; - } - - public void setParallelProcessing(boolean parallelProcessing) { - this.parallelProcessing = parallelProcessing; - } - - public boolean isParallelAggregate() { - return parallelAggregate; - } - - public void setParallelAggregate(boolean parallelAggregate) { - this.parallelAggregate = parallelAggregate; - } - - public boolean isStopOnAggregateException() { - return stopOnAggregateException; - } - - public void setStopOnAggregateException(boolean stopOnAggregateException) { - this.stopOnAggregateException = stopOnAggregateException; - } - - public boolean isStopOnException() { - return stopOnException; - } - - public void setStopOnException(boolean stopOnException) { - this.stopOnException = stopOnException; - } - - public ExecutorService getExecutorService() { - return executorService; - } - - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } - - public boolean isShutdownExecutorService() { - return shutdownExecutorService; - } - - public void setShutdownExecutorService(boolean shutdownExecutorService) { - this.shutdownExecutorService = shutdownExecutorService; - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public long getTimeout() { - return timeout; - } - - public void setTimeout(long timeout) { - this.timeout = timeout; - } - - public Processor getOnPrepare() { - return onPrepare; - } - - public void setOnPrepare(Processor onPrepare) { - this.onPrepare = onPrepare; - } - - public boolean isShareUnitOfWork() { - return shareUnitOfWork; - } - - public void setShareUnitOfWork(boolean shareUnitOfWork) { - this.shareUnitOfWork = shareUnitOfWork; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java deleted file mode 100644 index 6e45bf7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java +++ /dev/null @@ -1,343 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.NormalizedEndpointUri; -import org.apache.camel.spi.ProducerCache; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.EndpointHelper; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.ExecutorService; - -/** - * Implements a dynamic Recipient List - * pattern where the list of actual endpoints to send a message exchange to are - * dependent on some dynamic expression. - *

- * This implementation is a specialized {@link org.apache.camel.processor.MulticastProcessor} which is based - * on recipient lists. This implementation have to handle the fact the processors is not known at design time - * but evaluated at runtime from the dynamic recipient list. Therefore this implementation have to at runtime - * lookup endpoints and create producers which should act as the processors for the multicast processors which - * runs under the hood. Also this implementation supports the asynchronous routing engine which makes the code - * more trickier. - */ -public class RecipientListProcessor extends MulticastProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(RecipientListProcessor.class); - private final Iterator iter; - private boolean ignoreInvalidEndpoints; - private ProducerCache producerCache; - private int cacheSize; - - /** - * Class that represent each step in the recipient list to do - *

- * This implementation ensures the provided producer is being released back in the producer cache when - * its done using it. - */ - static final class RecipientProcessorExchangePair implements org.apache.camel.processor.ProcessorExchangePair { - private final int index; - private final Endpoint endpoint; - private final AsyncProducer producer; - private Processor prepared; - private final Exchange exchange; - private final ProducerCache producerCache; - private final ExchangePattern pattern; - private volatile ExchangePattern originalPattern; - private final boolean prototypeEndpoint; - - private RecipientProcessorExchangePair(int index, ProducerCache producerCache, Endpoint endpoint, Producer producer, - Processor prepared, Exchange exchange, ExchangePattern pattern, boolean prototypeEndpoint) { - this.index = index; - this.producerCache = producerCache; - this.endpoint = endpoint; - this.producer = AsyncProcessorConverterHelper.convert(producer); - this.prepared = prepared; - this.exchange = exchange; - this.pattern = pattern; - this.prototypeEndpoint = prototypeEndpoint; - } - - @Override - public int getIndex() { - return index; - } - - @Override - public Exchange getExchange() { - return exchange; - } - - @Override - public Producer getProducer() { - return producer; - } - - @Override - public Processor getProcessor() { - return prepared; - } - - @Override - public void begin() { - // we have already acquired and prepare the producer - LOG.trace("RecipientProcessorExchangePair #{} begin: {}", index, exchange); - exchange.setProperty(Exchange.RECIPIENT_LIST_ENDPOINT, endpoint.getEndpointUri()); - // ensure stream caching is reset - MessageHelper.resetStreamCache(exchange.getIn()); - // if the MEP on the endpoint is different then - if (pattern != null) { - originalPattern = exchange.getPattern(); - LOG.trace("Using exchangePattern: {} on exchange: {}", pattern, exchange); - exchange.setPattern(pattern); - } - } - - @Override - public void done() { - LOG.trace("RecipientProcessorExchangePair #{} done: {}", index, exchange); - try { - // preserve original MEP - if (originalPattern != null) { - exchange.setPattern(originalPattern); - } - // when we are done we should release back in pool - producerCache.releaseProducer(endpoint, producer); - // and stop prototype endpoints - if (prototypeEndpoint) { - ServiceHelper.stopAndShutdownService(endpoint); - } - } catch (Exception e) { - if (LOG.isDebugEnabled()) { - LOG.debug("Error releasing producer: " + producer + ". This exception will be ignored.", e); - } - } - } - - } - - // TODO: camel-bean @RecipientList cacheSize - - public RecipientListProcessor(CamelContext camelContext, Route route, ProducerCache producerCache, Iterator iter) { - super(camelContext, route, null); - this.producerCache = producerCache; - this.iter = iter; - } - - public RecipientListProcessor(CamelContext camelContext, Route route, ProducerCache producerCache, Iterator iter, AggregationStrategy aggregationStrategy) { - super(camelContext, route, null, aggregationStrategy); - this.producerCache = producerCache; - this.iter = iter; - } - - public RecipientListProcessor(CamelContext camelContext, Route route, ProducerCache producerCache, Iterator iter, AggregationStrategy aggregationStrategy, - boolean parallelProcessing, ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, - long timeout, Processor onPrepare, boolean shareUnitOfWork, boolean parallelAggregate, boolean stopOnAggregateException) { - super(camelContext, route, null, aggregationStrategy, parallelProcessing, executorService, shutdownExecutorService, streaming, stopOnException, timeout, onPrepare, - shareUnitOfWork, parallelAggregate, stopOnAggregateException); - this.producerCache = producerCache; - this.iter = iter; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public boolean isIgnoreInvalidEndpoints() { - return ignoreInvalidEndpoints; - } - - public void setIgnoreInvalidEndpoints(boolean ignoreInvalidEndpoints) { - this.ignoreInvalidEndpoints = ignoreInvalidEndpoints; - } - - @Override - protected Iterable createProcessorExchangePairs(Exchange exchange) throws Exception { - // here we iterate the recipient lists and create the exchange pair for each of those - List result = new ArrayList<>(); - - // at first we must lookup the endpoint and acquire the producer which can send to the endpoint - int index = 0; - while (iter.hasNext()) { - boolean prototype = cacheSize < 0; - - Object recipient = iter.next(); - Endpoint endpoint; - Producer producer; - ExchangePattern pattern; - try { - recipient = prepareRecipient(exchange, recipient); - Endpoint existing = getExistingEndpoint(exchange, recipient); - if (existing == null) { - endpoint = resolveEndpoint(exchange, recipient, prototype); - } else { - endpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - pattern = resolveExchangePattern(recipient); - producer = producerCache.acquireProducer(endpoint); - } catch (Exception e) { - if (isIgnoreInvalidEndpoints()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e); - } - continue; - } else { - // failure so break out - throw e; - } - } - - // then create the exchange pair - result.add(createProcessorExchangePair(index++, endpoint, producer, exchange, pattern, prototype)); - } - - return result; - } - - /** - * This logic is similar to MulticastProcessor but we have to return a RecipientProcessorExchangePair instead - */ - protected ProcessorExchangePair createProcessorExchangePair(int index, Endpoint endpoint, Producer producer, - Exchange exchange, ExchangePattern pattern, boolean prototypeEndpoint) { - // copy exchange, and do not share the unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - - // if we share unit of work, we need to prepare the child exchange - if (isShareUnitOfWork()) { - prepareSharedUnitOfWork(copy, exchange); - } - - // set property which endpoint we send to - setToEndpoint(copy, producer); - - // rework error handling to support fine grained error handling - Route route = ExchangeHelper.getRoute(exchange); - Processor prepared = createErrorHandler(route, copy, producer); - - // invoke on prepare on the exchange if specified - if (onPrepare != null) { - try { - onPrepare.process(copy); - } catch (Exception e) { - copy.setException(e); - } - } - - // and create the pair - return new RecipientProcessorExchangePair(index, producerCache, endpoint, producer, prepared, copy, pattern, prototypeEndpoint); - } - - protected static Object prepareRecipient(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient instanceof Endpoint || recipient instanceof NormalizedEndpointUri) { - return recipient; - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - recipient = ((String) recipient).trim(); - } - if (recipient != null) { - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - String uri; - if (recipient instanceof String) { - uri = (String) recipient; - } else { - // convert to a string type we can work with - uri = ecc.getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - // optimize and normalize endpoint - return ecc.normalizeUri(uri); - } - return null; - } - - protected static Endpoint getExistingEndpoint(Exchange exchange, Object recipient) { - if (recipient instanceof Endpoint) { - return (Endpoint) recipient; - } - if (recipient != null) { - if (recipient instanceof NormalizedEndpointUri) { - NormalizedEndpointUri nu = (NormalizedEndpointUri) recipient; - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - return ecc.hasEndpoint(nu); - } else { - String uri = recipient.toString().trim(); - return exchange.getContext().hasEndpoint(uri); - } - } - return null; - } - - protected static Endpoint resolveEndpoint(Exchange exchange, Object recipient, boolean prototype) { - return prototype ? ExchangeHelper.resolvePrototypeEndpoint(exchange, recipient) : ExchangeHelper.resolveEndpoint(exchange, recipient); - } - - protected ExchangePattern resolveExchangePattern(Object recipient) { - String s = null; - - if (recipient instanceof NormalizedEndpointUri) { - s = ((NormalizedEndpointUri) recipient).getUri(); - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - s = ((String) recipient).trim(); - } - if (s != null) { - return EndpointHelper.resolveExchangePatternFromUrl(s); - } - - return null; - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - ObjectHelper.notNull(producerCache, "producerCache", this); - ServiceHelper.startService(producerCache); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producerCache); - super.doStop(); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownService(producerCache); - super.doShutdown(); - } - - @Override - public String getTraceLabel() { - return "recipientList"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java deleted file mode 100644 index 2ba0c14..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * A processor which removes the header from the IN or OUT message - */ -public class RemoveHeaderProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private final String headerName; - private String id; - private String routeId; - - public RemoveHeaderProcessor(String headerName) { - this.headerName = headerName; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - exchange.getMessage().removeHeader(headerName); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "removeHeader[" + headerName + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getHeaderName() { - return headerName; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java deleted file mode 100644 index 7efad80..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * A processor which removes one ore more headers from the IN or OUT message - */ -public class RemoveHeadersProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final String pattern; - private final String[] excludePattern; - - public RemoveHeadersProcessor(String pattern, String[] excludePattern) { - this.pattern = pattern; - this.excludePattern = excludePattern; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - exchange.getMessage().removeHeaders(pattern, excludePattern); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "removeHeaders[" + pattern + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getPattern() { - return pattern; - } - - public String[] getExcludePattern() { - return excludePattern; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java deleted file mode 100644 index 8dffb58..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java +++ /dev/null @@ -1,90 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * A processor which removes one ore more properties from the exchange - */ -public class RemovePropertiesProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final String pattern; - private final String[] excludePattern; - - public RemovePropertiesProcessor(String pattern, String[] excludePattern) { - this.pattern = pattern; - this.excludePattern = excludePattern; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - exchange.removeProperties(pattern, excludePattern); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "removeProperties[" + pattern + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getPattern() { - return pattern; - } - - public String[] getExcludePattern() { - return excludePattern; - } - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java deleted file mode 100644 index 1f31f28..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * A processor which removes the property from the exchange - */ -public class RemovePropertyProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final String propertyName; - - public RemovePropertyProcessor(String propertyName) { - this.propertyName = propertyName; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - exchange.removeProperty(propertyName); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "removeProperty[" + propertyName + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getPropertyName() { - return propertyName; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java deleted file mode 100644 index e7d84f3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java +++ /dev/null @@ -1,534 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.ExceptionHandler; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExpressionComparator; -import org.apache.camel.support.LoggingExceptionHandler; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -/** - * An implementation of the Resequencer - * which can reorder messages within a batch. - */ -public class Resequencer extends AsyncProcessorSupport implements Navigate, IdAware, RouteIdAware, Traceable { - - public static final long DEFAULT_BATCH_TIMEOUT = 1000L; - public static final int DEFAULT_BATCH_SIZE = 100; - - private static final Logger LOG = LoggerFactory.getLogger(Resequencer.class); - - private String id; - private String routeId; - private long batchTimeout = DEFAULT_BATCH_TIMEOUT; - private int batchSize = DEFAULT_BATCH_SIZE; - private int outBatchSize; - private boolean groupExchanges; - private boolean batchConsumer; - private boolean ignoreInvalidExchanges; - private boolean reverse; - private boolean allowDuplicates; - private Predicate completionPredicate; - private Expression expression; - - private final CamelContext camelContext; - private final AsyncProcessor processor; - private final Collection collection; - private ExceptionHandler exceptionHandler; - - private final BatchSender sender; - - public Resequencer(CamelContext camelContext, Processor processor, Expression expression) { - this(camelContext, processor, createSet(expression, false, false), expression); - } - - public Resequencer(CamelContext camelContext, Processor processor, Expression expression, - boolean allowDuplicates, boolean reverse) { - this(camelContext, processor, createSet(expression, allowDuplicates, reverse), expression); - } - - public Resequencer(CamelContext camelContext, Processor processor, Set collection, Expression expression) { - ObjectHelper.notNull(camelContext, "camelContext"); - ObjectHelper.notNull(processor, "processor"); - ObjectHelper.notNull(collection, "collection"); - ObjectHelper.notNull(expression, "expression"); - - // wrap processor in UnitOfWork so what we send out of the batch runs in a UoW - this.camelContext = camelContext; - this.processor = AsyncProcessorConverterHelper.convert(processor); - this.collection = collection; - this.expression = expression; - this.sender = new BatchSender(); - this.exceptionHandler = new LoggingExceptionHandler(camelContext, getClass()); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "resequencer"; - } - - // Properties - // ------------------------------------------------------------------------- - - - public Expression getExpression() { - return expression; - } - - public ExceptionHandler getExceptionHandler() { - return exceptionHandler; - } - - public void setExceptionHandler(ExceptionHandler exceptionHandler) { - this.exceptionHandler = exceptionHandler; - } - - public int getBatchSize() { - return batchSize; - } - - /** - * Sets the in batch size. This is the number of incoming exchanges that this batch processor will - * process before its completed. The default value is {@link #DEFAULT_BATCH_SIZE}. - * - * @param batchSize the size - */ - public void setBatchSize(int batchSize) { - // setting batch size to 0 or negative is like disabling it, so we set it as the max value - // as the code logic is dependent on a batch size having 1..n value - if (batchSize <= 0) { - LOG.debug("Disabling batch size, will only be triggered by timeout"); - this.batchSize = Integer.MAX_VALUE; - } else { - this.batchSize = batchSize; - } - } - - public int getOutBatchSize() { - return outBatchSize; - } - - /** - * Sets the out batch size. If the batch processor holds more exchanges than this out size then the - * completion is triggered. Can for instance be used to ensure that this batch is completed when a certain - * number of exchanges has been collected. By default this feature is not enabled. - * - * @param outBatchSize the size - */ - public void setOutBatchSize(int outBatchSize) { - this.outBatchSize = outBatchSize; - } - - public long getBatchTimeout() { - return batchTimeout; - } - - public void setBatchTimeout(long batchTimeout) { - this.batchTimeout = batchTimeout; - } - - public boolean isGroupExchanges() { - return groupExchanges; - } - - public void setGroupExchanges(boolean groupExchanges) { - this.groupExchanges = groupExchanges; - } - - public boolean isBatchConsumer() { - return batchConsumer; - } - - public void setBatchConsumer(boolean batchConsumer) { - this.batchConsumer = batchConsumer; - } - - public boolean isIgnoreInvalidExchanges() { - return ignoreInvalidExchanges; - } - - public void setIgnoreInvalidExchanges(boolean ignoreInvalidExchanges) { - this.ignoreInvalidExchanges = ignoreInvalidExchanges; - } - - public boolean isReverse() { - return reverse; - } - - public void setReverse(boolean reverse) { - this.reverse = reverse; - } - - public boolean isAllowDuplicates() { - return allowDuplicates; - } - - public void setAllowDuplicates(boolean allowDuplicates) { - this.allowDuplicates = allowDuplicates; - } - - public Predicate getCompletionPredicate() { - return completionPredicate; - } - - public void setCompletionPredicate(Predicate completionPredicate) { - this.completionPredicate = completionPredicate; - } - - public Processor getProcessor() { - return processor; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(processor); - return answer; - } - - @Override - public boolean hasNext() { - return processor != null; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - // Implementation methods - //------------------------------------------------------------------------- - - protected static Set createSet(Expression expression, boolean allowDuplicates, boolean reverse) { - return createSet(new ExpressionComparator(expression), allowDuplicates, reverse); - } - - protected static Set createSet(final Comparator comparator, boolean allowDuplicates, boolean reverse) { - Comparator answer = comparator; - - if (reverse) { - answer = comparator.reversed(); - } - - // if we allow duplicates then we need to cater for that in the comparator - if (allowDuplicates) { - // they are equal but we should allow duplicates so say that o2 is higher - // so it will come next - answer = answer.thenComparing((o1, o2) -> 1); - } - - return new TreeSet<>(answer); - } - - /** - * A strategy method to decide if the "in" batch is completed. That is, whether the resulting exchanges in - * the in queue should be drained to the "out" collection. - */ - private boolean isInBatchCompleted(int num) { - return num >= batchSize; - } - - /** - * A strategy method to decide if the "out" batch is completed. That is, whether the resulting exchange in - * the out collection should be sent. - */ - private boolean isOutBatchCompleted() { - if (outBatchSize == 0) { - // out batch is disabled, so go ahead and send. - return true; - } - return collection.size() > 0 && collection.size() >= outBatchSize; - } - - /** - * Strategy Method to process an exchange in the batch. This method allows derived classes to perform - * custom processing before or after an individual exchange is processed - */ - protected void processExchange(Exchange exchange) { - processor.process(exchange, sync -> postProcess(exchange)); - } - - protected void postProcess(Exchange exchange) { - if (exchange.getException() != null) { - getExceptionHandler().handleException("Error processing aggregated exchange: " + exchange, exchange.getException()); - } - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(processor); - sender.start(); - } - - @Override - protected void doStop() throws Exception { - sender.cancel(); - ServiceHelper.stopService(processor); - collection.clear(); - } - - /** - * Enqueues an exchange for later batch processing. - */ - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - // if batch consumer is enabled then we need to adjust the batch size - // with the size from the batch consumer - if (isBatchConsumer()) { - int size = exchange.getProperty(Exchange.BATCH_SIZE, Integer.class); - if (batchSize != size) { - batchSize = size; - LOG.trace("Using batch consumer completion, so setting batch size to: {}", batchSize); - } - } - - // validate that the exchange can be used - if (!isValid(exchange)) { - if (isIgnoreInvalidExchanges()) { - LOG.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange); - } else { - throw new CamelExchangeException("Exchange is not valid to be used by the BatchProcessor", exchange); - } - } else { - // exchange is valid so enqueue the exchange - sender.enqueueExchange(exchange); - } - } catch (Throwable e) { - exchange.setException(e); - } - callback.done(true); - return true; - } - - /** - * Is the given exchange valid to be used. - * - * @param exchange the given exchange - * @return true if valid, false otherwise - */ - private boolean isValid(Exchange exchange) { - Object result = null; - try { - result = expression.evaluate(exchange, Object.class); - } catch (Exception e) { - LOG.debug("Error evaluating expression: " + expression + ". This exception is ignored.", e); - } - return result != null; - } - - /** - * Sender thread for queued-up exchanges. - */ - private class BatchSender extends Thread { - - private Queue queue; - private Lock queueLock = new ReentrantLock(); - private final AtomicBoolean exchangeEnqueued = new AtomicBoolean(); - private final Queue completionPredicateMatched = new ConcurrentLinkedQueue<>(); - private Condition exchangeEnqueuedCondition = queueLock.newCondition(); - - BatchSender() { - super(camelContext.getExecutorServiceManager().resolveThreadName("Batch Sender")); - this.queue = new LinkedList<>(); - } - - @Override - public void run() { - // Wait until one of either: - // * an exchange being queued; - // * the batch timeout expiring; or - // * the thread being cancelled. - // - // If an exchange is queued then we need to determine whether the - // batch is complete. If it is complete then we send out the batched - // exchanges. Otherwise we move back into our wait state. - // - // If the batch times out then we send out the batched exchanges - // collected so far. - // - // If we receive an interrupt then all blocking operations are - // interrupted and our thread terminates. - // - // The goal of the following algorithm in terms of synchronisation - // is to provide fine grained locking i.e. retaining the lock only - // when required. Special consideration is given to releasing the - // lock when calling an overloaded method i.e. sendExchanges. - // Unlocking is important as the process of sending out the exchanges - // would otherwise block new exchanges from being queued. - - queueLock.lock(); - try { - do { - try { - if (!exchangeEnqueued.get()) { - LOG.trace("Waiting for new exchange to arrive or batchTimeout to occur after {} ms.", batchTimeout); - exchangeEnqueuedCondition.await(batchTimeout, TimeUnit.MILLISECONDS); - } - - // if the completion predicate was triggered then there is an exchange id which denotes when to complete - String id = null; - if (!completionPredicateMatched.isEmpty()) { - id = completionPredicateMatched.poll(); - } - - if (id != null || !exchangeEnqueued.get()) { - if (id != null) { - LOG.trace("Collecting exchanges to be aggregated triggered by completion predicate"); - } else { - LOG.trace("Collecting exchanges to be aggregated triggered by batch timeout"); - } - drainQueueTo(collection, batchSize, id); - } else { - exchangeEnqueued.set(false); - boolean drained = false; - while (isInBatchCompleted(queue.size())) { - drained = true; - drainQueueTo(collection, batchSize, id); - } - if (drained) { - LOG.trace("Collecting exchanges to be aggregated triggered by new exchanges received"); - } - - if (!isOutBatchCompleted()) { - continue; - } - } - - queueLock.unlock(); - try { - try { - sendExchanges(); - } catch (Throwable t) { - // a fail safe to handle all exceptions being thrown - getExceptionHandler().handleException(t); - } - } finally { - queueLock.lock(); - } - - } catch (InterruptedException e) { - break; - } - - } while (isRunAllowed()); - - } finally { - queueLock.unlock(); - } - } - - /** - * This method should be called with queueLock held - */ - private void drainQueueTo(Collection collection, int batchSize, String exchangeId) { - for (int i = 0; i < batchSize; ++i) { - Exchange e = queue.poll(); - if (e != null) { - try { - collection.add(e); - } catch (Exception t) { - e.setException(t); - } catch (Throwable t) { - getExceptionHandler().handleException(t); - } - if (exchangeId != null && exchangeId.equals(e.getExchangeId())) { - // this batch is complete so stop draining - break; - } - } else { - break; - } - } - } - - public void cancel() { - interrupt(); - } - - public void enqueueExchange(Exchange exchange) { - LOG.debug("Received exchange to be batched: {}", exchange); - queueLock.lock(); - try { - // pre test whether the completion predicate matched - if (completionPredicate != null) { - boolean matches = completionPredicate.matches(exchange); - if (matches) { - LOG.trace("Exchange matched completion predicate: {}", exchange); - // add this exchange to the list of exchanges which marks the batch as complete - completionPredicateMatched.add(exchange.getExchangeId()); - } - } - queue.add(exchange); - exchangeEnqueued.set(true); - exchangeEnqueuedCondition.signal(); - } finally { - queueLock.unlock(); - } - } - - private void sendExchanges() throws Exception { - Iterator iter = collection.iterator(); - while (iter.hasNext()) { - Exchange exchange = iter.next(); - iter.remove(); - LOG.debug("Sending aggregated exchange: {}", exchange); - processExchange(exchange); - } - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java deleted file mode 100644 index e8f9f07..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java +++ /dev/null @@ -1,535 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.processor.MarshalProcessor; -import org.apache.camel.support.processor.UnmarshalProcessor; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -/** - * A {@link CamelInternalProcessorAdvice} that binds the REST DSL incoming - * and outgoing messages from sources of json or xml to Java Objects. - *

- * The binding uses {@link DataFormat} for the actual work to transform - * from xml/json to Java Objects and reverse again. - *

- * The rest producer side is implemented in {@link org.apache.camel.component.rest.RestProducerBindingProcessor} - * - * @see CamelInternalProcessor - */ -public class RestBindingAdvice implements CamelInternalProcessorAdvice> { - - private static final Logger LOG = LoggerFactory.getLogger(RestBindingAdvice.class); - private static final String STATE_KEY_DO_MARSHAL = "doMarshal"; - private static final String STATE_KEY_ACCEPT = "accept"; - private static final String STATE_JSON = "json"; - private static final String STATE_XML = "xml"; - - private final AsyncProcessor jsonUnmarshal; - private final AsyncProcessor xmlUnmarshal; - private final AsyncProcessor jsonMarshal; - private final AsyncProcessor xmlMarshal; - private final String consumes; - private final String produces; - private final String bindingMode; - private final boolean skipBindingOnErrorCode; - private final boolean clientRequestValidation; - private final boolean enableCORS; - private final Map corsHeaders; - private final Map queryDefaultValues; - private final boolean requiredBody; - private final Set requiredQueryParameters; - private final Set requiredHeaders; - - public RestBindingAdvice(CamelContext camelContext, DataFormat jsonDataFormat, DataFormat xmlDataFormat, - DataFormat outJsonDataFormat, DataFormat outXmlDataFormat, - String consumes, String produces, String bindingMode, - boolean skipBindingOnErrorCode, boolean clientRequestValidation, boolean enableCORS, - Map corsHeaders, - Map queryDefaultValues, - boolean requiredBody, Set requiredQueryParameters, Set requiredHeaders) throws Exception { - - if (jsonDataFormat != null) { - this.jsonUnmarshal = new UnmarshalProcessor(jsonDataFormat); - } else { - this.jsonUnmarshal = null; - } - if (outJsonDataFormat != null) { - this.jsonMarshal = new MarshalProcessor(outJsonDataFormat); - } else if (jsonDataFormat != null) { - this.jsonMarshal = new MarshalProcessor(jsonDataFormat); - } else { - this.jsonMarshal = null; - } - - if (xmlDataFormat != null) { - this.xmlUnmarshal = new UnmarshalProcessor(xmlDataFormat); - } else { - this.xmlUnmarshal = null; - } - if (outXmlDataFormat != null) { - this.xmlMarshal = new MarshalProcessor(outXmlDataFormat); - } else if (xmlDataFormat != null) { - this.xmlMarshal = new MarshalProcessor(xmlDataFormat); - } else { - this.xmlMarshal = null; - } - - if (jsonMarshal != null) { - camelContext.addService(jsonMarshal, true); - } - if (jsonUnmarshal != null) { - camelContext.addService(jsonUnmarshal, true); - } - if (xmlMarshal instanceof CamelContextAware) { - camelContext.addService(xmlMarshal, true); - } - if (xmlUnmarshal instanceof CamelContextAware) { - camelContext.addService(xmlUnmarshal, true); - } - - this.consumes = consumes; - this.produces = produces; - this.bindingMode = bindingMode; - this.skipBindingOnErrorCode = skipBindingOnErrorCode; - this.clientRequestValidation = clientRequestValidation; - this.enableCORS = enableCORS; - this.corsHeaders = corsHeaders; - this.queryDefaultValues = queryDefaultValues; - this.requiredBody = requiredBody; - this.requiredQueryParameters = requiredQueryParameters; - this.requiredHeaders = requiredHeaders; - } - - @Override - public Map before(Exchange exchange) throws Exception { - Map state = new HashMap<>(); - if (isOptionsMethod(exchange, state)) { - return state; - } - unmarshal(exchange, state); - return state; - } - - @Override - public void after(Exchange exchange, Map state) throws Exception { - if (enableCORS) { - setCORSHeaders(exchange, state); - } - if (state.get(STATE_KEY_DO_MARSHAL) != null) { - marshal(exchange, state); - } - } - - private boolean isOptionsMethod(Exchange exchange, Map state) { - String method = exchange.getIn().getHeader(Exchange.HTTP_METHOD, String.class); - if ("OPTIONS".equalsIgnoreCase(method)) { - // for OPTIONS methods then we should not route at all as its part of CORS - exchange.setRouteStop(true); - return true; - } - return false; - } - - private void unmarshal(Exchange exchange, Map state) throws Exception { - boolean isXml = false; - boolean isJson = false; - - String contentType = ExchangeHelper.getContentType(exchange); - if (contentType != null) { - isXml = contentType.toLowerCase(Locale.ENGLISH).contains("xml"); - isJson = contentType.toLowerCase(Locale.ENGLISH).contains("json"); - } - // if content type could not tell us if it was json or xml, then fallback to if the binding was configured with - // that information in the consumes - if (!isXml && !isJson) { - isXml = consumes != null && consumes.toLowerCase(Locale.ENGLISH).contains("xml"); - isJson = consumes != null && consumes.toLowerCase(Locale.ENGLISH).contains("json"); - } - - // set data type if in use - if (exchange.getContext().isUseDataType()) { - if (exchange.getIn() instanceof DataTypeAware && (isJson || isXml)) { - ((DataTypeAware) exchange.getIn()).setDataType(new DataType(isJson ? "json" : "xml")); - } - } - - // only allow xml/json if the binding mode allows that - isXml &= bindingMode.equals("auto") || bindingMode.contains("xml"); - isJson &= bindingMode.equals("auto") || bindingMode.contains("json"); - - // if we do not yet know if its xml or json, then use the binding mode to know the mode - if (!isJson && !isXml) { - isXml = bindingMode.equals("auto") || bindingMode.contains("xml"); - isJson = bindingMode.equals("auto") || bindingMode.contains("json"); - } - - String accept = exchange.getMessage().getHeader("Accept", String.class); - state.put(STATE_KEY_ACCEPT, accept); - - // perform client request validation - if (clientRequestValidation) { - // check if the content-type is accepted according to consumes - if (!isValidOrAcceptedContentType(consumes, contentType)) { - LOG.trace("Consuming content type does not match contentType header {}. Stopping routing.", contentType); - // the content-type is not something we can process so its a HTTP_ERROR 415 - exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 415); - // set empty response body as http error code indicate the problem - exchange.getMessage().setBody(null); - // stop routing and return - exchange.setRouteStop(true); - return; - } - - // check if what is produces is accepted by the client - if (!isValidOrAcceptedContentType(produces, accept)) { - LOG.trace("Produced content type does not match accept header {}. Stopping routing.", contentType); - // the response type is not accepted by the client so its a HTTP_ERROR 406 - exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 406); - // set empty response body as http error code indicate the problem - exchange.getMessage().setBody(null); - // stop routing and return - exchange.setRouteStop(true); - return; - } - } - - String body = null; - if (exchange.getIn().getBody() != null) { - - // okay we have a binding mode, so need to check for empty body as that can cause the marshaller to fail - // as they assume a non-empty body - if (isXml || isJson) { - // we have binding enabled, so we need to know if there body is empty or not - // so force reading the body as a String which we can work with - body = MessageHelper.extractBodyAsString(exchange.getIn()); - if (body != null) { - if (exchange.getIn() instanceof DataTypeAware) { - ((DataTypeAware)exchange.getIn()).setBody(body, new DataType(isJson ? "json" : "xml")); - } else { - exchange.getIn().setBody(body); - } - - if (isXml && isJson) { - // we have still not determined between xml or json, so check the body if its xml based or not - isXml = body.startsWith("<"); - isJson = !isXml; - } - } - } - } - - // add missing default values which are mapped as headers - if (queryDefaultValues != null) { - for (Map.Entry entry : queryDefaultValues.entrySet()) { - if (exchange.getIn().getHeader(entry.getKey()) == null) { - exchange.getIn().setHeader(entry.getKey(), entry.getValue()); - } - } - } - - // check for required - if (clientRequestValidation) { - if (requiredBody) { - // the body is required so we need to know if we have a body or not - // so force reading the body as a String which we can work with - if (body == null) { - body = MessageHelper.extractBodyAsString(exchange.getIn()); - if (body != null) { - exchange.getIn().setBody(body); - } - } - if (body == null) { - // this is a bad request, the client did not include a message body - exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400); - exchange.getMessage().setBody("The request body is missing."); - // stop routing and return - exchange.setRouteStop(true); - return; - } - } - if (requiredQueryParameters != null && !exchange.getIn().getHeaders().keySet().containsAll(requiredQueryParameters)) { - // this is a bad request, the client did not include some of the required query parameters - exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400); - exchange.getMessage().setBody("Some of the required query parameters are missing."); - // stop routing and return - exchange.setRouteStop(true); - return; - } - if (requiredHeaders != null && !exchange.getIn().getHeaders().keySet().containsAll(requiredHeaders)) { - // this is a bad request, the client did not include some of the required http headers - exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400); - exchange.getMessage().setBody("Some of the required HTTP headers are missing."); - // stop routing and return - exchange.setRouteStop(true); - return; - } - } - - // favor json over xml - if (isJson && jsonUnmarshal != null) { - // add reverse operation - state.put(STATE_KEY_DO_MARSHAL, STATE_JSON); - if (ObjectHelper.isNotEmpty(body)) { - jsonUnmarshal.process(exchange); - ExchangeHelper.prepareOutToIn(exchange); - } - return; - } else if (isXml && xmlUnmarshal != null) { - // add reverse operation - state.put(STATE_KEY_DO_MARSHAL, STATE_XML); - if (ObjectHelper.isNotEmpty(body)) { - xmlUnmarshal.process(exchange); - ExchangeHelper.prepareOutToIn(exchange); - } - return; - } - - // we could not bind - if ("off".equals(bindingMode) || bindingMode.equals("auto")) { - // okay for auto we do not mind if we could not bind - state.put(STATE_KEY_DO_MARSHAL, STATE_JSON); - } else { - if (bindingMode.contains("xml")) { - exchange.setException(new CamelExchangeException("Cannot bind to xml as message body is not xml compatible", exchange)); - } else { - exchange.setException(new CamelExchangeException("Cannot bind to json as message body is not json compatible", exchange)); - } - } - - } - - private void marshal(Exchange exchange, Map state) { - // only marshal if there was no exception - if (exchange.getException() != null) { - return; - } - - if (skipBindingOnErrorCode) { - Integer code = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class); - // if there is a custom http error code then skip binding - if (code != null && code >= 300) { - return; - } - } - - boolean isXml = false; - boolean isJson = false; - - // accept takes precedence - String accept = (String)state.get(STATE_KEY_ACCEPT); - if (accept != null) { - isXml = accept.toLowerCase(Locale.ENGLISH).contains("xml"); - isJson = accept.toLowerCase(Locale.ENGLISH).contains("json"); - } - // fallback to content type if still undecided - if (!isXml && !isJson) { - String contentType = ExchangeHelper.getContentType(exchange); - if (contentType != null) { - isXml = contentType.toLowerCase(Locale.ENGLISH).contains("xml"); - isJson = contentType.toLowerCase(Locale.ENGLISH).contains("json"); - } - } - // if content type could not tell us if it was json or xml, then fallback to if the binding was configured with - // that information in the consumes - if (!isXml && !isJson) { - isXml = produces != null && produces.toLowerCase(Locale.ENGLISH).contains("xml"); - isJson = produces != null && produces.toLowerCase(Locale.ENGLISH).contains("json"); - } - - // only allow xml/json if the binding mode allows that (when off we still want to know if its xml or json) - if (bindingMode != null) { - isXml &= bindingMode.equals("off") || bindingMode.equals("auto") || bindingMode.contains("xml"); - isJson &= bindingMode.equals("off") || bindingMode.equals("auto") || bindingMode.contains("json"); - - // if we do not yet know if its xml or json, then use the binding mode to know the mode - if (!isJson && !isXml) { - isXml = bindingMode.equals("auto") || bindingMode.contains("xml"); - isJson = bindingMode.equals("auto") || bindingMode.contains("json"); - } - } - - // in case we have not yet been able to determine if xml or json, then use the same as in the unmarshaller - if (isXml && isJson) { - isXml = state.get(STATE_KEY_DO_MARSHAL).equals(STATE_XML); - isJson = !isXml; - } - - // need to prepare exchange first - ExchangeHelper.prepareOutToIn(exchange); - - // ensure there is a content type header (even if binding is off) - ensureHeaderContentType(produces, isXml, isJson, exchange); - - if (bindingMode == null || "off".equals(bindingMode)) { - // binding is off, so no message body binding - return; - } - - // is there any marshaller at all - if (jsonMarshal == null && xmlMarshal == null) { - return; - } - - // is the body empty - if (exchange.getMessage().getBody() == null) { - return; - } - - String contentType = exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class); - // need to lower-case so the contains check below can match if using upper case - contentType = contentType.toLowerCase(Locale.US); - try { - // favor json over xml - if (isJson && jsonMarshal != null) { - // only marshal if its json content type - if (contentType.contains("json")) { - jsonMarshal.process(exchange); - setOutputDataType(exchange, new DataType("json")); - } - } else if (isXml && xmlMarshal != null) { - // only marshal if its xml content type - if (contentType.contains("xml")) { - xmlMarshal.process(exchange); - setOutputDataType(exchange, new DataType("xml")); - } - } else { - // we could not bind - if (bindingMode.equals("auto")) { - // okay for auto we do not mind if we could not bind - } else { - if (bindingMode.contains("xml")) { - exchange.setException(new CamelExchangeException("Cannot bind to xml as message body is not xml compatible", exchange)); - } else { - exchange.setException(new CamelExchangeException("Cannot bind to json as message body is not json compatible", exchange)); - } - } - } - } catch (Throwable e) { - exchange.setException(e); - } - } - - private void setOutputDataType(Exchange exchange, DataType type) { - Message target = exchange.getMessage(); - if (target instanceof DataTypeAware) { - ((DataTypeAware)target).setDataType(type); - } - } - - private void ensureHeaderContentType(String contentType, boolean isXml, boolean isJson, Exchange exchange) { - // favor given content type - if (contentType != null) { - String type = ExchangeHelper.getContentType(exchange); - if (type == null) { - exchange.getIn().setHeader(Exchange.CONTENT_TYPE, contentType); - } - } - - // favor json over xml - if (isJson) { - // make sure there is a content-type with json - String type = ExchangeHelper.getContentType(exchange); - if (type == null) { - exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/json"); - } - } else if (isXml) { - // make sure there is a content-type with xml - String type = ExchangeHelper.getContentType(exchange); - if (type == null) { - exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/xml"); - } - } - } - - private void setCORSHeaders(Exchange exchange, Map state) { - // add the CORS headers after routing, but before the consumer writes the response - Message msg = exchange.getMessage(); - - // use default value if none has been configured - String allowOrigin = corsHeaders != null ? corsHeaders.get("Access-Control-Allow-Origin") : null; - if (allowOrigin == null) { - allowOrigin = RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN; - } - String allowMethods = corsHeaders != null ? corsHeaders.get("Access-Control-Allow-Methods") : null; - if (allowMethods == null) { - allowMethods = RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS; - } - String allowHeaders = corsHeaders != null ? corsHeaders.get("Access-Control-Allow-Headers") : null; - if (allowHeaders == null) { - allowHeaders = RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS; - } - String maxAge = corsHeaders != null ? corsHeaders.get("Access-Control-Max-Age") : null; - if (maxAge == null) { - maxAge = RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE; - } - String allowCredentials = corsHeaders != null ? corsHeaders.get("Access-Control-Allow-Credentials") : null; - - // Restrict the origin if credentials are allowed. - // https://www.w3.org/TR/cors/ - section 6.1, point 3 - String origin = exchange.getIn().getHeader("Origin", String.class); - if ("true".equalsIgnoreCase(allowCredentials) && "*".equals(allowOrigin) && origin != null) { - allowOrigin = origin; - } - - msg.setHeader("Access-Control-Allow-Origin", allowOrigin); - msg.setHeader("Access-Control-Allow-Methods", allowMethods); - msg.setHeader("Access-Control-Allow-Headers", allowHeaders); - msg.setHeader("Access-Control-Max-Age", maxAge); - if (allowCredentials != null) { - msg.setHeader("Access-Control-Allow-Credentials", allowCredentials); - } - } - - private static boolean isValidOrAcceptedContentType(String valid, String target) { - if (valid == null || target == null) { - return true; - } - - // Any MIME type - // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept#Directives - if ("*/*".equals(target)) { - return true; - } - - boolean isXml = valid.toLowerCase(Locale.ENGLISH).contains("xml"); - boolean isJson = valid.toLowerCase(Locale.ENGLISH).contains("json"); - - String type = target.toLowerCase(Locale.ENGLISH); - - if (isXml && !type.contains("xml")) { - return false; - } - if (isJson && !type.contains("json")) { - return false; - } - - return true; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java deleted file mode 100644 index 0a2eebb..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java +++ /dev/null @@ -1,132 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.RollbackExchangeException; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * Processor for marking an {@link Exchange} to rollback. - */ -public class RollbackProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private String id; - private String routeId; - private boolean markRollbackOnly; - private boolean markRollbackOnlyLast; - private String message; - - public RollbackProcessor() { - } - - public RollbackProcessor(String message) { - this.message = message; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (isMarkRollbackOnlyLast()) { - // only mark the last route (current) as rollback - // this is needed when you have multiple transactions in play - exchange.setRollbackOnlyLast(true); - } else { - // default to mark the entire route as rollback - exchange.setRollbackOnly(true); - } - - if (markRollbackOnly || markRollbackOnlyLast) { - // do not do anything more as we should only mark the rollback - callback.done(true); - return true; - } - - // throw exception to rollback - if (message != null) { - exchange.setException(new RollbackExchangeException(message, exchange)); - } else { - exchange.setException(new RollbackExchangeException(exchange)); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "rollback"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getMessage() { - return message; - } - - public boolean isMarkRollbackOnly() { - return markRollbackOnly; - } - - public void setMarkRollbackOnly(boolean markRollbackOnly) { - this.markRollbackOnly = markRollbackOnly; - } - - public boolean isMarkRollbackOnlyLast() { - return markRollbackOnlyLast; - } - - public void setMarkRollbackOnlyLast(boolean markRollbackOnlyLast) { - this.markRollbackOnlyLast = markRollbackOnlyLast; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java deleted file mode 100644 index 6e60370..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java +++ /dev/null @@ -1,582 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultProducerCache; -import org.apache.camel.impl.engine.EmptyProducerCache; -import org.apache.camel.spi.*; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.support.builder.ExpressionBuilder; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Iterator; - -import static org.apache.camel.processor.PipelineHelper.continueProcessing; -import static org.apache.camel.util.ObjectHelper.notNull; - -/** - * Implements a Routing Slip - * pattern where the list of actual endpoints to send a message exchange to are - * dependent on the value of a message header. - *

- * This implementation mirrors the logic from the {@link org.apache.camel.processor.Pipeline} in the async variation - * as the failover load balancer is a specialized pipeline. So the trick is to keep doing the same as the - * pipeline to ensure it works the same and the async routing engine is flawless. - */ -public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(RoutingSlip.class); - - protected String id; - protected String routeId; - protected ProducerCache producerCache; - protected int cacheSize; - protected boolean ignoreInvalidEndpoints; - protected String header; - protected Expression expression; - protected String uriDelimiter; - protected final CamelContext camelContext; - protected AsyncProcessor errorHandler; - - /** - * The iterator to be used for retrieving the next routing slip(s) to be used. - */ - protected interface RoutingSlipIterator { - - /** - * Are the more routing slip(s)? - * - * @param exchange the current exchange - * @return true if more slips, false otherwise. - */ - boolean hasNext(Exchange exchange); - - /** - * Returns the next routing slip(s). - * - * @param exchange the current exchange - * @return the slip(s). - */ - Object next(Exchange exchange); - - } - - public RoutingSlip(CamelContext camelContext) { - notNull(camelContext, "camelContext"); - this.camelContext = camelContext; - } - - public RoutingSlip(CamelContext camelContext, Expression expression, String uriDelimiter) { - notNull(camelContext, "camelContext"); - notNull(expression, "expression"); - - this.camelContext = camelContext; - this.expression = expression; - this.uriDelimiter = uriDelimiter; - this.header = null; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - public String getUriDelimiter() { - return uriDelimiter; - } - - public void setDelimiter(String delimiter) { - this.uriDelimiter = delimiter; - } - - public boolean isIgnoreInvalidEndpoints() { - return ignoreInvalidEndpoints; - } - - public void setIgnoreInvalidEndpoints(boolean ignoreInvalidEndpoints) { - this.ignoreInvalidEndpoints = ignoreInvalidEndpoints; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public AsyncProcessor getErrorHandler() { - return errorHandler; - } - - public void setErrorHandler(AsyncProcessor errorHandler) { - this.errorHandler = errorHandler; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "routingSlip[" + expression + "]"; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (!isStarted()) { - exchange.setException(new IllegalStateException("RoutingSlip has not been started: " + this)); - callback.done(true); - return true; - } - - Expression exp = expression; - Object slip = exchange.removeProperty(Exchange.EVALUATE_EXPRESSION_RESULT); - if (slip != null) { - if (slip instanceof Expression) { - exp = (Expression) slip; - } else { - exp = ExpressionBuilder.constantExpression(slip); - } - } - - return doRoutingSlipWithExpression(exchange, exp, callback); - } - - /** - * Creates the route slip iterator to be used. - * - * @param exchange the exchange - * @param expression the expression - * @return the iterator, should never be null - */ - protected RoutingSlipIterator createRoutingSlipIterator(final Exchange exchange, final Expression expression) throws Exception { - Object slip = expression.evaluate(exchange, Object.class); - if (exchange.getException() != null) { - // force any exceptions occurred during evaluation to be thrown - throw exchange.getException(); - } - - final Iterator delegate = ObjectHelper.createIterator(slip, uriDelimiter); - - return new RoutingSlipIterator() { - public boolean hasNext(Exchange exchange) { - return delegate.hasNext(); - } - - public Object next(Exchange exchange) { - return delegate.next(); - } - }; - } - - private boolean doRoutingSlipWithExpression(final Exchange exchange, final Expression expression, final AsyncCallback originalCallback) { - Exchange current = exchange; - RoutingSlipIterator iter; - try { - iter = createRoutingSlipIterator(exchange, expression); - } catch (Exception e) { - exchange.setException(e); - originalCallback.done(true); - return true; - } - - // ensure the slip is empty when we start - if (current.hasProperties()) { - current.setProperty(Exchange.SLIP_ENDPOINT, null); - } - - while (iter.hasNext(current)) { - - boolean prototype = cacheSize < 0; - Endpoint endpoint; - try { - Object recipient = iter.next(exchange); - recipient = prepareRecipient(exchange, recipient); - Endpoint existing = getExistingEndpoint(exchange, recipient); - if (existing == null) { - endpoint = resolveEndpoint(exchange, recipient, prototype); - } else { - endpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - // if no endpoint was resolved then try the next - if (endpoint == null) { - continue; - } - } catch (Exception e) { - // error resolving endpoint so we should break out - current.setException(e); - break; - } - - //process and prepare the routing slip - boolean sync = processExchange(endpoint, current, exchange, originalCallback, iter, prototype); - current = prepareExchangeForRoutingSlip(current, endpoint); - - if (!sync) { - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId()); - } - // the remainder of the routing slip will be completed async - // so we break out now, then the callback will be invoked which then continue routing from where we left here - return false; - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId()); - } - - // we ignore some kind of exceptions and allow us to continue - if (isIgnoreInvalidEndpoints()) { - FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class); - if (e != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e); - } - current.setException(null); - } - } - - // Decide whether to continue with the recipients or not; similar logic to the Pipeline - // check for error if so we should break out - if (!continueProcessing(current, "so breaking out of the routing slip", LOG)) { - break; - } - } - - // logging nextExchange as it contains the exchange that might have altered the payload and since - // we are logging the completion if will be confusing if we log the original instead - // we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), current); - } - - // copy results back to the original exchange - ExchangeHelper.copyResults(exchange, current); - - // okay we are completely done with the routing slip - // so we need to signal done on the original callback so it can continue - originalCallback.done(true); - return true; - } - - protected static Object prepareRecipient(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient instanceof Endpoint || recipient instanceof NormalizedEndpointUri) { - return recipient; - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - recipient = ((String) recipient).trim(); - } - if (recipient != null) { - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - String uri; - if (recipient instanceof String) { - uri = (String) recipient; - } else { - // convert to a string type we can work with - uri = ecc.getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - // optimize and normalize endpoint - return ecc.normalizeUri(uri); - } - return null; - } - - protected static Endpoint getExistingEndpoint(Exchange exchange, Object recipient) { - if (recipient instanceof Endpoint) { - return (Endpoint) recipient; - } - if (recipient != null) { - if (recipient instanceof NormalizedEndpointUri) { - NormalizedEndpointUri nu = (NormalizedEndpointUri) recipient; - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - return ecc.hasEndpoint(nu); - } else { - String uri = recipient.toString(); - return exchange.getContext().hasEndpoint(uri); - } - } - return null; - } - - protected Endpoint resolveEndpoint(Exchange exchange, Object recipient, boolean prototype) throws Exception { - Endpoint endpoint = null; - try { - endpoint = prototype ? ExchangeHelper.resolvePrototypeEndpoint(exchange, recipient) : ExchangeHelper.resolveEndpoint(exchange, recipient); - } catch (Exception e) { - if (isIgnoreInvalidEndpoints()) { - LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e); - } else { - throw e; - } - } - return endpoint; - } - - protected Exchange prepareExchangeForRoutingSlip(Exchange current, Endpoint endpoint) { - // we must use the same id as this is a snapshot strategy where Camel copies a snapshot - // before processing the next step in the pipeline, so we have a snapshot of the exchange - // just before. This snapshot is used if Camel should do redeliveries (re try) using - // DeadLetterChannel. That is why it's important the id is the same, as it is the *same* - // exchange being routed. - Exchange copy = ExchangeHelper.createCopy(current, true); - - // prepare for next run - ExchangeHelper.prepareOutToIn(copy); - - // ensure stream caching is reset - MessageHelper.resetStreamCache(copy.getIn()); - - return copy; - } - - protected AsyncProcessor createErrorHandler(Route route, Exchange exchange, AsyncProcessor processor, Endpoint endpoint) { - AsyncProcessor answer = processor; - - boolean tryBlock = exchange.getProperty(Exchange.TRY_ROUTE_BLOCK, false, boolean.class); - - // do not wrap in error handler if we are inside a try block - if (!tryBlock && route != null && errorHandler != null) { - // wrap the producer in error handler so we have fine grained error handling on - // the output side instead of the input side - // this is needed to support redelivery on that output alone and not doing redelivery - // for the entire routingslip/dynamic-router block again which will start from scratch again - answer = errorHandler; - } - - return answer; - } - - protected boolean processExchange(final Endpoint endpoint, final Exchange exchange, final Exchange original, - final AsyncCallback originalCallback, final RoutingSlipIterator iter, final boolean prototype) { - - // this does the actual processing so log at trace level - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - - // routing slip callback which are used when - // - routing slip was routed asynchronously - // - and we are completely done with the routing slip - // so we need to signal done on the original callback so it can continue - AsyncCallback callback = doneSync -> { - if (!doneSync) { - originalCallback.done(false); - } - }; - return producerCache.doInAsyncProducer(endpoint, exchange, callback, (p, ex, cb) -> { - - // rework error handling to support fine grained error handling - Route route = ExchangeHelper.getRoute(ex); - AsyncProcessor target = createErrorHandler(route, ex, p, endpoint); - - // set property which endpoint we send to and the producer that can do it - ex.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri()); - ex.setProperty(Exchange.SLIP_ENDPOINT, endpoint.getEndpointUri()); - ex.setProperty(Exchange.SLIP_PRODUCER, p); - - return target.process(ex, new AsyncCallback() { - public void done(boolean doneSync) { - // cleanup producer after usage - ex.removeProperty(Exchange.SLIP_PRODUCER); - - // we only have to handle async completion of the routing slip - if (doneSync) { - // and stop prototype endpoints - if (prototype) { - ServiceHelper.stopAndShutdownService(endpoint); - } - cb.done(true); - return; - } - - try { - // continue processing the routing slip asynchronously - Exchange current = prepareExchangeForRoutingSlip(ex, endpoint); - - while (iter.hasNext(current)) { - - // we ignore some kind of exceptions and allow us to continue - if (isIgnoreInvalidEndpoints()) { - FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class); - if (e != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e); - } - current.setException(null); - } - } - - // Decide whether to continue with the recipients or not; similar logic to the Pipeline - // check for error if so we should break out - if (!continueProcessing(current, "so breaking out of the routing slip", LOG)) { - break; - } - - Endpoint nextEndpoint; - boolean prototype = cacheSize < 0; - try { - Object recipient = iter.next(ex); - recipient = prepareRecipient(exchange, recipient); - Endpoint existing = getExistingEndpoint(exchange, recipient); - if (existing == null) { - nextEndpoint = resolveEndpoint(exchange, recipient, prototype); - } else { - nextEndpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - // if no endpoint was resolved then try the next - if (nextEndpoint == null) { - continue; - } - } catch (Exception e) { - // error resolving endpoint so we should break out - current.setException(e); - break; - } - - // prepare and process the routing slip - final boolean prototypeEndpoint = prototype; - AsyncCallback cbNext = doneNext -> { - // and stop prototype endpoints - if (prototypeEndpoint) { - ServiceHelper.stopAndShutdownService(nextEndpoint); - } - cb.done(doneNext); - }; - boolean sync = processExchange(nextEndpoint, current, original, cbNext, iter, prototype); - current = prepareExchangeForRoutingSlip(current, nextEndpoint); - - if (!sync) { - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", original.getExchangeId()); - } - return; - } - } - - // logging nextExchange as it contains the exchange that might have altered the payload and since - // we are logging the completion if will be confusing if we log the original instead - // we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", original.getExchangeId(), current); - } - - // copy results back to the original exchange - ExchangeHelper.copyResults(original, current); - } catch (Throwable e) { - ex.setException(e); - } - - // okay we are completely done with the routing slip - // so we need to signal done on the original callback so it can continue - cb.done(false); - } - }); - }); - } - - @Override - protected void doStart() throws Exception { - if (producerCache == null) { - if (cacheSize < 0) { - producerCache = new EmptyProducerCache(this, camelContext); - LOG.debug("RoutingSlip {} is not using ProducerCache", this); - } else { - producerCache = new DefaultProducerCache(this, camelContext, cacheSize); - LOG.debug("RoutingSlip {} using ProducerCache with cacheSize={}", this, cacheSize); - } - } - - ServiceHelper.startService(producerCache, errorHandler); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producerCache, errorHandler); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(producerCache, errorHandler); - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return producerCache.getEndpointUtilizationStatistics(); - } - - /** - * Returns the outbound message if available. Otherwise return the inbound message. - */ - private Message getResultMessage(Exchange exchange) { - return exchange.getMessage(); - } - - /** - * Creates the embedded processor to use when wrapping this routing slip in an error handler. - */ - public AsyncProcessor newRoutingSlipProcessorForErrorHandler() { - return new RoutingSlipProcessor(); - } - - /** - * Embedded processor that routes to the routing slip that has been set via the - * exchange property {@link Exchange#SLIP_PRODUCER}. - */ - private final class RoutingSlipProcessor extends AsyncProcessorSupport { - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - AsyncProcessor producer = exchange.getProperty(Exchange.SLIP_PRODUCER, AsyncProcessor.class); - return producer.process(exchange, callback); - } - - @Override - public String toString() { - return "RoutingSlipProcessor"; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java deleted file mode 100644 index 163a016..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java +++ /dev/null @@ -1,194 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Locale; -import java.util.concurrent.TimeUnit; - -/** - * A SamplingThrottler is a special kind of throttler. It also - * limits the number of exchanges sent to a downstream endpoint. It differs from - * a normal throttler in that it will not queue exchanges above the threshold - * for a given period. Instead these exchanges will be stopped, precluding them - * from being processed at all by downstream consumers. - *

- * This kind of throttling can be useful for taking a sample from - * an exchange stream, rough consolidation of noisy and bursty exchange traffic - * or where queuing of throttled exchanges is undesirable. - */ -public class SamplingThrottler extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(SamplingThrottler.class); - - private String id; - private String routeId; - private long messageFrequency; - private long currentMessageCount; - private long samplePeriod; - private long periodInMillis; - private TimeUnit units; - private long timeOfLastExchange; - private org.apache.camel.processor.StopProcessor stopper = new StopProcessor(); - private final Object calculationLock = new Object(); - private SampleStats sampled = new SampleStats(); - - public SamplingThrottler(long messageFrequency) { - if (messageFrequency <= 0) { - throw new IllegalArgumentException("A positive value is required for the sampling message frequency"); - } - this.messageFrequency = messageFrequency; - } - - public SamplingThrottler(long samplePeriod, TimeUnit units) { - if (samplePeriod <= 0) { - throw new IllegalArgumentException("A positive value is required for the sampling period"); - } - if (units == null) { - throw new IllegalArgumentException("A invalid null value was supplied for the units of the sampling period"); - } - this.samplePeriod = samplePeriod; - this.units = units; - this.periodInMillis = units.toMillis(samplePeriod); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - if (messageFrequency > 0) { - return "samplingThrottler[1 exchange per: " + messageFrequency + " messages received]"; - } else { - return "samplingThrottler[1 exchange per: " + samplePeriod + " " + units.toString().toLowerCase(Locale.ENGLISH) + "]"; - } - } - - public long getMessageFrequency() { - return messageFrequency; - } - - public long getSamplePeriod() { - return samplePeriod; - } - - public TimeUnit getUnits() { - return units; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - boolean doSend = false; - - synchronized (calculationLock) { - - if (messageFrequency > 0) { - currentMessageCount++; - if (currentMessageCount % messageFrequency == 0) { - doSend = true; - } - } else { - long now = System.currentTimeMillis(); - if (now >= timeOfLastExchange + periodInMillis) { - doSend = true; - if (LOG.isTraceEnabled()) { - LOG.trace(sampled.sample()); - } - timeOfLastExchange = now; - } else { - if (LOG.isTraceEnabled()) { - LOG.trace(sampled.drop()); - } - } - } - } - - if (!doSend) { - // will just set a property - try { - stopper.process(exchange); - } catch (Exception e) { - exchange.setException(e); - } - } - - // we are done synchronously - callback.done(true); - return true; - } - - private static class SampleStats { - private long droppedThisPeriod; - private long totalDropped; - private long totalSampled; - private long totalThisPeriod; - - String drop() { - droppedThisPeriod++; - totalThisPeriod++; - totalDropped++; - return getDroppedLog(); - } - - String sample() { - totalThisPeriod = 1; // a new period, reset to 1 - totalSampled++; - droppedThisPeriod = 0; - return getSampledLog(); - } - - String getSampledLog() { - return String.format("Sampled %d of %d total exchanges", totalSampled, totalSampled + totalDropped); - } - - String getDroppedLog() { - return String.format("Dropped %d of %d exchanges in this period, totalling %d dropped of %d exchanges overall.", - droppedThisPeriod, totalThisPeriod, totalDropped, totalSampled + totalDropped); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java deleted file mode 100644 index c1756d3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java +++ /dev/null @@ -1,96 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; - -/** - * A processor which executes the script as an expression and does not change the message body. - */ -public class ScriptProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Expression expression; - - public ScriptProcessor(Expression expression) { - ObjectHelper.notNull(expression, "expression", this); - this.expression = expression; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - expression.evaluate(exchange, Object.class); - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "script[" + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java deleted file mode 100644 index d92fe7c..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java +++ /dev/null @@ -1,70 +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.processor; - -import org.apache.camel.CamelContext; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.SendDynamicAware; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; - -public class SendDynamicAwareResolver { - - public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/send-dynamic/"; - - private static final Logger LOG = LoggerFactory.getLogger(SendDynamicAwareResolver.class); - - private FactoryFinder factoryFinder; - - public SendDynamicAware resolve(CamelContext context, String scheme) { - String name = scheme; - - // use factory finder to find a custom implementations - Class type = null; - try { - type = findFactory(name, context); - } catch (Exception e) { - // ignore - } - - if (type != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Found SendDynamicAware: {} via: {}{}", type.getName(), factoryFinder.getResourcePath(), name); - } - if (SendDynamicAware.class.isAssignableFrom(type)) { - SendDynamicAware answer = (SendDynamicAware) context.getInjector().newInstance(type, false); - answer.setScheme(scheme); - return answer; - } else { - throw new IllegalArgumentException("Type is not a SendDynamicAware implementation. Found: " + type.getName()); - } - } - - return null; - } - - private Class findFactory(String name, CamelContext context) throws IOException { - if (factoryFinder == null) { - factoryFinder = context.adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH); - } - return factoryFinder.findClass(name).orElse(null); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java deleted file mode 100644 index 2bdc7f7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java +++ /dev/null @@ -1,411 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultProducerCache; -import org.apache.camel.impl.engine.EmptyProducerCache; -import org.apache.camel.spi.*; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.EndpointHelper; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Processor for forwarding exchanges to a dynamic endpoint destination. - * - * @see org.apache.camel.processor.SendProcessor - */ -public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(SendDynamicProcessor.class); - - protected SendDynamicAware dynamicAware; - protected volatile String scheme; - protected CamelContext camelContext; - protected final String uri; - protected final Expression expression; - protected ExchangePattern pattern; - protected ProducerCache producerCache; - protected String id; - protected String routeId; - protected boolean ignoreInvalidEndpoint; - protected int cacheSize; - protected boolean allowOptimisedComponents = true; - protected boolean autoStartupComponents = true; - - public SendDynamicProcessor(String uri, Expression expression) { - this.uri = uri; - this.expression = expression; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(Exchange exchange, final AsyncCallback callback) { - if (!isStarted()) { - exchange.setException(new IllegalStateException("SendProcessor has not been started: " + this)); - callback.done(true); - return true; - } - - // we should preserve existing MEP so remember old MEP - // if you want to permanently to change the MEP then use .setExchangePattern in the DSL - final ExchangePattern existingPattern = exchange.getPattern(); - - // which endpoint to send to - final Endpoint endpoint; - final ExchangePattern destinationExchangePattern; - - // use dynamic endpoint so calculate the endpoint to use - Object recipient = null; - Processor preAwareProcessor = null; - Processor postAwareProcessor = null; - String staticUri = null; - boolean prototype = cacheSize < 0; - try { - recipient = expression.evaluate(exchange, Object.class); - if (dynamicAware != null) { - // if its the same scheme as the pre-resolved dynamic aware then we can optimise to use it - String originalUri = uri; - String uri = resolveUri(exchange, recipient); - String scheme = resolveScheme(exchange, uri); - if (dynamicAware.getScheme().equals(scheme)) { - SendDynamicAware.DynamicAwareEntry entry = dynamicAware.prepare(exchange, uri, originalUri); - if (entry != null) { - staticUri = dynamicAware.resolveStaticUri(exchange, entry); - preAwareProcessor = dynamicAware.createPreProcessor(exchange, entry); - postAwareProcessor = dynamicAware.createPostProcessor(exchange, entry); - if (staticUri != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Optimising toD via SendDynamicAware component: {} to use static uri: {}", scheme, URISupport.sanitizeUri(staticUri)); - } - } - } - } - } - Object targetRecipient = staticUri != null ? staticUri : recipient; - targetRecipient = prepareRecipient(exchange, targetRecipient); - if (targetRecipient == null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Send dynamic evaluated as null so cannot send to any endpoint"); - } - // no endpoint to send to, so ignore - callback.done(true); - return true; - } - Endpoint existing = getExistingEndpoint(exchange, targetRecipient); - if (existing == null) { - endpoint = resolveEndpoint(exchange, targetRecipient, prototype); - } else { - endpoint = existing; - // we have an existing endpoint then its not a prototype scope - prototype = false; - } - destinationExchangePattern = EndpointHelper.resolveExchangePatternFromUrl(endpoint.getEndpointUri()); - } catch (Throwable e) { - if (isIgnoreInvalidEndpoint()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e); - } - } else { - exchange.setException(e); - } - callback.done(true); - return true; - } - - // send the exchange to the destination using the producer cache - final Processor preProcessor = preAwareProcessor; - final Processor postProcessor = postAwareProcessor; - // destination exchange pattern overrides pattern - final ExchangePattern pattern = destinationExchangePattern != null ? destinationExchangePattern : this.pattern; - final boolean stopEndpoint = prototype; - return producerCache.doInAsyncProducer(endpoint, exchange, callback, (p, e, c) -> { - final Exchange target = configureExchange(e, pattern, endpoint); - try { - if (preProcessor != null) { - preProcessor.process(target); - } - } catch (Throwable t) { - e.setException(t); - // restore previous MEP - target.setPattern(existingPattern); - // we failed - c.done(true); - } - - LOG.debug(">>>> {} {}", endpoint, e); - return p.process(target, new AsyncCallback() { - public void done(boolean doneSync) { - // restore previous MEP - target.setPattern(existingPattern); - try { - if (postProcessor != null) { - postProcessor.process(target); - } - } catch (Throwable e) { - target.setException(e); - } - // stop endpoint if prototype as it was only used once - if (stopEndpoint) { - ServiceHelper.stopAndShutdownService(endpoint); - } - // signal we are done - c.done(doneSync); - } - }); - }); - } - - protected static String resolveUri(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient == null) { - return null; - } - - String uri; - // trim strings as end users might have added spaces between separators - if (recipient instanceof String) { - uri = ((String) recipient).trim(); - } else if (recipient instanceof Endpoint) { - uri = ((Endpoint) recipient).getEndpointKey(); - } else { - // convert to a string type we can work with - uri = exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - - // in case path has property placeholders then try to let property component resolve those - try { - uri = exchange.getContext().resolvePropertyPlaceholders(uri); - } catch (Exception e) { - throw new ResolveEndpointFailedException(uri, e); - } - - return uri; - } - - protected static String resolveScheme(Exchange exchange, String uri) { - return ExchangeHelper.resolveScheme(uri); - } - - protected static Object prepareRecipient(Exchange exchange, Object recipient) throws NoTypeConversionAvailableException { - if (recipient instanceof Endpoint || recipient instanceof NormalizedEndpointUri) { - return recipient; - } else if (recipient instanceof String) { - // trim strings as end users might have added spaces between separators - recipient = ((String) recipient).trim(); - } - if (recipient != null) { - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - String uri; - if (recipient instanceof String) { - uri = (String) recipient; - } else { - // convert to a string type we can work with - uri = ecc.getTypeConverter().mandatoryConvertTo(String.class, exchange, recipient); - } - // make sure the uri has a scheme and a path - int colon = uri.indexOf(':'); - if (colon == -1 || colon == uri.length() - 1) { - throw new ResolveEndpointFailedException(uri, "Endpoint should include scheme:path"); - } - // optimize and normalize endpoint - return ecc.normalizeUri(uri); - } - return null; - } - - protected static Endpoint getExistingEndpoint(Exchange exchange, Object recipient) { - if (recipient instanceof Endpoint) { - return (Endpoint) recipient; - } - if (recipient != null) { - if (recipient instanceof NormalizedEndpointUri) { - NormalizedEndpointUri nu = (NormalizedEndpointUri) recipient; - ExtendedCamelContext ecc = (ExtendedCamelContext) exchange.getContext(); - return ecc.hasEndpoint(nu); - } else { - String uri = recipient.toString(); - return exchange.getContext().hasEndpoint(uri); - } - } - return null; - } - - protected static Endpoint resolveEndpoint(Exchange exchange, Object recipient, boolean prototype) { - return prototype ? ExchangeHelper.resolvePrototypeEndpoint(exchange, recipient) : ExchangeHelper.resolveEndpoint(exchange, recipient); - } - - protected Exchange configureExchange(Exchange exchange, ExchangePattern pattern, Endpoint endpoint) { - if (pattern != null) { - exchange.setPattern(pattern); - } - // set property which endpoint we send to - exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri()); - return exchange; - } - - @Override - protected void doInit() throws Exception { - expression.init(camelContext); - - if ((isAllowOptimisedComponents() || isAutoStartupComponents()) && uri != null) { - // in case path has property placeholders then try to let property component resolve those - String u = camelContext.resolvePropertyPlaceholders(uri); - // find out which component it is - scheme = ExchangeHelper.resolveScheme(u); - } - - if (isAllowOptimisedComponents() && uri != null) { - try { - if (scheme != null) { - // find out if the component can be optimised for send-dynamic - SendDynamicAwareResolver resolver = new SendDynamicAwareResolver(); - dynamicAware = resolver.resolve(camelContext, scheme); - if (dynamicAware != null) { - if (LOG.isDebugEnabled()) { - LOG.debug("Detected SendDynamicAware component: {} optimising toD: {}", scheme, URISupport.sanitizeUri(uri)); - } - } - } - } catch (Throwable e) { - // ignore - if (LOG.isDebugEnabled()) { - LOG.debug("Error creating optimised SendDynamicAwareResolver for uri: " + URISupport.sanitizeUri(uri) - + " due to " + e.getMessage() + ". This exception is ignored", e); - } - } - } - } - - @Override - protected void doStart() throws Exception { - // ensure the component is started - if (autoStartupComponents && scheme != null) { - camelContext.getComponent(scheme); - } - - if (producerCache == null) { - if (cacheSize < 0) { - producerCache = new EmptyProducerCache(this, camelContext); - LOG.debug("DynamicSendTo {} is not using ProducerCache", this); - } else { - producerCache = new DefaultProducerCache(this, camelContext, cacheSize); - LOG.debug("DynamicSendTo {} using ProducerCache with cacheSize={}", this, cacheSize); - } - } - - ServiceHelper.startService(producerCache); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(producerCache); - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return producerCache.getEndpointUtilizationStatistics(); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public SendDynamicAware getDynamicAware() { - return dynamicAware; - } - - public String getUri() { - return uri; - } - - public Expression getExpression() { - return expression; - } - - public ExchangePattern getPattern() { - return pattern; - } - - public void setPattern(ExchangePattern pattern) { - this.pattern = pattern; - } - - public boolean isIgnoreInvalidEndpoint() { - return ignoreInvalidEndpoint; - } - - public void setIgnoreInvalidEndpoint(boolean ignoreInvalidEndpoint) { - this.ignoreInvalidEndpoint = ignoreInvalidEndpoint; - } - - public int getCacheSize() { - return cacheSize; - } - - public void setCacheSize(int cacheSize) { - this.cacheSize = cacheSize; - } - - public boolean isAllowOptimisedComponents() { - return allowOptimisedComponents; - } - - public void setAllowOptimisedComponents(boolean allowOptimisedComponents) { - this.allowOptimisedComponents = allowOptimisedComponents; - } - - public boolean isAutoStartupComponents() { - return autoStartupComponents; - } - - public void setAutoStartupComponents(boolean autoStartupComponents) { - this.autoStartupComponents = autoStartupComponents; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java deleted file mode 100644 index f2e1872..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java +++ /dev/null @@ -1,247 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.impl.engine.DefaultProducerCache; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ProducerCache; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.EndpointHelper; -import org.apache.camel.support.EventHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.atomic.AtomicLong; - -/** - * Processor for forwarding exchanges to a static endpoint destination. - * - * @see SendDynamicProcessor - */ -public class SendProcessor extends AsyncProcessorSupport implements Traceable, EndpointAware, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(SendProcessor.class); - - protected transient String traceLabelToString; - protected final ExtendedCamelContext camelContext; - protected final ExchangePattern pattern; - protected ProducerCache producerCache; - protected AsyncProducer producer; - protected Endpoint destination; - protected ExchangePattern destinationExchangePattern; - protected String id; - protected String routeId; - protected final AtomicLong counter = new AtomicLong(); - - public SendProcessor(Endpoint destination) { - this(destination, null); - } - - public SendProcessor(Endpoint destination, ExchangePattern pattern) { - ObjectHelper.notNull(destination, "destination"); - this.destination = destination; - this.camelContext = (ExtendedCamelContext) destination.getCamelContext(); - this.pattern = pattern; - this.destinationExchangePattern = null; - this.destinationExchangePattern = EndpointHelper.resolveExchangePatternFromUrl(destination.getEndpointUri()); - ObjectHelper.notNull(this.camelContext, "camelContext"); - } - - @Override - public String toString() { - return destination != null ? destination.toString() : id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String getTraceLabel() { - if (traceLabelToString == null) { - traceLabelToString = URISupport.sanitizeUri(destination.getEndpointUri()); - } - return traceLabelToString; - } - - @Override - public Endpoint getEndpoint() { - return destination; - } - - @Override - public boolean process(Exchange exchange, final AsyncCallback callback) { - if (!isStarted()) { - exchange.setException(new IllegalStateException("SendProcessor has not been started: " + this)); - callback.done(true); - return true; - } - - // we should preserve existing MEP so remember old MEP - // if you want to permanently to change the MEP then use .setExchangePattern in the DSL - final ExchangePattern existingPattern = exchange.getPattern(); - - counter.incrementAndGet(); - - // if we have a producer then use that as its optimized - if (producer != null) { - - final Exchange target = exchange; - // we can send with a different MEP pattern - if (destinationExchangePattern != null || pattern != null) { - target.setPattern(destinationExchangePattern != null ? destinationExchangePattern : pattern); - } - // set property which endpoint we send to - target.setProperty(Exchange.TO_ENDPOINT, destination.getEndpointUri()); - - final boolean sending = camelContext.isEventNotificationApplicable() && EventHelper.notifyExchangeSending(exchange.getContext(), target, destination); - // record timing for sending the exchange using the producer - StopWatch watch; - if (sending) { - watch = new StopWatch(); - } else { - watch = null; - } - - // optimize to only create a new callback if really needed, otherwise we can use the provided callback as-is - AsyncCallback ac = callback; - boolean newCallback = watch != null || existingPattern != target.getPattern(); - if (newCallback) { - ac = doneSync -> { - try { - // restore previous MEP - target.setPattern(existingPattern); - // emit event that the exchange was sent to the endpoint - if (watch != null) { - long timeTaken = watch.taken(); - EventHelper.notifyExchangeSent(target.getContext(), target, destination, timeTaken); - } - } finally { - callback.done(doneSync); - } - }; - } - try { - LOG.debug(">>>> {} {}", destination, exchange); - return producer.process(exchange, ac); - } catch (Throwable throwable) { - exchange.setException(throwable); - callback.done(true); - } - - return true; - } else { - // we can send with a different MEP pattern - if (destinationExchangePattern != null || pattern != null) { - exchange.setPattern(destinationExchangePattern != null ? destinationExchangePattern : pattern); - } - // set property which endpoint we send to - exchange.setProperty(Exchange.TO_ENDPOINT, destination.getEndpointUri()); - - LOG.debug(">>>> {} {}", destination, exchange); - - // send the exchange to the destination using the producer cache for the non optimized producers - return producerCache.doInAsyncProducer(destination, exchange, callback, (producer, ex, cb) -> producer.process(ex, doneSync -> { - // restore previous MEP - exchange.setPattern(existingPattern); - // signal we are done - cb.done(doneSync); - })); - } - } - - public Endpoint getDestination() { - return destination; - } - - public ExchangePattern getPattern() { - return pattern; - } - - public long getCounter() { - return counter.get(); - } - - public void reset() { - counter.set(0); - } - - @Override - protected void doInit() throws Exception { - // if the producer is not singleton we need to use a producer cache - if (!destination.isSingletonProducer() && producerCache == null) { - // use a single producer cache as we need to only hold reference for one destination - // and use a regular HashMap as we do not want a soft reference store that may get re-claimed when low on memory - // as we want to ensure the producer is kept around, to ensure its lifecycle is fully managed, - // eg stopping the producer when we stop etc. - producerCache = new DefaultProducerCache(this, camelContext, 1); - // do not add as service as we do not want to manage the producer cache - } - } - - @Override - protected void doStart() throws Exception { - // warm up the producer by starting it so we can fail fast if there was a problem - // however must start endpoint first - ServiceHelper.startService(destination); - - // yes we can optimize and use the producer directly for sending - if (destination.isSingletonProducer()) { - this.producer = destination.createAsyncProducer(); - // ensure the producer is managed and started - camelContext.addService(this.producer, true, true); - } else { - // no we need the producer cache for pooled non-singleton producers - ServiceHelper.startService(producerCache); - } - } - - @Override - protected void doStop() throws Exception { - // ensure the producer is removed before its stopped - if (this.producer != null) { - camelContext.removeService(this.producer); - } - ServiceHelper.stopService(producerCache, producer); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(producerCache, producer); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java deleted file mode 100644 index 32ec36e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java +++ /dev/null @@ -1,117 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultMessage; -import org.apache.camel.support.ExchangeHelper; - -/** - * A processor which sets the body on the IN or OUT message with an {@link Expression} - */ -public class SetBodyProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Expression expression; - - public SetBodyProcessor(Expression expression) { - this.expression = expression; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - Object newBody = expression.evaluate(exchange, Object.class); - - if (exchange.getException() != null) { - // the expression threw an exception so we should break-out - callback.done(true); - return true; - } - - Message old = exchange.getMessage(); - - // create a new message container so we do not drag specialized message objects along - // but that is only needed if the old message is a specialized message - boolean copyNeeded = !(old.getClass().equals(DefaultMessage.class)); - - if (copyNeeded) { - Message msg = new DefaultMessage(exchange.getContext()); - msg.copyFromWithNewBody(old, newBody); - - // replace message on exchange - ExchangeHelper.replaceMessage(exchange, msg, false); - } else { - // no copy needed so set replace value directly - old.setBody(newBody); - } - - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "setBody[" + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java deleted file mode 100644 index 8841d8c..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java +++ /dev/null @@ -1,112 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; - -/** - * A processor which sets the header on the IN or OUT message with an {@link Expression} - */ -public class SetHeaderProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Expression headerName; - private final Expression expression; - - public SetHeaderProcessor(Expression headerName, Expression expression) { - this.headerName = headerName; - this.expression = expression; - ObjectHelper.notNull(headerName, "headerName"); - ObjectHelper.notNull(expression, "expression"); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - Object newHeader = expression.evaluate(exchange, Object.class); - - if (exchange.getException() != null) { - // the expression threw an exception so we should break-out - callback.done(true); - return true; - } - - Message old = exchange.getMessage(); - - String key = headerName.evaluate(exchange, String.class); - old.setHeader(key, newHeader); - - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "setHeader[" + headerName + ", " + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getHeaderName() { - return headerName.toString(); - } - - public Expression getExpression() { - return expression; - } - - @Override - protected void doStart() throws Exception { - //noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java deleted file mode 100644 index c6ad929..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java +++ /dev/null @@ -1,112 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; - -/** - * A processor which sets the property on the exchange with an {@link Expression} - */ -public class SetPropertyProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Expression propertyName; - private final Expression expression; - - public SetPropertyProcessor(Expression propertyName, Expression expression) { - this.propertyName = propertyName; - this.expression = expression; - ObjectHelper.notNull(propertyName, "propertyName"); - ObjectHelper.notNull(expression, "expression"); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - Object newProperty = expression.evaluate(exchange, Object.class); - - if (exchange.getException() != null) { - // the expression threw an exception so we should break-out - callback.done(true); - return true; - } - - String key = propertyName.evaluate(exchange, String.class); - exchange.setProperty(key, newProperty); - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "setProperty[" + propertyName + ", " + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getPropertyName() { - return propertyName.toString(); - } - - public Expression getExpression() { - return expression; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java deleted file mode 100644 index 9bb04a1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java +++ /dev/null @@ -1,307 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; -import org.apache.camel.support.OrderedComparator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.RejectedExecutionException; - -/** - * A Shared (thread safe) internal {@link Processor} that Camel routing engine used during routing for cross cutting functionality such as: - *

    - *
  • Execute {@link UnitOfWork}
    • - *
  • Keeping track which route currently is being routed
    • - *
  • Execute {@link RoutePolicy}
    • - *
  • Gather JMX performance statics
    • - *
  • Tracing
    • - *
  • Debugging
    • - *
  • Message History
    • - *
  • Stream Caching
    • - *
  • {@link Transformer}
    • - *
- * ... and more. - *

- * This implementation executes this cross cutting functionality as a {@link CamelInternalProcessorAdvice} advice (before and after advice) - * by executing the {@link CamelInternalProcessorAdvice#before(Exchange)} and - * {@link CamelInternalProcessorAdvice#after(Exchange, Object)} callbacks in correct order during routing. - * This reduces number of stack frames needed during routing, and reduce the number of lines in stacktraces, as well - * makes debugging the routing engine easier for end users. - *

- * Debugging tips: Camel end users whom want to debug their Camel applications with the Camel source code, then make sure to - * read the source code of this class about the debugging tips, which you can find in the - * {@link #process(Exchange, AsyncCallback, AsyncProcessor, Processor)} method. - *

- * The added advices can implement {@link Ordered} to control in which order the advices are executed. - */ -public class SharedCamelInternalProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(SharedCamelInternalProcessor.class); - private static final Object[] EMPTY_STATES = new Object[0]; - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final AsyncProcessorAwaitManager awaitManager; - private final ShutdownStrategy shutdownStrategy; - private final List advices; - private byte statefulAdvices; - - public SharedCamelInternalProcessor(CamelContext camelContext, CamelInternalProcessorAdvice... advices) { - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.awaitManager = camelContext.adapt(ExtendedCamelContext.class).getAsyncProcessorAwaitManager(); - this.shutdownStrategy = camelContext.getShutdownStrategy(); - - if (advices != null) { - this.advices = new ArrayList<>(advices.length); - for (CamelInternalProcessorAdvice advice : advices) { - this.advices.add(advice); - if (advice.hasState()) { - statefulAdvices++; - } - } - // ensure advices are sorted so they are in the order we want - this.advices.sort(OrderedComparator.get()); - } else { - this.advices = null; - } - } - - /** - * Synchronous API - */ - public void process(Exchange exchange, AsyncProcessor processor, Processor resultProcessor) { - awaitManager.process(new AsyncProcessor() { - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - return SharedCamelInternalProcessor.this.process(exchange, callback, processor, resultProcessor); - } - - @Override - public CompletableFuture processAsync(Exchange exchange) { - AsyncCallbackToCompletableFutureAdapter callback = new AsyncCallbackToCompletableFutureAdapter<>(exchange); - process(exchange, callback); - return callback.getFuture(); - } - - @Override - public void process(Exchange exchange) throws Exception { - throw new IllegalStateException(); - } - }, exchange); - } - - /** - * Asynchronous API - */ - public boolean process(Exchange exchange, AsyncCallback originalCallback, AsyncProcessor processor, Processor resultProcessor) { - // ---------------------------------------------------------- - // CAMEL END USER - READ ME FOR DEBUGGING TIPS - // ---------------------------------------------------------- - // If you want to debug the Camel routing engine, then there is a lot of internal functionality - // the routing engine executes during routing messages. You can skip debugging this internal - // functionality and instead debug where the routing engine continues routing to the next node - // in the routes. The CamelInternalProcessor is a vital part of the routing engine, as its - // being used in between the nodes. As an end user you can just debug the code in this class - // in between the: - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // you can see in the code below. - // ---------------------------------------------------------- - - if (processor == null || !continueProcessing(exchange, processor)) { - // no processor or we should not continue then we are done - originalCallback.done(true); - return true; - } - - // optimise to use object array for states, and only for the number of advices that keep state - final Object[] states = statefulAdvices > 0 ? new Object[statefulAdvices] : EMPTY_STATES; - // optimise for loop using index access to avoid creating iterator object - for (int i = 0, j = 0; i < advices.size(); i++) { - CamelInternalProcessorAdvice task = advices.get(i); - try { - Object state = task.before(exchange); - if (task.hasState()) { - states[j++] = state; - } - } catch (Throwable e) { - exchange.setException(e); - originalCallback.done(true); - return true; - } - } - - // create internal callback which will execute the advices in reverse order when done - AsyncCallback callback = new InternalCallback(states, exchange, originalCallback, resultProcessor); - - // UNIT_OF_WORK_PROCESS_SYNC is @deprecated and we should remove it from Camel 3.0 - Object synchronous = exchange.removeProperty(Exchange.UNIT_OF_WORK_PROCESS_SYNC); - if (exchange.isTransacted() || synchronous != null) { - // must be synchronized for transacted exchanges - if (LOG.isTraceEnabled()) { - if (exchange.isTransacted()) { - LOG.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - } else { - LOG.trace("Synchronous UnitOfWork Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - } - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - try { - processor.process(exchange); - } catch (Throwable e) { - exchange.setException(e); - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - callback.done(true); - return true; - } else { - final UnitOfWork uow = exchange.getUnitOfWork(); - - // do uow before processing and if a value is returned the the uow wants to be processed after - // was well in the same thread - AsyncCallback async = callback; - boolean beforeAndAfter = uow.isBeforeAfterProcess(); - if (beforeAndAfter) { - async = uow.beforeProcess(processor, exchange, async); - } - - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchange for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - } - boolean sync = processor.process(exchange, async); - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - - // optimize to only do after uow processing if really needed - if (beforeAndAfter) { - reactiveExecutor.schedule(() -> { - // execute any after processor work (in current thread, not in the callback) - uow.afterProcess(processor, exchange, callback, sync); - }); - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Exchange processed and is continued routed asynchronously for exchangeId: {} -> {}", - exchange.getExchangeId(), exchange); - } - return sync; - } - } - - /** - * Internal callback that executes the after advices. - */ - private final class InternalCallback implements AsyncCallback { - - private final Object[] states; - private final Exchange exchange; - private final AsyncCallback callback; - private final Processor resultProcessor; - - private InternalCallback(Object[] states, Exchange exchange, AsyncCallback callback, Processor resultProcessor) { - this.states = states; - this.exchange = exchange; - this.callback = callback; - this.resultProcessor = resultProcessor; - } - - @Override - @SuppressWarnings("unchecked") - public void done(boolean doneSync) { - // NOTE: if you are debugging Camel routes, then all the code in the for loop below is internal only - // so you can step straight to the finally block and invoke the callback - - if (resultProcessor != null) { - try { - resultProcessor.process(exchange); - } catch (Throwable e) { - exchange.setException(e); - } - } - - // we should call after in reverse order - try { - for (int i = advices != null ? advices.size() - 1 : -1, j = states.length - 1; i >= 0; i--) { - CamelInternalProcessorAdvice task = advices.get(i); - Object state = null; - if (task.hasState()) { - state = states[j--]; - } - try { - task.after(exchange, state); - } catch (Throwable e) { - exchange.setException(e); - // allow all advices to complete even if there was an exception - } - } - } finally { - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ START +++ - // ---------------------------------------------------------- - // callback must be called - if (callback != null) { - reactiveExecutor.schedule(callback); - } - // ---------------------------------------------------------- - // CAMEL END USER - DEBUG ME HERE +++ END +++ - // ---------------------------------------------------------- - } - } - } - - /** - * Strategy to determine if we should continue processing the {@link Exchange}. - */ - protected boolean continueProcessing(Exchange exchange, AsyncProcessor processor) { - if (exchange.isRouteStop()) { - LOG.debug("Exchange is marked to stop routing: {}", exchange); - return false; - } - - // determine if we can still run, or the camel context is forcing a shutdown - if (processor instanceof Service) { - boolean forceShutdown = shutdownStrategy.forceShutdown((Service) processor); - if (forceShutdown) { - String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange; - LOG.debug(msg); - if (exchange.getException() == null) { - exchange.setException(new RejectedExecutionException(msg)); - } - return false; - } - } - - // yes we can continue - return true; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java deleted file mode 100644 index 32c49b8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java +++ /dev/null @@ -1,110 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -import java.util.Comparator; -import java.util.List; - -/** - * A processor that sorts the expression using a comparator - */ -public class SortProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware, Traceable { - - private String id; - private String routeId; - private final Expression expression; - private final Comparator comparator; - - public SortProcessor(Expression expression, Comparator comparator) { - this.expression = expression; - this.comparator = comparator; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - @SuppressWarnings("unchecked") - List list = expression.evaluate(exchange, List.class); - list.sort(comparator); - - exchange.getMessage().setBody(list); - } catch (Exception e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "sort[" + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - public Comparator getComparator() { - return comparator; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java deleted file mode 100644 index 1805546..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java +++ /dev/null @@ -1,264 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.processor.aggregate.ShareUnitOfWorkAggregationStrategy; -import org.apache.camel.processor.aggregate.UseOriginalAggregationStrategy; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.ObjectHelper; -import org.apache.camel.util.IOHelper; - -import java.io.Closeable; -import java.io.IOException; -import java.util.*; -import java.util.concurrent.ExecutorService; - -import static org.apache.camel.util.ObjectHelper.notNull; - -/** - * Implements a dynamic Splitter pattern - * where an expression is evaluated to iterate through each of the parts of a - * message and then each part is then send to some endpoint. - */ -public class Splitter extends MulticastProcessor implements AsyncProcessor, Traceable { - - private final Expression expression; - - public Splitter(CamelContext camelContext, Route route, Expression expression, Processor destination, AggregationStrategy aggregationStrategy, boolean parallelProcessing, - ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, long timeout, Processor onPrepare, - boolean useSubUnitOfWork, boolean parallelAggregate) { - this(camelContext, route, expression, destination, aggregationStrategy, parallelProcessing, executorService, shutdownExecutorService, streaming, stopOnException, timeout, - onPrepare, useSubUnitOfWork, parallelAggregate, false); - } - - public Splitter(CamelContext camelContext, Route route, Expression expression, Processor destination, AggregationStrategy aggregationStrategy, boolean parallelProcessing, - ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, long timeout, Processor onPrepare, - boolean useSubUnitOfWork, boolean parallelAggregate, boolean stopOnAggregateException) { - super(camelContext, route, Collections.singleton(destination), aggregationStrategy, parallelProcessing, executorService, shutdownExecutorService, streaming, stopOnException, - timeout, onPrepare, useSubUnitOfWork, parallelAggregate, stopOnAggregateException); - this.expression = expression; - notNull(expression, "expression"); - notNull(destination, "destination"); - } - - @Override - public String getTraceLabel() { - return "split[" + expression + "]"; - } - - @Override - protected void doInit() throws Exception { - super.doInit(); - expression.init(getCamelContext()); - } - - @Override - public boolean process(Exchange exchange, final AsyncCallback callback) { - AggregationStrategy strategy = getAggregationStrategy(); - - // set original exchange if not already pre-configured - if (strategy instanceof UseOriginalAggregationStrategy) { - // need to create a new private instance, as we can also have concurrency issue so we cannot store state - UseOriginalAggregationStrategy original = (UseOriginalAggregationStrategy) strategy; - AggregationStrategy clone = original.newInstance(exchange); - if (isShareUnitOfWork()) { - clone = new ShareUnitOfWorkAggregationStrategy(clone); - } - setAggregationStrategyOnExchange(exchange, clone); - } - - // if no custom aggregation strategy is being used then fallback to keep the original - // and propagate exceptions which is done by a per exchange specific aggregation strategy - // to ensure it supports async routing - if (strategy == null) { - AggregationStrategy original = new UseOriginalAggregationStrategy(exchange, true); - if (isShareUnitOfWork()) { - original = new ShareUnitOfWorkAggregationStrategy(original); - } - setAggregationStrategyOnExchange(exchange, original); - } - - return super.process(exchange, callback); - } - - @Override - protected Iterable createProcessorExchangePairs(Exchange exchange) throws Exception { - Object value = expression.evaluate(exchange, Object.class); - if (exchange.getException() != null) { - // force any exceptions occurred during evaluation to be thrown - throw exchange.getException(); - } - - Iterable answer = isStreaming() - ? createProcessorExchangePairsIterable(exchange, value) - : createProcessorExchangePairsList(exchange, value); - if (exchange.getException() != null) { - // force any exceptions occurred during creation of exchange paris to be thrown - // before returning the answer; - throw exchange.getException(); - } - - return answer; - } - - private Iterable createProcessorExchangePairsIterable(final Exchange exchange, final Object value) { - return new SplitterIterable(exchange, value); - } - - private final class SplitterIterable implements Iterable, Closeable { - - // create a copy which we use as master to copy during splitting - // this avoids any side effect reflected upon the incoming exchange - final Object value; - final Iterator iterator; - private final Exchange copy; - private final Route route; - private final Exchange original; - - private SplitterIterable(Exchange exchange, Object value) { - this.original = exchange; - this.value = value; - this.iterator = ObjectHelper.createIterator(value); - this.copy = copyAndPrepareSubExchange(exchange, true); - this.route = ExchangeHelper.getRoute(exchange); - } - - @Override - public Iterator iterator() { - return new Iterator() { - private int index; - private boolean closed; - - public boolean hasNext() { - if (closed) { - return false; - } - - boolean answer = iterator.hasNext(); - if (!answer) { - // we are now closed - closed = true; - // nothing more so we need to close the expression value in case it needs to be - try { - close(); - } catch (IOException e) { - throw new RuntimeCamelException("Scanner aborted because of an IOException!", e); - } - } - return answer; - } - - public ProcessorExchangePair next() { - Object part = iterator.next(); - if (part != null) { - // create a correlated copy as the new exchange to be routed in the splitter from the copy - // and do not share the unit of work - Exchange newExchange = ExchangeHelper.createCorrelatedCopy(copy, false); - // If the splitter has an aggregation strategy - // then the StreamCache created by the child routes must not be - // closed by the unit of work of the child route, but by the unit of - // work of the parent route or grand parent route or grand grand parent route... (in case of nesting). - // Therefore, set the unit of work of the parent route as stream cache unit of work, if not already set. - if (newExchange.getProperty(Exchange.STREAM_CACHE_UNIT_OF_WORK) == null) { - newExchange.setProperty(Exchange.STREAM_CACHE_UNIT_OF_WORK, original.getUnitOfWork()); - } - // if we share unit of work, we need to prepare the child exchange - if (isShareUnitOfWork()) { - prepareSharedUnitOfWork(newExchange, copy); - } - if (part instanceof Message) { - newExchange.setIn((Message) part); - } else { - Message in = newExchange.getIn(); - in.setBody(part); - } - return createProcessorExchangePair(index++, getProcessors().iterator().next(), newExchange, route); - } else { - return null; - } - } - - public void remove() { - throw new UnsupportedOperationException("Remove is not supported by this iterator"); - } - }; - } - - @Override - public void close() throws IOException { - IOHelper.closeIterator(value); - } - - } - - private Iterable createProcessorExchangePairsList(Exchange exchange, Object value) { - List result = new ArrayList<>(); - - // reuse iterable and add it to the result list - Iterable pairs = createProcessorExchangePairsIterable(exchange, value); - try { - for (ProcessorExchangePair pair : pairs) { - if (pair != null) { - result.add(pair); - } - } - } finally { - if (pairs instanceof Closeable) { - IOHelper.close((Closeable) pairs, "Splitter:ProcessorExchangePairs"); - } - } - - return result; - } - - @Override - protected void updateNewExchange(Exchange exchange, int index, Iterable allPairs, boolean hasNext) { - // do not share unit of work - exchange.adapt(ExtendedExchange.class).setUnitOfWork(null); - - exchange.setProperty(Exchange.SPLIT_INDEX, index); - if (allPairs instanceof Collection) { - // non streaming mode, so we know the total size already - exchange.setProperty(Exchange.SPLIT_SIZE, ((Collection) allPairs).size()); - } - if (hasNext) { - exchange.setProperty(Exchange.SPLIT_COMPLETE, Boolean.FALSE); - } else { - exchange.setProperty(Exchange.SPLIT_COMPLETE, Boolean.TRUE); - // streaming mode, so set total size when we are complete based on the index - exchange.setProperty(Exchange.SPLIT_SIZE, index + 1); - } - } - - @Override - protected Integer getExchangeIndex(Exchange exchange) { - return exchange.getProperty(Exchange.SPLIT_INDEX, Integer.class); - } - - public Expression getExpression() { - return expression; - } - - private static Exchange copyAndPrepareSubExchange(Exchange exchange, boolean preserveExchangeId) { - Exchange answer = ExchangeHelper.createCopy(exchange, preserveExchangeId); - // we do not want to copy the message history for splitted sub-messages - answer.getProperties().remove(Exchange.MESSAGE_HISTORY); - return answer; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java deleted file mode 100644 index 95c758f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java +++ /dev/null @@ -1,88 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.support.EventHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.List; - -public class StepProcessor extends Pipeline { - - private static final Logger LOG = LoggerFactory.getLogger(StepProcessor.class); - - private final String stepId; - - public StepProcessor(CamelContext camelContext, Collection processors, String stepId) { - super(camelContext, processors); - this.stepId = stepId; - } - - public static Processor newInstance(CamelContext camelContext, List processors, String stepId) { - if (processors.isEmpty()) { - return null; - } else if (processors.size() == 1) { - return processors.get(0); - } - return new StepProcessor(camelContext, processors, stepId); - } - - @Override - public boolean process(Exchange exchange, final AsyncCallback callback) { - // setup step id on exchange - final Object oldStepId = exchange.removeProperty(Exchange.STEP_ID); - exchange.setProperty(Exchange.STEP_ID, stepId); - - EventHelper.notifyStepStarted(exchange.getContext(), exchange, stepId); - - return super.process(exchange, sync -> { - // then fire event to signal the step is done - boolean failed = exchange.isFailed(); - try { - if (failed) { - EventHelper.notifyStepFailed(exchange.getContext(), exchange, stepId); - } else { - EventHelper.notifyStepDone(exchange.getContext(), exchange, stepId); - } - } catch (Throwable t) { - // must catch exceptions to ensure synchronizations is also invoked - LOG.warn("Exception occurred during event notification. This exception will be ignored.", t); - } finally { - if (oldStepId != null) { - // restore step id - exchange.setProperty(Exchange.STEP_ID, oldStepId); - } else { - // clear step id - exchange.removeProperty(Exchange.STEP_ID); - } - callback.done(sync); - } - }); - } - - @Override - public String getTraceLabel() { - return "step"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java deleted file mode 100644 index 975317b..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java +++ /dev/null @@ -1,76 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; - -/** - * Stops continue processing the route and marks it as complete. - */ -public class StopProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware { - - private String id; - private String routeId; - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - // mark the exchange to stop continue routing - exchange.setRouteStop(true); - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java deleted file mode 100644 index e7e7295..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.processor; - -import org.apache.camel.*; -import org.apache.camel.processor.resequencer.ResequencerEngine; -import org.apache.camel.processor.resequencer.SequenceElementComparator; -import org.apache.camel.processor.resequencer.SequenceSender; -import org.apache.camel.spi.ExceptionHandler; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.LoggingExceptionHandler; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -/** - * A resequencer that re-orders a (continuous) stream of {@link Exchange}s. The - * algorithm implemented by {@link ResequencerEngine} is based on the detection - * of gaps in a message stream rather than on a fixed batch size. Gap detection - * in combination with timeouts removes the constraint of having to know the - * number of messages of a sequence (i.e. the batch size) in advance. - *

- * Messages must contain a unique sequence number for which a predecessor and a - * successor is known. For example a message with the sequence number 3 has a - * predecessor message with the sequence number 2 and a successor message with - * the sequence number 4. The message sequence 2,3,5 has a gap because the - * successor of 3 is missing. The resequencer therefore has to retain message 5 - * until message 4 arrives (or a timeout occurs). - *

- * Instances of this class poll for {@link Exchange}s from a given - * endpoint. Resequencing work and the delivery of messages to - * the next processor is done within the single polling thread. - * - * @see ResequencerEngine - */ -public class StreamResequencer extends AsyncProcessorSupport implements SequenceSender, Navigate, Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(StreamResequencer.class); - - private String id; - private String routeId; - private final CamelContext camelContext; - private final ExceptionHandler exceptionHandler; - private final ResequencerEngine engine; - private final Processor processor; - private final Expression expression; - private Delivery delivery; - private int capacity; - private boolean ignoreInvalidExchanges; - private long deliveryAttemptInterval = 1000L; - - /** - * Creates a new {@link StreamResequencer} instance. - * - * @param processor next processor that processes re-ordered exchanges. - * @param comparator a sequence element comparator for exchanges. - */ - public StreamResequencer(CamelContext camelContext, Processor processor, SequenceElementComparator comparator, Expression expression) { - ObjectHelper.notNull(camelContext, "CamelContext"); - this.camelContext = camelContext; - this.engine = new ResequencerEngine<>(comparator); - this.engine.setSequenceSender(this); - this.processor = processor; - this.expression = expression; - this.exceptionHandler = new LoggingExceptionHandler(camelContext, getClass()); - } - - public Expression getExpression() { - return expression; - } - - /** - * Returns this resequencer's exception handler. - */ - public ExceptionHandler getExceptionHandler() { - return exceptionHandler; - } - - /** - * Returns the next processor. - */ - public Processor getProcessor() { - return processor; - } - - /** - * Returns this resequencer's capacity. The capacity is the maximum number - * of exchanges that can be managed by this resequencer at a given point in - * time. If the capacity if reached, polling from the endpoint will be - * skipped for timeout milliseconds giving exchanges the - * possibility to time out and to be delivered after the waiting period. - * - * @return this resequencer's capacity. - */ - public int getCapacity() { - return capacity; - } - - /** - * Returns this resequencer's timeout. This sets the resequencer engine's - * timeout via {@link ResequencerEngine#setTimeout(long)}. This value is - * also used to define the polling timeout from the endpoint. - * - * @return this resequencer's timeout. (Processor) - * @see ResequencerEngine#setTimeout(long) - */ - public long getTimeout() { - return engine.getTimeout(); - } - - public void setCapacity(int capacity) { - this.capacity = capacity; - } - - public void setTimeout(long timeout) { - engine.setTimeout(timeout); - } - - public void setDeliveryAttemptInterval(long deliveryAttemptInterval) { - this.deliveryAttemptInterval = deliveryAttemptInterval; - } - - public boolean isIgnoreInvalidExchanges() { - return ignoreInvalidExchanges; - } - - public void setRejectOld(Boolean rejectOld) { - engine.setRejectOld(rejectOld); - } - - public boolean isRejectOld() { - return engine.getRejectOld() != null && engine.getRejectOld(); - } - - /** - * Sets whether to ignore invalid exchanges which cannot be used by this stream resequencer. - *

- * Default is false, by which an {@link CamelExchangeException} is thrown if the {@link Exchange} - * is invalid. - */ - public void setIgnoreInvalidExchanges(boolean ignoreInvalidExchanges) { - this.ignoreInvalidExchanges = ignoreInvalidExchanges; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "streamResequence"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(processor); - delivery = new Delivery(); - engine.start(); - delivery.start(); - } - - @Override - protected void doStop() throws Exception { - // let's stop everything in the reverse order - // no need to stop the worker thread -- it will stop automatically when this service is stopped - engine.stop(); - ServiceHelper.stopService(processor); - } - - /** - * Sends the exchange to the next processor. - * - * @param exchange exchange to send. - */ - @Override - public void sendElement(Exchange exchange) throws Exception { - processor.process(exchange); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - while (engine.size() >= capacity) { - try { - Thread.sleep(getTimeout()); - } catch (InterruptedException e) { - // we was interrupted so break out - exchange.setException(e); - callback.done(true); - return true; - } - } - - try { - engine.insert(exchange); - delivery.request(); - } catch (Exception e) { - if (isIgnoreInvalidExchanges()) { - LOG.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange); - } else { - exchange.setException(new CamelExchangeException("Error processing Exchange in StreamResequencer", exchange, e)); - } - } - - callback.done(true); - return true; - } - - @Override - public boolean hasNext() { - return processor != null; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(processor); - return answer; - } - - class Delivery extends Thread { - - private Lock deliveryRequestLock = new ReentrantLock(); - private Condition deliveryRequestCondition = deliveryRequestLock.newCondition(); - - Delivery() { - super(camelContext.getExecutorServiceManager().resolveThreadName("Resequencer Delivery")); - } - - @Override - public void run() { - while (isRunAllowed()) { - try { - deliveryRequestLock.lock(); - try { - deliveryRequestCondition.await(deliveryAttemptInterval, TimeUnit.MILLISECONDS); - } finally { - deliveryRequestLock.unlock(); - } - } catch (InterruptedException e) { - break; - } - try { - engine.deliver(); - } catch (Throwable t) { - // a fail safe to handle all exceptions being thrown - getExceptionHandler().handleException(t); - } - } - } - - public void cancel() { - interrupt(); - } - - public void request() { - deliveryRequestLock.lock(); - try { - deliveryRequestCondition.signal(); - } finally { - deliveryRequestLock.unlock(); - } - } - - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java deleted file mode 100644 index 41dcde0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java +++ /dev/null @@ -1,205 +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.processor; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.concurrent.Rejectable; -import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * Threads processor that leverage a thread pool for continue processing the {@link Exchange}s - * using the asynchronous routing engine. - *

- * Notice: For transacted routes then this {@link ThreadsProcessor} is not in use, as we want to - * process messages using the same thread to support all work done in the same transaction. The reason - * is that the transaction manager that orchestrate the transaction, requires all the work to be done - * on the same thread. - *

- * Pay attention to how this processor handles rejected tasks. - *

    - *
  • Abort - The current exchange will be set with a {@link RejectedExecutionException} exception, - * and marked to stop continue routing. - * The {@link org.apache.camel.spi.UnitOfWork} will be regarded as failed, due the exception.
    • - *
  • Discard - The current exchange will be marked to stop continue routing (notice no exception is set). - * The {@link org.apache.camel.spi.UnitOfWork} will be regarded as successful, due no exception being set.
    • - *
  • DiscardOldest - The oldest exchange will be marked to stop continue routing (notice no exception is set). - * The {@link org.apache.camel.spi.UnitOfWork} will be regarded as successful, due no exception being set. - * And the current exchange will be added to the task queue.
    • - *
  • CallerRuns - The current exchange will be processed by the current thread. Which mean the current thread - * will not be free to process a new exchange, as its processing the current exchange.
    • - *
- */ -public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(ThreadsProcessor.class); - - private String id; - private String routeId; - private final CamelContext camelContext; - private final ExecutorService executorService; - private final ThreadPoolRejectedPolicy rejectedPolicy; - private volatile boolean shutdownExecutorService; - private final AtomicBoolean shutdown = new AtomicBoolean(true); - - private final class ProcessCall implements Runnable, Rejectable { - private final Exchange exchange; - private final AsyncCallback callback; - private final boolean done; - - ProcessCall(Exchange exchange, AsyncCallback callback, boolean done) { - this.exchange = exchange; - this.callback = callback; - this.done = done; - } - - @Override - public void run() { - LOG.trace("Continue routing exchange {}", exchange); - if (shutdown.get()) { - exchange.setException(new RejectedExecutionException("ThreadsProcessor is not running.")); - } - callback.done(done); - } - - @Override - public void reject() { - // reject should mark the exchange with an rejected exception and mark not to route anymore - exchange.setException(new RejectedExecutionException()); - LOG.trace("Rejected routing exchange {}", exchange); - if (shutdown.get()) { - exchange.setException(new RejectedExecutionException("ThreadsProcessor is not running.")); - } - callback.done(done); - } - - @Override - public String toString() { - return "ProcessCall[" + exchange + "]"; - } - } - - public ThreadsProcessor(CamelContext camelContext, ExecutorService executorService, boolean shutdownExecutorService, ThreadPoolRejectedPolicy rejectedPolicy) { - ObjectHelper.notNull(camelContext, "camelContext"); - ObjectHelper.notNull(executorService, "executorService"); - ObjectHelper.notNull(rejectedPolicy, "rejectedPolicy"); - this.camelContext = camelContext; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.rejectedPolicy = rejectedPolicy; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - if (shutdown.get()) { - throw new IllegalStateException("ThreadsProcessor is not running."); - } - - // we cannot execute this asynchronously for transacted exchanges, as the transaction manager doesn't support - // using different threads in the same transaction - if (exchange.isTransacted()) { - LOG.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange); - callback.done(true); - return true; - } - - try { - // process the call in asynchronous mode - ProcessCall call = new ProcessCall(exchange, callback, false); - LOG.trace("Submitting task {}", call); - executorService.submit(call); - // tell Camel routing engine we continue routing asynchronous - return false; - } catch (Throwable e) { - if (executorService instanceof ThreadPoolExecutor) { - ThreadPoolExecutor tpe = (ThreadPoolExecutor) executorService; - // process the call in synchronous mode - ProcessCall call = new ProcessCall(exchange, callback, true); - rejectedPolicy.asRejectedExecutionHandler().rejectedExecution(call, tpe); - return true; - } else { - exchange.setException(e); - callback.done(true); - return true; - } - } - } - - public ExecutorService getExecutorService() { - return executorService; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public ThreadPoolRejectedPolicy getRejectedPolicy() { - return rejectedPolicy; - } - - @Override - protected void doStart() throws Exception { - shutdown.set(false); - } - - @Override - protected void doStop() throws Exception { - shutdown.set(true); - } - - @Override - protected void doShutdown() throws Exception { - if (shutdownExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(executorService); - } - super.doShutdown(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java deleted file mode 100644 index 65128cf..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java +++ /dev/null @@ -1,455 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Map; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicReference; - -/** - * A Throttler - * will set a limit on the maximum number of message exchanges which can be sent - * to a processor within a specific time period.

This pattern can be - * extremely useful if you have some external system which meters access; such - * as only allowing 100 requests per second; or if huge load can cause a - * particular system to malfunction or to reduce its throughput you might want - * to introduce some throttling. - * - * This throttle implementation is thread-safe and is therefore safe to be used - * by multiple concurrent threads in a single route. - * - * The throttling mechanism is a DelayQueue with maxRequestsPerPeriod permits on - * it. Each permit is set to be delayed by timePeriodMillis (except when the - * throttler is initialized or the throttle rate increased, then there is no delay - * for those permits). Callers trying to acquire a permit from the DelayQueue will - * block if necessary. The end result is a rolling window of time. Where from the - * callers point of view in the last timePeriodMillis no more than - * maxRequestsPerPeriod have been allowed to be acquired. - */ -public class Throttler extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(Throttler.class); - - private static final String DEFAULT_KEY = "CamelThrottlerDefaultKey"; - - private static final String PROPERTY_EXCHANGE_QUEUED_TIMESTAMP = "CamelThrottlerExchangeQueuedTimestamp"; - private static final String PROPERTY_EXCHANGE_STATE = "CamelThrottlerExchangeState"; - - private enum State { SYNC, ASYNC, ASYNC_REJECTED } - - private final CamelContext camelContext; - private final ScheduledExecutorService asyncExecutor; - private final boolean shutdownAsyncExecutor; - - private volatile long timePeriodMillis; - private volatile long cleanPeriodMillis; - private String id; - private String routeId; - private Expression maxRequestsPerPeriodExpression; - private boolean rejectExecution; - private boolean asyncDelayed; - private boolean callerRunsWhenRejected = true; - private Expression correlationExpression; - private Map states = new ConcurrentHashMap<>(); - - public Throttler(final CamelContext camelContext, final Expression maxRequestsPerPeriodExpression, final long timePeriodMillis, - final ScheduledExecutorService asyncExecutor, final boolean shutdownAsyncExecutor, final boolean rejectExecution, Expression correlation) { - this.camelContext = camelContext; - this.rejectExecution = rejectExecution; - this.shutdownAsyncExecutor = shutdownAsyncExecutor; - - ObjectHelper.notNull(maxRequestsPerPeriodExpression, "maxRequestsPerPeriodExpression"); - this.maxRequestsPerPeriodExpression = maxRequestsPerPeriodExpression; - - if (timePeriodMillis <= 0) { - throw new IllegalArgumentException("TimePeriodMillis should be a positive number, was: " + timePeriodMillis); - } - this.timePeriodMillis = timePeriodMillis; - this.cleanPeriodMillis = timePeriodMillis * 10; - this.asyncExecutor = asyncExecutor; - this.correlationExpression = correlation; - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - long queuedStart = 0; - if (LOG.isTraceEnabled()) { - queuedStart = exchange.getProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP, 0L, Long.class); - exchange.removeProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP); - } - State state = exchange.getProperty(PROPERTY_EXCHANGE_STATE, State.SYNC, State.class); - exchange.removeProperty(PROPERTY_EXCHANGE_STATE); - boolean doneSync = state == State.SYNC || state == State.ASYNC_REJECTED; - - try { - if (!isRunAllowed()) { - throw new RejectedExecutionException("Run is not allowed"); - } - - String key = DEFAULT_KEY; - if (correlationExpression != null) { - key = correlationExpression.evaluate(exchange, String.class); - } - ThrottlingState throttlingState = states.computeIfAbsent(key, ThrottlingState::new); - throttlingState.calculateAndSetMaxRequestsPerPeriod(exchange); - - ThrottlePermit permit = throttlingState.poll(); - - if (permit == null) { - if (isRejectExecution()) { - throw new ThrottlerRejectedExecutionException("Exceeded the max throttle rate of " - + throttlingState.getThrottleRate() + " within " + timePeriodMillis + "ms"); - } else { - // delegate to async pool - if (isAsyncDelayed() && !exchange.isTransacted() && state == State.SYNC) { - if (LOG.isDebugEnabled()) { - LOG.debug("Throttle rate exceeded but AsyncDelayed enabled, so queueing for async processing, exchangeId: {}", exchange.getExchangeId()); - } - return processAsynchronously(exchange, callback, throttlingState); - } - - // block waiting for a permit - long start = 0; - long elapsed = 0; - if (LOG.isTraceEnabled()) { - start = System.currentTimeMillis(); - } - permit = throttlingState.take(); - if (LOG.isTraceEnabled()) { - elapsed = System.currentTimeMillis() - start; - } - throttlingState.enqueue(permit, exchange); - - if (state == State.ASYNC) { - if (LOG.isTraceEnabled()) { - long queuedTime = start - queuedStart; - if (LOG.isTraceEnabled()) { - LOG.trace("Queued for {}ms, Throttled for {}ms, exchangeId: {}", queuedTime, elapsed, exchange.getExchangeId()); - } - } - } else { - if (LOG.isTraceEnabled()) { - LOG.trace("Throttled for {}ms, exchangeId: {}", elapsed, exchange.getExchangeId()); - } - } - } - } else { - throttlingState.enqueue(permit, exchange); - - if (state == State.ASYNC) { - if (LOG.isTraceEnabled()) { - long queuedTime = System.currentTimeMillis() - queuedStart; - LOG.trace("Queued for {}ms, No throttling applied (throttle cleared while queued), for exchangeId: {}", queuedTime, exchange.getExchangeId()); - } - } else { - if (LOG.isTraceEnabled()) { - LOG.trace("No throttling applied to exchangeId: {}", exchange.getExchangeId()); - } - } - } - - callback.done(doneSync); - return doneSync; - - } catch (final InterruptedException e) { - // determine if we can still run, or the camel context is forcing a shutdown - boolean forceShutdown = exchange.getContext().getShutdownStrategy().forceShutdown(this); - if (forceShutdown) { - String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange; - LOG.debug(msg); - exchange.setException(new RejectedExecutionException(msg, e)); - } else { - exchange.setException(e); - } - callback.done(doneSync); - return doneSync; - } catch (final Throwable t) { - exchange.setException(t); - callback.done(doneSync); - return doneSync; - } - } - - /** - * Delegate blocking on the DelayQueue to an asyncExecutor. Except if the executor rejects the submission - * and isCallerRunsWhenRejected() is enabled, then this method will delegate back to process(), but not - * before changing the exchange state to stop any recursion. - */ - protected boolean processAsynchronously(final Exchange exchange, final AsyncCallback callback, ThrottlingState throttlingState) { - try { - if (LOG.isTraceEnabled()) { - exchange.setProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP, System.currentTimeMillis()); - } - exchange.setProperty(PROPERTY_EXCHANGE_STATE, State.ASYNC); - long delay = throttlingState.peek().getDelay(TimeUnit.NANOSECONDS); - asyncExecutor.schedule(() -> process(exchange, callback), delay, TimeUnit.NANOSECONDS); - return false; - } catch (final RejectedExecutionException e) { - if (isCallerRunsWhenRejected()) { - if (LOG.isDebugEnabled()) { - LOG.debug("AsyncExecutor is full, rejected exchange will run in the current thread, exchangeId: {}", exchange.getExchangeId()); - } - exchange.setProperty(PROPERTY_EXCHANGE_STATE, State.ASYNC_REJECTED); - return process(exchange, callback); - } - throw e; - } - } - - @Override - protected void doStart() throws Exception { - if (isAsyncDelayed()) { - ObjectHelper.notNull(asyncExecutor, "executorService", this); - } - } - - @Override - protected void doStop() throws Exception { - } - - @Override - protected void doShutdown() throws Exception { - if (shutdownAsyncExecutor && asyncExecutor != null) { - camelContext.getExecutorServiceManager().shutdownNow(asyncExecutor); - } - states.clear(); - super.doShutdown(); - } - - private class ThrottlingState { - private final String key; - private final DelayQueue delayQueue = new DelayQueue<>(); - private final AtomicReference> cleanFuture = new AtomicReference<>(); - private volatile int throttleRate; - - ThrottlingState(String key) { - this.key = key; - } - - public int getThrottleRate() { - return throttleRate; - } - - public ThrottlePermit poll() { - return delayQueue.poll(); - } - - public ThrottlePermit peek() { - return delayQueue.peek(); - } - - public ThrottlePermit take() throws InterruptedException { - return delayQueue.take(); - } - - public void clean() { - states.remove(key); - } - - /** - * Returns a permit to the DelayQueue, first resetting it's delay to be relative to now. - */ - public void enqueue(final ThrottlePermit permit, final Exchange exchange) { - permit.setDelayMs(getTimePeriodMillis()); - delayQueue.put(permit); - try { - ScheduledFuture next = asyncExecutor.schedule(this::clean, cleanPeriodMillis, TimeUnit.MILLISECONDS); - ScheduledFuture prev = cleanFuture.getAndSet(next); - if (prev != null) { - prev.cancel(false); - } - // try and incur the least amount of overhead while releasing permits back to the queue - if (LOG.isTraceEnabled()) { - LOG.trace("Permit released, for exchangeId: {}", exchange.getExchangeId()); - } - } catch (RejectedExecutionException e) { - LOG.debug("Throttling queue cleaning rejected", e); - } - } - - /** - * Evaluates the maxRequestsPerPeriodExpression and adjusts the throttle rate up or down. - */ - public synchronized void calculateAndSetMaxRequestsPerPeriod(final Exchange exchange) throws Exception { - Integer newThrottle = maxRequestsPerPeriodExpression.evaluate(exchange, Integer.class); - - if (newThrottle != null && newThrottle < 0) { - throw new IllegalStateException("The maximumRequestsPerPeriod must be a positive number, was: " + newThrottle); - } - - if (newThrottle == null && throttleRate == 0) { - throw new RuntimeExchangeException("The maxRequestsPerPeriodExpression was evaluated as null: " + maxRequestsPerPeriodExpression, exchange); - } - - if (newThrottle != null) { - if (newThrottle != throttleRate) { - // decrease - if (throttleRate > newThrottle) { - int delta = throttleRate - newThrottle; - - // discard any permits that are needed to decrease throttling - while (delta > 0) { - delayQueue.take(); - delta--; - if (LOG.isTraceEnabled()) { - LOG.trace("Permit discarded due to throttling rate decrease, triggered by ExchangeId: {}", exchange.getExchangeId()); - } - } - if (LOG.isDebugEnabled()) { - LOG.debug("Throttle rate decreased from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId()); - } - - // increase - } else if (newThrottle > throttleRate) { - int delta = newThrottle - throttleRate; - for (int i = 0; i < delta; i++) { - delayQueue.put(new ThrottlePermit(-1)); - } - if (throttleRate == 0) { - if (LOG.isDebugEnabled()) { - LOG.debug("Initial throttle rate set to {}, triggered by ExchangeId: {}", newThrottle, exchange.getExchangeId()); - } - } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Throttle rate increase from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId()); - } - } - } - throttleRate = newThrottle; - } - } - } - } - - /** - * Permit that implements the Delayed interface needed by DelayQueue. - */ - private class ThrottlePermit implements Delayed { - private volatile long scheduledTime; - - ThrottlePermit(final long delayMs) { - setDelayMs(delayMs); - } - - public void setDelayMs(final long delayMs) { - this.scheduledTime = System.currentTimeMillis() + delayMs; - } - - @Override - public long getDelay(final TimeUnit unit) { - return unit.convert(scheduledTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS); - } - - @Override - public int compareTo(final Delayed o) { - return (int)(getDelay(TimeUnit.MILLISECONDS) - o.getDelay(TimeUnit.MILLISECONDS)); - } - } - - public boolean isRejectExecution() { - return rejectExecution; - } - - public void setRejectExecution(boolean rejectExecution) { - this.rejectExecution = rejectExecution; - } - - public boolean isAsyncDelayed() { - return asyncDelayed; - } - - public void setAsyncDelayed(boolean asyncDelayed) { - this.asyncDelayed = asyncDelayed; - } - - public boolean isCallerRunsWhenRejected() { - return callerRunsWhenRejected; - } - - public void setCallerRunsWhenRejected(boolean callerRunsWhenRejected) { - this.callerRunsWhenRejected = callerRunsWhenRejected; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(final String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - /** - * Sets the maximum number of requests per time period expression - */ - public void setMaximumRequestsPerPeriodExpression(Expression maxRequestsPerPeriodExpression) { - this.maxRequestsPerPeriodExpression = maxRequestsPerPeriodExpression; - } - - public Expression getMaximumRequestsPerPeriodExpression() { - return maxRequestsPerPeriodExpression; - } - - /** - * Gets the current maximum request per period value. - * If it is grouped throttling applied with correlationExpression - * than the max per period within the group will return - */ - public int getCurrentMaximumRequestsPerPeriod() { - return states.values().stream().mapToInt(ThrottlingState::getThrottleRate).max().orElse(0); - } - - /** - * Sets the time period during which the maximum number of requests apply - */ - public void setTimePeriodMillis(final long timePeriodMillis) { - this.timePeriodMillis = timePeriodMillis; - } - - public long getTimePeriodMillis() { - return timePeriodMillis; - } - - @Override - public String getTraceLabel() { - return "throttle[" + maxRequestsPerPeriodExpression + " per: " + timePeriodMillis + "]"; - } - - @Override - public String toString() { - return id; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java deleted file mode 100644 index fc17833..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java +++ /dev/null @@ -1,29 +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.processor; - -import java.util.concurrent.RejectedExecutionException; - -public class ThrottlerRejectedExecutionException extends RejectedExecutionException { - private static final long serialVersionUID = 1L; - - public ThrottlerRejectedExecutionException(String message) { - super(message); - } - -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java deleted file mode 100644 index 41d49d5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.util.ObjectHelper; - -import java.lang.reflect.Constructor; - -/** - * The processor which sets an {@link Exception} on the {@link Exchange} - */ -public class ThrowExceptionProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware, CamelContextAware { - private String id; - private String routeId; - private CamelContext camelContext; - private Expression simple; - private final Exception exception; - private final Class type; - private final String message; - - public ThrowExceptionProcessor(Exception exception) { - this(exception, null, null); - } - - public ThrowExceptionProcessor(Exception exception, Class type, String message) { - this.exception = exception; - this.type = type; - this.message = message; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - Exception cause = exception; - - try { - if (message != null && type != null) { - // create the message using simple language so it can be dynamic - String text = simple.evaluate(exchange, String.class); - // create a new exception of that type, and provide the message as - Constructor constructor = type.getConstructor(String.class); - cause = (Exception) constructor.newInstance(text); - exchange.setException(cause); - } else if (cause == null && type != null) { - // create a new exception of that type using its default constructor - Constructor constructor = type.getDeclaredConstructor(); - cause = (Exception) constructor.newInstance(); - exchange.setException(cause); - } else { - exchange.setException(cause); - } - } catch (Throwable e) { - exchange.setException(new CamelExchangeException("Error creating new instance of " + exception.getClass(), exchange, e)); - } - - callback.done(true); - return true; - } - - @Override - public String getTraceLabel() { - String className = this.exception == null ? this.type.getSimpleName() : this.exception.getClass().getSimpleName(); - return "throwException[" + className + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Exception getException() { - return exception; - } - - public Class getType() { - return type; - } - - public String getMessage() { - return message; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String toString() { - return id; - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(camelContext, "camelContext", this); - - if (message != null) { - simple = camelContext.resolveLanguage("simple").createExpression(message); - } - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java deleted file mode 100644 index 2b25f8f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java +++ /dev/null @@ -1,124 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultMessage; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.util.ObjectHelper; - -/** - * A processor which sets the body on the OUT message with an {@link Expression}. - */ -public class TransformProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware { - private String id; - private String routeId; - private final Expression expression; - - public TransformProcessor(Expression expression) { - ObjectHelper.notNull(expression, "expression", this); - this.expression = expression; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - Object newBody = expression.evaluate(exchange, Object.class); - - if (exchange.getException() != null) { - // the expression threw an exception so we should break-out - callback.done(true); - return true; - } - - Message old = exchange.getMessage(); - - // create a new message container so we do not drag specialized message objects along - // but that is only needed if the old message is a specialized message - boolean copyNeeded = !(old.getClass().equals(DefaultMessage.class)); - - if (copyNeeded) { - Message msg = new DefaultMessage(exchange.getContext()); - msg.copyFromWithNewBody(old, newBody); - - // replace message on exchange (must set as OUT) - ExchangeHelper.replaceMessage(exchange, msg, true); - } else { - // no copy needed so set replace value directly - old.setBody(newBody); - - // but the message must be on OUT - if (!exchange.hasOut()) { - exchange.setOut(exchange.getIn()); - } - } - - } catch (Throwable e) { - exchange.setException(e); - } - - callback.done(true); - return true; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "transform[" + expression + "]"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public Expression getExpression() { - return expression; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java deleted file mode 100644 index 6a1a974..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java +++ /dev/null @@ -1,180 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Implements try/catch/finally type processing - */ -public class TryProcessor extends AsyncProcessorSupport implements Navigate, Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(TryProcessor.class); - - protected final CamelContext camelContext; - protected final ReactiveExecutor reactiveExecutor; - protected String id; - protected String routeId; - protected final Processor tryProcessor; - protected final List catchClauses; - protected final Processor finallyProcessor; - - public TryProcessor(CamelContext camelContext, Processor tryProcessor, List catchClauses, Processor finallyProcessor) { - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.tryProcessor = tryProcessor; - this.catchClauses = catchClauses; - this.finallyProcessor = finallyProcessor; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "doTry"; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - reactiveExecutor.schedule(new TryState(exchange, callback)); - return false; - } - - class TryState implements Runnable { - - final Exchange exchange; - final AsyncCallback callback; - final Iterator processors; - final Object lastHandled; - - public TryState(Exchange exchange, AsyncCallback callback) { - this.exchange = exchange; - this.callback = callback; - this.processors = next().iterator(); - this.lastHandled = exchange.getProperty(Exchange.EXCEPTION_HANDLED); - exchange.setProperty(Exchange.EXCEPTION_HANDLED, null); - } - - @Override - public void run() { - if (continueRouting(processors, exchange)) { - exchange.setProperty(Exchange.TRY_ROUTE_BLOCK, true); - ExchangeHelper.prepareOutToIn(exchange); - - // process the next processor - Processor processor = processors.next(); - AsyncProcessor async = AsyncProcessorConverterHelper.convert(processor); - if (LOG.isTraceEnabled()) { - LOG.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - async.process(exchange, doneSync -> reactiveExecutor.schedule(this)); - } else { - ExchangeHelper.prepareOutToIn(exchange); - exchange.removeProperty(Exchange.TRY_ROUTE_BLOCK); - exchange.setProperty(Exchange.EXCEPTION_HANDLED, lastHandled); - if (LOG.isTraceEnabled()) { - LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - callback.done(false); - } - } - - @Override - public String toString() { - return "TryState"; - } - } - - protected boolean continueRouting(Iterator it, Exchange exchange) { - if (exchange.isRouteStop()) { - LOG.debug("Exchange is marked to stop routing: {}", exchange); - return false; - } - - // continue if there are more processors to route - return it.hasNext(); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(tryProcessor, catchClauses, finallyProcessor); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(tryProcessor, catchClauses, finallyProcessor); - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(); - if (tryProcessor != null) { - answer.add(tryProcessor); - } - if (catchClauses != null) { - answer.addAll(catchClauses); - } - if (finallyProcessor != null) { - answer.add(finallyProcessor); - } - return answer; - } - - @Override - public boolean hasNext() { - return tryProcessor != null || catchClauses != null && !catchClauses.isEmpty() || finallyProcessor != null; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java deleted file mode 100644 index d9ad93d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java +++ /dev/null @@ -1,76 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.support.DefaultAsyncProducer; -import org.apache.camel.support.service.ServiceHelper; - -/** - * Ensures a {@link Producer} is executed within an {@link org.apache.camel.spi.UnitOfWork}. - */ -public final class UnitOfWorkProducer extends DefaultAsyncProducer { - - private final Producer producer; - private final AsyncProcessor processor; - - /** - * The producer which should be executed within an {@link org.apache.camel.spi.UnitOfWork}. - * - * @param producer the producer - */ - public UnitOfWorkProducer(Producer producer) { - super(producer.getEndpoint()); - this.producer = producer; - // wrap in unit of work - org.apache.camel.processor.CamelInternalProcessor internal = new org.apache.camel.processor.CamelInternalProcessor(producer.getEndpoint().getCamelContext(), producer); - internal.addAdvice(new CamelInternalProcessor.UnitOfWorkProcessorAdvice(null, producer.getEndpoint().getCamelContext())); - this.processor = internal; - } - - @Override - public Endpoint getEndpoint() { - return producer.getEndpoint(); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - return processor.process(exchange, callback); - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - ServiceHelper.startService(processor); - } - - @Override - protected void doStop() throws Exception { - super.doStop(); - ServiceHelper.stopService(processor); - } - - @Override - public boolean isSingleton() { - return producer.isSingleton(); - } - - @Override - public String toString() { - return "UnitOfWork(" + producer + ")"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java deleted file mode 100644 index 66fff22..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java +++ /dev/null @@ -1,320 +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.processor; - -import org.apache.camel.*; -import org.apache.camel.spi.EndpointUtilizationStatistics; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.ShutdownAware; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultExchange; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.LongAdder; - -/** - * Processor for wire tapping exchanges to an endpoint destination. - */ -public class WireTapProcessor extends AsyncProcessorSupport implements Traceable, ShutdownAware, IdAware, RouteIdAware, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(WireTapProcessor.class); - - private String id; - private String routeId; - private CamelContext camelContext; - private final org.apache.camel.processor.SendDynamicProcessor dynamicProcessor; - private final String uri; - private final boolean dynamicUri; - private final Processor processor; - private final AsyncProcessor asyncProcessor; - private final ExchangePattern exchangePattern; - private final ExecutorService executorService; - private volatile boolean shutdownExecutorService; - private final LongAdder taskCount = new LongAdder(); - - // expression or processor used for populating a new exchange to send - // as opposed to traditional wiretap that sends a copy of the original exchange - private Expression newExchangeExpression; - private List newExchangeProcessors; - private boolean copy; - private Processor onPrepare; - - public WireTapProcessor(SendDynamicProcessor dynamicProcessor, Processor processor, ExchangePattern exchangePattern, - ExecutorService executorService, boolean shutdownExecutorService, boolean dynamicUri) { - this.dynamicProcessor = dynamicProcessor; - this.uri = dynamicProcessor.getUri(); - this.processor = processor; - this.asyncProcessor = AsyncProcessorConverterHelper.convert(processor); - this.exchangePattern = exchangePattern; - ObjectHelper.notNull(executorService, "executorService"); - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.dynamicUri = dynamicUri; - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "wireTap(" + uri + ")"; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public boolean deferShutdown(ShutdownRunningTask shutdownRunningTask) { - // not in use - return true; - } - - @Override - public int getPendingExchangesSize() { - return taskCount.intValue(); - } - - @Override - public void prepareShutdown(boolean suspendOnly, boolean forced) { - // noop - } - - public EndpointUtilizationStatistics getEndpointUtilizationStatistics() { - return dynamicProcessor.getEndpointUtilizationStatistics(); - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - if (!isStarted()) { - throw new IllegalStateException("WireTapProcessor has not been started: " + this); - } - - // must configure the wire tap beforehand - Exchange target; - try { - target = configureExchange(exchange, exchangePattern); - } catch (Exception e) { - exchange.setException(e); - callback.done(true); - return true; - } - - final Exchange wireTapExchange = target; - - // send the exchange to the destination using an executor service - try { - executorService.submit(() -> { - taskCount.increment(); - LOG.debug(">>>> (wiretap) {} {}", uri, wireTapExchange); - asyncProcessor.process(wireTapExchange, doneSync -> { - if (wireTapExchange.getException() != null) { - String u = URISupport.sanitizeUri(uri); - LOG.warn("Error occurred during processing " + wireTapExchange + " wiretap to " + u + ". This exception will be ignored.", wireTapExchange.getException()); - } - taskCount.decrement(); - }); - }); - } catch (Throwable e) { - // in case the thread pool rejects or cannot submit the task then we need to catch - // so camel error handler can react - exchange.setException(e); - } - - // continue routing this synchronously - callback.done(true); - return true; - } - - protected Exchange configureExchange(Exchange exchange, ExchangePattern pattern) throws IOException { - Exchange answer; - if (copy) { - // use a copy of the original exchange - answer = configureCopyExchange(exchange); - } else { - // use a new exchange - answer = configureNewExchange(exchange); - } - - // prepare the exchange - if (newExchangeExpression != null) { - Object body = newExchangeExpression.evaluate(answer, Object.class); - if (body != null) { - answer.getIn().setBody(body); - } - } - - if (newExchangeProcessors != null) { - for (Processor processor : newExchangeProcessors) { - try { - processor.process(answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - } - - // if the body is a stream cache we must use a copy of the stream in the wire tapped exchange - Message msg = answer.getMessage(); - if (msg.getBody() instanceof StreamCache) { - // in parallel processing case, the stream must be copied, therefore get the stream - StreamCache cache = (StreamCache) msg.getBody(); - StreamCache copied = cache.copy(answer); - if (copied != null) { - msg.setBody(copied); - } - } - - // invoke on prepare on the exchange if specified - if (onPrepare != null) { - try { - onPrepare.process(answer); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - return answer; - } - - private Exchange configureCopyExchange(Exchange exchange) { - // must use a copy as we dont want it to cause side effects of the original exchange - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - // set MEP to InOnly as this wire tap is a fire and forget - copy.setPattern(ExchangePattern.InOnly); - // remove STREAM_CACHE_UNIT_OF_WORK property because this wire tap will - // close its own created stream cache(s) - copy.removeProperty(Exchange.STREAM_CACHE_UNIT_OF_WORK); - return copy; - } - - private Exchange configureNewExchange(Exchange exchange) { - return new DefaultExchange(exchange.getFromEndpoint(), ExchangePattern.InOnly); - } - - public List getNewExchangeProcessors() { - return newExchangeProcessors; - } - - public void setNewExchangeProcessors(List newExchangeProcessors) { - this.newExchangeProcessors = newExchangeProcessors; - } - - public Expression getNewExchangeExpression() { - return newExchangeExpression; - } - - public void setNewExchangeExpression(Expression newExchangeExpression) { - this.newExchangeExpression = newExchangeExpression; - } - - public void addNewExchangeProcessor(Processor processor) { - if (newExchangeProcessors == null) { - newExchangeProcessors = new ArrayList<>(); - } - newExchangeProcessors.add(processor); - } - - public boolean isCopy() { - return copy; - } - - public void setCopy(boolean copy) { - this.copy = copy; - } - - public Processor getOnPrepare() { - return onPrepare; - } - - public void setOnPrepare(Processor onPrepare) { - this.onPrepare = onPrepare; - } - - public String getUri() { - return uri; - } - - public int getCacheSize() { - return dynamicProcessor.getCacheSize(); - } - - public boolean isIgnoreInvalidEndpoint() { - return dynamicProcessor.isIgnoreInvalidEndpoint(); - } - - public boolean isDynamicUri() { - return dynamicUri; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(processor); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(processor); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownService(processor); - if (shutdownExecutorService) { - getCamelContext().getExecutorServiceManager().shutdownNow(executorService); - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java deleted file mode 100644 index bf85cf7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java +++ /dev/null @@ -1,61 +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.processor; - -import org.apache.camel.Processor; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.support.service.ServiceHelper; - -import java.util.List; - -/** - * A processor which ensures wrapping processors is having lifecycle handled. - */ -public class WrapProcessor extends DelegateAsyncProcessor { - private final Processor wrapped; - - public WrapProcessor(Processor processor, Processor wrapped) { - super(processor); - this.wrapped = wrapped; - } - - @Override - public String toString() { - return "WrapDelegateAsyncProcessor[" + processor + "]"; - } - - @Override - public List next() { - // must include wrapped in navigate - List list = super.next(); - list.add(wrapped); - return list; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(wrapped); - super.doStart(); - } - - @Override - protected void doStop() throws Exception { - super.doStop(); - ServiceHelper.stopService(wrapped); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java deleted file mode 100644 index 6478650..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.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.processor.aggregate; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.Exchange; - -import java.util.ArrayList; -import java.util.List; - -/** - * Aggregate all exchanges into a {@link List} of values defined by the {@link #getValue(Exchange)} call. - * The combined Exchange will hold all the aggregated exchanges in a {@link List} - * as a exchange property with the key {@link Exchange#GROUPED_EXCHANGE}. - *

- * The method {@link #isStoreAsBodyOnCompletion()} determines if the aggregated {@link List} should - * be stored on the {@link org.apache.camel.Message#setBody(Object)} or be kept as a property - * on the exchange. - *
- * The default behavior to store as message body, allows to more easily group together a list of values - * and have its result stored as a {@link List} on the completed {@link Exchange}. - * - * @since 2.11 - */ -public abstract class AbstractListAggregationStrategy implements AggregationStrategy { - - /** - * This method is implemented by the sub-class and is called to retrieve - * an instance of the value that will be aggregated and forwarded to the - * receiving end point. - *

- * If null is returned, then the value is not added to the {@link List}. - * - * @param exchange The exchange that is used to retrieve the value from - * @return An instance of V that is the associated value of the passed exchange - */ - public abstract V getValue(Exchange exchange); - - /** - * Whether to store the completed aggregated {@link List} as message body, or to keep as property on the exchange. - *

- * The default behavior is true to store as message body. - * - * @return true to store as message body, false to keep as property on the exchange. - */ - public boolean isStoreAsBodyOnCompletion() { - return true; - } - - @Override - @SuppressWarnings("unchecked") - public void onCompletion(Exchange exchange) { - if (exchange != null && isStoreAsBodyOnCompletion()) { - List list = (List) exchange.removeProperty(Exchange.GROUPED_EXCHANGE); - if (list != null) { - exchange.getIn().setBody(list); - } - } - } - - /** - * This method will aggregate the old and new exchange and return the result. - * - * @param oldExchange The oldest exchange, can be null - * @param newExchange The newest exchange, can be null - * @return a composite exchange of the old and/or new exchanges - */ - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - List list; - - if (oldExchange == null) { - list = getList(newExchange); - } else { - list = getList(oldExchange); - } - - if (newExchange != null) { - V value = getValue(newExchange); - if (value != null) { - list.add(value); - } - } - - return oldExchange != null ? oldExchange : newExchange; - } - - @SuppressWarnings("unchecked") - private List getList(Exchange exchange) { - List list = exchange.getProperty(Exchange.GROUPED_EXCHANGE, List.class); - if (list == null) { - list = new GroupedExchangeList<>(); - exchange.setProperty(Exchange.GROUPED_EXCHANGE, list); - } - return list; - } - - /** - * A list to contains grouped {@link Exchange}s. - */ - private static final class GroupedExchangeList extends ArrayList { - - private static final long serialVersionUID = 1L; - - @Override - public String toString() { - // lets override toString so we don't write data for all the Exchanges by default - return "List(" + size() + " elements)"; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java deleted file mode 100644 index 703065e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateController.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.processor.aggregate; - -/** - * A controller which allows controlling a {@link org.apache.camel.processor.aggregate.AggregateProcessor} from an - * external source, such as Java API or JMX. This can be used to force completion of aggregated groups, and more. - */ -public interface AggregateController { - - /** - * Callback when the aggregate processor is started. - * - * @param processor the aggregate processor - */ - void onStart(AggregateProcessor processor); - - /** - * Callback when the aggregate processor is stopped. - * - * @param processor the aggregate processor - */ - void onStop(AggregateProcessor processor); - - /** - * To force completing a specific group by its key. - * - * @param key the key - * @return 1 if the group was forced completed, 0 if the group does not exists - */ - int forceCompletionOfGroup(String key); - - /** - * To force complete of all groups - * - * @return number of groups that was forced completed - */ - int forceCompletionOfAllGroups(); - - /** - * To force discarding a specific group by its key. - * - * @param key the key - * @return 1 if the group was forced discarded, 0 if the group does not exists - */ - int forceDiscardingOfGroup(String key); - - /** - * To force discardingof all groups - * - * @return number of groups that was forced discarded - */ - int forceDiscardingOfAllGroups(); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java deleted file mode 100644 index 4bf9864..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ /dev/null @@ -1,1790 +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.processor.aggregate; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.AsyncCallback; -import org.apache.camel.AsyncProcessor; -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.CamelExchangeException; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ExtendedExchange; -import org.apache.camel.Navigate; -import org.apache.camel.NoSuchEndpointException; -import org.apache.camel.Predicate; -import org.apache.camel.Processor; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.ShutdownRunningTask; -import org.apache.camel.TimeoutMap; -import org.apache.camel.Traceable; -import org.apache.camel.spi.AggregationRepository; -import org.apache.camel.spi.ExceptionHandler; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.OptimisticLockingAggregationRepository; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RecoverableAggregationRepository; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.ShutdownAware; -import org.apache.camel.spi.ShutdownPrepared; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultTimeoutMap; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.support.LoggingExceptionHandler; -import org.apache.camel.support.NoLock; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.TimeUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * An implementation of the Aggregator - * pattern where a batch of messages are processed (up to a maximum amount or - * until some timeout is reached) and messages for the same correlation key are - * combined together using some kind of {@link AggregationStrategy} - * (by default the latest message is used) to compress many message exchanges - * into a smaller number of exchanges. - *

- * A good example of this is stock market data; you may be receiving 30,000 - * messages/second and you may want to throttle it right down so that multiple - * messages for the same stock are combined (or just the latest message is used - * and older prices are discarded). Another idea is to combine line item messages - * together into a single invoice message. - */ -public class AggregateProcessor extends AsyncProcessorSupport implements Navigate, Traceable, ShutdownPrepared, ShutdownAware, IdAware, RouteIdAware { - - public static final String AGGREGATE_TIMEOUT_CHECKER = "AggregateTimeoutChecker"; - public static final String AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR = "AggregateOptimisticLockingExecutor"; - - public static final String COMPLETED_BY_SIZE = "size"; - public static final String COMPLETED_BY_PREDICATE = "predicate"; - public static final String COMPLETED_BY_CONSUMER = "consumer"; - public static final String COMPLETED_BY_STRATEGY = "strategy"; - public static final String COMPLETED_BY_INTERVAL = "interval"; - public static final String COMPLETED_BY_TIMEOUT = "timeout"; - public static final String COMPLETED_BY_FORCE = "force"; - - private static final Logger LOG = LoggerFactory.getLogger(AggregateProcessor.class); - - private volatile Lock lock; - private final AtomicBoolean aggregateRepositoryWarned = new AtomicBoolean(); - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final AsyncProcessor processor; - private String id; - private String routeId; - private AggregationStrategy aggregationStrategy; - private boolean preCompletion; - private Expression correlationExpression; - private AggregateController aggregateController; - private final ExecutorService executorService; - private final boolean shutdownExecutorService; - private OptimisticLockRetryPolicy optimisticLockRetryPolicy = new OptimisticLockRetryPolicy(); - private ScheduledExecutorService timeoutCheckerExecutorService; - private boolean shutdownTimeoutCheckerExecutorService; - private ScheduledExecutorService optimisticLockingExecutorService; - private boolean shutdownOptimisticLockingExecutorService; - private ScheduledExecutorService recoverService; - // store correlation key -> exchange id in timeout map - private TimeoutMap timeoutMap; - private ExceptionHandler exceptionHandler; - private AggregationRepository aggregationRepository; - private Map closedCorrelationKeys; - private final Set batchConsumerCorrelationKeys = new ConcurrentSkipListSet<>(); - private final Set inProgressCompleteExchanges = Collections.newSetFromMap(new ConcurrentHashMap<>()); - private final Map redeliveryState = new ConcurrentHashMap<>(); - - private final AggregateProcessorStatistics statistics = new Statistics(); - private final AtomicLong totalIn = new AtomicLong(); - private final AtomicLong totalCompleted = new AtomicLong(); - private final AtomicLong completedBySize = new AtomicLong(); - private final AtomicLong completedByStrategy = new AtomicLong(); - private final AtomicLong completedByInterval = new AtomicLong(); - private final AtomicLong completedByTimeout = new AtomicLong(); - private final AtomicLong completedByPredicate = new AtomicLong(); - private final AtomicLong completedByBatchConsumer = new AtomicLong(); - private final AtomicLong completedByForce = new AtomicLong(); - private final AtomicLong discarded = new AtomicLong(); - - // keep booking about redelivery - private class RedeliveryData { - int redeliveryCounter; - } - - private class Statistics implements AggregateProcessorStatistics { - - private boolean statisticsEnabled = true; - - @Override - public long getTotalIn() { - return totalIn.get(); - } - - @Override - public long getTotalCompleted() { - return totalCompleted.get(); - } - - @Override - public long getCompletedBySize() { - return completedBySize.get(); - } - - @Override - public long getCompletedByStrategy() { - return completedByStrategy.get(); - } - - @Override - public long getCompletedByInterval() { - return completedByInterval.get(); - } - - @Override - public long getCompletedByTimeout() { - return completedByTimeout.get(); - } - - @Override - public long getCompletedByPredicate() { - return completedByPredicate.get(); - } - - @Override - public long getCompletedByBatchConsumer() { - return completedByBatchConsumer.get(); - } - - @Override - public long getCompletedByForce() { - return completedByForce.get(); - } - - @Override - public long getDiscarded() { - return discarded.get(); - } - - @Override - public void reset() { - totalIn.set(0); - totalCompleted.set(0); - completedBySize.set(0); - completedByStrategy.set(0); - completedByTimeout.set(0); - completedByPredicate.set(0); - completedByBatchConsumer.set(0); - completedByForce.set(0); - discarded.set(0); - } - - @Override - public boolean isStatisticsEnabled() { - return statisticsEnabled; - } - - @Override - public void setStatisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - } - - // options - private boolean ignoreInvalidCorrelationKeys; - private Integer closeCorrelationKeyOnCompletion; - private boolean parallelProcessing; - private boolean optimisticLocking; - - // different ways to have completion triggered - private boolean eagerCheckCompletion; - private Predicate completionPredicate; - private long completionTimeout; - private Expression completionTimeoutExpression; - private long completionInterval; - private int completionSize; - private Expression completionSizeExpression; - private boolean completionFromBatchConsumer; - private boolean completionOnNewCorrelationGroup; - private AtomicInteger batchConsumerCounter = new AtomicInteger(); - private boolean discardOnCompletionTimeout; - private boolean discardOnAggregationFailure; - private boolean forceCompletionOnStop; - private boolean completeAllOnStop; - private long completionTimeoutCheckerInterval = 1000; - - private ProducerTemplate deadLetterProducerTemplate; - - public AggregateProcessor(CamelContext camelContext, AsyncProcessor processor, - Expression correlationExpression, AggregationStrategy aggregationStrategy, - ExecutorService executorService, boolean shutdownExecutorService) { - ObjectHelper.notNull(camelContext, "camelContext"); - ObjectHelper.notNull(processor, "processor"); - ObjectHelper.notNull(correlationExpression, "correlationExpression"); - ObjectHelper.notNull(aggregationStrategy, "aggregationStrategy"); - ObjectHelper.notNull(executorService, "executorService"); - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.processor = processor; - this.correlationExpression = correlationExpression; - this.aggregationStrategy = aggregationStrategy; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.exceptionHandler = new LoggingExceptionHandler(camelContext, getClass()); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "aggregate[" + correlationExpression + "]"; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(processor); - return answer; - } - - @Override - public boolean hasNext() { - return processor != null; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - public String getRouteId() { - return routeId; - } - - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - return doProcess(exchange, callback); - } catch (Throwable e) { - exchange.setException(e); - callback.done(true); - return true; - } - } - - protected boolean doProcess(Exchange exchange, AsyncCallback callback) throws Exception { - if (getStatistics().isStatisticsEnabled()) { - totalIn.incrementAndGet(); - } - - //check for the special header to force completion of all groups (and ignore the exchange otherwise) - if (isCompleteAllGroups(exchange)) { - removeFlagCompleteAllGroups(exchange); - forceCompletionOfAllGroups(); - callback.done(true); - return true; - } - - // compute correlation expression - String key = correlationExpression.evaluate(exchange, String.class); - if (ObjectHelper.isEmpty(key)) { - // we have a bad correlation key - if (isIgnoreInvalidCorrelationKeys()) { - LOG.debug("Invalid correlation key. This Exchange will be ignored: {}", exchange); - } else { - exchange.setException(new CamelExchangeException("Invalid correlation key", exchange)); - } - callback.done(true); - return true; - } - - // is the correlation key closed? - if (closedCorrelationKeys != null && closedCorrelationKeys.containsKey(key)) { - exchange.setException(new ClosedCorrelationKeyException(key, exchange)); - callback.done(true); - return true; - } - - if (optimisticLocking) { - return doInOptimisticLock(exchange, key, callback, 0, true); - } else { - return doProcess(exchange, key, callback, true); - } - } - - protected boolean doInOptimisticLock(Exchange exchange, String key, AsyncCallback callback, int attempt, boolean sync) { - while (true) { - attempt++; - try { - return doProcess(exchange, key, callback, sync); - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - LOG.trace("On attempt {} OptimisticLockingAggregationRepository: {} threw OptimisticLockingException while trying to aggregate exchange: {}", - attempt, aggregationRepository, exchange, e); - if (optimisticLockRetryPolicy.shouldRetry(attempt)) { - long delay = optimisticLockRetryPolicy.getDelay(attempt); - if (delay > 0) { - int nextAttempt = attempt; - getOptimisticLockingExecutorService().schedule(() -> doInOptimisticLock(exchange, key, callback, nextAttempt, false), delay, TimeUnit.MILLISECONDS); - return false; - } - } else { - exchange.setException(new CamelExchangeException("Exhausted optimistic locking retry attempts, tried " + attempt + " times", exchange, - new OptimisticLockingAggregationRepository.OptimisticLockingException())); - callback.done(sync); - return sync; - } - } - } - } - - protected boolean doProcess(Exchange exchange, String key, AsyncCallback callback, boolean sync) { - // copy exchange, and do not share the unit of work - // the aggregated output runs in another unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - - // remove the complete all groups flags as it should not be on the copy - removeFlagCompleteCurrentGroup(copy); - removeFlagCompleteAllGroups(copy); - removeFlagCompleteAllGroupsInclusive(copy); - - List aggregated = null; - lock.lock(); - try { - aggregated = doAggregation(key, copy); - } catch (CamelExchangeException e) { - exchange.setException(e); - } finally { - lock.unlock(); - } - - // we are completed so do that work outside the lock - if (aggregated != null) { - // we are completed so submit to completion - aggregated.forEach(agg -> onSubmitCompletion(key, agg)); - } - - // check for the special header to force completion of all groups (inclusive of the message) - if (isCompleteAllGroupsInclusive(exchange)) { - removeFlagCompleteAllGroupsInclusive(exchange); - forceCompletionOfAllGroups(); - } - - callback.done(sync); - return sync; - } - - private Object removeFlagCompleteCurrentGroup(Exchange exchange) { - //before everywhere : return exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP); - return exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP); - } - - private Boolean isCompleteCurrentGroup(Exchange exchange) { - return exchange.getProperty(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP, false, boolean.class); - } - - private Object removeFlagCompleteAllGroups(Exchange exchange) { - Object removedHeader = exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS); - Object removedProp = exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS); - return removedHeader == null ? removedProp : removedHeader; - } - - private Boolean isCompleteAllGroups(Exchange exchange) { - boolean retVal = exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, boolean.class); - if (!retVal) { - // according to doc it is a property but it is sometimes read as header - // some test don't fail because they use the header expression which contains a fallback to properties - retVal = exchange.getProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, boolean.class); - } - return retVal; - } - - private Object removeFlagCompleteAllGroupsInclusive(Exchange exchange) { - return exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE); - } - - private Boolean isCompleteAllGroupsInclusive(Exchange exchange) { - return exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE, false, boolean.class); - } - - /** - * Aggregates the exchange with the given correlation key - *

- * This method must be run synchronized as we cannot aggregate the same correlation key - * in parallel. - *

- * The returned {@link Exchange} should be send downstream using the {@link #onSubmitCompletion(String, org.apache.camel.Exchange)} - * method which sends out the aggregated and completed {@link Exchange}. - * - * @param key the correlation key - * @param newExchange the exchange - * @return the aggregated exchange(s) which is complete, or null if not yet complete - * @throws org.apache.camel.CamelExchangeException is thrown if error aggregating - */ - private List doAggregation(String key, Exchange newExchange) throws CamelExchangeException { - LOG.trace("onAggregation +++ start +++ with correlation key: {}", key); - - List list = new ArrayList<>(); - String complete = null; - - Exchange answer; - Exchange originalExchange = aggregationRepository.get(newExchange.getContext(), key); - Exchange oldExchange = originalExchange; - - Integer size = 1; - if (oldExchange != null) { - // hack to support legacy AggregationStrategy's that modify and return the oldExchange, these will not - // working when using an identify based approach for optimistic locking like the MemoryAggregationRepository. - if (optimisticLocking && aggregationRepository instanceof MemoryAggregationRepository) { - oldExchange = originalExchange.copy(); - } - size = oldExchange.getProperty(Exchange.AGGREGATED_SIZE, 0, Integer.class); - size++; - } - - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(oldExchange, newExchange); - - // check if we are pre complete - if (preCompletion) { - try { - // put the current aggregated size on the exchange so its avail during completion check - newExchange.setProperty(Exchange.AGGREGATED_SIZE, size); - complete = isPreCompleted(key, oldExchange, newExchange); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - // remove it afterwards - newExchange.removeProperty(Exchange.AGGREGATED_SIZE); - } catch (Throwable e) { - // must catch any exception from aggregation - throw new CamelExchangeException("Error occurred during preComplete", newExchange, e); - } - } else if (isEagerCheckCompletion()) { - // put the current aggregated size on the exchange so its avail during completion check - newExchange.setProperty(Exchange.AGGREGATED_SIZE, size); - complete = isCompleted(key, newExchange); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - // remove it afterwards - newExchange.removeProperty(Exchange.AGGREGATED_SIZE); - } - - if (preCompletion && complete != null) { - // need to pre complete the current group before we aggregate - doAggregationComplete(complete, list, key, originalExchange, oldExchange, false); - // as we complete the current group eager, we should indicate the new group is not complete - complete = null; - // and clear old/original exchange as we start on a new group - oldExchange = null; - originalExchange = null; - // and reset the size to 1 - size = 1; - // make sure to track timeout as we just restart the correlation group when we are in pre completion mode - trackTimeout(key, newExchange); - } - - // aggregate the exchanges - boolean aggregateFailed = false; - try { - answer = onAggregation(oldExchange, newExchange); - } catch (Throwable e) { - aggregateFailed = true; - if (isDiscardOnAggregationFailure()) { - // discard due failure in aggregation strategy - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {} due to failure in AggregationStrategy caused by: {}", key, oldExchange, e.getMessage()); - complete = COMPLETED_BY_STRATEGY; - answer = oldExchange; - if (answer == null) { - // first message in group failed during aggregation and we should just discard this - return null; - } - } else { - // must catch any exception from aggregation - throw new CamelExchangeException("Error occurred during aggregation", newExchange, e); - } - } - if (answer == null) { - throw new CamelExchangeException("AggregationStrategy " + aggregationStrategy + " returned null which is not allowed", newExchange); - } - - // check for the special exchange property to force completion of all groups - if (isCompleteAllGroups(answer)) { - removeFlagCompleteAllGroups(answer); - forceCompletionOfAllGroups(); - } else if (isCompletionOnNewCorrelationGroup() && originalExchange == null) { - // its a new group so force complete of all existing groups - forceCompletionOfAllGroups(); - } - - // special for some repository implementations - if (aggregationRepository instanceof RecoverableAggregationRepository) { - boolean valid = oldExchange == null || answer.getExchangeId().equals(oldExchange.getExchangeId()); - if (!valid && aggregateRepositoryWarned.compareAndSet(false, true)) { - LOG.warn("AggregationStrategy should return the oldExchange instance instead of the newExchange whenever possible" - + " as otherwise this can lead to unexpected behavior with some RecoverableAggregationRepository implementations"); - } - } - - // update the aggregated size - answer.setProperty(Exchange.AGGREGATED_SIZE, size); - - // maybe we should check completion after the aggregation - if (!preCompletion && !isEagerCheckCompletion()) { - complete = isCompleted(key, answer); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - } - - if (!aggregateFailed && complete == null) { - // only need to update aggregation repository if we are not complete - doAggregationRepositoryAdd(newExchange.getContext(), key, originalExchange, answer); - } else { - // if we are complete then add the answer to the list - doAggregationComplete(complete, list, key, originalExchange, answer, aggregateFailed); - } - - LOG.trace("onAggregation +++ end +++ with correlation key: {}", key); - return list; - } - - protected void doAggregationComplete(String complete, List list, String key, - Exchange originalExchange, Exchange answer, boolean aggregateFailed) { - if (COMPLETED_BY_CONSUMER.equals(complete)) { - for (String batchKey : batchConsumerCorrelationKeys) { - Exchange batchAnswer; - if (batchKey.equals(key)) { - // skip the current aggregated key as we have already aggregated it and have the answer - batchAnswer = answer; - } else { - batchAnswer = aggregationRepository.get(camelContext, batchKey); - } - - if (batchAnswer != null) { - batchAnswer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, complete); - onCompletion(batchKey, originalExchange, batchAnswer, false, aggregateFailed); - list.add(batchAnswer); - } - } - batchConsumerCorrelationKeys.clear(); - // we have already submitted to completion, so answer should be null - answer = null; - } else if (answer != null) { - // we are complete for this exchange - answer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, complete); - answer = onCompletion(key, originalExchange, answer, false, aggregateFailed); - } - - if (answer != null) { - list.add(answer); - } - } - - protected void doAggregationRepositoryAdd(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange) { - LOG.trace("In progress aggregated oldExchange: {}, newExchange: {} with correlation key: {}", oldExchange, newExchange, key); - if (optimisticLocking) { - try { - ((OptimisticLockingAggregationRepository)aggregationRepository).add(camelContext, key, oldExchange, newExchange); - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - onOptimisticLockingFailure(oldExchange, newExchange); - throw e; - } - } else { - aggregationRepository.add(camelContext, key, newExchange); - } - } - - protected void onOptimisticLockingFailure(Exchange oldExchange, Exchange newExchange) { - aggregationStrategy.onOptimisticLockFailure(oldExchange, newExchange); - } - - /** - * Tests whether the given exchanges is pre-complete or not - * - * @param key the correlation key - * @param oldExchange the existing exchange - * @param newExchange the incoming exchange - * @return null if not pre-completed, otherwise a String with the type that triggered the pre-completion - */ - protected String isPreCompleted(String key, Exchange oldExchange, Exchange newExchange) { - return aggregationStrategy.preComplete(oldExchange, newExchange) ? "strategy" : null; - } - - /** - * Tests whether the given exchange is complete or not - * - * @param key the correlation key - * @param exchange the incoming exchange - * @return null if not completed, otherwise a String with the type that triggered the completion - */ - protected String isCompleted(String key, Exchange exchange) { - // batch consumer completion must always run first - if (isCompletionFromBatchConsumer()) { - batchConsumerCorrelationKeys.add(key); - batchConsumerCounter.incrementAndGet(); - int size = exchange.getProperty(Exchange.BATCH_SIZE, 0, Integer.class); - if (size > 0 && batchConsumerCounter.intValue() >= size) { - // batch consumer is complete then reset the counter - batchConsumerCounter.set(0); - return COMPLETED_BY_CONSUMER; - } - } - - if (isCompleteCurrentGroup(exchange)) { - removeFlagCompleteCurrentGroup(exchange); - return COMPLETED_BY_STRATEGY; - } - - if (getCompletionPredicate() != null) { - boolean answer = getCompletionPredicate().matches(exchange); - if (answer) { - return COMPLETED_BY_PREDICATE; - } - } - - boolean sizeChecked = false; - if (getCompletionSizeExpression() != null) { - Integer value = getCompletionSizeExpression().evaluate(exchange, Integer.class); - if (value != null && value > 0) { - // mark as already checked size as expression takes precedence over static configured - sizeChecked = true; - int size = exchange.getProperty(Exchange.AGGREGATED_SIZE, 1, Integer.class); - if (size >= value) { - return COMPLETED_BY_SIZE; - } - } - } - if (!sizeChecked && getCompletionSize() > 0) { - int size = exchange.getProperty(Exchange.AGGREGATED_SIZE, 1, Integer.class); - if (size >= getCompletionSize()) { - return COMPLETED_BY_SIZE; - } - } - - // not complete - return null; - } - - protected void trackTimeout(String key, Exchange exchange) { - // timeout can be either evaluated based on an expression or from a fixed value - // expression takes precedence - boolean timeoutSet = false; - if (getCompletionTimeoutExpression() != null) { - Long value = getCompletionTimeoutExpression().evaluate(exchange, Long.class); - if (value != null && value > 0) { - if (LOG.isTraceEnabled()) { - LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}", - key, value, exchange); - } - addExchangeToTimeoutMap(key, exchange, value); - timeoutSet = true; - } - } - if (!timeoutSet && getCompletionTimeout() > 0) { - // timeout is used so use the timeout map to keep an eye on this - if (LOG.isTraceEnabled()) { - LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}", - key, getCompletionTimeout(), exchange); - } - addExchangeToTimeoutMap(key, exchange, getCompletionTimeout()); - } - } - - protected Exchange onAggregation(Exchange oldExchange, Exchange newExchange) { - return aggregationStrategy.aggregate(oldExchange, newExchange); - } - - protected Exchange onCompletion(final String key, final Exchange original, final Exchange aggregated, boolean fromTimeout, boolean aggregateFailed) { - // store the correlation key as property before we remove so the repository has that information - if (original != null) { - original.setProperty(Exchange.AGGREGATED_CORRELATION_KEY, key); - } - aggregated.setProperty(Exchange.AGGREGATED_CORRELATION_KEY, key); - - // only remove if we have previous added (as we could potentially complete with only 1 exchange) - // (if we have previous added then we have that as the original exchange) - if (original != null) { - // remove from repository as its completed, we do this first as to trigger any OptimisticLockingException's - aggregationRepository.remove(aggregated.getContext(), key, original); - } - - if (!fromTimeout && timeoutMap != null) { - // cleanup timeout map if it was a incoming exchange which triggered the timeout (and not the timeout checker) - LOG.trace("Removing correlation key {} from timeout", key); - timeoutMap.remove(key); - } - - // this key has been closed so add it to the closed map - if (closedCorrelationKeys != null) { - closedCorrelationKeys.put(key, key); - } - - if (fromTimeout) { - // invoke timeout to allow any custom processing before discarding the exchange - long timeout = getCompletionTimeout() > 0 ? getCompletionTimeout() : -1; - aggregationStrategy.timeout(aggregated, -1, -1, timeout); - } - - Exchange answer; - if (fromTimeout && isDiscardOnCompletionTimeout()) { - // this exchange is discarded - discarded.incrementAndGet(); - // discard due timeout - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated); - // must confirm the discarded exchange - aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId()); - // and remove redelivery state as well - redeliveryState.remove(aggregated.getExchangeId()); - // the completion was from timeout and we should just discard it - answer = null; - } else if (aggregateFailed && isDiscardOnAggregationFailure()) { - // this exchange is discarded - discarded.incrementAndGet(); - // discard due aggregation failed (or by force) - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated); - // must confirm the discarded exchange - aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId()); - // and remove redelivery state as well - redeliveryState.remove(aggregated.getExchangeId()); - // the completion was failed during aggregation and we should just discard it - answer = null; - } else { - // the aggregated exchange should be published (sent out) - answer = aggregated; - } - - return answer; - } - - private void onSubmitCompletion(final String key, final Exchange exchange) { - LOG.debug("Aggregation complete for correlation key {} sending aggregated exchange: {}", key, exchange); - - // add this as in progress before we submit the task - inProgressCompleteExchanges.add(exchange.getExchangeId()); - - // invoke the on completion callback - aggregationStrategy.onCompletion(exchange); - - if (getStatistics().isStatisticsEnabled()) { - totalCompleted.incrementAndGet(); - - String completedBy = exchange.getProperty(Exchange.AGGREGATED_COMPLETED_BY, String.class); - switch (completedBy) { - case COMPLETED_BY_INTERVAL: - completedByInterval.incrementAndGet(); - break; - case COMPLETED_BY_TIMEOUT: - completedByTimeout.incrementAndGet(); - break; - case COMPLETED_BY_FORCE: - completedByForce.incrementAndGet(); - break; - case COMPLETED_BY_CONSUMER: - completedByBatchConsumer.incrementAndGet(); - break; - case COMPLETED_BY_PREDICATE: - completedByPredicate.incrementAndGet(); - break; - case COMPLETED_BY_SIZE: - completedBySize.incrementAndGet(); - break; - case COMPLETED_BY_STRATEGY: - completedByStrategy.incrementAndGet(); - break; - default: - LOG.error("Invalid value of {} property: {}", Exchange.AGGREGATED_COMPLETED_BY, exchange); - break; - } - } - - LOG.debug("Processing aggregated exchange: {}", exchange); - - // add on completion task so we remember to update the inProgressCompleteExchanges - exchange.adapt(ExtendedExchange.class).addOnCompletion(new AggregateOnCompletion(exchange.getExchangeId())); - - // send this exchange - // the call to schedule is needed to ensure in-order processing of the aggregates - executorService.execute(() -> reactiveExecutor.schedule(() -> processor.process(exchange, done -> { - // log exception if there was a problem - if (exchange.getException() != null) { - // if there was an exception then let the exception handler handle it - getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException()); - } else { - LOG.trace("Processing aggregated exchange: {} complete.", exchange); - } - }))); - } - - /** - * Restores the timeout map with timeout values from the aggregation repository. - *

- * This is needed in case the aggregator has been stopped and started again (for example a server restart). - * Then the existing exchanges from the {@link AggregationRepository} must have their timeout conditions restored. - */ - protected void restoreTimeoutMapFromAggregationRepository() throws Exception { - // grab the timeout value for each partly aggregated exchange - Set keys = aggregationRepository.getKeys(); - if (keys == null || keys.isEmpty()) { - return; - } - - StopWatch watch = new StopWatch(); - LOG.trace("Starting restoring CompletionTimeout for {} existing exchanges from the aggregation repository...", keys.size()); - - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - // grab the timeout value - long timeout = exchange.hasProperties() ? exchange.getProperty(Exchange.AGGREGATED_TIMEOUT, 0L, long.class) : 0L; - if (timeout > 0) { - if (LOG.isTraceEnabled()) { - LOG.trace("Restoring CompletionTimeout for exchangeId: {} with timeout: {} millis.", exchange.getExchangeId(), timeout); - } - addExchangeToTimeoutMap(key, exchange, timeout); - } - } - - // log duration of this task so end user can see how long it takes to pre-check this upon starting - LOG.info("Restored {} CompletionTimeout conditions in the AggregationTimeoutChecker in {}", - timeoutMap.size(), TimeUtils.printDuration(watch.taken())); - } - - /** - * Adds the given exchange to the timeout map, which is used by the timeout checker task to trigger timeouts. - * - * @param key the correlation key - * @param exchange the exchange - * @param timeout the timeout value in millis - */ - private void addExchangeToTimeoutMap(String key, Exchange exchange, long timeout) { - // store the timeout value on the exchange as well, in case we need it later - exchange.setProperty(Exchange.AGGREGATED_TIMEOUT, timeout); - timeoutMap.put(key, exchange.getExchangeId(), timeout); - } - - /** - * Current number of closed correlation keys in the memory cache - */ - public int getClosedCorrelationKeysCacheSize() { - if (closedCorrelationKeys != null) { - return closedCorrelationKeys.size(); - } else { - return 0; - } - } - - /** - * Clear all the closed correlation keys stored in the cache - */ - public void clearClosedCorrelationKeysCache() { - if (closedCorrelationKeys != null) { - closedCorrelationKeys.clear(); - } - } - - public AggregateProcessorStatistics getStatistics() { - return statistics; - } - - public int getInProgressCompleteExchanges() { - return inProgressCompleteExchanges.size(); - } - - public Predicate getCompletionPredicate() { - return completionPredicate; - } - - public void setCompletionPredicate(Predicate completionPredicate) { - this.completionPredicate = completionPredicate; - } - - public boolean isEagerCheckCompletion() { - return eagerCheckCompletion; - } - - public void setEagerCheckCompletion(boolean eagerCheckCompletion) { - this.eagerCheckCompletion = eagerCheckCompletion; - } - - public long getCompletionTimeout() { - return completionTimeout; - } - - public void setCompletionTimeout(long completionTimeout) { - this.completionTimeout = completionTimeout; - } - - public Expression getCompletionTimeoutExpression() { - return completionTimeoutExpression; - } - - public void setCompletionTimeoutExpression(Expression completionTimeoutExpression) { - this.completionTimeoutExpression = completionTimeoutExpression; - } - - public long getCompletionInterval() { - return completionInterval; - } - - public void setCompletionInterval(long completionInterval) { - this.completionInterval = completionInterval; - } - - public int getCompletionSize() { - return completionSize; - } - - public void setCompletionSize(int completionSize) { - this.completionSize = completionSize; - } - - public Expression getCompletionSizeExpression() { - return completionSizeExpression; - } - - public void setCompletionSizeExpression(Expression completionSizeExpression) { - this.completionSizeExpression = completionSizeExpression; - } - - public boolean isIgnoreInvalidCorrelationKeys() { - return ignoreInvalidCorrelationKeys; - } - - public void setIgnoreInvalidCorrelationKeys(boolean ignoreInvalidCorrelationKeys) { - this.ignoreInvalidCorrelationKeys = ignoreInvalidCorrelationKeys; - } - - public Integer getCloseCorrelationKeyOnCompletion() { - return closeCorrelationKeyOnCompletion; - } - - public void setCloseCorrelationKeyOnCompletion(Integer closeCorrelationKeyOnCompletion) { - this.closeCorrelationKeyOnCompletion = closeCorrelationKeyOnCompletion; - } - - public boolean isCompletionFromBatchConsumer() { - return completionFromBatchConsumer; - } - - public void setCompletionFromBatchConsumer(boolean completionFromBatchConsumer) { - this.completionFromBatchConsumer = completionFromBatchConsumer; - } - - public boolean isCompletionOnNewCorrelationGroup() { - return completionOnNewCorrelationGroup; - } - - public void setCompletionOnNewCorrelationGroup(boolean completionOnNewCorrelationGroup) { - this.completionOnNewCorrelationGroup = completionOnNewCorrelationGroup; - } - - public boolean isCompleteAllOnStop() { - return completeAllOnStop; - } - - public long getCompletionTimeoutCheckerInterval() { - return completionTimeoutCheckerInterval; - } - - public void setCompletionTimeoutCheckerInterval(long completionTimeoutCheckerInterval) { - this.completionTimeoutCheckerInterval = completionTimeoutCheckerInterval; - } - - public ExceptionHandler getExceptionHandler() { - return exceptionHandler; - } - - public void setExceptionHandler(ExceptionHandler exceptionHandler) { - this.exceptionHandler = exceptionHandler; - } - - public boolean isParallelProcessing() { - return parallelProcessing; - } - - public void setParallelProcessing(boolean parallelProcessing) { - this.parallelProcessing = parallelProcessing; - } - - public boolean isOptimisticLocking() { - return optimisticLocking; - } - - public void setOptimisticLocking(boolean optimisticLocking) { - this.optimisticLocking = optimisticLocking; - } - - public AggregationRepository getAggregationRepository() { - return aggregationRepository; - } - - public void setAggregationRepository(AggregationRepository aggregationRepository) { - this.aggregationRepository = aggregationRepository; - } - - public boolean isDiscardOnCompletionTimeout() { - return discardOnCompletionTimeout; - } - - public void setDiscardOnCompletionTimeout(boolean discardOnCompletionTimeout) { - this.discardOnCompletionTimeout = discardOnCompletionTimeout; - } - - public boolean isDiscardOnAggregationFailure() { - return discardOnAggregationFailure; - } - - public void setDiscardOnAggregationFailure(boolean discardOnAggregationFailure) { - this.discardOnAggregationFailure = discardOnAggregationFailure; - } - - public void setForceCompletionOnStop(boolean forceCompletionOnStop) { - this.forceCompletionOnStop = forceCompletionOnStop; - } - - public void setCompleteAllOnStop(boolean completeAllOnStop) { - this.completeAllOnStop = completeAllOnStop; - } - - public void setTimeoutCheckerExecutorService(ScheduledExecutorService timeoutCheckerExecutorService) { - this.timeoutCheckerExecutorService = timeoutCheckerExecutorService; - } - - public ScheduledExecutorService getTimeoutCheckerExecutorService() { - return timeoutCheckerExecutorService; - } - - public boolean isShutdownTimeoutCheckerExecutorService() { - return shutdownTimeoutCheckerExecutorService; - } - - public void setShutdownTimeoutCheckerExecutorService(boolean shutdownTimeoutCheckerExecutorService) { - this.shutdownTimeoutCheckerExecutorService = shutdownTimeoutCheckerExecutorService; - } - - public void setOptimisticLockingExecutorService(ScheduledExecutorService optimisticLockingExecutorService) { - this.optimisticLockingExecutorService = optimisticLockingExecutorService; - } - - public ScheduledExecutorService getOptimisticLockingExecutorService() { - return optimisticLockingExecutorService; - } - - public boolean isShutdownOptimisticLockingExecutorService() { - return shutdownOptimisticLockingExecutorService; - } - - public void setShutdownOptimisticLockingExecutorService(boolean shutdownOptimisticLockingExecutorService) { - this.shutdownOptimisticLockingExecutorService = shutdownOptimisticLockingExecutorService; - } - - public void setOptimisticLockRetryPolicy(OptimisticLockRetryPolicy optimisticLockRetryPolicy) { - this.optimisticLockRetryPolicy = optimisticLockRetryPolicy; - } - - public OptimisticLockRetryPolicy getOptimisticLockRetryPolicy() { - return optimisticLockRetryPolicy; - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public Expression getCorrelationExpression() { - return correlationExpression; - } - - public void setCorrelationExpression(Expression correlationExpression) { - this.correlationExpression = correlationExpression; - } - - public AggregateController getAggregateController() { - return aggregateController; - } - - public void setAggregateController(AggregateController aggregateController) { - this.aggregateController = aggregateController; - } - - /** - * On completion task which keeps the booking of the in progress up to date - */ - private final class AggregateOnCompletion implements Synchronization { - private final String exchangeId; - - private AggregateOnCompletion(String exchangeId) { - // must use the original exchange id as it could potentially change if send over SEDA etc. - this.exchangeId = exchangeId; - } - - @Override - public void onFailure(Exchange exchange) { - LOG.trace("Aggregated exchange onFailure: {}", exchange); - - // must remember to remove in progress when we failed - inProgressCompleteExchanges.remove(exchangeId); - // do not remove redelivery state as we need it when we redeliver again later - } - - @Override - public void onComplete(Exchange exchange) { - LOG.trace("Aggregated exchange onComplete: {}", exchange); - - // only confirm if we processed without a problem - try { - aggregationRepository.confirm(exchange.getContext(), exchangeId); - // and remove redelivery state as well - redeliveryState.remove(exchangeId); - } finally { - // must remember to remove in progress when we are complete - inProgressCompleteExchanges.remove(exchangeId); - } - } - - @Override - public String toString() { - return "AggregateOnCompletion"; - } - } - - /** - * Background task that looks for aggregated exchanges which is triggered by completion timeouts. - */ - private final class AggregationTimeoutMap extends DefaultTimeoutMap { - - private AggregationTimeoutMap(ScheduledExecutorService executor, long requestMapPollTimeMillis) { - // do NOT use locking on the timeout map as this aggregator has its own shared lock we will use instead - super(executor, requestMapPollTimeMillis, optimisticLocking); - addListener(this::onEviction); - } - - @Override - protected void purge() { - // wait for lock to be created - if (lock != null) { - // must acquire the shared aggregation lock to be able to purge - lock.lock(); - try { - super.purge(); - } finally { - lock.unlock(); - } - } - } - - private void onEviction(Listener.Type type, String key, String exchangeId) { - if (type != Listener.Type.Evict) { - return; - } - log.debug("Completion timeout triggered for correlation key: {}", key); - - boolean inProgress = inProgressCompleteExchanges.contains(exchangeId); - if (inProgress) { - log.trace("Aggregated exchange with id: {} is already in progress.", exchangeId); - return; - } - - // get the aggregated exchange - boolean evictionStolen = false; - Exchange answer = aggregationRepository.get(camelContext, key); - if (answer == null) { - evictionStolen = true; - } else { - // indicate it was completed by timeout - answer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_TIMEOUT); - try { - answer = onCompletion(key, answer, answer, true, false); - if (answer != null) { - onSubmitCompletion(key, answer); - } - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - evictionStolen = true; - } - } - - if (optimisticLocking && evictionStolen) { - log.debug("Another Camel instance has already successfully correlated or processed this timeout eviction " - + "for exchange with id: {} and correlation id: {}", exchangeId, key); - } - } - } - - /** - * Background task that triggers completion based on interval. - */ - private final class AggregationIntervalTask implements Runnable { - - @Override - public void run() { - // only run if CamelContext has been fully started - if (!camelContext.getStatus().isStarted()) { - LOG.trace("Completion interval task cannot start due CamelContext({}) has not been started yet", camelContext.getName()); - return; - } - - LOG.trace("Starting completion interval task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger interval completion - lock.lock(); - try { - for (String key : keys) { - boolean stolenInterval = false; - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange == null) { - stolenInterval = true; - } else { - LOG.trace("Completion interval triggered for correlation key: {}", key); - // indicate it was completed by interval - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_INTERVAL); - try { - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - } - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - stolenInterval = true; - } - } - if (optimisticLocking && stolenInterval) { - LOG.debug("Another Camel instance has already processed this interval aggregation for exchange with correlation id: {}", key); - } - } - } finally { - lock.unlock(); - } - } - - LOG.trace("Completion interval task complete"); - } - } - - /** - * Background task that looks for aggregated exchanges to recover. - */ - private final class RecoverTask implements Runnable { - private final RecoverableAggregationRepository recoverable; - - private RecoverTask(RecoverableAggregationRepository recoverable) { - this.recoverable = recoverable; - } - - @Override - public void run() { - // only run if CamelContext has been fully started - if (!camelContext.getStatus().isStarted()) { - LOG.trace("Recover check cannot start due CamelContext({}) has not been started yet", camelContext.getName()); - return; - } - - LOG.trace("Starting recover check"); - - // copy the current in progress before doing scan - final Set copyOfInProgress = new LinkedHashSet<>(inProgressCompleteExchanges); - - Set exchangeIds = recoverable.scan(camelContext); - for (String exchangeId : exchangeIds) { - - // we may shutdown while doing recovery - if (!isRunAllowed()) { - LOG.info("We are shutting down so stop recovering"); - return; - } - lock.lock(); - try { - // consider in progress if it was in progress before we did the scan, or currently after we did the scan - // its safer to consider it in progress than risk duplicates due both in progress + recovered - boolean inProgress = copyOfInProgress.contains(exchangeId) || inProgressCompleteExchanges.contains(exchangeId); - if (inProgress) { - LOG.trace("Aggregated exchange with id: {} is already in progress.", exchangeId); - } else { - LOG.debug("Loading aggregated exchange with id: {} to be recovered.", exchangeId); - Exchange exchange = recoverable.recover(camelContext, exchangeId); - if (exchange != null) { - // get the correlation key - String key = exchange.getProperty(Exchange.AGGREGATED_CORRELATION_KEY, String.class); - // and mark it as redelivered - exchange.getIn().setHeader(Exchange.REDELIVERED, Boolean.TRUE); - - // get the current redelivery data - RedeliveryData data = redeliveryState.get(exchange.getExchangeId()); - - // if we are exhausted, then move to dead letter channel - if (data != null && recoverable.getMaximumRedeliveries() > 0 && data.redeliveryCounter >= recoverable.getMaximumRedeliveries()) { - LOG.warn("The recovered exchange is exhausted after " + recoverable.getMaximumRedeliveries() - + " attempts, will now be moved to dead letter channel: " + recoverable.getDeadLetterUri()); - - // send to DLC - try { - // set redelivery counter - exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); - // and prepare for sending to DLC - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - exchange.adapt(ExtendedExchange.class).setRollbackOnly(false); - deadLetterProducerTemplate.send(recoverable.getDeadLetterUri(), exchange); - } catch (Throwable e) { - exchange.setException(e); - } - - // handle if failed - if (exchange.getException() != null) { - getExceptionHandler().handleException("Failed to move recovered Exchange to dead letter channel: " + recoverable.getDeadLetterUri(), exchange.getException()); - } else { - // it was ok, so confirm after it has been moved to dead letter channel, so we wont recover it again - recoverable.confirm(camelContext, exchangeId); - } - } else { - // update current redelivery state - if (data == null) { - // create new data - data = new RedeliveryData(); - redeliveryState.put(exchange.getExchangeId(), data); - } - data.redeliveryCounter++; - - // set redelivery counter - exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); - if (recoverable.getMaximumRedeliveries() > 0) { - exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, recoverable.getMaximumRedeliveries()); - } - - LOG.debug("Delivery attempt: {} to recover aggregated exchange with id: {}", data.redeliveryCounter, exchangeId); - - // not exhaust so resubmit the recovered exchange - onSubmitCompletion(key, exchange); - } - } - } - } finally { - lock.unlock(); - } - } - - LOG.trace("Recover check complete"); - } - } - - @Override - @SuppressWarnings("unchecked") - protected void doStart() throws Exception { - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - if (aggregationStrategy.canPreComplete()) { - preCompletion = true; - LOG.info("PreCompletionAwareAggregationStrategy detected. Aggregator {} is in pre-completion mode.", getId()); - } - - if (!preCompletion) { - // if not in pre completion mode then check we configured the completion required - if (getCompletionTimeout() <= 0 && getCompletionInterval() <= 0 && getCompletionSize() <= 0 && getCompletionPredicate() == null - && !isCompletionFromBatchConsumer() && getCompletionTimeoutExpression() == null - && getCompletionSizeExpression() == null) { - throw new IllegalStateException("At least one of the completions options" - + " [completionTimeout, completionInterval, completionSize, completionPredicate, completionFromBatchConsumer] must be set"); - } - } - - if (getCloseCorrelationKeyOnCompletion() != null) { - if (getCloseCorrelationKeyOnCompletion() > 0) { - LOG.info("Using ClosedCorrelationKeys with a LRUCache with a capacity of {}", getCloseCorrelationKeyOnCompletion()); - closedCorrelationKeys = LRUCacheFactory.newLRUCache(getCloseCorrelationKeyOnCompletion()); - } else { - LOG.info("Using ClosedCorrelationKeys with unbounded capacity"); - closedCorrelationKeys = new ConcurrentHashMap<>(); - } - } - - if (aggregationRepository == null) { - aggregationRepository = new MemoryAggregationRepository(optimisticLocking); - LOG.info("Defaulting to MemoryAggregationRepository"); - } - - if (optimisticLocking) { - if (!(aggregationRepository instanceof OptimisticLockingAggregationRepository)) { - throw new IllegalArgumentException("Optimistic locking cannot be enabled without using an AggregationRepository that implements OptimisticLockingAggregationRepository"); - } - LOG.info("Optimistic locking is enabled"); - } - - ServiceHelper.startService(aggregationStrategy, processor, aggregationRepository); - - // should we use recover checker - if (aggregationRepository instanceof RecoverableAggregationRepository) { - RecoverableAggregationRepository recoverable = (RecoverableAggregationRepository) aggregationRepository; - if (recoverable.isUseRecovery()) { - long interval = recoverable.getRecoveryIntervalInMillis(); - if (interval <= 0) { - throw new IllegalArgumentException("AggregationRepository has recovery enabled and the RecoveryInterval option must be a positive number, was: " + interval); - } - - // create a background recover thread to check every interval - recoverService = camelContext.getExecutorServiceManager().newScheduledThreadPool(this, "AggregateRecoverChecker", 1); - Runnable recoverTask = new RecoverTask(recoverable); - LOG.info("Using RecoverableAggregationRepository by scheduling recover checker to run every {} millis.", interval); - // use fixed delay so there is X interval between each run - recoverService.scheduleWithFixedDelay(recoverTask, 1000L, interval, TimeUnit.MILLISECONDS); - - if (recoverable.getDeadLetterUri() != null) { - int max = recoverable.getMaximumRedeliveries(); - if (max <= 0) { - throw new IllegalArgumentException("Option maximumRedeliveries must be a positive number, was: " + max); - } - LOG.info("After {} failed redelivery attempts Exchanges will be moved to deadLetterUri: {}", max, recoverable.getDeadLetterUri()); - - // dead letter uri must be a valid endpoint - Endpoint endpoint = camelContext.getEndpoint(recoverable.getDeadLetterUri()); - if (endpoint == null) { - throw new NoSuchEndpointException(recoverable.getDeadLetterUri()); - } - deadLetterProducerTemplate = camelContext.createProducerTemplate(); - } - } - } - - if (getCompletionInterval() > 0 && getCompletionTimeout() > 0) { - throw new IllegalArgumentException("Only one of completionInterval or completionTimeout can be used, not both."); - } - if (getCompletionInterval() > 0) { - LOG.info("Using CompletionInterval to run every {} millis.", getCompletionInterval()); - if (getTimeoutCheckerExecutorService() == null) { - setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER)); - shutdownTimeoutCheckerExecutorService = true; - } - // trigger completion based on interval - getTimeoutCheckerExecutorService().scheduleAtFixedRate(new AggregationIntervalTask(), getCompletionInterval(), getCompletionInterval(), TimeUnit.MILLISECONDS); - } - - // start timeout service if its in use - if (getCompletionTimeout() > 0 || getCompletionTimeoutExpression() != null) { - LOG.info("Using CompletionTimeout to trigger after {} millis of inactivity.", getCompletionTimeout()); - if (getTimeoutCheckerExecutorService() == null) { - setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER)); - shutdownTimeoutCheckerExecutorService = true; - } - // check for timed out aggregated messages once every second - timeoutMap = new AggregationTimeoutMap(getTimeoutCheckerExecutorService(), getCompletionTimeoutCheckerInterval()); - // fill in existing timeout values from the aggregation repository, for example if a restart occurred, then we - // need to re-establish the timeout map so timeout can trigger - restoreTimeoutMapFromAggregationRepository(); - ServiceHelper.startService(timeoutMap); - } - - if (aggregateController == null) { - aggregateController = new DefaultAggregateController(); - } - aggregateController.onStart(this); - - if (optimisticLocking) { - lock = NoLock.INSTANCE; - if (getOptimisticLockingExecutorService() == null) { - setOptimisticLockingExecutorService(camelContext.getExecutorServiceManager().newScheduledThreadPool(this, AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR, 1)); - shutdownOptimisticLockingExecutorService = true; - } - } else { - lock = new ReentrantLock(); - } - } - - @Override - protected void doStop() throws Exception { - // note: we cannot do doForceCompletionOnStop from this doStop method - // as this is handled in the prepareShutdown method which is also invoked when stopping a route - // and is better suited for preparing to shutdown than this doStop method is - - if (aggregateController != null) { - aggregateController.onStop(this); - } - - if (recoverService != null) { - camelContext.getExecutorServiceManager().shutdown(recoverService); - } - - if (shutdownTimeoutCheckerExecutorService && timeoutCheckerExecutorService != null) { - camelContext.getExecutorServiceManager().shutdown(timeoutCheckerExecutorService); - timeoutCheckerExecutorService = null; - shutdownTimeoutCheckerExecutorService = false; - } - - ServiceHelper.stopService(timeoutMap, processor, deadLetterProducerTemplate); - - if (closedCorrelationKeys != null) { - // it may be a service so stop it as well - ServiceHelper.stopService(closedCorrelationKeys); - closedCorrelationKeys.clear(); - } - batchConsumerCorrelationKeys.clear(); - redeliveryState.clear(); - } - - @Override - public void prepareShutdown(boolean suspendOnly, boolean forced) { - // we are shutting down, so force completion if this option was enabled - // but only do this when forced=false, as that is when we have chance to - // send out new messages to be routed by Camel. When forced=true, then - // we have to shutdown in a hurry - if (!forced && forceCompletionOnStop) { - doForceCompletionOnStop(); - } - } - - @Override - public boolean deferShutdown(ShutdownRunningTask shutdownRunningTask) { - // not in use - return true; - } - - @Override - public int getPendingExchangesSize() { - if (completeAllOnStop) { - // we want to regard all pending exchanges in the repo as inflight - Set keys = getAggregationRepository().getKeys(); - return keys != null ? keys.size() : 0; - } else { - return 0; - } - } - - private void doForceCompletionOnStop() { - int expected = forceCompletionOfAllGroups(); - - StopWatch watch = new StopWatch(); - while (inProgressCompleteExchanges.size() > 0) { - LOG.trace("Waiting for {} inflight exchanges to complete", getInProgressCompleteExchanges()); - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // break out as we got interrupted such as the JVM terminating - LOG.warn("Interrupted while waiting for {} inflight exchanges to complete.", getInProgressCompleteExchanges()); - break; - } - } - - if (expected > 0) { - LOG.info("Forcing completion of all groups with {} exchanges completed in {}", expected, TimeUtils.printDuration(watch.taken())); - } - } - - @Override - protected void doShutdown() throws Exception { - // shutdown aggregation repository and the strategy - ServiceHelper.stopAndShutdownServices(aggregationRepository, aggregationStrategy); - - // cleanup when shutting down - inProgressCompleteExchanges.clear(); - - if (shutdownExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(executorService); - } - if (shutdownTimeoutCheckerExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(timeoutCheckerExecutorService); - timeoutCheckerExecutorService = null; - } - if (shutdownOptimisticLockingExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(optimisticLockingExecutorService); - optimisticLockingExecutorService = null; - } - - super.doShutdown(); - } - - public int forceCompletionOfGroup(String key) { - // must acquire the shared aggregation lock to be able to trigger force completion - int total = 0; - - lock.lock(); - try { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - total = 1; - LOG.trace("Force completion triggered for correlation key: {}", key); - // indicate it was completed by a force completion request - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE); - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - } - } - } finally { - lock.unlock(); - } - LOG.trace("Completed force completion of group {}", key); - - if (total > 0) { - LOG.debug("Forcing completion of group {} with {} exchanges", key, total); - } - return total; - } - - public int forceCompletionOfAllGroups() { - - // only run if CamelContext has been fully started or is stopping - boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping(); - if (!allow) { - LOG.warn("Cannot start force completion of all groups because CamelContext({}) has not been started", camelContext.getName()); - return 0; - } - - LOG.trace("Starting force completion of all groups task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - int total = 0; - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger force completion - lock.lock(); - total = keys.size(); - try { - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - LOG.trace("Force completion triggered for correlation key: {}", key); - // indicate it was completed by a force completion request - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE); - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - } - } - } - } finally { - lock.unlock(); - } - } - LOG.trace("Completed force completion of all groups task"); - - if (total > 0) { - LOG.debug("Forcing completion of all groups with {} exchanges", total); - } - return total; - } - - public int forceDiscardingOfGroup(String key) { - // must acquire the shared aggregation lock to be able to trigger force completion - int total = 0; - - lock.lock(); - try { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - total = 1; - LOG.trace("Force discarded triggered for correlation key: {}", key); - // force discarding by setting aggregate failed as true - onCompletion(key, exchange, exchange, false, true); - } - } finally { - lock.unlock(); - } - LOG.trace("Completed force discarded of group {}", key); - - if (total > 0) { - LOG.debug("Forcing discarding of group {} with {} exchanges", key, total); - } - return total; - } - - public int forceDiscardingOfAllGroups() { - - // only run if CamelContext has been fully started or is stopping - boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping(); - if (!allow) { - LOG.warn("Cannot start force discarding of all groups because CamelContext({}) has not been started", camelContext.getName()); - return 0; - } - - LOG.trace("Starting force discarding of all groups task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - int total = 0; - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger force completion - lock.lock(); - total = keys.size(); - try { - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - LOG.trace("Force discarded triggered for correlation key: {}", key); - // force discarding by setting aggregate failed as true - onCompletion(key, exchange, exchange, false, true); - } - } - } finally { - lock.unlock(); - } - } - LOG.trace("Completed force discarding of all groups task"); - - if (total > 0) { - LOG.debug("Forcing discarding of all groups with {} exchanges", total); - } - return total; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorSetter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorSetter.java deleted file mode 100644 index 495aa73..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorSetter.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.apache.camel.processor.aggregate; - -public interface AggregateProcessorSetter { - - void setAggregateProcessor(EntaxyAggregateProcessor aggregateProcessor); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java deleted file mode 100644 index c082613..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java +++ /dev/null @@ -1,91 +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.processor.aggregate; - -/** - * Various statistics of the aggregator - */ -public interface AggregateProcessorStatistics { - - /** - * Total number of exchanges arrived into the aggregator - */ - long getTotalIn(); - - /** - * Total number of exchanges completed and outgoing from the aggregator - */ - long getTotalCompleted(); - - /** - * Total number of exchanged completed by completion size trigger - */ - long getCompletedBySize(); - - /** - * Total number of exchanged completed by completion strategy trigger - */ - long getCompletedByStrategy(); - - /** - * Total number of exchanged completed by completion interval trigger - */ - long getCompletedByInterval(); - - /** - * Total number of exchanged completed by completion timeout trigger - */ - long getCompletedByTimeout(); - - /** - * Total number of exchanged completed by completion predicate trigger - */ - long getCompletedByPredicate(); - - /** - * Total number of exchanged completed by completion batch consumer trigger - */ - long getCompletedByBatchConsumer(); - - /** - * Total number of exchanged completed by completion force trigger - */ - long getCompletedByForce(); - - /** - * Total number of exchanged discarded - */ - long getDiscarded(); - - /** - * Reset the counters - */ - void reset(); - - /** - * Whether statistics is enabled. - */ - boolean isStatisticsEnabled(); - - /** - * Sets whether statistics is enabled. - * - * @param statisticsEnabled true to enable - */ - void setStatisticsEnabled(boolean statisticsEnabled); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java deleted file mode 100644 index f528aeb..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java +++ /dev/null @@ -1,243 +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.processor.aggregate; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; - -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Proxy; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * An {@link AggregationStrategy} that adapts to a POJO. - *

- * This allows end users to use POJOs for the aggregation logic, instead of having to implement the - * Camel API {@link AggregationStrategy}. - */ -public final class AggregationStrategyBeanAdapter extends ServiceSupport implements AggregationStrategy, CamelContextAware { - - private static final List EXCLUDED_METHODS = new ArrayList<>(); - private CamelContext camelContext; - private Object pojo; - private final Class type; - private String methodName; - private boolean allowNullOldExchange; - private boolean allowNullNewExchange; - private volatile AggregationStrategyMethodInfo mi; - - static { - // exclude all java.lang.Object methods as we dont want to invoke them - EXCLUDED_METHODS.addAll(Arrays.asList(Object.class.getMethods())); - // exclude all java.lang.reflect.Proxy methods as we dont want to invoke them - EXCLUDED_METHODS.addAll(Arrays.asList(Proxy.class.getMethods())); - } - - /** - * Creates this adapter. - * - * @param pojo the pojo to use. - */ - public AggregationStrategyBeanAdapter(Object pojo) { - this(pojo, null); - } - - /** - * Creates this adapter. - * - * @param type the class type of the pojo - */ - public AggregationStrategyBeanAdapter(Class type) { - this(type, null); - } - - /** - * Creates this adapter. - * - * @param pojo the pojo to use. - * @param methodName the name of the method to call - */ - public AggregationStrategyBeanAdapter(Object pojo, String methodName) { - this.pojo = pojo; - this.type = pojo.getClass(); - this.methodName = methodName; - } - - /** - * Creates this adapter. - * - * @param type the class type of the pojo - * @param methodName the name of the method to call - */ - public AggregationStrategyBeanAdapter(Class type, String methodName) { - this.type = type; - this.pojo = null; - this.methodName = methodName; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public String getMethodName() { - return methodName; - } - - public void setMethodName(String methodName) { - this.methodName = methodName; - } - - public boolean isAllowNullOldExchange() { - return allowNullOldExchange; - } - - public void setAllowNullOldExchange(boolean allowNullOldExchange) { - this.allowNullOldExchange = allowNullOldExchange; - } - - public boolean isAllowNullNewExchange() { - return allowNullNewExchange; - } - - public void setAllowNullNewExchange(boolean allowNullNewExchange) { - this.allowNullNewExchange = allowNullNewExchange; - } - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (!allowNullOldExchange && oldExchange == null) { - return newExchange; - } - if (!allowNullNewExchange && newExchange == null) { - return oldExchange; - } - - try { - Object out = mi.invoke(pojo, oldExchange, newExchange); - if (out != null) { - if (oldExchange != null) { - oldExchange.getIn().setBody(out); - } else { - newExchange.getIn().setBody(out); - } - } - } catch (Exception e) { - if (oldExchange != null) { - oldExchange.setException(e); - } else { - newExchange.setException(e); - } - } - return oldExchange != null ? oldExchange : newExchange; - } - - /** - * Validates whether the given method is valid. - * - * @param method the method - * @return true if valid, false to skip the method - */ - protected boolean isValidMethod(Method method) { - // must not be in the excluded list - for (Method excluded : EXCLUDED_METHODS) { - if (method.equals(excluded)) { - return false; - } - } - - // must be a public method - if (!Modifier.isPublic(method.getModifiers())) { - return false; - } - - // return type must not be void and it should not be a bridge method - if (method.getReturnType().equals(Void.TYPE) || method.isBridge()) { - return false; - } - - return true; - } - - private static boolean isStaticMethod(Method method) { - return Modifier.isStatic(method.getModifiers()); - } - - @Override - protected void doStart() throws Exception { - Method found = null; - if (methodName != null) { - for (Method method : type.getMethods()) { - if (isValidMethod(method) && method.getName().equals(methodName)) { - if (found == null) { - found = method; - } else { - throw new IllegalArgumentException("The bean " + type + " has 2 or more methods with the name " + methodName); - } - } - } - } else { - for (Method method : type.getMethods()) { - if (isValidMethod(method)) { - if (found == null) { - found = method; - } else { - throw new IllegalArgumentException("The bean " + type + " has 2 or more methods and no explicit method name was configured."); - } - } - } - } - - if (found == null) { - throw new UnsupportedOperationException("Cannot find a valid method with name: " + methodName + " on bean type: " + type); - } - - // if its not a static method then we must have an instance of the pojo - if (!isStaticMethod(found) && pojo == null) { - pojo = camelContext.getInjector().newInstance(type); - } - - // create the method info which has adapted to the pojo - AggregationStrategyBeanInfo bi = new AggregationStrategyBeanInfo(type, found); - mi = bi.createMethodInfo(); - - // in case the POJO is CamelContextAware - if (pojo instanceof CamelContextAware) { - ((CamelContextAware) pojo).setCamelContext(getCamelContext()); - } - - // in case the pojo is a service - ServiceHelper.startService(pojo); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(pojo); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java deleted file mode 100644 index c8f5c4e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.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.processor.aggregate; - -import org.apache.camel.Expression; -import org.apache.camel.support.builder.ExpressionBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -/** - * Class information about the POJO method to call when using the {@link AggregationStrategyBeanAdapter}. - */ -public class AggregationStrategyBeanInfo { - - private static final Logger LOG = LoggerFactory.getLogger(AggregationStrategyBeanInfo.class); - - private final Class type; - private final Method method; - - public AggregationStrategyBeanInfo(Class type, Method method) { - this.type = type; - this.method = method; - } - - protected AggregationStrategyMethodInfo createMethodInfo() { - Class[] parameterTypes = method.getParameterTypes(); - - int size = parameterTypes.length; - if (LOG.isTraceEnabled()) { - LOG.trace("Creating MethodInfo for class: {} method: {} having {} parameters", type, method, size); - } - - // must have equal number of parameters - if (size < 2) { - throw new IllegalArgumentException("The method " + method.getName() + " must have at least two parameters, has: " + size); - } else if (size % 2 != 0) { - throw new IllegalArgumentException("The method " + method.getName() + " must have equal number of parameters, has: " + size); - } - - // must not have annotations as they are not supported (yet) - Annotation[][] parameterAnnotations = method.getParameterAnnotations(); - for (int i = 0; i < parameterAnnotations.length; i++) { - Annotation[] annotations = parameterAnnotations[i]; - if (annotations.length > 0) { - throw new IllegalArgumentException("Method parameter annotation: " + annotations[0] + " at index: " + i + " is not supported on method: " + method); - } - } - - List oldParameters = new ArrayList<>(); - List newParameters = new ArrayList<>(); - - for (int i = 0; i < size / 2; i++) { - Class oldType = parameterTypes[i]; - if (oldParameters.size() == 0) { - // the first parameter is the body - Expression oldBody = ExpressionBuilder.mandatoryBodyExpression(oldType); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo(i, oldType, oldBody); - oldParameters.add(info); - } else if (oldParameters.size() == 1) { - // the 2nd parameter is the headers - Expression oldHeaders = ExpressionBuilder.headersExpression(); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo(i, oldType, oldHeaders); - oldParameters.add(info); - } else if (oldParameters.size() == 2) { - // the 3rd parameter is the properties - Expression oldProperties = ExpressionBuilder.exchangePropertiesExpression(); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo(i, oldType, oldProperties); - oldParameters.add(info); - } - } - - for (int i = size / 2; i < size; i++) { - Class newType = parameterTypes[i]; - if (newParameters.size() == 0) { - // the first parameter is the body - Expression newBody = ExpressionBuilder.mandatoryBodyExpression(newType); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo(i, newType, newBody); - newParameters.add(info); - } else if (newParameters.size() == 1) { - // the 2nd parameter is the headers - Expression newHeaders = ExpressionBuilder.headersExpression(); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo(i, newType, newHeaders); - newParameters.add(info); - } else if (newParameters.size() == 2) { - // the 3rd parameter is the properties - Expression newProperties = ExpressionBuilder.exchangePropertiesExpression(); - org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info = new AggregationStrategyParameterInfo(i, newType, newProperties); - newParameters.add(info); - } - } - - return new AggregationStrategyMethodInfo(method, oldParameters, newParameters); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java deleted file mode 100644 index 7587853..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.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.processor.aggregate; - -import org.apache.camel.Exchange; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -/** - * Method information about the POJO method to call when using the {@link AggregationStrategyBeanAdapter}. - */ -public class AggregationStrategyMethodInfo { - - private final Method method; - private final List oldParameters; - private final List newParameters; - - - public AggregationStrategyMethodInfo(Method method, - List oldParameters, - List newParameters) { - this.method = method; - this.oldParameters = oldParameters; - this.newParameters = newParameters; - } - - public Object invoke(Object pojo, Exchange oldExchange, Exchange newExchange) throws Exception { - // evaluate the parameters - List list = new ArrayList<>(oldParameters.size() + newParameters.size()); - for (org.apache.camel.processor.aggregate.AggregationStrategyParameterInfo info : oldParameters) { - if (oldExchange != null) { - Object value = info.getExpression().evaluate(oldExchange, info.getType()); - list.add(value); - } else { - // use a null value as oldExchange is null - list.add(null); - } - } - for (AggregationStrategyParameterInfo info : newParameters) { - if (newExchange != null) { - Object value = info.getExpression().evaluate(newExchange, info.getType()); - list.add(value); - } else { - // use a null value as newExchange is null - list.add(null); - } - } - - Object[] args = list.toArray(); - return method.invoke(pojo, args); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyParameterInfo.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyParameterInfo.java deleted file mode 100644 index fb57319..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyParameterInfo.java +++ /dev/null @@ -1,61 +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.processor.aggregate; - -import org.apache.camel.Expression; - -/** - * Parameter information to be used for method invocation. - */ -public class AggregationStrategyParameterInfo { - private final int index; - private final Class type; - private Expression expression; - - public AggregationStrategyParameterInfo(int index, Class type, Expression expression) { - this.index = index; - this.type = type; - this.expression = expression; - } - - public Expression getExpression() { - return expression; - } - - public int getIndex() { - return index; - } - - public Class getType() { - return type; - } - - public void setExpression(Expression expression) { - this.expression = expression; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("ParameterInfo"); - sb.append("[index=").append(index); - sb.append(", type=").append(type); - sb.append(", expression=").append(expression); - sb.append(']'); - return sb.toString(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java deleted file mode 100644 index db9afbe..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.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.processor.aggregate; - -import org.apache.camel.CamelExchangeException; -import org.apache.camel.Exchange; - -/** - * The correlation key has been closed and the Exchange cannot be aggregated. - */ -public class ClosedCorrelationKeyException extends CamelExchangeException { - private static final long serialVersionUID = 1L; - private final String correlationKey; - - public ClosedCorrelationKeyException(String correlationKey, Exchange exchange) { - super("The correlation key [" + correlationKey + "] has been closed", exchange); - this.correlationKey = correlationKey; - } - - public ClosedCorrelationKeyException(String correlationKey, Exchange exchange, Throwable cause) { - super("The correlation key [" + correlationKey + "] has been closed", exchange, cause); - this.correlationKey = correlationKey; - } - - public String getCorrelationKey() { - return correlationKey; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java deleted file mode 100644 index 6765bfd..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.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.processor.aggregate; - -/** - * A default {@link org.apache.camel.processor.aggregate.AggregateController} that offers Java and JMX API. - */ -public class DefaultAggregateController implements AggregateController { - - private AggregateProcessor processor; - - @Override - public void onStart(AggregateProcessor processor) { - this.processor = processor; - } - - @Override - public void onStop(AggregateProcessor processor) { - this.processor = null; - } - - @Override - public int forceCompletionOfGroup(String key) { - if (processor != null) { - return processor.forceCompletionOfGroup(key); - } else { - return 0; - } - } - - @Override - public int forceCompletionOfAllGroups() { - if (processor != null) { - return processor.forceCompletionOfAllGroups(); - } else { - return 0; - } - } - - @Override - public int forceDiscardingOfGroup(String key) { - if (processor != null) { - return processor.forceDiscardingOfGroup(key); - } else { - return 0; - } - } - - @Override - public int forceDiscardingOfAllGroups() { - if (processor != null) { - return processor.forceDiscardingOfAllGroups(); - } else { - return 0; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/EntaxyAggregateProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/EntaxyAggregateProcessor.java deleted file mode 100644 index c557afa..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/EntaxyAggregateProcessor.java +++ /dev/null @@ -1,1938 +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.processor.aggregate; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.AsyncCallback; -import org.apache.camel.AsyncProcessor; -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.CamelExchangeException; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ExtendedExchange; -import org.apache.camel.Navigate; -import org.apache.camel.NoSuchEndpointException; -import org.apache.camel.Predicate; -import org.apache.camel.Processor; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.ShutdownRunningTask; -import org.apache.camel.TimeoutMap; -import org.apache.camel.Traceable; -import org.apache.camel.component.jms.JmsMessage; -import org.apache.camel.spi.AggregationRepository; -import org.apache.camel.spi.ExceptionHandler; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.OptimisticLockingAggregationRepository; -import org.apache.camel.spi.ReactiveExecutor; -import org.apache.camel.spi.RecoverableAggregationRepository; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.ShutdownAware; -import org.apache.camel.spi.ShutdownPrepared; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.DefaultTimeoutMap; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.LRUCacheFactory; -import org.apache.camel.support.LoggingExceptionHandler; -import org.apache.camel.support.NoLock; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.TimeUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.jms.JMSException; -import javax.jms.Session; - -/** - * An implementation of the Aggregator - * pattern where a batch of messages are processed (up to a maximum amount or - * until some timeout is reached) and messages for the same correlation key are - * combined together using some kind of {@link AggregationStrategy} - * (by default the latest message is used) to compress many message exchanges - * into a smaller number of exchanges. - *

- * A good example of this is stock market data; you may be receiving 30,000 - * messages/second and you may want to throttle it right down so that multiple - * messages for the same stock are combined (or just the latest message is used - * and older prices are discarded). Another idea is to combine line item messages - * together into a single invoice message. - */ -public class EntaxyAggregateProcessor extends AggregateProcessor { - - public static final String AGGREGATE_TIMEOUT_CHECKER = "AggregateTimeoutChecker"; - public static final String AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR = "AggregateOptimisticLockingExecutor"; - public static final String AGGREGATION_COMPLETED_NODE_TIME = "AggregationCompletedNodeTime"; - public static final int MAX_TIME_WORKING_WITH_COMPLETED_MESSAGE = 3000; - - public static final String COMPLETED_BY_SIZE = "size"; - public static final String COMPLETED_BY_PREDICATE = "predicate"; - public static final String COMPLETED_BY_CONSUMER = "consumer"; - public static final String COMPLETED_BY_STRATEGY = "strategy"; - public static final String COMPLETED_BY_INTERVAL = "interval"; - public static final String COMPLETED_BY_TIMEOUT = "timeout"; - public static final String COMPLETED_BY_FORCE = "force"; - - private static final Logger LOG = LoggerFactory.getLogger(EntaxyAggregateProcessor.class); - - private volatile Lock lock; - private final AtomicBoolean aggregateRepositoryWarned = new AtomicBoolean(); - private final CamelContext camelContext; - private final ReactiveExecutor reactiveExecutor; - private final AsyncProcessor processor; - private String id; - private String routeId; - private AggregationStrategy aggregationStrategy; - private boolean preCompletion; - private Expression correlationExpression; - private AggregateController aggregateController; - private final ExecutorService executorService; - private final boolean shutdownExecutorService; - private OptimisticLockRetryPolicy optimisticLockRetryPolicy = new OptimisticLockRetryPolicy(); - private ScheduledExecutorService timeoutCheckerExecutorService; - private boolean shutdownTimeoutCheckerExecutorService; - private ScheduledExecutorService optimisticLockingExecutorService; - private boolean shutdownOptimisticLockingExecutorService; - private ScheduledExecutorService recoverService; - // store correlation key -> exchange id in timeout map - private TimeoutMap timeoutMap; - private ExceptionHandler exceptionHandler; - private AggregationRepository aggregationRepository; - private Map closedCorrelationKeys; - private final Set batchConsumerCorrelationKeys = new ConcurrentSkipListSet<>(); - private final Set inProgressCompleteExchanges = Collections.newSetFromMap(new ConcurrentHashMap<>()); - private final Map redeliveryState = new ConcurrentHashMap<>(); - - private final AggregateProcessorStatistics statistics = new Statistics(); - private final AtomicLong totalIn = new AtomicLong(); - private final AtomicLong totalCompleted = new AtomicLong(); - private final AtomicLong completedBySize = new AtomicLong(); - private final AtomicLong completedByStrategy = new AtomicLong(); - private final AtomicLong completedByInterval = new AtomicLong(); - private final AtomicLong completedByTimeout = new AtomicLong(); - private final AtomicLong completedByPredicate = new AtomicLong(); - private final AtomicLong completedByBatchConsumer = new AtomicLong(); - private final AtomicLong completedByForce = new AtomicLong(); - private final AtomicLong discarded = new AtomicLong(); - - // keep booking about redelivery - private class RedeliveryData { - int redeliveryCounter; - } - - private class Statistics implements AggregateProcessorStatistics { - - private boolean statisticsEnabled = true; - - @Override - public long getTotalIn() { - return totalIn.get(); - } - - @Override - public long getTotalCompleted() { - return totalCompleted.get(); - } - - @Override - public long getCompletedBySize() { - return completedBySize.get(); - } - - @Override - public long getCompletedByStrategy() { - return completedByStrategy.get(); - } - - @Override - public long getCompletedByInterval() { - return completedByInterval.get(); - } - - @Override - public long getCompletedByTimeout() { - return completedByTimeout.get(); - } - - @Override - public long getCompletedByPredicate() { - return completedByPredicate.get(); - } - - @Override - public long getCompletedByBatchConsumer() { - return completedByBatchConsumer.get(); - } - - @Override - public long getCompletedByForce() { - return completedByForce.get(); - } - - @Override - public long getDiscarded() { - return discarded.get(); - } - - @Override - public void reset() { - totalIn.set(0); - totalCompleted.set(0); - completedBySize.set(0); - completedByStrategy.set(0); - completedByTimeout.set(0); - completedByPredicate.set(0); - completedByBatchConsumer.set(0); - completedByForce.set(0); - discarded.set(0); - } - - @Override - public boolean isStatisticsEnabled() { - return statisticsEnabled; - } - - @Override - public void setStatisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - } - - // options - private boolean ignoreInvalidCorrelationKeys; - private Integer closeCorrelationKeyOnCompletion; - private boolean parallelProcessing; - private boolean optimisticLocking; - - // different ways to have completion triggered - private boolean eagerCheckCompletion; - private Predicate completionPredicate; - private long completionTimeout; - private Expression completionTimeoutExpression; - private long completionInterval; - private int completionSize; - private Expression completionSizeExpression; - private boolean completionFromBatchConsumer; - private boolean completionOnNewCorrelationGroup; - private final AtomicInteger batchConsumerCounter = new AtomicInteger(); - private boolean discardOnCompletionTimeout; - private boolean discardOnAggregationFailure; - private boolean forceCompletionOnStop; - private boolean completeAllOnStop; - private long completionTimeoutCheckerInterval = 1000; - - private ProducerTemplate deadLetterProducerTemplate; - - public EntaxyAggregateProcessor(CamelContext camelContext, AsyncProcessor processor, - Expression correlationExpression, AggregationStrategy aggregationStrategy, - ExecutorService executorService, boolean shutdownExecutorService) { - super(camelContext, processor, correlationExpression, aggregationStrategy, executorService, shutdownExecutorService); - this.camelContext = camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.processor = processor; - this.correlationExpression = correlationExpression; - this.aggregationStrategy = aggregationStrategy; - this.executorService = executorService; - this.shutdownExecutorService = shutdownExecutorService; - this.exceptionHandler = new LoggingExceptionHandler(camelContext, getClass()); - } - - @Override - public String toString() { - return id; - } - - @Override - public String getTraceLabel() { - return "aggregate[" + correlationExpression + "]"; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(processor); - return answer; - } - - @Override - public boolean hasNext() { - return processor != null; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - public String getRouteId() { - return routeId; - } - - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - try { - return doProcess(exchange, callback); - } catch (Throwable e) { - exchange.setException(e); - callback.done(true); - return true; - } - } - - protected boolean doProcess(Exchange exchange, AsyncCallback callback) throws Exception { - if (getStatistics().isStatisticsEnabled()) { - totalIn.incrementAndGet(); - } - - //check for the special header to force completion of all groups (and ignore the exchange otherwise) - if (isCompleteAllGroups(exchange)) { - removeFlagCompleteAllGroups(exchange); - forceCompletionOfAllGroups(); - callback.done(true); - return true; - } - - // compute correlation expression - String key = correlationExpression.evaluate(exchange, String.class); - if (ObjectHelper.isEmpty(key)) { - // we have a bad correlation key - if (isIgnoreInvalidCorrelationKeys()) { - LOG.debug("Invalid correlation key. This Exchange will be ignored: {}", exchange); - } else { - exchange.setException(new CamelExchangeException("Invalid correlation key", exchange)); - } - callback.done(true); - return true; - } - - // is the correlation key closed? - if (closedCorrelationKeys != null && closedCorrelationKeys.containsKey(key)) { - exchange.setException(new ClosedCorrelationKeyException(key, exchange)); - callback.done(true); - return true; - } - - if (optimisticLocking) { - return doInOptimisticLock(exchange, key, callback, 0, true); - } else { - return doProcess(exchange, key, callback, true); - } - } - - protected boolean doInOptimisticLock(Exchange exchange, String key, AsyncCallback callback, int attempt, boolean sync) { - while (true) { - attempt++; - try { - return doProcess(exchange, key, callback, sync); - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - LOG.trace("On attempt {} OptimisticLockingAggregationRepository: {} threw OptimisticLockingException while trying to aggregate exchange: {}", - attempt, aggregationRepository, exchange, e); - if (optimisticLockRetryPolicy.shouldRetry(attempt)) { - long delay = optimisticLockRetryPolicy.getDelay(attempt); - if (delay > 0) { - int nextAttempt = attempt; - getOptimisticLockingExecutorService().schedule(() -> doInOptimisticLock(exchange, key, callback, nextAttempt, false), delay, TimeUnit.MILLISECONDS); - return false; - } - } else { - exchange.setException(new CamelExchangeException("Exhausted optimistic locking retry attempts, tried " + attempt + " times", exchange, - new OptimisticLockingAggregationRepository.OptimisticLockingException())); - callback.done(sync); - return sync; - } - } - } - } - - protected boolean doProcess(Exchange exchange, String key, AsyncCallback callback, boolean sync) { - // copy exchange, and do not share the unit of work - // the aggregated output runs in another unit of work - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false); - - // remove the complete all groups flags as it should not be on the copy - removeFlagCompleteCurrentGroup(copy); - removeFlagCompleteAllGroups(copy); - removeFlagCompleteAllGroupsInclusive(copy); - - List aggregated = null; - lock.lock(); - try { - aggregated = doAggregation(key, copy); - } catch (CamelExchangeException e) { - exchange.setException(e); - } finally { - lock.unlock(); - } - - // we are completed so do that work outside the lock - if (aggregated != null) { - // we are completed so submit to completion - aggregated.forEach(agg -> onSubmitCompletion(key, agg)); - } - - // check for the special header to force completion of all groups (inclusive of the message) - if (isCompleteAllGroupsInclusive(exchange)) { - removeFlagCompleteAllGroupsInclusive(exchange); - forceCompletionOfAllGroups(); - } - - callback.done(sync); - return sync; - } - - private Object removeFlagCompleteCurrentGroup(Exchange exchange) { - //before everywhere : return exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP); - return exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP); - } - - private Boolean isCompleteCurrentGroup(Exchange exchange) { - return exchange.getProperty(Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP, false, boolean.class); - } - - private Object removeFlagCompleteAllGroups(Exchange exchange) { - Object removedHeader = exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS); - Object removedProp = exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS); - return removedHeader == null ? removedProp : removedHeader; - } - - private Boolean isCompleteAllGroups(Exchange exchange) { - boolean retVal = exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, boolean.class); - if (!retVal) { - // according to doc it is a property but it is sometimes read as header - // some test don't fail because they use the header expression which contains a fallback to properties - retVal = exchange.getProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS, false, boolean.class); - } - return retVal; - } - - private Object removeFlagCompleteAllGroupsInclusive(Exchange exchange) { - return exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE); - } - - private Boolean isCompleteAllGroupsInclusive(Exchange exchange) { - return exchange.getIn().getHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE, false, boolean.class); - } - - /** - * Aggregates the exchange with the given correlation key - *

- * This method must be run synchronized as we cannot aggregate the same correlation key - * in parallel. - *

- * The returned {@link Exchange} should be send downstream using the {@link #onSubmitCompletion(String, org.apache.camel.Exchange)} - * method which sends out the aggregated and completed {@link Exchange}. - * - * @param key the correlation key - * @param newExchange the exchange - * @return the aggregated exchange(s) which is complete, or null if not yet complete - * @throws org.apache.camel.CamelExchangeException is thrown if error aggregating - */ - private List doAggregation(String key, Exchange newExchange) throws CamelExchangeException { - LOG.trace("onAggregation +++ start +++ with correlation key: {}", key); - - List list = new ArrayList<>(); - String complete = null; - - Exchange answer; - Exchange originalExchange = aggregationRepository.get(newExchange.getContext(), key); - Exchange oldExchange = originalExchange; - - Integer size = 1; - if (oldExchange != null) { - // hack to support legacy AggregationStrategy's that modify and return the oldExchange, these will not - // working when using an identify based approach for optimistic locking like the MemoryAggregationRepository. - if (optimisticLocking && aggregationRepository instanceof MemoryAggregationRepository) { - oldExchange = originalExchange.copy(); - } - size = oldExchange.getProperty(Exchange.AGGREGATED_SIZE, 0, Integer.class); - size++; - } - - // prepare the exchanges for aggregation - ExchangeHelper.prepareAggregation(oldExchange, newExchange); - - // check if we are pre complete - if (preCompletion) { - try { - // put the current aggregated size on the exchange so its avail during completion check - newExchange.setProperty(Exchange.AGGREGATED_SIZE, size); - complete = isPreCompleted(key, oldExchange, newExchange); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - // remove it afterwards - newExchange.removeProperty(Exchange.AGGREGATED_SIZE); - } catch (Throwable e) { - // must catch any exception from aggregation - throw new CamelExchangeException("Error occurred during preComplete", newExchange, e); - } - } else if (isEagerCheckCompletion()) { - // put the current aggregated size on the exchange so its avail during completion check - newExchange.setProperty(Exchange.AGGREGATED_SIZE, size); - complete = isCompleted(key, newExchange); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - // remove it afterwards - newExchange.removeProperty(Exchange.AGGREGATED_SIZE); - } - - if (preCompletion && complete != null) { - // need to pre complete the current group before we aggregate - doAggregationComplete(complete, list, key, originalExchange, oldExchange, false); - // as we complete the current group eager, we should indicate the new group is not complete - complete = null; - // and clear old/original exchange as we start on a new group - oldExchange = null; - originalExchange = null; - // and reset the size to 1 - size = 1; - // make sure to track timeout as we just restart the correlation group when we are in pre completion mode - trackTimeout(key, newExchange); - } - - // aggregate the exchanges - boolean aggregateFailed = false; - try { - answer = onAggregation(oldExchange, newExchange); - } catch (Throwable e) { - aggregateFailed = true; - if (isDiscardOnAggregationFailure()) { - // discard due failure in aggregation strategy - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {} due to failure in AggregationStrategy caused by: {}", key, oldExchange, e.getMessage()); - complete = COMPLETED_BY_STRATEGY; - answer = oldExchange; - if (answer == null) { - // first message in group failed during aggregation and we should just discard this - return null; - } - } else { - // must catch any exception from aggregation - throw new CamelExchangeException("Error occurred during aggregation", newExchange, e); - } - } - if (answer == null) { - throw new CamelExchangeException("AggregationStrategy " + aggregationStrategy + " returned null which is not allowed", newExchange); - } - - // check for the special exchange property to force completion of all groups - if (isCompleteAllGroups(answer)) { - removeFlagCompleteAllGroups(answer); - forceCompletionOfAllGroups(); - } else if (isCompletionOnNewCorrelationGroup() && originalExchange == null) { - // its a new group so force complete of all existing groups - forceCompletionOfAllGroups(); - } - - // special for some repository implementations - if (aggregationRepository instanceof RecoverableAggregationRepository) { - boolean valid = oldExchange == null || answer.getExchangeId().equals(oldExchange.getExchangeId()); - if (!valid && aggregateRepositoryWarned.compareAndSet(false, true)) { - LOG.warn("AggregationStrategy should return the oldExchange instance instead of the newExchange whenever possible" - + " as otherwise this can lead to unexpected behavior with some RecoverableAggregationRepository implementations"); - } - } - - // update the aggregated size - answer.setProperty(Exchange.AGGREGATED_SIZE, size); - - // maybe we should check completion after the aggregation - if (!preCompletion && !isEagerCheckCompletion()) { - complete = isCompleted(key, answer); - // make sure to track timeouts if not complete - if (complete == null) { - trackTimeout(key, newExchange); - } - } - - if (!aggregateFailed && complete == null) { - // only need to update aggregation repository if we are not complete - doAggregationRepositoryAdd(newExchange.getContext(), key, originalExchange, answer); - } else { - // if we are complete then add the answer to the list - doAggregationComplete(complete, list, key, originalExchange, answer, aggregateFailed); - } - - LOG.trace("onAggregation +++ end +++ with correlation key: {}", key); - return list; - } - - protected void doAggregationComplete(String complete, List list, String key, - Exchange originalExchange, Exchange answer, boolean aggregateFailed) { - if (COMPLETED_BY_CONSUMER.equals(complete)) { - for (String batchKey : batchConsumerCorrelationKeys) { - Exchange batchAnswer; - if (batchKey.equals(key)) { - // skip the current aggregated key as we have already aggregated it and have the answer - batchAnswer = answer; - } else { - batchAnswer = aggregationRepository.get(camelContext, batchKey); - } - - if (batchAnswer != null) { - batchAnswer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, complete); - onCompletion(batchKey, originalExchange, batchAnswer, false, aggregateFailed); - list.add(batchAnswer); - } - } - batchConsumerCorrelationKeys.clear(); - // we have already submitted to completion, so answer should be null - answer = null; - } else if (answer != null) { - // we are complete for this exchange - answer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, complete); - answer = onCompletion(key, originalExchange, answer, false, aggregateFailed); - } - - if (answer != null) { - list.add(answer); - } - } - - protected void doAggregationRepositoryAdd(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange) { - LOG.trace("In progress aggregated oldExchange: {}, newExchange: {} with correlation key: {}", oldExchange, newExchange, key); - if (optimisticLocking) { - try { - ((OptimisticLockingAggregationRepository) aggregationRepository).add(camelContext, key, oldExchange, newExchange); - - // обработка CLIENT_ACKNOWLEDGE для обработки внезапных отсановок - JmsMessage jms = newExchange.getIn(JmsMessage.class); - Session session = jms.getJmsSession(); - if (session != null && Session.CLIENT_ACKNOWLEDGE == session.getAcknowledgeMode()) { - jms.getJmsMessage().acknowledge(); - } - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - onOptimisticLockingFailure(oldExchange, newExchange); - throw e; - } catch (JMSException e) { - LOG.error("Error in CLIENT_ACKNOWLEDGE.", e); - } - } else { - aggregationRepository.add(camelContext, key, newExchange); - } - } - - protected void onOptimisticLockingFailure(Exchange oldExchange, Exchange newExchange) { - aggregationStrategy.onOptimisticLockFailure(oldExchange, newExchange); - } - - /** - * Tests whether the given exchanges is pre-complete or not - * - * @param key the correlation key - * @param oldExchange the existing exchange - * @param newExchange the incoming exchange - * @return null if not pre-completed, otherwise a String with the type that triggered the pre-completion - */ - protected String isPreCompleted(String key, Exchange oldExchange, Exchange newExchange) { - return aggregationStrategy.preComplete(oldExchange, newExchange) ? "strategy" : null; - } - - /** - * Tests whether the given exchange is complete or not - * - * @param key the correlation key - * @param exchange the incoming exchange - * @return null if not completed, otherwise a String with the type that triggered the completion - */ - protected String isCompleted(String key, Exchange exchange) { - // batch consumer completion must always run first - if (isCompletionFromBatchConsumer()) { - batchConsumerCorrelationKeys.add(key); - batchConsumerCounter.incrementAndGet(); - int size = exchange.getProperty(Exchange.BATCH_SIZE, 0, Integer.class); - if (size > 0 && batchConsumerCounter.intValue() >= size) { - // batch consumer is complete then reset the counter - batchConsumerCounter.set(0); - return COMPLETED_BY_CONSUMER; - } - } - - if (isCompleteCurrentGroup(exchange)) { - removeFlagCompleteCurrentGroup(exchange); - return COMPLETED_BY_STRATEGY; - } - - if (getCompletionPredicate() != null) { - boolean answer = getCompletionPredicate().matches(exchange); - if (answer) { - return COMPLETED_BY_PREDICATE; - } - } - - boolean sizeChecked = false; - if (getCompletionSizeExpression() != null) { - Integer value = getCompletionSizeExpression().evaluate(exchange, Integer.class); - if (value != null && value > 0) { - // mark as already checked size as expression takes precedence over static configured - sizeChecked = true; - int size = exchange.getProperty(Exchange.AGGREGATED_SIZE, 1, Integer.class); - if (size >= value) { - return COMPLETED_BY_SIZE; - } - } - } - if (!sizeChecked && getCompletionSize() > 0) { - int size = exchange.getProperty(Exchange.AGGREGATED_SIZE, 1, Integer.class); - if (size >= getCompletionSize()) { - return COMPLETED_BY_SIZE; - } - } - - // not complete - return null; - } - - protected void trackTimeout(String key, Exchange exchange) { - // timeout can be either evaluated based on an expression or from a fixed value - // expression takes precedence - boolean timeoutSet = false; - if (getCompletionTimeoutExpression() != null) { - Long value = getCompletionTimeoutExpression().evaluate(exchange, Long.class); - if (value != null && value > 0) { - if (LOG.isTraceEnabled()) { - LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}", - key, value, exchange); - } - addExchangeToTimeoutMap(key, exchange, value); - timeoutSet = true; - } - } - if (!timeoutSet && getCompletionTimeout() > 0) { - // timeout is used so use the timeout map to keep an eye on this - if (LOG.isTraceEnabled()) { - LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}", - key, getCompletionTimeout(), exchange); - } - addExchangeToTimeoutMap(key, exchange, getCompletionTimeout()); - } - } - - protected Exchange onAggregation(Exchange oldExchange, Exchange newExchange) { - return aggregationStrategy.aggregate(oldExchange, newExchange); - } - - protected Exchange onCompletion(final String key, final Exchange original, final Exchange aggregated, boolean fromTimeout, boolean aggregateFailed) { - // store the correlation key as property before we remove so the repository has that information - if (original != null) { - original.setProperty(Exchange.AGGREGATED_CORRELATION_KEY, key); - } - aggregated.setProperty(Exchange.AGGREGATED_CORRELATION_KEY, key); - - // only remove if we have previous added (as we could potentially complete with only 1 exchange) - // (if we have previous added then we have that as the original exchange) - if (original != null) { - // remove from repository as its completed, we do this first as to trigger any OptimisticLockingException's - original.getMessage().setHeader(AGGREGATION_COMPLETED_NODE_TIME, System.currentTimeMillis()); - - aggregationRepository.remove(aggregated.getContext(), key, original); - } - - if (!fromTimeout && timeoutMap != null) { - // cleanup timeout map if it was a incoming exchange which triggered the timeout (and not the timeout checker) - LOG.trace("Removing correlation key {} from timeout", key); - timeoutMap.remove(key); - } - - // this key has been closed so add it to the closed map - if (closedCorrelationKeys != null) { - closedCorrelationKeys.put(key, key); - } - - if (fromTimeout) { - // invoke timeout to allow any custom processing before discarding the exchange - long timeout = getCompletionTimeout() > 0 ? getCompletionTimeout() : -1; - aggregationStrategy.timeout(aggregated, -1, -1, timeout); - } - - Exchange answer; - if (fromTimeout && isDiscardOnCompletionTimeout()) { - // this exchange is discarded - discarded.incrementAndGet(); - // discard due timeout - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated); - // must confirm the discarded exchange - // перенесено на подтерждение, после отправки в очередь, т к при остановке карафа сообщения из бд забирались, - // а в маршрут не успевали кластся(в результате чего просиходили потери сообщений) -// aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId()); - // and remove redelivery state as well - redeliveryState.remove(aggregated.getExchangeId()); - // the completion was from timeout and we should just discard it - answer = null; - } else if (aggregateFailed && isDiscardOnAggregationFailure()) { - // this exchange is discarded - discarded.incrementAndGet(); - // discard due aggregation failed (or by force) - LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated); - // must confirm the discarded exchange - // перенесено на подтерждение, после отправки в очередь, т к при остановке карафа сообщения из бд забирались, - // а в маршрут не успевали кластся(в результате чего просиходили потери сообщений) -// aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId()); - // and remove redelivery state as well - redeliveryState.remove(aggregated.getExchangeId()); - // the completion was failed during aggregation and we should just discard it - answer = null; - } else { - // the aggregated exchange should be published (sent out) - answer = aggregated; - } - - return answer; - } - - private void onSubmitCompletion(final String key, final Exchange exchange) { - LOG.debug("Aggregation complete for correlation key {} sending aggregated exchange: {}", key, exchange); - - // add this as in progress before we submit the task - inProgressCompleteExchanges.add(exchange.getExchangeId()); - - // invoke the on completion callback - aggregationStrategy.onCompletion(exchange); - - if (getStatistics().isStatisticsEnabled()) { - totalCompleted.incrementAndGet(); - - String completedBy = exchange.getProperty(Exchange.AGGREGATED_COMPLETED_BY, String.class); - switch (completedBy) { - case COMPLETED_BY_INTERVAL: - completedByInterval.incrementAndGet(); - break; - case COMPLETED_BY_TIMEOUT: - completedByTimeout.incrementAndGet(); - break; - case COMPLETED_BY_FORCE: - completedByForce.incrementAndGet(); - break; - case COMPLETED_BY_CONSUMER: - completedByBatchConsumer.incrementAndGet(); - break; - case COMPLETED_BY_PREDICATE: - completedByPredicate.incrementAndGet(); - break; - case COMPLETED_BY_SIZE: - completedBySize.incrementAndGet(); - break; - case COMPLETED_BY_STRATEGY: - completedByStrategy.incrementAndGet(); - break; - default: - LOG.error("Invalid value of {} property: {}", Exchange.AGGREGATED_COMPLETED_BY, exchange); - break; - } - } - - LOG.debug("Processing aggregated exchange: {}", exchange); - - // add on completion task so we remember to update the inProgressCompleteExchanges - exchange.adapt(ExtendedExchange.class).addOnCompletion(new AggregateOnCompletion(exchange.getExchangeId())); - - // send this exchange - // the call to schedule is needed to ensure in-order processing of the aggregates - executorService.execute(() -> reactiveExecutor.schedule(() -> processor.process(exchange, done -> { - // log exception if there was a problem - if (exchange.getException() != null) { - // if there was an exception then let the exception handler handle it - //восстаналиваю сообщение, т к processor.process(exchange); происходит в ассинхронном режиме и в момент, - // когда маршрут уже выключен, а бин в процессе остановки, и подтверждение приходит - exchange.setException(null); - aggregationRepository.add(camelContext, key, exchange); - - getExceptionHandler().handleException("Error processing aggregated exchange", exchange, - exchange.getException()); - } else { - LOG.trace("Processing aggregated exchange: {} complete.", exchange); - } - }))); - } - - /** - * Restores the timeout map with timeout values from the aggregation repository. - *

- * This is needed in case the aggregator has been stopped and started again (for example a server restart). - * Then the existing exchanges from the {@link AggregationRepository} must have their timeout conditions restored. - */ - public void restoreTimeoutMapFromAggregationRepository() throws Exception { - // grab the timeout value for each partly aggregated exchange - Set keys = aggregationRepository.getKeys(); - if (keys == null || keys.isEmpty()) { - return; - } - - StopWatch watch = new StopWatch(); - LOG.trace("Starting restoring CompletionTimeout for {} existing exchanges from the aggregation repository...", keys.size()); - - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - // grab the timeout value - long timeout = exchange.hasProperties() ? exchange.getProperty(Exchange.AGGREGATED_TIMEOUT, 0, long.class) : 0; - if (timeout > 0) { - if (LOG.isTraceEnabled()) { - LOG.trace("Restoring CompletionTimeout for exchangeId: {} with timeout: {} millis.", exchange.getExchangeId(), timeout); - } - addExchangeToTimeoutMap(key, exchange, timeout); - } - } - - // log duration of this task so end user can see how long it takes to pre-check this upon starting - LOG.info("Restored {} CompletionTimeout conditions in the AggregationTimeoutChecker in {}", - timeoutMap.size(), TimeUtils.printDuration(watch.taken())); - } - - //TODO - // изенен порядок восстановления сообщения из таблицы completed, из-за состояния гонки. И работы с одним и тем же - // сообщением в кластере. - public void recoverCompletedMessageFromAggregationRepository(CamelContext camelContext) { - // copy the current in progress before doing scan - final Set copyOfInProgress = new LinkedHashSet<>(inProgressCompleteExchanges); - RecoverableAggregationRepository recoverable = ((RecoverableAggregationRepository) aggregationRepository); - - Set exchangeIds = recoverable.scan(camelContext); - for (String exchangeId : exchangeIds) { - - // we may shutdown while doing recovery - if (!isRunAllowed()) { - LOG.info("We are shutting down so stop recovering"); - return; - } - lock.lock(); - try { - // consider in progress if it was in progress before we did the scan, or currently after we did the scan - // its safer to consider it in progress than risk duplicates due both in progress + recovered - boolean inProgress - = copyOfInProgress.contains(exchangeId) || inProgressCompleteExchanges.contains(exchangeId); - if (inProgress) { - LOG.trace("Aggregated exchange with id: {} is already in progress.", exchangeId); - } else { - LOG.debug("Loading aggregated exchange with id: {} to be recovered.", exchangeId); - Exchange exchange = recoverable.recover(camelContext, exchangeId); - if (exchange != null) { - // get the correlation key - String key = exchange.getProperty(Exchange.AGGREGATED_CORRELATION_KEY, String.class); - // and mark it as redelivered - exchange.getIn().setHeader(Exchange.REDELIVERED, Boolean.TRUE); - - // get the current redelivery data - RedeliveryData data = redeliveryState.get(exchange.getExchangeId()); - - // if we are exhausted, then move to dead letter channel - if (data != null && recoverable.getMaximumRedeliveries() > 0 - && data.redeliveryCounter >= recoverable.getMaximumRedeliveries()) { - LOG.warn("The recovered exchange is exhausted after " + recoverable.getMaximumRedeliveries() - + " attempts, will now be moved to dead letter channel: " - + recoverable.getDeadLetterUri()); - - // send to DLC - try { - // set redelivery counter - exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); - // and prepare for sending to DLC - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - exchange.adapt(ExtendedExchange.class).setRollbackOnly(false); - deadLetterProducerTemplate.send(recoverable.getDeadLetterUri(), exchange); - } catch (Throwable e) { - exchange.setException(e); - } - - // handle if failed - if (exchange.getException() != null) { - getExceptionHandler() - .handleException("Failed to move recovered Exchange to dead letter channel: " - + recoverable.getDeadLetterUri(), - exchange.getException()); - } else { - // it was ok, so confirm after it has been moved to dead letter channel, so we wont recover it again - recoverable.confirm(camelContext, exchangeId); - } - } else { - // update current redelivery state - if (data == null) { - // create new data - data = new RedeliveryData(); - redeliveryState.put(exchange.getExchangeId(), data); - } - data.redeliveryCounter++; - - // set redelivery counter - exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); - if (recoverable.getMaximumRedeliveries() > 0) { - exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, - recoverable.getMaximumRedeliveries()); - } - - LOG.debug("Delivery attempt: {} to recover aggregated exchange with id: {}", - data.redeliveryCounter, exchangeId); - - // not exhaust so resubmit the recovered exchange - aggregationRepository.add(camelContext, key, exchange); - aggregationRepository.confirm(camelContext, key); - } - } - } - } finally { - lock.unlock(); - } - } - - LOG.trace("Recover check complete"); - } - - private boolean checkCorrectTimeout(Exchange exchange) { - long completedNodeTime = (Long) exchange.getMessage().getHeader(AGGREGATION_COMPLETED_NODE_TIME); - - return (System.currentTimeMillis() - completedNodeTime) > MAX_TIME_WORKING_WITH_COMPLETED_MESSAGE; - } - - /** - * Adds the given exchange to the timeout map, which is used by the timeout checker task to trigger timeouts. - * - * @param key the correlation key - * @param exchange the exchange - * @param timeout the timeout value in millis - */ - private void addExchangeToTimeoutMap(String key, Exchange exchange, long timeout) { - // store the timeout value on the exchange as well, in case we need it later - exchange.setProperty(Exchange.AGGREGATED_TIMEOUT, timeout); - timeoutMap.put(key, exchange.getExchangeId(), timeout); - } - - /** - * Current number of closed correlation keys in the memory cache - */ - public int getClosedCorrelationKeysCacheSize() { - if (closedCorrelationKeys != null) { - return closedCorrelationKeys.size(); - } else { - return 0; - } - } - - /** - * Clear all the closed correlation keys stored in the cache - */ - public void clearClosedCorrelationKeysCache() { - if (closedCorrelationKeys != null) { - closedCorrelationKeys.clear(); - } - } - - public AggregateProcessorStatistics getStatistics() { - return statistics; - } - - public int getInProgressCompleteExchanges() { - return inProgressCompleteExchanges.size(); - } - - public Predicate getCompletionPredicate() { - return completionPredicate; - } - - public void setCompletionPredicate(Predicate completionPredicate) { - this.completionPredicate = completionPredicate; - } - - public boolean isEagerCheckCompletion() { - return eagerCheckCompletion; - } - - public void setEagerCheckCompletion(boolean eagerCheckCompletion) { - this.eagerCheckCompletion = eagerCheckCompletion; - } - - public long getCompletionTimeout() { - return completionTimeout; - } - - public void setCompletionTimeout(long completionTimeout) { - this.completionTimeout = completionTimeout; - } - - public Expression getCompletionTimeoutExpression() { - return completionTimeoutExpression; - } - - public void setCompletionTimeoutExpression(Expression completionTimeoutExpression) { - this.completionTimeoutExpression = completionTimeoutExpression; - } - - public long getCompletionInterval() { - return completionInterval; - } - - public void setCompletionInterval(long completionInterval) { - this.completionInterval = completionInterval; - } - - public int getCompletionSize() { - return completionSize; - } - - public void setCompletionSize(int completionSize) { - this.completionSize = completionSize; - } - - public Expression getCompletionSizeExpression() { - return completionSizeExpression; - } - - public void setCompletionSizeExpression(Expression completionSizeExpression) { - this.completionSizeExpression = completionSizeExpression; - } - - public boolean isIgnoreInvalidCorrelationKeys() { - return ignoreInvalidCorrelationKeys; - } - - public void setIgnoreInvalidCorrelationKeys(boolean ignoreInvalidCorrelationKeys) { - this.ignoreInvalidCorrelationKeys = ignoreInvalidCorrelationKeys; - } - - public Integer getCloseCorrelationKeyOnCompletion() { - return closeCorrelationKeyOnCompletion; - } - - public void setCloseCorrelationKeyOnCompletion(Integer closeCorrelationKeyOnCompletion) { - this.closeCorrelationKeyOnCompletion = closeCorrelationKeyOnCompletion; - } - - public boolean isCompletionFromBatchConsumer() { - return completionFromBatchConsumer; - } - - public void setCompletionFromBatchConsumer(boolean completionFromBatchConsumer) { - this.completionFromBatchConsumer = completionFromBatchConsumer; - } - - public boolean isCompletionOnNewCorrelationGroup() { - return completionOnNewCorrelationGroup; - } - - public void setCompletionOnNewCorrelationGroup(boolean completionOnNewCorrelationGroup) { - this.completionOnNewCorrelationGroup = completionOnNewCorrelationGroup; - } - - public boolean isCompleteAllOnStop() { - return completeAllOnStop; - } - - public long getCompletionTimeoutCheckerInterval() { - return completionTimeoutCheckerInterval; - } - - public void setCompletionTimeoutCheckerInterval(long completionTimeoutCheckerInterval) { - this.completionTimeoutCheckerInterval = completionTimeoutCheckerInterval; - } - - public ExceptionHandler getExceptionHandler() { - return exceptionHandler; - } - - public void setExceptionHandler(ExceptionHandler exceptionHandler) { - this.exceptionHandler = exceptionHandler; - } - - public boolean isParallelProcessing() { - return parallelProcessing; - } - - public void setParallelProcessing(boolean parallelProcessing) { - this.parallelProcessing = parallelProcessing; - } - - public boolean isOptimisticLocking() { - return optimisticLocking; - } - - public void setOptimisticLocking(boolean optimisticLocking) { - this.optimisticLocking = optimisticLocking; - } - - public AggregationRepository getAggregationRepository() { - return aggregationRepository; - } - - public void setAggregationRepository(AggregationRepository aggregationRepository) { - this.aggregationRepository = aggregationRepository; - } - - public boolean isDiscardOnCompletionTimeout() { - return discardOnCompletionTimeout; - } - - public void setDiscardOnCompletionTimeout(boolean discardOnCompletionTimeout) { - this.discardOnCompletionTimeout = discardOnCompletionTimeout; - } - - public boolean isDiscardOnAggregationFailure() { - return discardOnAggregationFailure; - } - - public void setDiscardOnAggregationFailure(boolean discardOnAggregationFailure) { - this.discardOnAggregationFailure = discardOnAggregationFailure; - } - - public void setForceCompletionOnStop(boolean forceCompletionOnStop) { - this.forceCompletionOnStop = forceCompletionOnStop; - } - - public void setCompleteAllOnStop(boolean completeAllOnStop) { - this.completeAllOnStop = completeAllOnStop; - } - - public void setTimeoutCheckerExecutorService(ScheduledExecutorService timeoutCheckerExecutorService) { - this.timeoutCheckerExecutorService = timeoutCheckerExecutorService; - } - - public ScheduledExecutorService getTimeoutCheckerExecutorService() { - return timeoutCheckerExecutorService; - } - - public boolean isShutdownTimeoutCheckerExecutorService() { - return shutdownTimeoutCheckerExecutorService; - } - - public void setShutdownTimeoutCheckerExecutorService(boolean shutdownTimeoutCheckerExecutorService) { - this.shutdownTimeoutCheckerExecutorService = shutdownTimeoutCheckerExecutorService; - } - - public void setOptimisticLockingExecutorService(ScheduledExecutorService optimisticLockingExecutorService) { - this.optimisticLockingExecutorService = optimisticLockingExecutorService; - } - - public ScheduledExecutorService getOptimisticLockingExecutorService() { - return optimisticLockingExecutorService; - } - - public boolean isShutdownOptimisticLockingExecutorService() { - return shutdownOptimisticLockingExecutorService; - } - - public void setShutdownOptimisticLockingExecutorService(boolean shutdownOptimisticLockingExecutorService) { - this.shutdownOptimisticLockingExecutorService = shutdownOptimisticLockingExecutorService; - } - - public void setOptimisticLockRetryPolicy(OptimisticLockRetryPolicy optimisticLockRetryPolicy) { - this.optimisticLockRetryPolicy = optimisticLockRetryPolicy; - } - - public OptimisticLockRetryPolicy getOptimisticLockRetryPolicy() { - return optimisticLockRetryPolicy; - } - - public AggregationStrategy getAggregationStrategy() { - return aggregationStrategy; - } - - public void setAggregationStrategy(AggregationStrategy aggregationStrategy) { - this.aggregationStrategy = aggregationStrategy; - } - - public Expression getCorrelationExpression() { - return correlationExpression; - } - - public void setCorrelationExpression(Expression correlationExpression) { - this.correlationExpression = correlationExpression; - } - - public AggregateController getAggregateController() { - return aggregateController; - } - - public void setAggregateController(AggregateController aggregateController) { - this.aggregateController = aggregateController; - } - - /** - * On completion task which keeps the booking of the in progress up to date - */ - private final class AggregateOnCompletion implements Synchronization { - private final String exchangeId; - - private AggregateOnCompletion(String exchangeId) { - // must use the original exchange id as it could potentially change if send over SEDA etc. - this.exchangeId = exchangeId; - } - - @Override - public void onFailure(Exchange exchange) { - LOG.trace("Aggregated exchange onFailure: {}", exchange); - - // must remember to remove in progress when we failed - inProgressCompleteExchanges.remove(exchangeId); - // do not remove redelivery state as we need it when we redeliver again later - } - - @Override - public void onComplete(Exchange exchange) { - LOG.trace("Aggregated exchange onComplete: {}", exchange); - - // only confirm if we processed without a problem - try { - aggregationRepository.confirm(exchange.getContext(), exchangeId); - // and remove redelivery state as well - redeliveryState.remove(exchangeId); - } finally { - // must remember to remove in progress when we are complete - inProgressCompleteExchanges.remove(exchangeId); - } - } - - @Override - public String toString() { - return "AggregateOnCompletion"; - } - } - - /** - * Background task that looks for aggregated exchanges which is triggered by completion timeouts. - */ - private final class AggregationTimeoutMap extends DefaultTimeoutMap { - - private AggregationTimeoutMap(ScheduledExecutorService executor, long requestMapPollTimeMillis) { - // do NOT use locking on the timeout map as this aggregator has its own shared lock we will use instead - super(executor, requestMapPollTimeMillis, optimisticLocking); - addListener(this::onEviction); - } - - @Override - protected void purge() { - // wait for lock to be created - if (lock != null) { - // must acquire the shared aggregation lock to be able to purge - lock.lock(); - try { - super.purge(); - } finally { - lock.unlock(); - } - } - } - - private void onEviction(Listener.Type type, String key, String exchangeId) { - if (type != Listener.Type.Evict) { - return; - } - log.debug("Completion timeout triggered for correlation key: {}", key); - - boolean inProgress = inProgressCompleteExchanges.contains(exchangeId); - if (inProgress) { - log.trace("Aggregated exchange with id: {} is already in progress.", exchangeId); - return; - } - - // get the aggregated exchange - boolean evictionStolen = false; - Exchange answer = aggregationRepository.get(camelContext, key); - if (answer == null) { - evictionStolen = true; - } else { - // indicate it was completed by timeout - answer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_TIMEOUT); - try { - answer = onCompletion(key, answer, answer, true, false); - if (answer != null) { - onSubmitCompletion(key, answer); - aggregationRepository.confirm(answer.getContext(), key); - } - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - evictionStolen = true; - } - } - - if (optimisticLocking && evictionStolen) { - log.debug("Another Camel instance has already successfully correlated or processed this timeout eviction " - + "for exchange with id: {} and correlation id: {}", exchangeId, key); - } - } - } - - /** - * Background task that triggers completion based on interval. - */ - private final class AggregationIntervalTask implements Runnable { - - @Override - public void run() { - // only run if CamelContext has been fully started - if (!camelContext.getStatus().isStarted()) { - LOG.trace("Completion interval task cannot start due CamelContext({}) has not been started yet", camelContext.getName()); - return; - } - - LOG.trace("Starting completion interval task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger interval completion - lock.lock(); - try { - for (String key : keys) { - boolean stolenInterval = false; - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange == null) { - stolenInterval = true; - } else { - LOG.trace("Completion interval triggered for correlation key: {}", key); - // indicate it was completed by interval - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_INTERVAL); - try { - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - aggregationRepository.confirm(camelContext, key); - } - } catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) { - stolenInterval = true; - } - } - if (optimisticLocking && stolenInterval) { - LOG.debug("Another Camel instance has already processed this interval aggregation for exchange with correlation id: {}", key); - } - } - } finally { - lock.unlock(); - } - } - - LOG.trace("Completion interval task complete"); - } - } - - /** - * Background task that looks for aggregated exchanges to recover. - */ - private final class RecoverTask implements Runnable { - private final RecoverableAggregationRepository recoverable; - - private RecoverTask(RecoverableAggregationRepository recoverable) { - this.recoverable = recoverable; - } - - @Override - public void run() { - // only run if CamelContext has been fully started - if (!camelContext.getStatus().isStarted()) { - LOG.trace("Recover check cannot start due CamelContext({}) has not been started yet", camelContext.getName()); - return; - } - - LOG.trace("Starting recover check"); - -// TODO - // copy the current in progress before doing scan -// final Set copyOfInProgress = new LinkedHashSet<>(inProgressCompleteExchanges); -// -// Set exchangeIds = recoverable.scan(camelContext); -// for (String exchangeId : exchangeIds) { -// -// // we may shutdown while doing recovery -// if (!isRunAllowed()) { -// LOG.info("We are shutting down so stop recovering"); -// return; -// } -// lock.lock(); -// try { -// // consider in progress if it was in progress before we did the scan, or currently after we did the scan -// // its safer to consider it in progress than risk duplicates due both in progress + recovered -// boolean inProgress -// = copyOfInProgress.contains(exchangeId) || inProgressCompleteExchanges.contains(exchangeId); -// if (inProgress) { -// LOG.trace("Aggregated exchange with id: {} is already in progress.", exchangeId); -// } else { -// LOG.debug("Loading aggregated exchange with id: {} to be recovered.", exchangeId); -// Exchange exchange = recoverable.recover(camelContext, exchangeId); -// if (exchange != null) { -// // get the correlation key -// String key = exchange.getProperty(Exchange.AGGREGATED_CORRELATION_KEY, String.class); -// // and mark it as redelivered -// exchange.getIn().setHeader(Exchange.REDELIVERED, Boolean.TRUE); -// -// // get the current redelivery data -// RedeliveryData data = redeliveryState.get(exchange.getExchangeId()); -// -// // if we are exhausted, then move to dead letter channel -// if (data != null && recoverable.getMaximumRedeliveries() > 0 -// && data.redeliveryCounter >= recoverable.getMaximumRedeliveries()) { -// LOG.warn("The recovered exchange is exhausted after " + recoverable.getMaximumRedeliveries() -// + " attempts, will now be moved to dead letter channel: " -// + recoverable.getDeadLetterUri()); -// -// // send to DLC -// try { -// // set redelivery counter -// exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); -// // and prepare for sending to DLC -// exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); -// exchange.adapt(ExtendedExchange.class).setRollbackOnly(false); -// deadLetterProducerTemplate.send(recoverable.getDeadLetterUri(), exchange); -// } catch (Throwable e) { -// exchange.setException(e); -// } -// -// // handle if failed -// if (exchange.getException() != null) { -// getExceptionHandler() -// .handleException("Failed to move recovered Exchange to dead letter channel: " -// + recoverable.getDeadLetterUri(), -// exchange.getException()); -// } else { -// // it was ok, so confirm after it has been moved to dead letter channel, so we wont recover it again -// recoverable.confirm(camelContext, exchangeId); -// } -// } else { -// // update current redelivery state -// if (data == null) { -// // create new data -// data = new RedeliveryData(); -// redeliveryState.put(exchange.getExchangeId(), data); -// } -// data.redeliveryCounter++; -// -// // set redelivery counter -// exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter); -// if (recoverable.getMaximumRedeliveries() > 0) { -// exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, -// recoverable.getMaximumRedeliveries()); -// } -// -// LOG.debug("Delivery attempt: {} to recover aggregated exchange with id: {}", -// data.redeliveryCounter, exchangeId); -// -// // not exhaust so resubmit the recovered exchange -// onSubmitCompletion(key, exchange); -// } -// } -// } -// } finally { -// lock.unlock(); -// } -// } - -// LOG.trace("Recover check complete"); - recoverCompletedMessageFromAggregationRepository(camelContext); - } - } - - @Override - @SuppressWarnings("unchecked") - protected void doStart() throws Exception { - if (aggregationStrategy instanceof CamelContextAware) { - ((CamelContextAware) aggregationStrategy).setCamelContext(camelContext); - } - if (aggregationStrategy.canPreComplete()) { - preCompletion = true; - LOG.info("PreCompletionAwareAggregationStrategy detected. Aggregator {} is in pre-completion mode.", getId()); - } - - if (!preCompletion) { - // if not in pre completion mode then check we configured the completion required - if (getCompletionTimeout() <= 0 && getCompletionInterval() <= 0 && getCompletionSize() <= 0 - && getCompletionPredicate() == null - && !isCompletionFromBatchConsumer() && getCompletionTimeoutExpression() == null - && getCompletionSizeExpression() == null) { - throw new IllegalStateException("At least one of the completions options" - + " [completionTimeout, completionInterval, completionSize, completionPredicate, completionFromBatchConsumer] must be set"); - } - } - - if (getCloseCorrelationKeyOnCompletion() != null) { - if (getCloseCorrelationKeyOnCompletion() > 0) { - LOG.info("Using ClosedCorrelationKeys with a LRUCache with a capacity of {}", getCloseCorrelationKeyOnCompletion()); - closedCorrelationKeys = LRUCacheFactory.newLRUCache(getCloseCorrelationKeyOnCompletion()); - } else { - LOG.info("Using ClosedCorrelationKeys with unbounded capacity"); - closedCorrelationKeys = new ConcurrentHashMap<>(); - } - } - - if (aggregationRepository == null) { - aggregationRepository = new MemoryAggregationRepository(optimisticLocking); - LOG.info("Defaulting to MemoryAggregationRepository"); - } - - if (optimisticLocking) { - if (!(aggregationRepository instanceof OptimisticLockingAggregationRepository)) { - throw new IllegalArgumentException("Optimistic locking cannot be enabled without using an AggregationRepository that implements OptimisticLockingAggregationRepository"); - } - LOG.info("Optimistic locking is enabled"); - } - - ServiceHelper.startService(aggregationStrategy, processor, aggregationRepository); - - // should we use recover checker - if (aggregationRepository instanceof RecoverableAggregationRepository) { - RecoverableAggregationRepository recoverable = (RecoverableAggregationRepository) aggregationRepository; - if (recoverable.isUseRecovery()) { - long interval = recoverable.getRecoveryIntervalInMillis(); - if (interval <= 0) { - throw new IllegalArgumentException("AggregationRepository has recovery enabled and the RecoveryInterval option must be a positive number, was: " + interval); - } - - // create a background recover thread to check every interval - recoverService - = camelContext.getExecutorServiceManager().newScheduledThreadPool(this, "AggregateRecoverChecker", 1); - Runnable recoverTask = new RecoverTask(recoverable); - LOG.info("Using RecoverableAggregationRepository by scheduling recover checker to run every {} millis.", interval); - // use fixed delay so there is X interval between each run - recoverService.scheduleWithFixedDelay(recoverTask, 1000L, interval, TimeUnit.MILLISECONDS); - - if (recoverable.getDeadLetterUri() != null) { - int max = recoverable.getMaximumRedeliveries(); - if (max <= 0) { - throw new IllegalArgumentException("Option maximumRedeliveries must be a positive number, was: " + max); - } - LOG.info("After {} failed redelivery attempts Exchanges will be moved to deadLetterUri: {}", max, recoverable.getDeadLetterUri()); - - // dead letter uri must be a valid endpoint - Endpoint endpoint = camelContext.getEndpoint(recoverable.getDeadLetterUri()); - if (endpoint == null) { - throw new NoSuchEndpointException(recoverable.getDeadLetterUri()); - } - deadLetterProducerTemplate = camelContext.createProducerTemplate(); - } - } - } - - if (getCompletionInterval() > 0 && getCompletionTimeout() > 0) { - throw new IllegalArgumentException("Only one of completionInterval or completionTimeout can be used, not both."); - } - if (getCompletionInterval() > 0) { - LOG.info("Using CompletionInterval to run every {} millis.", getCompletionInterval()); - if (getTimeoutCheckerExecutorService() == null) { - setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER)); - shutdownTimeoutCheckerExecutorService = true; - } - // trigger completion based on interval - getTimeoutCheckerExecutorService().scheduleAtFixedRate(new AggregationIntervalTask(), getCompletionInterval(), getCompletionInterval(), TimeUnit.MILLISECONDS); - } - - // start timeout service if its in use - if (getCompletionTimeout() > 0 || getCompletionTimeoutExpression() != null) { - LOG.info("Using CompletionTimeout to trigger after {} millis of inactivity.", getCompletionTimeout()); - if (getTimeoutCheckerExecutorService() == null) { - setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER)); - shutdownTimeoutCheckerExecutorService = true; - } - // check for timed out aggregated messages once every second - timeoutMap = new AggregationTimeoutMap(getTimeoutCheckerExecutorService(), getCompletionTimeoutCheckerInterval()); - // fill in existing timeout values from the aggregation repository, for example if a restart occurred, then we - // need to re-establish the timeout map so timeout can trigger - //TODO - recoverCompletedMessageFromAggregationRepository(camelContext); - restoreTimeoutMapFromAggregationRepository(); - ServiceHelper.startService(timeoutMap); - } - - if (aggregateController == null) { - aggregateController = new DefaultAggregateController(); - } - aggregateController.onStart(this); - - if (optimisticLocking) { - lock = NoLock.INSTANCE; - if (getOptimisticLockingExecutorService() == null) { - setOptimisticLockingExecutorService(camelContext.getExecutorServiceManager().newScheduledThreadPool(this, AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR, 1)); - shutdownOptimisticLockingExecutorService = true; - } - } else { - lock = new ReentrantLock(); - } - } - - @Override - protected void doStop() throws Exception { - // note: we cannot do doForceCompletionOnStop from this doStop method - // as this is handled in the prepareShutdown method which is also invoked when stopping a route - // and is better suited for preparing to shutdown than this doStop method is - - if (aggregateController != null) { - aggregateController.onStop(this); - } - - if (recoverService != null) { - camelContext.getExecutorServiceManager().shutdown(recoverService); - } - - if (shutdownTimeoutCheckerExecutorService && timeoutCheckerExecutorService != null) { - camelContext.getExecutorServiceManager().shutdown(timeoutCheckerExecutorService); - timeoutCheckerExecutorService = null; - shutdownTimeoutCheckerExecutorService = false; - } - - ServiceHelper.stopService(timeoutMap, processor, deadLetterProducerTemplate); - - if (closedCorrelationKeys != null) { - // it may be a service so stop it as well - ServiceHelper.stopService(closedCorrelationKeys); - closedCorrelationKeys.clear(); - } - batchConsumerCorrelationKeys.clear(); - redeliveryState.clear(); - } - - @Override - public void prepareShutdown(boolean suspendOnly, boolean forced) { - // we are shutting down, so force completion if this option was enabled - // but only do this when forced=false, as that is when we have chance to - // send out new messages to be routed by Camel. When forced=true, then - // we have to shutdown in a hurry - if (!forced && forceCompletionOnStop) { - doForceCompletionOnStop(); - } - } - - @Override - public boolean deferShutdown(ShutdownRunningTask shutdownRunningTask) { - // not in use - return true; - } - - @Override - public int getPendingExchangesSize() { - if (completeAllOnStop) { - // we want to regard all pending exchanges in the repo as inflight - Set keys = getAggregationRepository().getKeys(); - return keys != null ? keys.size() : 0; - } else { - return 0; - } - } - - private void doForceCompletionOnStop() { - int expected = forceCompletionOfAllGroups(); - - StopWatch watch = new StopWatch(); - while (inProgressCompleteExchanges.size() > 0) { - LOG.trace("Waiting for {} inflight exchanges to complete", getInProgressCompleteExchanges()); - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // break out as we got interrupted such as the JVM terminating - LOG.warn("Interrupted while waiting for {} inflight exchanges to complete.", getInProgressCompleteExchanges()); - break; - } - } - - if (expected > 0) { - LOG.info("Forcing completion of all groups with {} exchanges completed in {}", expected, TimeUtils.printDuration(watch.taken())); - } - } - - @Override - protected void doShutdown() throws Exception { - // shutdown aggregation the strategy - ServiceHelper.stopAndShutdownServices(aggregationStrategy); - - // cleanup when shutting down - inProgressCompleteExchanges.clear(); - - if (shutdownExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(executorService); - } - if (shutdownTimeoutCheckerExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(timeoutCheckerExecutorService); - timeoutCheckerExecutorService = null; - } - if (shutdownOptimisticLockingExecutorService) { - camelContext.getExecutorServiceManager().shutdownNow(optimisticLockingExecutorService); - optimisticLockingExecutorService = null; - } - - super.doShutdown(); - - // shutdown aggregation repository - ServiceHelper.stopAndShutdownServices(aggregationRepository); - } - - public int forceCompletionOfGroup(String key) { - // must acquire the shared aggregation lock to be able to trigger force completion - int total = 0; - - lock.lock(); - try { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - total = 1; - LOG.trace("Force completion triggered for correlation key: {}", key); - // indicate it was completed by a force completion request - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE); - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - aggregationRepository.confirm(camelContext, key); - } - } - } finally { - lock.unlock(); - } - LOG.trace("Completed force completion of group {}", key); - - if (total > 0) { - LOG.debug("Forcing completion of group {} with {} exchanges", key, total); - } - return total; - } - - public int forceCompletionOfAllGroups() { - - // only run if CamelContext has been fully started or is stopping - boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping(); - if (!allow) { - LOG.warn("Cannot start force completion of all groups because CamelContext({}) has not been started", camelContext.getName()); - return 0; - } - - LOG.trace("Starting force completion of all groups task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - int total = 0; - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger force completion - lock.lock(); - total = keys.size(); - try { - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - LOG.trace("Force completion triggered for correlation key: {}", key); - // indicate it was completed by a force completion request - exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE); - Exchange answer = onCompletion(key, exchange, exchange, false, false); - if (answer != null) { - onSubmitCompletion(key, answer); - aggregationRepository.confirm(camelContext, key); - } - } - } - } finally { - lock.unlock(); - } - } - LOG.trace("Completed force completion of all groups task"); - - if (total > 0) { - LOG.debug("Forcing completion of all groups with {} exchanges", total); - } - return total; - } - - public int forceDiscardingOfGroup(String key) { - // must acquire the shared aggregation lock to be able to trigger force completion - int total = 0; - - lock.lock(); - try { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - total = 1; - LOG.trace("Force discarded triggered for correlation key: {}", key); - // force discarding by setting aggregate failed as true - onCompletion(key, exchange, exchange, false, true); - } - } finally { - lock.unlock(); - } - LOG.trace("Completed force discarded of group {}", key); - - if (total > 0) { - LOG.debug("Forcing discarding of group {} with {} exchanges", key, total); - } - return total; - } - - public int forceDiscardingOfAllGroups() { - - // only run if CamelContext has been fully started or is stopping - boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping(); - if (!allow) { - LOG.warn("Cannot start force discarding of all groups because CamelContext({}) has not been started", camelContext.getName()); - return 0; - } - - LOG.trace("Starting force discarding of all groups task"); - - // trigger completion for all in the repository - Set keys = aggregationRepository.getKeys(); - - int total = 0; - if (keys != null && !keys.isEmpty()) { - // must acquire the shared aggregation lock to be able to trigger force completion - lock.lock(); - total = keys.size(); - try { - for (String key : keys) { - Exchange exchange = aggregationRepository.get(camelContext, key); - if (exchange != null) { - LOG.trace("Force discarded triggered for correlation key: {}", key); - // force discarding by setting aggregate failed as true - onCompletion(key, exchange, exchange, false, true); - } - } - } finally { - lock.unlock(); - } - } - LOG.trace("Completed force discarding of all groups task"); - - if (total > 0) { - LOG.debug("Forcing discarding of all groups with {} exchanges", total); - } - return total; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java deleted file mode 100644 index ca7b8d5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java +++ /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. - */ -package org.apache.camel.processor.aggregate; - -import org.apache.camel.Exchange; -import org.apache.camel.Message; - -import java.util.List; - -/** - * Aggregate body of input {@link Message} into a single combined Exchange holding all the - * aggregated bodies in a {@link List} of type {@link Object} as the message body. - * - * This aggregation strategy can used in combination with {@link org.apache.camel.processor.Splitter} to batch messages - */ -public class GroupedBodyAggregationStrategy extends AbstractListAggregationStrategy { - - @Override - public Object getValue(Exchange exchange) { - return exchange.getIn().getBody(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java deleted file mode 100644 index 9ee734f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.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.processor.aggregate; - -import org.apache.camel.Exchange; -import org.apache.camel.support.DefaultExchange; - -import java.util.List; - -/** - * Aggregate all exchanges into a single combined Exchange holding all the aggregated exchanges - * in a {@link List} of {@link Exchange} as the message body. - *

- * Important: This strategy is not to be used with the Content Enricher EIP - * which is enrich or pollEnrich. - */ -public class GroupedExchangeAggregationStrategy extends AbstractListAggregationStrategy { - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (oldExchange == null) { - // for the first time we must create a new empty exchange as the holder, as the outgoing exchange - // must not be one of the grouped exchanges, as that causes a endless circular reference - oldExchange = new DefaultExchange(newExchange); - } - return super.aggregate(oldExchange, newExchange); - } - - @Override - public Exchange getValue(Exchange exchange) { - return exchange; - } - -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java deleted file mode 100644 index 4add611..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.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.processor.aggregate; - -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.support.DefaultExchange; - -import java.util.List; - -/** - * Aggregate all {@link Message} into a single combined Exchange holding all the - * aggregated messages in a {@link List} of {@link Message} as the message body. - * - * This aggregation strategy can used in combination with {@link org.apache.camel.processor.Splitter} to batch messages - */ -public class GroupedMessageAggregationStrategy extends AbstractListAggregationStrategy { - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (oldExchange == null) { - // for the first time we must create a new empty exchange as the - // holder, as the outgoing exchange - // must not be one of the grouped exchanges, as that causes a - // endless circular reference - oldExchange = new DefaultExchange(newExchange); - } - return super.aggregate(oldExchange, newExchange); - } - - @Override - public Message getValue(Exchange exchange) { - return exchange.getIn(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java deleted file mode 100644 index 1589ce0..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java +++ /dev/null @@ -1,107 +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.processor.aggregate; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.spi.OptimisticLockingAggregationRepository; -import org.apache.camel.support.service.ServiceSupport; - -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -/** - * A memory based {@link org.apache.camel.spi.AggregationRepository} which stores {@link Exchange}s in memory only. - * - * Supports both optimistic locking and non-optimistic locking modes. Defaults to non-optimistic locking mode. - */ -public class MemoryAggregationRepository extends ServiceSupport implements OptimisticLockingAggregationRepository { - private final ConcurrentMap cache = new ConcurrentHashMap<>(); - private final boolean optimisticLocking; - - public MemoryAggregationRepository() { - this(false); - } - - public MemoryAggregationRepository(boolean optimisticLocking) { - this.optimisticLocking = optimisticLocking; - } - - @Override - public Exchange add(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange) { - if (!optimisticLocking) { - throw new UnsupportedOperationException(); - } - if (oldExchange == null) { - if (cache.putIfAbsent(key, newExchange) != null) { - throw new OptimisticLockingException(); - } - } else { - if (!cache.replace(key, oldExchange, newExchange)) { - throw new OptimisticLockingException(); - } - } - return oldExchange; - } - - @Override - public Exchange add(CamelContext camelContext, String key, Exchange exchange) { - if (optimisticLocking) { - throw new UnsupportedOperationException(); - } - return cache.put(key, exchange); - } - - @Override - public Exchange get(CamelContext camelContext, String key) { - return cache.get(key); - } - - @Override - public void remove(CamelContext camelContext, String key, Exchange exchange) { - if (optimisticLocking) { - if (!cache.remove(key, exchange)) { - throw new OptimisticLockingException(); - } - } else { - cache.remove(key); - } - } - - @Override - public void confirm(CamelContext camelContext, String exchangeId) { - // noop - } - - @Override - public Set getKeys() { - // do not allow edits to the set - return Collections.unmodifiableSet(cache.keySet()); - } - - @Override - protected void doStart() throws Exception { - } - - @Override - protected void doStop() throws Exception { - cache.clear(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java deleted file mode 100644 index 8fabf74..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java +++ /dev/null @@ -1,153 +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.processor.aggregate; - -import java.util.concurrent.ThreadLocalRandom; - -/** - * Class to control how failed optimistic locks are tried. This policy supports random and exponential back-off delays. - *

- * If {@code randomBackOff} is enabled and a value is supplied for {@code retryDelay} the value will be ignored. - *

- * If {@code randomBackOff} is enabled and no value is set for {@code maximumRetryDelay}, a default value of 1000ms will - * be used, the random delay will be between 0 and 1000 milliseconds. - *

- * If both {@code randomBackOff} and {@code exponentialBackOff} are enabled, {@code exponentialBackOff} will take precedence. - *

- * If {@code exponentialBackOff} is enabled and a value is set for {@code maximumRetryDelay}, the retry delay will keep - * doubling in value until it reaches or exceeds {@code maximumRetryDelay}. After it has reached or exceeded {@code maximumRetryDelay} - * the value of {@code maximumRetryDelay} will be used as the retry delay. - *

- * If both {@code exponentialBackOff} and {@code randomBackOff} are disabled, the value of {@code retryDelay} will be used - * as the retry delay and remain constant through all the retry attempts. - *

- * If the value of {@code maximumRetries} is set above zero, retry attempts will stop at the value specified. - *

- * The default behaviour of this policy is to retry forever and exponentially increase the back-off delay starting with 50ms. - */ -public class OptimisticLockRetryPolicy { - private static final long DEFAULT_MAXIMUM_RETRY_DELAY = 1000L; - - private int maximumRetries; - private long retryDelay = 50L; - private long maximumRetryDelay; - private boolean exponentialBackOff = true; - private boolean randomBackOff; - - public OptimisticLockRetryPolicy() { - } - - public boolean shouldRetry(final int retryCounter) { - return maximumRetries <= 0 || retryCounter < maximumRetries; - } - - public void doDelay(final int retryCounter) throws InterruptedException { - long sleepFor = getDelay(retryCounter); - if (sleepFor > 0) { - Thread.sleep(sleepFor); - } - } - - public long getDelay(final int retryCounter) { - long sleepFor = 0; - if (retryDelay > 0 || randomBackOff) { - sleepFor = exponentialBackOff ? (retryDelay << retryCounter) - : (randomBackOff ? ThreadLocalRandom.current().nextInt((int)(maximumRetryDelay > 0 ? maximumRetryDelay : DEFAULT_MAXIMUM_RETRY_DELAY)) : retryDelay); - if (maximumRetryDelay > 0 && sleepFor > maximumRetryDelay) { - sleepFor = maximumRetryDelay; - } - } - return sleepFor; - } - - public int getMaximumRetries() { - return maximumRetries; - } - - public void setMaximumRetries(int maximumRetries) { - this.maximumRetries = maximumRetries; - } - - public OptimisticLockRetryPolicy maximumRetries(int maximumRetries) { - setMaximumRetries(maximumRetries); - return this; - } - - public long getRetryDelay() { - return retryDelay; - } - - public void setRetryDelay(long retryDelay) { - this.retryDelay = retryDelay; - } - - public OptimisticLockRetryPolicy retryDelay(long retryDelay) { - setRetryDelay(retryDelay); - return this; - } - - public long getMaximumRetryDelay() { - return maximumRetryDelay; - } - - public void setMaximumRetryDelay(long maximumRetryDelay) { - this.maximumRetryDelay = maximumRetryDelay; - } - - public OptimisticLockRetryPolicy maximumRetryDelay(long maximumRetryDelay) { - setMaximumRetryDelay(maximumRetryDelay); - return this; - } - - public boolean isExponentialBackOff() { - return exponentialBackOff; - } - - public void setExponentialBackOff(boolean exponentialBackOff) { - this.exponentialBackOff = exponentialBackOff; - } - - public OptimisticLockRetryPolicy exponentialBackOff() { - setExponentialBackOff(true); - return this; - } - - public boolean isRandomBackOff() { - return randomBackOff; - } - - public void setRandomBackOff(boolean randomBackOff) { - this.randomBackOff = randomBackOff; - } - - public OptimisticLockRetryPolicy randomBackOff() { - setRandomBackOff(true); - return this; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("OptimisticLockRetryPolicy["); - sb.append("maximumRetries=").append(maximumRetries); - sb.append(", retryDelay=").append(retryDelay); - sb.append(", maximumRetryDelay=").append(maximumRetryDelay); - sb.append(", exponentialBackOff=").append(exponentialBackOff); - sb.append(", randomBackOff=").append(randomBackOff); - sb.append(']'); - return sb.toString(); - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java deleted file mode 100644 index 73a7b3a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java +++ /dev/null @@ -1,141 +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.processor.aggregate; - -import org.apache.camel.*; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; - -/** - * An {@link AggregationStrategy} which are used when the option shareUnitOfWork is enabled - * on EIPs such as multicast, splitter or recipientList. - *

- * This strategy wraps the actual in use strategy to provide the logic needed for making shareUnitOfWork work. - *

- * This strategy is not intended for end users to use. - */ -public final class ShareUnitOfWorkAggregationStrategy extends ServiceSupport implements AggregationStrategy, CamelContextAware { - - private final AggregationStrategy strategy; - private CamelContext camelContext; - - public ShareUnitOfWorkAggregationStrategy(AggregationStrategy strategy) { - this.strategy = strategy; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - if (strategy instanceof CamelContextAware) { - ((CamelContextAware) strategy).setCamelContext(camelContext); - } - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - public AggregationStrategy getDelegate() { - return strategy; - } - - @Override - public boolean canPreComplete() { - return strategy.canPreComplete(); - } - - @Override - public boolean preComplete(Exchange oldExchange, Exchange newExchange) { - return strategy.preComplete(oldExchange, newExchange); - } - - @Override - public void onCompletion(Exchange exchange) { - strategy.onCompletion(exchange); - } - - @Override - public void timeout(Exchange exchange, int index, int total, long timeout) { - strategy.timeout(exchange, index, total, timeout); - } - - @Override - public void onOptimisticLockFailure(Exchange oldExchange, Exchange newExchange) { - strategy.onOptimisticLockFailure(oldExchange, newExchange); - } - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - // aggregate using the actual strategy first - Exchange answer = strategy.aggregate(oldExchange, newExchange); - // ensure any errors is propagated from the new exchange to the answer - propagateFailure(answer, newExchange); - - return answer; - } - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange, Exchange inputExchange) { - // aggregate using the actual strategy first - Exchange answer = strategy.aggregate(oldExchange, newExchange, inputExchange); - // ensure any errors is propagated from the new exchange to the answer - propagateFailure(answer, newExchange); - - return answer; - } - - protected void propagateFailure(Exchange answer, Exchange newExchange) { - ExtendedExchange nee = (ExtendedExchange) newExchange; - // if new exchange failed then propagate all the error related properties to the answer - if (nee.isFailed() || nee.isRollbackOnly() || nee.isRollbackOnlyLast() || nee.isErrorHandlerHandled()) { - if (newExchange.getException() != null) { - answer.setException(newExchange.getException()); - } - if (newExchange.getProperty(Exchange.EXCEPTION_CAUGHT) != null) { - answer.setProperty(Exchange.EXCEPTION_CAUGHT, newExchange.getProperty(Exchange.EXCEPTION_CAUGHT)); - } - if (newExchange.getProperty(Exchange.FAILURE_ENDPOINT) != null) { - answer.setProperty(Exchange.FAILURE_ENDPOINT, newExchange.getProperty(Exchange.FAILURE_ENDPOINT)); - } - if (newExchange.getProperty(Exchange.FAILURE_ROUTE_ID) != null) { - answer.setProperty(Exchange.FAILURE_ROUTE_ID, newExchange.getProperty(Exchange.FAILURE_ROUTE_ID)); - } - if (newExchange.adapt(ExtendedExchange.class).getErrorHandlerHandled() != null) { - answer.adapt(ExtendedExchange.class).setErrorHandlerHandled(newExchange.adapt(ExtendedExchange.class).getErrorHandlerHandled()); - } - if (newExchange.getProperty(Exchange.FAILURE_HANDLED) != null) { - answer.setProperty(Exchange.FAILURE_HANDLED, newExchange.getProperty(Exchange.FAILURE_HANDLED)); - } - } - } - - @Override - public String toString() { - return "ShareUnitOfWorkAggregationStrategy"; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(strategy); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopAndShutdownServices(strategy); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.java deleted file mode 100644 index e98474f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.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.processor.aggregate; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.support.builder.ExpressionBuilder; - -/** - * Aggregate result of pick expression into a single combined Exchange holding all the - * aggregated bodies in a {@link String} as the message body. - * - * This aggregation strategy can used in combination with {@link org.apache.camel.processor.Splitter} to batch messages - * @since 3.0.0 - */ -public class StringAggregationStrategy implements AggregationStrategy { - - private String delimiter = ""; - private Expression pickExpression = ExpressionBuilder.bodyExpression(); - - /** - * Set delimiter used for joining aggregated String - * @param delimiter The delimiter to join with. Default empty String - * @return - */ - public StringAggregationStrategy delimiter(String delimiter) { - this.delimiter = delimiter; - return this; - } - - /** - * Set an expression to extract the element to be aggregated from the incoming {@link Exchange}. - *

- * By default, it picks the full IN message body of the incoming exchange. - * @param expression The picking expression. - * @return This instance. - */ - public StringAggregationStrategy pick(Expression expression) { - this.pickExpression = expression; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - StringBuffer result; // Aggregate in StringBuffer instead of StringBuilder, to make it thread safe - StringBuilder value = new StringBuilder(); - if (oldExchange == null) { - result = getStringBuffer(newExchange); // do not prepend delimiter for first invocation - } else { - result = getStringBuffer(oldExchange); - value.append(delimiter); - } - - if (newExchange != null) { - String pick = pickExpression.evaluate(newExchange, String.class); - if (pick != null) { - value.append(pick); - result.append(value); - } - } - - return oldExchange != null ? oldExchange : newExchange; - } - - @Override - public void onCompletion(Exchange exchange) { - if (exchange != null) { - StringBuffer stringBuffer = (StringBuffer) exchange.removeProperty(Exchange.GROUPED_EXCHANGE); - if (stringBuffer != null) { - exchange.getIn().setBody(stringBuffer.toString()); - } - } - } - - private static StringBuffer getStringBuffer(Exchange exchange) { - StringBuffer stringBuffer = exchange.getProperty(Exchange.GROUPED_EXCHANGE, StringBuffer.class); - if (stringBuffer == null) { - stringBuffer = new StringBuffer(); - exchange.setProperty(Exchange.GROUPED_EXCHANGE, stringBuffer); - } - return stringBuffer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java deleted file mode 100644 index 35fe5e8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java +++ /dev/null @@ -1,86 +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.processor.aggregate; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.Exchange; -import org.apache.camel.ExtendedExchange; - -/** - * An {@link AggregationStrategy} which just uses the latest exchange which is useful - * for status messages where old status messages have no real value. Another example is things - * like market data prices, where old stock prices are not that relevant, only the current price is. - */ -public class UseLatestAggregationStrategy implements AggregationStrategy { - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (newExchange == null) { - return oldExchange; - } - if (oldExchange == null) { - return newExchange; - } - - Exchange answer = null; - - // propagate exception first - propagateException(oldExchange, newExchange); - if (newExchange.getException() != null) { - answer = newExchange; - } - - if (answer == null) { - // the propagate failures - answer = propagateFailure(oldExchange, newExchange); - } - - return answer; - } - - protected void propagateException(Exchange oldExchange, Exchange newExchange) { - if (oldExchange == null) { - return; - } - - // propagate exception from old exchange if there isn't already an exception - if (newExchange.getException() == null) { - newExchange.setException(oldExchange.getException()); - newExchange.setProperty(Exchange.FAILURE_ENDPOINT, oldExchange.getProperty(Exchange.FAILURE_ENDPOINT)); - } - } - - protected Exchange propagateFailure(Exchange oldExchange, Exchange newExchange) { - if (oldExchange == null) { - return newExchange; - } - - // propagate exception from old exchange if there isn't already an exception - ExtendedExchange oee = (ExtendedExchange) oldExchange; - if (oee.isFailed() || oee.isRollbackOnly() || oee.isRollbackOnlyLast() || oee.isErrorHandlerHandled()) { - // propagate failure by using old exchange as the answer - return oldExchange; - } - - return newExchange; - } - - @Override - public String toString() { - return "UseLatestAggregationStrategy"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java deleted file mode 100644 index ca65f5d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java +++ /dev/null @@ -1,87 +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.processor.aggregate; - -import org.apache.camel.AggregationStrategy; -import org.apache.camel.Exchange; - -/** - * An {@link AggregationStrategy} which just uses the original exchange - * which can be needed when you want to preserve the original Exchange. For example when splitting an {@link Exchange} - * and then you may want to keep routing using the original {@link Exchange}. - * - * @see org.apache.camel.processor.Splitter - */ -public class UseOriginalAggregationStrategy implements AggregationStrategy { - - private final Exchange original; - private final boolean propagateException; - - public UseOriginalAggregationStrategy() { - this(null, true); - } - - public UseOriginalAggregationStrategy(boolean propagateException) { - this(null, propagateException); - } - - public UseOriginalAggregationStrategy(Exchange original, boolean propagateException) { - this.original = original; - this.propagateException = propagateException; - } - - /** - * Creates a new instance as a clone of this strategy with the new given original. - */ - public UseOriginalAggregationStrategy newInstance(Exchange original) { - return new UseOriginalAggregationStrategy(original, propagateException); - } - - @Override - public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { - if (propagateException) { - Exception exception = checkException(oldExchange, newExchange); - if (exception != null) { - if (original != null) { - original.setException(exception); - } else { - oldExchange.setException(exception); - } - } - } - return original != null ? original : oldExchange; - } - - protected Exception checkException(Exchange oldExchange, Exchange newExchange) { - if (oldExchange == null) { - return newExchange.getException(); - } else { - return (newExchange != null && newExchange.getException() != null) - ? newExchange.getException() - : oldExchange.getException(); - } - } - - public Exchange getOriginal() { - return original; - } - - @Override - public String toString() { - return "UseOriginalAggregationStrategy"; - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/package.html deleted file mode 100644 index 86b3c32..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Helper classes for the Aggregator pattern. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java deleted file mode 100644 index 77f7b80..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java +++ /dev/null @@ -1,329 +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.processor.channel; - -import org.apache.camel.*; -import org.apache.camel.processor.CamelInternalProcessor; -import org.apache.camel.processor.WrapProcessor; -import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; -import org.apache.camel.processor.interceptor.BacklogDebugger; -import org.apache.camel.processor.interceptor.BacklogTracer; -import org.apache.camel.spi.*; -import org.apache.camel.support.OrderedComparator; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * DefaultChannel is the default {@link Channel}. - *

- * The current implementation is just a composite containing the interceptors and error handler - * that beforehand was added to the route graph directly. - *
- * With this {@link Channel} we can in the future implement better strategies for routing the - * {@link Exchange} in the route graph, as we have a {@link Channel} between each and every node - * in the graph. - */ -public class DefaultChannel extends CamelInternalProcessor implements Channel { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultChannel.class); - - private Processor errorHandler; - // the next processor (non wrapped) - private Processor nextProcessor; - // the real output to invoke that has been wrapped - private Processor output; - private NamedNode definition; - private ManagementInterceptStrategy.InstrumentationProcessor instrumentationProcessor; - private CamelContext camelContext; - private Route route; - - public DefaultChannel(CamelContext camelContext) { - super(camelContext); - } - - @Override - public Processor getOutput() { - // the errorHandler is already decorated with interceptors - // so it contain the entire chain of processors, so we can safely use it directly as output - // if no error handler provided we use the output - // the error handlers, interceptors, etc. woven in at design time - return errorHandler != null ? errorHandler : output; - } - - @Override - public boolean hasNext() { - return nextProcessor != null; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(nextProcessor); - return answer; - } - - public void setOutput(Processor output) { - this.output = output; - } - - @Override - public Processor getNextProcessor() { - return nextProcessor; - } - - /** - * Sets the {@link org.apache.camel.processor.ErrorHandler} this Channel uses. - * - * @param errorHandler the error handler - */ - public void setErrorHandler(Processor errorHandler) { - this.errorHandler = errorHandler; - } - - @Override - public Processor getErrorHandler() { - return errorHandler; - } - - @Override - public NamedNode getProcessorDefinition() { - return definition; - } - - public void clearModelReferences() { - this.definition = null; - } - - @Override - public Route getRoute() { - return route; - } - - @Override - protected void doStart() throws Exception { - // do not call super as we want to be in control here of the lifecycle - - // the output has now been created, so assign the output as the processor - setProcessor(getOutput()); - ServiceHelper.startService(errorHandler, output); - } - - @Override - protected void doStop() throws Exception { - // do not call super as we want to be in control here of the lifecycle - - // only stop services if not context scoped (as context scoped is reused by others) - ServiceHelper.stopService(output, errorHandler); - } - - @Override - protected void doShutdown() throws Exception { - // do not call super as we want to be in control here of the lifecycle - - ServiceHelper.stopAndShutdownServices(output, errorHandler); - } - - /** - * Initializes the channel. - * If the initialized output definition contained outputs (children) then - * the childDefinition will be set so we can leverage fine grained tracing - * - * @param route the route context - * @param definition the route definition the {@link Channel} represents - * @param childDefinition the child definition - * @throws Exception is thrown if some error occurred - */ - public void initChannel(Route route, - NamedNode definition, - NamedNode childDefinition, - List interceptors, - Processor nextProcessor, - NamedRoute routeDefinition, - boolean first) throws Exception { - this.route = route; - this.definition = definition; - this.camelContext = route.getCamelContext(); - this.nextProcessor = nextProcessor; - - // init CamelContextAware as early as possible on nextProcessor - if (nextProcessor instanceof CamelContextAware) { - ((CamelContextAware) nextProcessor).setCamelContext(camelContext); - } - - // the definition to wrap should be the fine grained, - // so if a child is set then use it, if not then its the original output used - NamedNode targetOutputDef = childDefinition != null ? childDefinition : definition; - LOG.trace("Initialize channel for target: {}", targetOutputDef); - - // setup instrumentation processor for management (jmx) - // this is later used in postInitChannel as we need to setup the error handler later as well - ManagementInterceptStrategy managed = route.getManagementInterceptStrategy(); - if (managed != null) { - instrumentationProcessor = managed.createProcessor(targetOutputDef, nextProcessor); - } - - if (route.isMessageHistory()) { - // add message history advice - MessageHistoryFactory factory = camelContext.getMessageHistoryFactory(); - addAdvice(new MessageHistoryAdvice(factory, targetOutputDef)); - } - // add advice that keeps track of which node is processing - addAdvice(new NodeHistoryAdvice(targetOutputDef)); - - // then wrap the output with the tracer and debugger (debugger first, - // as we do not want regular tracer to trace the debugger) - if (route.isDebugging()) { - if (camelContext.getDebugger() != null) { - // use custom debugger - Debugger debugger = camelContext.getDebugger(); - addAdvice(new DebuggerAdvice(debugger, nextProcessor, targetOutputDef)); - } else { - // use backlog debugger - BacklogDebugger debugger = getOrCreateBacklogDebugger(); - camelContext.addService(debugger); - addAdvice(new BacklogDebuggerAdvice(debugger, nextProcessor, targetOutputDef)); - } - } - - if (route.isBacklogTracing()) { - // add jmx backlog tracer - BacklogTracer backlogTracer = getOrCreateBacklogTracer(); - addAdvice(new BacklogTracerAdvice(backlogTracer, targetOutputDef, routeDefinition, first)); - } - if (route.isTracing()) { - // add logger tracer - Tracer tracer = camelContext.getTracer(); - addAdvice(new TracingAdvice(tracer, targetOutputDef, routeDefinition, first)); - } - - // sort interceptors according to ordered - interceptors.sort(OrderedComparator.get()); - // reverse list so the first will be wrapped last, as it would then be first being invoked - Collections.reverse(interceptors); - // wrap the output with the configured interceptors - Processor target = nextProcessor; - for (InterceptStrategy strategy : interceptors) { - Processor next = target == nextProcessor ? null : nextProcessor; - // use the fine grained definition (eg the child if available). Its always possible to get back to the parent - Processor wrapped = strategy.wrapProcessorInInterceptors(route.getCamelContext(), targetOutputDef, target, next); - if (!(wrapped instanceof AsyncProcessor)) { - LOG.warn("Interceptor: " + strategy + " at: " + definition + " does not return an AsyncProcessor instance." - + " This causes the asynchronous routing engine to not work as optimal as possible." - + " See more details at the InterceptStrategy javadoc." - + " Camel will use a bridge to adapt the interceptor to the asynchronous routing engine," - + " but its not the most optimal solution. Please consider changing your interceptor to comply."); - } - if (!(wrapped instanceof WrapProcessor)) { - // wrap the target so it becomes a service and we can manage its lifecycle - wrapped = new WrapProcessor(wrapped, target); - } - target = wrapped; - } - - if (route.isStreamCaching()) { - addAdvice(new StreamCachingAdvice(camelContext.getStreamCachingStrategy())); - } - - if (route.getDelayer() != null && route.getDelayer() > 0) { - addAdvice(new DelayerAdvice(route.getDelayer())); - } - - // sets the delegate to our wrapped output - output = target; - } - - /** - * Post initializes the channel. - * - * @throws Exception is thrown if some error occurred - */ - public void postInitChannel() throws Exception { - // if jmx was enabled for the processor then either add as advice or wrap and change the processor - // on the error handler. See more details in the class javadoc of InstrumentationProcessor - if (instrumentationProcessor != null) { - boolean redeliveryPossible = false; - if (errorHandler instanceof RedeliveryErrorHandler) { - redeliveryPossible = ((RedeliveryErrorHandler) errorHandler).determineIfRedeliveryIsEnabled(); - if (redeliveryPossible) { - // okay we can redeliver then we need to change the output in the error handler - // to use us which we then wrap the call so we can capture before/after for redeliveries as well - Processor currentOutput = ((RedeliveryErrorHandler) errorHandler).getOutput(); - instrumentationProcessor.setProcessor(currentOutput); - ((RedeliveryErrorHandler) errorHandler).changeOutput(instrumentationProcessor); - } - } - if (!redeliveryPossible) { - // optimise to use advice as we cannot redeliver - addAdvice(CamelInternalProcessor.wrap(instrumentationProcessor)); - } - } - } - - private BacklogTracer getOrCreateBacklogTracer() { - BacklogTracer tracer = null; - if (camelContext.getRegistry() != null) { - // lookup in registry - Map map = camelContext.getRegistry().findByTypeWithName(BacklogTracer.class); - if (map.size() == 1) { - tracer = map.values().iterator().next(); - } - } - if (tracer == null) { - tracer = camelContext.getExtension(BacklogTracer.class); - } - if (tracer == null) { - tracer = BacklogTracer.createTracer(camelContext); - camelContext.setExtension(BacklogTracer.class, tracer); - } - return tracer; - } - - private BacklogDebugger getOrCreateBacklogDebugger() { - BacklogDebugger debugger = null; - if (camelContext.getRegistry() != null) { - // lookup in registry - Map map = camelContext.getRegistry().findByTypeWithName(BacklogDebugger.class); - if (map.size() == 1) { - debugger = map.values().iterator().next(); - } - } - if (debugger == null) { - debugger = camelContext.hasService(BacklogDebugger.class); - } - if (debugger == null) { - // fallback to use the default debugger - debugger = BacklogDebugger.createDebugger(camelContext); - } - return debugger; - } - - @Override - public String toString() { - // just output the next processor as all the interceptors and error handler is just too verbose - return "Channel[" + nextProcessor + "]"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.java deleted file mode 100644 index a5c3d83..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DeadLetterChannel.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.processor.errorhandler; - -import org.apache.camel.CamelContext; -import org.apache.camel.Predicate; -import org.apache.camel.Processor; -import org.apache.camel.spi.CamelLogger; - -import java.util.concurrent.ScheduledExecutorService; - -/** - * Implements a Dead Letter - * Channel after attempting to redeliver the message using the - * {@link RedeliveryPolicy} - */ -public class DeadLetterChannel extends RedeliveryErrorHandler { - - /** - * Creates the dead letter channel. - * - * @param camelContext the camel context - * @param output outer processor that should use this dead letter channel - * @param logger logger to use for logging failures and redelivery attempts - * @param redeliveryProcessor an optional processor to run before redelivery attempt - * @param redeliveryPolicy policy for redelivery - * @param exceptionPolicyStrategy strategy for onException handling - * @param deadLetter the failure processor to send failed exchanges to - * @param deadLetterUri an optional uri for logging purpose - * @param deadLetterHandleException whether dead letter channel should handle (and ignore) exceptions which may be thrown during sending the message to the dead letter endpoint - * @param useOriginalMessagePolicy should the original IN message be moved to the dead letter queue or the current exchange IN message? - * @param useOriginalBodyPolicy should the original IN message body be moved to the dead letter queue or the current exchange IN message body? - * @param retryWhile retry while - * @param executorService the {@link ScheduledExecutorService} to be used for redelivery thread pool. Can be null. - * @param onPrepareProcessor a custom {@link Processor} to prepare the {@link org.apache.camel.Exchange} before - * handled by the failure processor / dead letter channel. - * @param onExceptionOccurredProcessor a custom {@link Processor} to process the {@link org.apache.camel.Exchange} just after an exception was thrown. - */ - public DeadLetterChannel(CamelContext camelContext, Processor output, CamelLogger logger, Processor redeliveryProcessor, RedeliveryPolicy redeliveryPolicy, - ExceptionPolicyStrategy exceptionPolicyStrategy, Processor deadLetter, String deadLetterUri, boolean deadLetterHandleException, - boolean useOriginalMessagePolicy, boolean useOriginalBodyPolicy, Predicate retryWhile, ScheduledExecutorService executorService, Processor onPrepareProcessor, Processor onExceptionOccurredProcessor) { - - super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, deadLetter, deadLetterUri, deadLetterHandleException, - useOriginalMessagePolicy, useOriginalBodyPolicy, retryWhile, executorService, onPrepareProcessor, onExceptionOccurredProcessor); - setExceptionPolicy(exceptionPolicyStrategy); - } - - @Override - public String toString() { - if (output == null) { - // if no output then don't do any description - return ""; - } - return "DeadLetterChannel[" + output + ", " + (deadLetterUri != null ? deadLetterUri : deadLetter) + "]"; - } - - @Override - protected boolean isRunAllowedOnPreparingShutdown() { - // allow to run as we want to move the message eto DLC, instead of rejecting the message - return true; - } - - @Override - public boolean isDeadLetterChannel() { - return true; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultErrorHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultErrorHandler.java deleted file mode 100644 index 312c24e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultErrorHandler.java +++ /dev/null @@ -1,63 +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.processor.errorhandler; - -import org.apache.camel.CamelContext; -import org.apache.camel.Predicate; -import org.apache.camel.Processor; -import org.apache.camel.spi.CamelLogger; - -import java.util.concurrent.ScheduledExecutorService; - -/** - * Default error handler - */ -public class DefaultErrorHandler extends RedeliveryErrorHandler { - - /** - * Creates the default error handler. - * - * @param camelContext the camel context - * @param output outer processor that should use this default error handler - * @param logger logger to use for logging failures and redelivery attempts - * @param redeliveryProcessor an optional processor to run before redelivery attempt - * @param redeliveryPolicy policy for redelivery - * @param exceptionPolicyStrategy strategy for onException handling - * @param retryWhile retry while - * @param executorService the {@link ScheduledExecutorService} to be used for redelivery thread pool. Can be null. - * @param onPrepareProcessor a custom {@link Processor} to prepare the {@link org.apache.camel.Exchange} before - * handled by the failure processor / dead letter channel. - * @param onExceptionOccurredProcessor a custom {@link Processor} to process the {@link org.apache.camel.Exchange} just after an exception was thrown. - */ - public DefaultErrorHandler(CamelContext camelContext, Processor output, CamelLogger logger, Processor redeliveryProcessor, - RedeliveryPolicy redeliveryPolicy, ExceptionPolicyStrategy exceptionPolicyStrategy, Predicate retryWhile, - ScheduledExecutorService executorService, Processor onPrepareProcessor, Processor onExceptionOccurredProcessor) { - - super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, null, null, true, false, false, retryWhile, executorService, onPrepareProcessor, onExceptionOccurredProcessor); - setExceptionPolicy(exceptionPolicyStrategy); - } - - @Override - public String toString() { - if (output == null) { - // if no output then dont do any description - return ""; - } - return "DefaultErrorHandler[" + output + "]"; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java deleted file mode 100644 index ad879f9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.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.processor.errorhandler; - -import org.apache.camel.Exchange; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; - -/** - * The default strategy used in Camel to resolve the {@link ExceptionPolicyKey} that should - * handle the thrown exception. - *

- * Selection strategy: - *
This strategy applies the following rules: - *

    - *
  • Will walk the exception hierarchy from bottom upwards till the thrown exception, meaning that the most outer caused - * by is selected first, ending with the thrown exception itself. The method {@link #createExceptionIterable(Throwable)} - * provides the Iterator used for the walking.
    • - *
  • The exception type must be configured with an Exception that is an instance of the thrown exception, this - * is tested using the {@link #filter(ExceptionPolicyKey, Class, Throwable)} method. - * By default the filter uses instanceof test.
    • - *
  • If the exception type has exactly the thrown exception then its selected as its an exact match
    • - *
  • Otherwise the type that has an exception that is the closest super of the thrown exception is selected - * (recurring up the exception hierarchy)
    • - *
- *

- * Fine grained matching: - *
If the {@link ExceptionPolicyKey} has a when defined with an expression the type is also matches against - * the current exchange using the {@link #matchesWhen(ExceptionPolicyKey, Exchange)} - * method. This can be used to for more fine grained matching, so you can e.g. define multiple sets of - * exception types with the same exception class(es) but have a predicate attached to select which to select at runtime. - */ -public class DefaultExceptionPolicyStrategy implements ExceptionPolicyStrategy { - - private static final Logger LOG = LoggerFactory.getLogger(DefaultExceptionPolicyStrategy.class); - - @Override - public ExceptionPolicyKey getExceptionPolicy(Set exceptionPolicies, Exchange exchange, Throwable exception) { - - Map candidates = new TreeMap<>(); - Set routeScoped = new LinkedHashSet<>(); - Set contextScoped = new LinkedHashSet<>(); - - // split policies into route and context scoped - initRouteAndContextScopedExceptionPolicies(exceptionPolicies, routeScoped, contextScoped); - - // at first check route scoped as we prefer them over context scoped - // recursive up the tree using the iterator - Iterable throwables = createExceptionIterable(exception); - - boolean exactMatch = false; - Iterator it = throwables.iterator(); - while (!exactMatch && it.hasNext()) { - // we should stop looking if we have found an exact match - exactMatch = findMatchedExceptionPolicy(routeScoped, exchange, it.next(), candidates); - } - - // fallback to check context scoped (only do this if there was no exact match) - it = throwables.iterator(); - while (!exactMatch && it.hasNext()) { - // we should stop looking if we have found an exact match - exactMatch = findMatchedExceptionPolicy(contextScoped, exchange, it.next(), candidates); - } - - // now go through the candidates and find the best - LOG.trace("Found {} candidates", candidates.size()); - - if (candidates.isEmpty()) { - // no type found - return null; - } else { - // return the first in the map as its sorted and we checked route scoped first, which we prefer - return candidates.values().iterator().next(); - } - } - - private void initRouteAndContextScopedExceptionPolicies(Set exceptionPolicies, - Set routeScoped, - Set contextScoped) { - - // loop through all the entries and split into route and context scoped - for (ExceptionPolicyKey entry : exceptionPolicies) { - if (entry.getRouteId() != null) { - routeScoped.add(entry); - } else { - contextScoped.add(entry); - } - } - } - - - private boolean findMatchedExceptionPolicy(Iterable exceptionPolicies, - Exchange exchange, Throwable exception, - Map candidates) { - if (LOG.isTraceEnabled()) { - LOG.trace("Finding best suited exception policy for thrown exception {}", exception.getClass().getName()); - } - - // the goal is to find the exception with the same/closet inheritance level as the target exception being thrown - int targetLevel = getInheritanceLevel(exception.getClass()); - // candidate is the best candidate found so far to return - ExceptionPolicyKey candidate = null; - // difference in inheritance level between the current candidate and the thrown exception (target level) - int candidateDiff = Integer.MAX_VALUE; - - // loop through all the entries and find the best candidates to use - for (ExceptionPolicyKey type : exceptionPolicies) { - Class clazz = type.getExceptionClass(); - - // if ExceptionPolicy is route scoped then the current route (Exchange) must match - // so we will not pick an ExceptionPolicy from another route - String typeRoute = type.getRouteId(); - if (exchange != null && ObjectHelper.isNotEmpty(typeRoute)) { - String route = ExchangeHelper.getRouteId(exchange); - if (route != null && !route.equals(typeRoute)) { - if (LOG.isTraceEnabled()) { - LOG.trace("The type is scoped for route: {} however Exchange is at route: {}", typeRoute, route); - } - continue; - } - } - - if (filter(type, clazz, exception)) { - - // must match - if (!matchesWhen(type, exchange)) { - LOG.trace("The type did not match when: {}", type); - continue; - } - - // exact match then break - if (clazz.equals(exception.getClass())) { - candidate = type; - candidateDiff = 0; - break; - } - - // not an exact match so find the best candidate - int level = getInheritanceLevel(clazz); - int diff = targetLevel - level; - - if (diff < candidateDiff) { - // replace with a much better candidate - candidate = type; - candidateDiff = diff; - } - } - } - - if (candidate != null) { - if (!candidates.containsKey(candidateDiff)) { - // only add as candidate if we do not already have it registered with that level - LOG.trace("Adding {} as candidate at level {}", candidate, candidateDiff); - candidates.put(candidateDiff, candidate); - } else { - // we have an existing candidate already which we should prefer to use - // for example we check route scope before context scope (preferring route scopes) - if (LOG.isTraceEnabled()) { - LOG.trace("Existing candidate {} takes precedence over{} at level {}", - candidates.get(candidateDiff), candidate, candidateDiff); - } - } - } - - // if we found a exact match then we should stop continue looking - boolean exactMatch = candidateDiff == 0; - if (LOG.isTraceEnabled() && exactMatch) { - LOG.trace("Exact match found for candidate: {}", candidate); - } - return exactMatch; - } - - /** - * Strategy to filter the given type exception class with the thrown exception - * - * @param type the exception type - * @param exceptionClass the current exception class for testing - * @param exception the thrown exception - * @return true if the to current exception class is a candidate, false to skip it. - */ - protected boolean filter(ExceptionPolicyKey type, Class exceptionClass, Throwable exception) { - // must be instance of check to ensure that the exceptionClass is one type of the thrown exception - return exceptionClass.isInstance(exception); - } - - /** - * Strategy method for matching the exception type with the current exchange. - *

- * This default implementation will match as: - *

    - *
  • Always true if no when predicate on the exception type - *
  • Otherwise the when predicate is matches against the current exchange - *
- * - * @param definition the exception definition - * @param exchange the current {@link Exchange} - * @return true if matched, false otherwise. - */ - protected boolean matchesWhen(ExceptionPolicyKey definition, Exchange exchange) { - if (definition.getWhen() == null) { - // if no predicate then it's always a match - return true; - } - return definition.getWhen().matches(exchange); - } - - /** - * Strategy method creating the iterator to walk the exception in the order Camel should use - * for find the {@link ExceptionPolicyKey} should be used. - *

- * The default iterator will walk from the bottom upwards - * (the last caused by going upwards to the exception) - * - * @param exception the exception - * @return the list to iterate - */ - protected Iterable createExceptionIterable(Throwable exception) { - return ObjectHelper.createExceptionIterable(exception); - } - - private static int getInheritanceLevel(Class clazz) { - if (clazz == null || "java.lang.Object".equals(clazz.getName())) { - return 0; - } - return 1 + getInheritanceLevel(clazz.getSuperclass()); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java deleted file mode 100644 index 7a6e713..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.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.processor.errorhandler; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.processor.ErrorHandler; -import org.apache.camel.support.ChildServiceSupport; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * Support class for {@link ErrorHandler} implementations. - */ -public abstract class ErrorHandlerSupport extends ChildServiceSupport implements ErrorHandler { - - protected final Map exceptionPolicies = new LinkedHashMap<>(); - protected org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy exceptionPolicy = createDefaultExceptionPolicyStrategy(); - - public void addErrorHandler(Processor errorHandler) { - addChildService(errorHandler); - } - - public void addExceptionPolicy(org.apache.camel.processor.errorhandler.ExceptionPolicyKey key, org.apache.camel.processor.errorhandler.ExceptionPolicy policy) { - exceptionPolicies.put(key, policy); - } - - /**CamelContextHelper - * Attempts to find the best suited {@link org.apache.camel.processor.errorhandler.ExceptionPolicy} to be used for handling the given thrown exception. - * - * @param exchange the exchange - * @param exception the exception that was thrown - * @return the best exception type to handle this exception, null if none found. - */ - protected org.apache.camel.processor.errorhandler.ExceptionPolicy getExceptionPolicy(Exchange exchange, Throwable exception) { - if (exceptionPolicy == null) { - throw new IllegalStateException("The exception policy has not been set"); - } - - ExceptionPolicyKey key = exceptionPolicy.getExceptionPolicy(exceptionPolicies.keySet(), exchange, exception); - return key != null ? exceptionPolicies.get(key) : null; - } - - /** - * Sets the strategy to use for resolving the {@link ExceptionPolicy} to use - * for handling thrown exceptions. - */ - public void setExceptionPolicy(org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy exceptionPolicy) { - if (exceptionPolicy != null) { - this.exceptionPolicy = exceptionPolicy; - } - } - - /** - * Creates the default exception policy strategy to use. - */ - public static ExceptionPolicyStrategy createDefaultExceptionPolicyStrategy() { - return new DefaultExceptionPolicyStrategy(); - } - - /** - * Whether this error handler supports transacted exchanges or not. - */ - public abstract boolean supportTransacted(); - - /** - * Whether this error handler handles exhausted errors by moving the exchange to a dead letter channel. - */ - public boolean isDeadLetterChannel() { - return false; - } - - /** - * Gets the output - */ - public abstract Processor getOutput(); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java deleted file mode 100644 index 9a0a0d3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java +++ /dev/null @@ -1,265 +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.processor.errorhandler; - -import org.apache.camel.*; -import org.apache.camel.support.CamelContextHelper; - -import java.util.List; -import java.util.Map; - -public class ExceptionPolicy { - - private String id; - private String routeId; - private boolean useOriginalInMessage; - private boolean useOriginalInBody; - private boolean hasOutputs; - - private Predicate handledPolicy; - private Predicate continuedPolicy; - private Predicate retryWhilePolicy; - private Processor onRedelivery; - private Processor onExceptionOccurred; - private String redeliveryPolicyRef; - private Map redeliveryPolicy; - private List exceptions; - - public ExceptionPolicy(String id, String routeId, boolean useOriginalInMessage, boolean useOriginalInBody, - boolean hasOutputs, Predicate handledPolicy, Predicate continuedPolicy, - Predicate retryWhilePolicy, Processor onRedelivery, Processor onExceptionOccurred, - String redeliveryPolicyRef, Map redeliveryPolicy, List exceptions) { - this.id = id; - this.routeId = routeId; - this.useOriginalInMessage = useOriginalInMessage; - this.useOriginalInBody = useOriginalInBody; - this.hasOutputs = hasOutputs; - this.handledPolicy = handledPolicy; - this.continuedPolicy = continuedPolicy; - this.retryWhilePolicy = retryWhilePolicy; - this.onRedelivery = onRedelivery; - this.onExceptionOccurred = onExceptionOccurred; - this.redeliveryPolicyRef = redeliveryPolicyRef; - this.redeliveryPolicy = redeliveryPolicy; - this.exceptions = exceptions; - } - - public String getId() { - return id; - } - - public String getRouteId() { - return routeId; - } - - public boolean isUseOriginalInMessage() { - return useOriginalInMessage; - } - - public boolean isUseOriginalInBody() { - return useOriginalInBody; - } - - public List getExceptions() { - return exceptions; - } - - public Predicate getHandledPolicy() { - return handledPolicy; - } - - public Predicate getContinuedPolicy() { - return continuedPolicy; - } - - public Predicate getRetryWhilePolicy() { - return retryWhilePolicy; - } - - public Processor getOnRedelivery() { - return onRedelivery; - } - - public Processor getOnExceptionOccurred() { - return onExceptionOccurred; - } - - /** - * Allows an exception handler to create a new redelivery policy for this exception type - * - * @param context the camel context - * @param parentPolicy the current redelivery policy, is newer null - * @return a newly created redelivery policy, or return the original policy if no customization is required - * for this exception handler. - */ - public RedeliveryPolicy createRedeliveryPolicy(CamelContext context, RedeliveryPolicy parentPolicy) { - if (redeliveryPolicyRef != null) { - return CamelContextHelper.mandatoryLookup(context, redeliveryPolicyRef, RedeliveryPolicy.class); - } else if (redeliveryPolicy != null) { - return createRedeliveryPolicy(redeliveryPolicy, context, parentPolicy); - } else if (hasOutputs && parentPolicy.getMaximumRedeliveries() != 0) { - // if we have outputs, then do not inherit parent maximumRedeliveries - // as you would have to explicit configure maximumRedeliveries on this onException to use it - // this is the behavior Camel has always had - RedeliveryPolicy answer = parentPolicy.copy(); - answer.setMaximumRedeliveries(0); - return answer; - } else { - return parentPolicy; - } - } - - public boolean determineIfRedeliveryIsEnabled(CamelContext camelContext) throws Exception { - if (redeliveryPolicyRef != null) { - // lookup in registry if ref provided - RedeliveryPolicy policy = CamelContextHelper.mandatoryLookup(camelContext, redeliveryPolicyRef, RedeliveryPolicy.class); - if (policy.getMaximumRedeliveries() != 0) { - // must check for != 0 as (-1 means redeliver forever) - return true; - } - } else if (redeliveryPolicy != null) { - Integer max = CamelContextHelper.parseInteger(camelContext, redeliveryPolicy.get(RedeliveryOption.maximumRedeliveries)); - if (max != null && max != 0) { - // must check for != 0 as (-1 means redeliver forever) - return true; - } - } - - if (retryWhilePolicy != null) { - return true; - } - - return false; - } - - public enum RedeliveryOption { - maximumRedeliveries, - redeliveryDelay, - asyncDelayedRedelivery, - backOffMultiplier, - useExponentialBackOff, - collisionAvoidanceFactor, - useCollisionAvoidance, - maximumRedeliveryDelay, - retriesExhaustedLogLevel, - retryAttemptedLogLevel, - retryAttemptedLogInterval, - logRetryAttempted, - logStackTrace, - logRetryStackTrace, - logHandled, - logNewException, - logContinued, - logExhausted, - logExhaustedMessageHistory, - logExhaustedMessageBody, - disableRedelivery, - delayPattern, - allowRedeliveryWhileStopping, - exchangeFormatterRef; - } - - private static RedeliveryPolicy createRedeliveryPolicy(Map definition, CamelContext context, RedeliveryPolicy parentPolicy) { - RedeliveryPolicy answer; - if (parentPolicy != null) { - answer = parentPolicy.copy(); - } else { - answer = new RedeliveryPolicy(); - } - try { - if (definition.get(RedeliveryOption.maximumRedeliveries) != null) { - answer.setMaximumRedeliveries(CamelContextHelper.parseInteger(context, definition.get(RedeliveryOption.maximumRedeliveries))); - } - if (definition.get(RedeliveryOption.redeliveryDelay) != null) { - answer.setRedeliveryDelay(CamelContextHelper.parseLong(context, definition.get(RedeliveryOption.redeliveryDelay))); - } - if (definition.get(RedeliveryOption.asyncDelayedRedelivery) != null) { - answer.setAsyncDelayedRedelivery(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.asyncDelayedRedelivery))); - } - if (definition.get(RedeliveryOption.retriesExhaustedLogLevel) != null) { - answer.setRetriesExhaustedLogLevel(CamelContextHelper.parse(context, LoggingLevel.class, definition.get(RedeliveryOption.retriesExhaustedLogLevel))); - } - if (definition.get(RedeliveryOption.retryAttemptedLogLevel) != null) { - answer.setRetryAttemptedLogLevel(CamelContextHelper.parse(context, LoggingLevel.class, definition.get(RedeliveryOption.retryAttemptedLogLevel))); - } - if (definition.get(RedeliveryOption.retryAttemptedLogInterval) != null) { - answer.setRetryAttemptedLogInterval(CamelContextHelper.parseInteger(context, definition.get(RedeliveryOption.retryAttemptedLogInterval))); - } - if (definition.get(RedeliveryOption.backOffMultiplier) != null) { - answer.setBackOffMultiplier(CamelContextHelper.parseDouble(context, definition.get(RedeliveryOption.backOffMultiplier))); - } - if (definition.get(RedeliveryOption.useExponentialBackOff) != null) { - answer.setUseExponentialBackOff(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.useExponentialBackOff))); - } - if (definition.get(RedeliveryOption.collisionAvoidanceFactor) != null) { - answer.setCollisionAvoidanceFactor(CamelContextHelper.parseDouble(context, definition.get(RedeliveryOption.collisionAvoidanceFactor))); - } - if (definition.get(RedeliveryOption.useCollisionAvoidance) != null) { - answer.setUseCollisionAvoidance(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.useCollisionAvoidance))); - } - if (definition.get(RedeliveryOption.maximumRedeliveryDelay) != null) { - answer.setMaximumRedeliveryDelay(CamelContextHelper.parseLong(context, definition.get(RedeliveryOption.maximumRedeliveryDelay))); - } - if (definition.get(RedeliveryOption.logStackTrace) != null) { - answer.setLogStackTrace(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logStackTrace))); - } - if (definition.get(RedeliveryOption.logRetryStackTrace) != null) { - answer.setLogRetryStackTrace(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logRetryStackTrace))); - } - if (definition.get(RedeliveryOption.logHandled) != null) { - answer.setLogHandled(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logHandled))); - } - if (definition.get(RedeliveryOption.logNewException) != null) { - answer.setLogNewException(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logNewException))); - } - if (definition.get(RedeliveryOption.logContinued) != null) { - answer.setLogContinued(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logContinued))); - } - if (definition.get(RedeliveryOption.logRetryAttempted) != null) { - answer.setLogRetryAttempted(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logRetryAttempted))); - } - if (definition.get(RedeliveryOption.logExhausted) != null) { - answer.setLogExhausted(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logExhausted))); - } - if (definition.get(RedeliveryOption.logExhaustedMessageHistory) != null) { - answer.setLogExhaustedMessageHistory(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logExhaustedMessageHistory))); - } - if (definition.get(RedeliveryOption.logExhaustedMessageBody) != null) { - answer.setLogExhaustedMessageBody(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.logExhaustedMessageBody))); - } - if (definition.get(RedeliveryOption.disableRedelivery) != null) { - if (CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.disableRedelivery))) { - answer.setMaximumRedeliveries(0); - } - } - if (definition.get(RedeliveryOption.delayPattern) != null) { - answer.setDelayPattern(CamelContextHelper.parseText(context, definition.get(RedeliveryOption.delayPattern))); - } - if (definition.get(RedeliveryOption.allowRedeliveryWhileStopping) != null) { - answer.setAllowRedeliveryWhileStopping(CamelContextHelper.parseBoolean(context, definition.get(RedeliveryOption.allowRedeliveryWhileStopping))); - } - if (definition.get(RedeliveryOption.exchangeFormatterRef) != null) { - answer.setExchangeFormatterRef(CamelContextHelper.parseText(context, definition.get(RedeliveryOption.exchangeFormatterRef))); - } - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - - return answer; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyKey.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyKey.java deleted file mode 100644 index 368e0c2..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyKey.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.processor.errorhandler; - -import org.apache.camel.Predicate; - -/** - * Exception policy key is a compound key for storing: - * route id + exception class + when => exception type. - *

- * This is used by Camel to store the onException types configured that has or has not predicates attached (when). - */ -public final class ExceptionPolicyKey { - - private final String routeId; - private final Class exceptionClass; - private final Predicate when; - - /** - * Key for exception clause - * - * @param routeId the route, or use null for a global scoped - * @param exceptionClass the exception class - * @param when optional predicate when the exception clause should trigger - */ - public ExceptionPolicyKey(String routeId, Class exceptionClass, Predicate when) { - this.routeId = routeId; - this.exceptionClass = exceptionClass; - this.when = when; - } - - public Class getExceptionClass() { - return exceptionClass; - } - - public Predicate getWhen() { - return when; - } - - public String getRouteId() { - return routeId; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - ExceptionPolicyKey that = (ExceptionPolicyKey) o; - - if (exceptionClass != null ? !exceptionClass.equals(that.exceptionClass) : that.exceptionClass != null) { - return false; - } - if (routeId != null ? !routeId.equals(that.routeId) : that.routeId != null) { - return false; - } - if (when != null ? !when.equals(that.when) : that.when != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = routeId != null ? routeId.hashCode() : 0; - result = 31 * result + (exceptionClass != null ? exceptionClass.hashCode() : 0); - result = 31 * result + (when != null ? when.hashCode() : 0); - return result; - } - - @Override - public String toString() { - return "ExceptionPolicyKey[route: " + (routeId != null ? routeId : "") + ", " + exceptionClass + (when != null ? " " + when : "") + "]"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyStrategy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyStrategy.java deleted file mode 100644 index faef806..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicyStrategy.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.processor.errorhandler; - -import org.apache.camel.Exchange; - -import java.util.Set; - -/** - * A strategy to determine which {@link ExceptionPolicyKey} should handle the thrown - * exception. - * - * @see DefaultExceptionPolicyStrategy DefaultExceptionPolicy - */ -public interface ExceptionPolicyStrategy { - - /** - * Resolves the {@link ExceptionPolicyKey} that should handle the thrown exception. - * - * @param exceptionPolicies the configured exception policies to resolve from - * @param exchange the exchange - * @param exception the exception that was thrown - * @return the resolved exception type to handle this exception, null if none found. - */ - ExceptionPolicyKey getExceptionPolicy(Set exceptionPolicies, Exchange exchange, Throwable exception); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java deleted file mode 100644 index a9d7bde..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java +++ /dev/null @@ -1,1474 +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.processor.errorhandler; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.support.*; -import org.apache.camel.support.processor.DefaultExchangeFormatter; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StopWatch; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * Base redeliverable error handler that also supports a final dead letter queue in case - * all redelivery attempts fail. - *

- * This implementation should contain all the error handling logic and the sub classes - * should only configure it according to what they support. - */ -public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport implements AsyncProcessor, ShutdownPrepared, Navigate { - - private static final Logger LOG = LoggerFactory.getLogger(RedeliveryErrorHandler.class); - - protected final AtomicInteger redeliverySleepCounter = new AtomicInteger(); - protected ScheduledExecutorService executorService; - protected final ExtendedCamelContext camelContext; - protected final ReactiveExecutor reactiveExecutor; - protected final AsyncProcessorAwaitManager awaitManager; - protected final ShutdownStrategy shutdownStrategy; - protected final Processor deadLetter; - protected final String deadLetterUri; - protected final boolean deadLetterHandleNewException; - protected Processor output; - protected AsyncProcessor outputAsync; - protected final Processor redeliveryProcessor; - protected final org.apache.camel.processor.errorhandler.RedeliveryPolicy redeliveryPolicy; - protected final Predicate retryWhilePolicy; - protected final CamelLogger logger; - protected final boolean useOriginalMessagePolicy; - protected final boolean useOriginalBodyPolicy; - protected boolean redeliveryEnabled; - protected boolean simpleTask; - protected volatile boolean preparingShutdown; - protected final ExchangeFormatter exchangeFormatter; - protected final boolean customExchangeFormatter; - protected final Processor onPrepareProcessor; - protected final Processor onExceptionProcessor; - - public RedeliveryErrorHandler(CamelContext camelContext, Processor output, CamelLogger logger, - Processor redeliveryProcessor, org.apache.camel.processor.errorhandler.RedeliveryPolicy redeliveryPolicy, Processor deadLetter, - String deadLetterUri, boolean deadLetterHandleNewException, boolean useOriginalMessagePolicy, boolean useOriginalBodyPolicy, - Predicate retryWhile, ScheduledExecutorService executorService, Processor onPrepareProcessor, Processor onExceptionProcessor) { - - ObjectHelper.notNull(camelContext, "CamelContext", this); - ObjectHelper.notNull(redeliveryPolicy, "RedeliveryPolicy", this); - - this.camelContext = (ExtendedCamelContext) camelContext; - this.reactiveExecutor = camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor(); - this.awaitManager = camelContext.adapt(ExtendedCamelContext.class).getAsyncProcessorAwaitManager(); - this.shutdownStrategy = camelContext.getShutdownStrategy(); - this.redeliveryProcessor = redeliveryProcessor; - this.deadLetter = deadLetter; - this.output = output; - this.outputAsync = AsyncProcessorConverterHelper.convert(output); - this.redeliveryPolicy = redeliveryPolicy; - this.logger = logger; - this.deadLetterUri = deadLetterUri; - this.deadLetterHandleNewException = deadLetterHandleNewException; - this.useOriginalMessagePolicy = useOriginalMessagePolicy; - this.useOriginalBodyPolicy = useOriginalBodyPolicy; - this.retryWhilePolicy = retryWhile; - this.executorService = executorService; - this.onPrepareProcessor = onPrepareProcessor; - this.onExceptionProcessor = onExceptionProcessor; - - if (ObjectHelper.isNotEmpty(redeliveryPolicy.getExchangeFormatterRef())) { - ExchangeFormatter formatter = camelContext.getRegistry().lookupByNameAndType(redeliveryPolicy.getExchangeFormatterRef(), ExchangeFormatter.class); - if (formatter != null) { - this.exchangeFormatter = formatter; - this.customExchangeFormatter = true; - } else { - throw new IllegalArgumentException("Cannot find the exchangeFormatter by using reference id " + redeliveryPolicy.getExchangeFormatterRef()); - } - } else { - this.customExchangeFormatter = false; - // setup exchange formatter to be used for message history dump - DefaultExchangeFormatter formatter = new DefaultExchangeFormatter(); - formatter.setShowExchangeId(true); - formatter.setMultiline(true); - formatter.setShowHeaders(true); - formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Fixed); - try { - Integer maxChars = CamelContextHelper.parseInteger(camelContext, camelContext.getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS)); - if (maxChars != null) { - formatter.setMaxChars(maxChars); - } - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - this.exchangeFormatter = formatter; - } - } - - @Override - public void process(Exchange exchange) { - if (output == null) { - // no output then just return - return; - } - awaitManager.process(this, exchange); - } - - /** - * Process the exchange using redelivery error handling. - */ - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - // Create the redelivery task object for this exchange (optimize to only create task can do redelivery or not) - Runnable task; - if (simpleTask) { - task = new SimpleTask(exchange, callback); - } else { - task = new RedeliveryTask(exchange, callback); - } - // Run it - if (exchange.isTransacted()) { - reactiveExecutor.scheduleSync(task); - } else { - reactiveExecutor.scheduleMain(task); - } - return false; - } - - @Override - public CompletableFuture processAsync(Exchange exchange) { - AsyncCallbackToCompletableFutureAdapter callback = new AsyncCallbackToCompletableFutureAdapter<>(exchange); - process(exchange, callback); - return callback.getFuture(); - } - - /** - * Allows to change the output of the error handler which are used when optimising the - * JMX instrumentation to use either an advice or wrapped processor when calling a processor. - * The former is faster and therefore preferred, however if the error handler supports - * redelivery we need fine grained instrumentation which then must be wrapped and therefore - * need to change the output on the error handler. - */ - public void changeOutput(Processor output) { - this.output = output; - this.outputAsync = AsyncProcessorConverterHelper.convert(output); - } - - @Override - public boolean supportTransacted() { - return false; - } - - @Override - public boolean hasNext() { - return output != null; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(output); - return answer; - } - - protected boolean isRunAllowedOnPreparingShutdown() { - return false; - } - - @Override - public void prepareShutdown(boolean suspendOnly, boolean forced) { - // prepare for shutdown, eg do not allow redelivery if configured - LOG.trace("Prepare shutdown on error handler: {}", this); - preparingShutdown = true; - } - - /** - *

Determines the redelivery delay time by first inspecting the Message header {@link Exchange#REDELIVERY_DELAY} - * and if not present, defaulting to {@link org.apache.camel.processor.errorhandler.RedeliveryPolicy#calculateRedeliveryDelay(long, int)}

- * - *

In order to prevent manipulation of the RedeliveryData state, the values of {@link RedeliveryTask#redeliveryDelay} - * and {@link RedeliveryTask#redeliveryCounter} are copied in.

- * - * @param exchange The current exchange in question. - * @param redeliveryPolicy The RedeliveryPolicy to use in the calculation. - * @param redeliveryDelay The default redelivery delay from RedeliveryData - * @param redeliveryCounter The redeliveryCounter - * @return The time to wait before the next redelivery. - */ - protected long determineRedeliveryDelay(Exchange exchange, org.apache.camel.processor.errorhandler.RedeliveryPolicy redeliveryPolicy, long redeliveryDelay, int redeliveryCounter) { - Message message = exchange.getIn(); - Long delay = message.getHeader(Exchange.REDELIVERY_DELAY, Long.class); - if (delay == null) { - delay = redeliveryPolicy.calculateRedeliveryDelay(redeliveryDelay, redeliveryCounter); - LOG.debug("Redelivery delay calculated as {}", delay); - } else { - LOG.debug("Redelivery delay is {} from Message Header [{}]", delay, Exchange.REDELIVERY_DELAY); - } - return delay; - } - - /** - * Performs a defensive copy of the exchange if needed - * - * @param exchange the exchange - * @return the defensive copy, or null if not needed (redelivery is not enabled). - */ - protected Exchange defensiveCopyExchangeIfNeeded(Exchange exchange) { - // only do a defensive copy if redelivery is enabled - if (redeliveryEnabled) { - return ExchangeHelper.createCopy(exchange, true); - } else { - return null; - } - } - - /** - * Strategy to determine if the exchange is done so we can continue - */ - protected boolean isDone(Exchange exchange) { - ExtendedExchange ee = (ExtendedExchange) exchange; - if (ee.isInterrupted()) { - // mark the exchange to stop continue routing when interrupted - // as we do not want to continue routing (for example a task has been cancelled) - if (LOG.isTraceEnabled()) { - LOG.trace("Is exchangeId: {} interrupted? true", exchange.getExchangeId()); - } - exchange.setRouteStop(true); - return true; - } - - // only done if the exchange hasn't failed - // and it has not been handled by the failure processor - // or we are exhausted - boolean answer = exchange.getException() == null - || ExchangeHelper.isFailureHandled(exchange) - || ee.isRedeliveryExhausted(); - - if (LOG.isTraceEnabled()) { - LOG.trace("Is exchangeId: {} done? {}", exchange.getExchangeId(), answer); - } - return answer; - } - - /** - * Returns the output processor - */ - @Override - public Processor getOutput() { - return output; - } - - /** - * Returns the dead letter that message exchanges will be sent to if the - * redelivery attempts fail - */ - public Processor getDeadLetter() { - return deadLetter; - } - - public String getDeadLetterUri() { - return deadLetterUri; - } - - public boolean isUseOriginalMessagePolicy() { - return useOriginalMessagePolicy; - } - - public boolean isUseOriginalBodyPolicy() { - return useOriginalBodyPolicy; - } - - public boolean isDeadLetterHandleNewException() { - return deadLetterHandleNewException; - } - - public org.apache.camel.processor.errorhandler.RedeliveryPolicy getRedeliveryPolicy() { - return redeliveryPolicy; - } - - public CamelLogger getLogger() { - return logger; - } - - protected Predicate getDefaultHandledPredicate() { - // Default is not not handle errors - return null; - } - - /** - * Simple task to perform calling the processor with no redelivery support - */ - protected class SimpleTask implements Runnable { - private final ExtendedExchange exchange; - private final AsyncCallback callback; - - public SimpleTask(Exchange exchange, AsyncCallback callback) { - this.exchange = (ExtendedExchange) exchange; - this.callback = callback; - } - - @Override - public String toString() { - return "SimpleTask"; - } - - /** - * Processing logic. - */ - @Override - public void run() { - // can we still run - boolean run = true; - boolean forceShutdown = shutdownStrategy.forceShutdown(RedeliveryErrorHandler.this); - if (forceShutdown) { - run = false; - } - if (run && isStoppingOrStopped()) { - run = false; - } - if (!run) { - LOG.trace("Run not allowed, will reject executing exchange: {}", exchange); - if (exchange.getException() == null) { - exchange.setException(new RejectedExecutionException()); - } - callback.done(false); - return; - } - - if (exchange.getException() != null) { - // previous processing cause an exception - handleException(); - onExceptionOccurred(); - prepareExchangeAfterFailure(exchange); - - // we do not support redelivery so continue callback - reactiveExecutor.schedule(callback); - } else { - // Simple delivery - outputAsync.process(exchange, doneSync -> { - // only continue with callback if we are done - if (isDone(exchange)) { - reactiveExecutor.schedule(callback); - } else { - // error occurred so loop back around and call ourselves - reactiveExecutor.schedule(this); - } - }); - } - } - - protected void handleException() { - Exception e = exchange.getException(); - // e is never null - - Throwable previous = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); - if (previous != null && previous != e) { - // a 2nd exception was thrown while handling a previous exception - // so we need to add the previous as suppressed by the new exception - // see also FatalFallbackErrorHandler - Throwable[] suppressed = e.getSuppressed(); - boolean found = false; - for (Throwable t : suppressed) { - if (t == previous) { - found = true; - } - } - if (!found) { - e.addSuppressed(previous); - } - } - - // store the original caused exception in a property, so we can restore it later - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, e); - } - - /** - * Gives an optional configured OnExceptionOccurred processor a chance to process just after an exception - * was thrown while processing the Exchange. This allows to execute the processor at the same time the exception was thrown. - */ - protected void onExceptionOccurred() { - if (onExceptionProcessor == null) { - return; - } - - // run this synchronously as its just a Processor - try { - if (LOG.isTraceEnabled()) { - LOG.trace("OnExceptionOccurred processor {} is processing Exchange: {} due exception occurred", onExceptionProcessor, exchange); - } - onExceptionProcessor.process(exchange); - } catch (Throwable e) { - // we dont not want new exception to override existing, so log it as a WARN - LOG.warn("Error during processing OnExceptionOccurred. This exception is ignored.", e); - } - LOG.trace("OnExceptionOccurred processor done"); - } - - protected void prepareExchangeAfterFailure(final Exchange exchange) { - ExtendedExchange ee = (ExtendedExchange) exchange; - - // we could not process the exchange so we let the failure processor handled it - ExchangeHelper.setFailureHandled(exchange); - - // honor if already set a handling - boolean alreadySet = ee.getErrorHandlerHandled() != null; - if (alreadySet) { - boolean handled = ee.getErrorHandlerHandled() != null && ee.getErrorHandlerHandled(); - LOG.trace("This exchange has already been marked for handling: {}", handled); - if (!handled) { - // exception not handled, put exception back in the exchange - exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); - // and put failure endpoint back as well - exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT)); - } - return; - } - - // not handled by default - prepareExchangeAfterFailureNotHandled(exchange); - } - - private void prepareExchangeAfterFailureNotHandled(Exchange exchange) { - ExtendedExchange ee = (ExtendedExchange) exchange; - - LOG.trace("This exchange is not handled or continued so its marked as failed: {}", ee); - // exception not handled, put exception back in the exchange - ee.setErrorHandlerHandled(false); - ee.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); - // and put failure endpoint back as well - ee.setProperty(Exchange.FAILURE_ENDPOINT, ee.getProperty(Exchange.TO_ENDPOINT)); - // and store the route id so we know in which route we failed - Route rc = ExchangeHelper.getRoute(ee); - if (rc != null) { - ee.setProperty(Exchange.FAILURE_ROUTE_ID, rc.getRouteId()); - } - - // create log message - String msg = "Failed delivery for " + ExchangeHelper.logIds(exchange); - msg = msg + ". Exhausted after delivery attempt: 1 caught: " + ee.getException(); - - // log that we failed delivery as we are exhausted - logFailedDelivery(exchange, msg, null); - } - - private void logFailedDelivery(Exchange exchange, String message, Throwable e) { - if (logger == null) { - return; - } - - if (e == null) { - e = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); - } - - if (exchange.isRollbackOnly() || exchange.isRollbackOnlyLast()) { - String msg = "Rollback " + ExchangeHelper.logIds(exchange); - Throwable cause = exchange.getException() != null ? exchange.getException() : exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); - if (cause != null) { - msg = msg + " due: " + cause.getMessage(); - } - - // should we include message history - if (redeliveryPolicy.isLogExhaustedMessageHistory()) { - // only use the exchange formatter if we should log exhausted message body (and if using a custom formatter then always use it) - ExchangeFormatter formatter = customExchangeFormatter - ? exchangeFormatter : (redeliveryPolicy.isLogExhaustedMessageBody() || camelContext.isLogExhaustedMessageBody() ? exchangeFormatter : null); - String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, formatter, false); - if (routeStackTrace != null) { - msg = msg + "\n" + routeStackTrace; - } - } - - if (logger.getLevel() == LoggingLevel.ERROR) { - // log intended rollback on maximum WARN level (not ERROR) - logger.log(msg, LoggingLevel.WARN); - } else { - // otherwise use the desired logging level - logger.log(msg); - } - } else { - String msg = message; - // should we include message history - if (redeliveryPolicy.isLogExhaustedMessageHistory()) { - // only use the exchange formatter if we should log exhausted message body (and if using a custom formatter then always use it) - ExchangeFormatter formatter = customExchangeFormatter - ? exchangeFormatter : (redeliveryPolicy.isLogExhaustedMessageBody() || camelContext.isLogExhaustedMessageBody() ? exchangeFormatter : null); - String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, formatter, e != null && redeliveryPolicy.isLogStackTrace()); - if (routeStackTrace != null) { - msg = msg + "\n" + routeStackTrace; - } - } - - if (e != null && redeliveryPolicy.isLogStackTrace()) { - logger.log(msg, e); - } else { - logger.log(msg); - } - } - } - } - - - /** - * Task to perform calling the processor and handling redelivery if it fails (more advanced than ProcessTask) - */ - protected class RedeliveryTask implements Runnable { - private final Exchange original; - private final ExtendedExchange exchange; - private final AsyncCallback callback; - private int redeliveryCounter; - private long redeliveryDelay; - private Predicate retryWhilePredicate; - - // default behavior which can be overloaded on a per exception basis - private RedeliveryPolicy currentRedeliveryPolicy; - private Processor failureProcessor; - private Processor onRedeliveryProcessor; - private Processor onExceptionProcessor; - private Predicate handledPredicate; - private Predicate continuedPredicate; - private boolean useOriginalInMessage; - private boolean useOriginalInBody; - - public RedeliveryTask(Exchange exchange, AsyncCallback callback) { - this.retryWhilePredicate = retryWhilePolicy; - this.currentRedeliveryPolicy = redeliveryPolicy; - this.handledPredicate = getDefaultHandledPredicate(); - this.useOriginalInMessage = useOriginalMessagePolicy; - this.useOriginalInBody = useOriginalBodyPolicy; - this.onRedeliveryProcessor = redeliveryProcessor; - this.onExceptionProcessor = RedeliveryErrorHandler.this.onExceptionProcessor; - - // do a defensive copy of the original Exchange, which is needed for redelivery so we can ensure the - // original Exchange is being redelivered, and not a mutated Exchange - this.original = redeliveryEnabled ? defensiveCopyExchangeIfNeeded(exchange) : null; - this.exchange = (ExtendedExchange) exchange; - this.callback = callback; - } - - @Override - public String toString() { - return "RedeliveryTask"; - } - - /** - * Processing and redelivery logic. - */ - @Override - public void run() { - // can we still run - if (!isRunAllowed()) { - LOG.trace("Run not allowed, will reject executing exchange: {}", exchange); - if (exchange.getException() == null) { - exchange.setException(new RejectedExecutionException()); - } - callback.done(false); - return; - } - - try { - doRun(); - } catch (Throwable e) { - // unexpected exception during running so break out - exchange.setException(e); - callback.done(false); - } - } - - private void doRun() throws Exception { - // did previous processing cause an exception? - if (exchange.getException() != null) { - handleException(); - onExceptionOccurred(); - } - - // compute if we are exhausted or cannot redeliver - boolean redeliverAllowed = redeliveryCounter == 0 || isRedeliveryAllowed(); - boolean exhausted = false; - if (redeliverAllowed) { - // we can redeliver but check if we are exhausted first (optimized to only check when needed) - exhausted = exchange.isRedeliveryExhausted() || exchange.isRollbackOnly(); - if (!exhausted && redeliveryCounter > 0) { - // its a potential redelivery so determine if we should redeliver or not - redeliverAllowed = currentRedeliveryPolicy.shouldRedeliver(exchange, redeliveryCounter, retryWhilePredicate); - } - } - // if we are exhausted or redelivery is not allowed, then deliver to failure processor (eg such as DLC) - if (!redeliverAllowed || exhausted) { - Processor target = failureProcessor != null ? failureProcessor : deadLetter; - // we should always invoke the deliverToFailureProcessor as it prepares, logs and does a fair - // bit of work for exhausted exchanges (its only the target processor which may be null if handled by a savepoint) - boolean isDeadLetterChannel = isDeadLetterChannel() && target == deadLetter; - deliverToFailureProcessor(target, isDeadLetterChannel, exchange); - // we are breaking out - } else if (redeliveryCounter > 0) { - // calculate the redelivery delay - redeliveryDelay = determineRedeliveryDelay(exchange, currentRedeliveryPolicy, redeliveryDelay, redeliveryCounter); - - if (redeliveryDelay > 0) { - // okay there is a delay so create a scheduled task to have it executed in the future - - if (currentRedeliveryPolicy.isAsyncDelayedRedelivery() && !exchange.isTransacted()) { - - // we are doing a redelivery then a thread pool must be configured (see the doStart method) - ObjectHelper.notNull(executorService, "Redelivery is enabled but ExecutorService has not been configured.", this); - - // schedule the redelivery task - if (LOG.isTraceEnabled()) { - LOG.trace("Scheduling redelivery task to run in {} millis for exchangeId: {}", redeliveryDelay, exchange.getExchangeId()); - } - executorService.schedule(() -> reactiveExecutor.schedule(this::redeliver), redeliveryDelay, TimeUnit.MILLISECONDS); - - } else { - // async delayed redelivery was disabled or we are transacted so we must be synchronous - // as the transaction manager requires to execute in the same thread context - try { - // we are doing synchronous redelivery and use thread sleep, so we keep track using a counter how many are sleeping - redeliverySleepCounter.incrementAndGet(); - boolean complete = sleep(); - redeliverySleepCounter.decrementAndGet(); - if (!complete) { - // the task was rejected - exchange.setException(new RejectedExecutionException("Redelivery not allowed while stopping")); - // mark the exchange as redelivery exhausted so the failure processor / dead letter channel can process the exchange - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(true); - // jump to start of loop which then detects that we are failed and exhausted - reactiveExecutor.schedule(this); - } else { - reactiveExecutor.schedule(this::redeliver); - } - } catch (InterruptedException e) { - redeliverySleepCounter.decrementAndGet(); - // we was interrupted so break out - exchange.setException(e); - // mark the exchange to stop continue routing when interrupted - // as we do not want to continue routing (for example a task has been cancelled) - exchange.setRouteStop(true); - reactiveExecutor.schedule(callback); - } - } - } else { - // execute the task immediately - reactiveExecutor.schedule(this::redeliver); - } - } else { - // Simple delivery - outputAsync.process(exchange, doneSync -> { - // only continue with callback if we are done - if (isDone(exchange)) { - reactiveExecutor.schedule(callback); - } else { - // error occurred so loop back around and call ourselves - reactiveExecutor.schedule(this); - } - }); - } - } - - protected boolean isRunAllowed() { - // if camel context is forcing a shutdown then do not allow running - boolean forceShutdown = shutdownStrategy.forceShutdown(RedeliveryErrorHandler.this); - if (forceShutdown) { - return false; - } - - // redelivery policy can control if redelivery is allowed during stopping/shutdown - // but this only applies during a redelivery (counter must > 0) - if (redeliveryCounter > 0) { - if (currentRedeliveryPolicy.allowRedeliveryWhileStopping) { - return true; - } else if (preparingShutdown) { - // we are preparing for shutdown, now determine if we can still run - return isRunAllowedOnPreparingShutdown(); - } - } - - // we cannot run if we are stopping/stopped - return !isStoppingOrStopped(); - } - - protected boolean isRedeliveryAllowed() { - // redelivery policy can control if redelivery is allowed during stopping/shutdown - // but this only applies during a redelivery (this method is only invoked when counter > 0) - boolean stopping = isStoppingOrStopped(); - if (!preparingShutdown && !stopping) { - // we are not preparing to shutdown and are not stopping so we can redeliver - return true; - } else { - // we are stopping or preparing to shutdown, so see policy - return currentRedeliveryPolicy.allowRedeliveryWhileStopping; - } - } - - protected void redeliver() { - // prepare for redelivery - prepareExchangeForRedelivery(); - - // letting onRedeliver be executed at first - deliverToOnRedeliveryProcessor(); - - if (LOG.isTraceEnabled()) { - LOG.trace("Redelivering exchangeId: {} -> {} for Exchange: {}", exchange.getExchangeId(), outputAsync, exchange); - } - - // emmit event we are doing redelivery - if (camelContext.isEventNotificationApplicable()) { - EventHelper.notifyExchangeRedelivery(exchange.getContext(), exchange, redeliveryCounter); - } - - // process the exchange (also redelivery) - outputAsync.process(exchange, doneSync -> { - if (LOG.isTraceEnabled()) { - LOG.trace("Redelivering exchangeId: {}", exchange.getExchangeId()); - } - - // only process if the exchange hasn't failed - // and it has not been handled by the error processor - if (isDone(exchange)) { - reactiveExecutor.schedule(callback); - return; - } else { - // error occurred so loop back around which we do by invoking the processAsyncErrorHandler - reactiveExecutor.schedule(this); - } - }); - } - - protected void prepareExchangeForContinue(Exchange exchange, boolean isDeadLetterChannel) { - Exception caught = exchange.getException(); - - // we continue so clear any exceptions - exchange.setException(null); - // clear rollback flags - exchange.setRollbackOnly(false); - // reset cached streams so they can be read again - MessageHelper.resetStreamCache(exchange.getIn()); - - // its continued then remove traces of redelivery attempted and caught exception - exchange.getIn().removeHeader(Exchange.REDELIVERED); - exchange.getIn().removeHeader(Exchange.REDELIVERY_COUNTER); - exchange.getIn().removeHeader(Exchange.REDELIVERY_MAX_COUNTER); - exchange.removeProperty(Exchange.FAILURE_HANDLED); - // keep the Exchange.EXCEPTION_CAUGHT as property so end user knows the caused exception - - // create log message - String msg = "Failed delivery for " + ExchangeHelper.logIds(exchange); - msg = msg + ". Exhausted after delivery attempt: " + redeliveryCounter + " caught: " + caught; - msg = msg + ". Handled and continue routing."; - - // log that we failed but want to continue - logFailedDelivery(false, false, false, true, isDeadLetterChannel, exchange, msg, null); - } - - protected void prepareExchangeForRedelivery() { - if (!redeliveryEnabled) { - throw new IllegalStateException("Redelivery is not enabled on " + RedeliveryErrorHandler.this + ". Make sure you have configured the error handler properly."); - } - // there must be a defensive copy of the exchange - ObjectHelper.notNull(this.original, "Defensive copy of Exchange is null", RedeliveryErrorHandler.this); - - // okay we will give it another go so clear the exception so we can try again - exchange.setException(null); - - // clear rollback flags - exchange.setRollbackOnly(false); - - // TODO: We may want to store these as state on RedeliveryData so we keep them in case end user messes with Exchange - // and then put these on the exchange when doing a redelivery / fault processor - - // preserve these headers - Integer redeliveryCounter = exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER, Integer.class); - Integer redeliveryMaxCounter = exchange.getIn().getHeader(Exchange.REDELIVERY_MAX_COUNTER, Integer.class); - Boolean redelivered = exchange.getIn().getHeader(Exchange.REDELIVERED, Boolean.class); - - // we are redelivering so copy from original back to exchange - exchange.getIn().copyFrom(this.original.getIn()); - exchange.setOut(null); - // reset cached streams so they can be read again - MessageHelper.resetStreamCache(exchange.getIn()); - - // put back headers - if (redeliveryCounter != null) { - exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, redeliveryCounter); - } - if (redeliveryMaxCounter != null) { - exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, redeliveryMaxCounter); - } - if (redelivered != null) { - exchange.getIn().setHeader(Exchange.REDELIVERED, redelivered); - } - } - - protected void handleException() { - Exception e = exchange.getException(); - // e is never null - - Throwable previous = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); - if (previous != null && previous != e) { - // a 2nd exception was thrown while handling a previous exception - // so we need to add the previous as suppressed by the new exception - // see also FatalFallbackErrorHandler - Throwable[] suppressed = e.getSuppressed(); - boolean found = false; - for (Throwable t : suppressed) { - if (t == previous) { - found = true; - } - } - if (!found) { - e.addSuppressed(previous); - } - } - - // store the original caused exception in a property, so we can restore it later - exchange.setProperty(Exchange.EXCEPTION_CAUGHT, e); - - // find the error handler to use (if any) - org.apache.camel.processor.errorhandler.ExceptionPolicy exceptionPolicy = getExceptionPolicy(exchange, e); - if (exceptionPolicy != null) { - currentRedeliveryPolicy = exceptionPolicy.createRedeliveryPolicy(exchange.getContext(), currentRedeliveryPolicy); - handledPredicate = exceptionPolicy.getHandledPolicy(); - continuedPredicate = exceptionPolicy.getContinuedPolicy(); - retryWhilePredicate = exceptionPolicy.getRetryWhilePolicy(); - useOriginalInMessage = exceptionPolicy.isUseOriginalInMessage(); - useOriginalInBody = exceptionPolicy.isUseOriginalInBody(); - - // route specific failure handler? - Processor processor = null; - Route rc = ExchangeHelper.getRoute(exchange); - if (rc != null) { - processor = rc.getOnException(exceptionPolicy.getId()); - } else { - // note this should really not happen, but we have this code as a fail safe - // to be backwards compatible with the old behavior - LOG.warn("Cannot determine current route from Exchange with id: {}, will fallback and use first error handler.", exchange.getExchangeId()); - } - if (processor != null) { - failureProcessor = processor; - } - - // route specific on redelivery? - processor = exceptionPolicy.getOnRedelivery(); - if (processor != null) { - onRedeliveryProcessor = processor; - } - // route specific on exception occurred? - processor = exceptionPolicy.getOnExceptionOccurred(); - if (processor != null) { - onExceptionProcessor = processor; - } - } - - // only log if not failure handled or not an exhausted unit of work - if (!ExchangeHelper.isFailureHandled(exchange) && !ExchangeHelper.isUnitOfWorkExhausted(exchange)) { - String msg = "Failed delivery for " + ExchangeHelper.logIds(exchange) - + ". On delivery attempt: " + redeliveryCounter + " caught: " + e; - logFailedDelivery(true, false, false, false, isDeadLetterChannel(), exchange, msg, e); - } - - redeliveryCounter = incrementRedeliveryCounter(exchange, e); - } - - /** - * Gives an optional configured OnExceptionOccurred processor a chance to process just after an exception - * was thrown while processing the Exchange. This allows to execute the processor at the same time the exception was thrown. - */ - protected void onExceptionOccurred() { - if (onExceptionProcessor == null) { - return; - } - - // run this synchronously as its just a Processor - try { - if (LOG.isTraceEnabled()) { - LOG.trace("OnExceptionOccurred processor {} is processing Exchange: {} due exception occurred", onExceptionProcessor, exchange); - } - onExceptionProcessor.process(exchange); - } catch (Throwable e) { - // we dont not want new exception to override existing, so log it as a WARN - LOG.warn("Error during processing OnExceptionOccurred. This exception is ignored.", e); - } - LOG.trace("OnExceptionOccurred processor done"); - } - - /** - * Gives an optional configured redelivery processor a chance to process before the Exchange - * will be redelivered. This can be used to alter the Exchange. - */ - protected void deliverToOnRedeliveryProcessor() { - if (onRedeliveryProcessor == null) { - return; - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Redelivery processor {} is processing Exchange: {} before its redelivered", - onRedeliveryProcessor, exchange); - } - - // run this synchronously as its just a Processor - try { - onRedeliveryProcessor.process(exchange); - } catch (Throwable e) { - exchange.setException(e); - } - LOG.trace("Redelivery processor done"); - } - - /** - * All redelivery attempts failed so move the exchange to the dead letter queue - */ - protected void deliverToFailureProcessor(final Processor processor, final boolean isDeadLetterChannel, final Exchange exchange) { - Exception caught = exchange.getException(); - - // we did not success with the redelivery so now we let the failure processor handle it - // clear exception as we let the failure processor handle it - exchange.setException(null); - - final boolean shouldHandle = shouldHandle(exchange); - final boolean shouldContinue = shouldContinue(exchange); - - // regard both handled or continued as being handled - boolean handled = false; - - // always handle if dead letter channel - boolean handleOrContinue = isDeadLetterChannel || shouldHandle || shouldContinue; - if (handleOrContinue) { - // its handled then remove traces of redelivery attempted - exchange.getIn().removeHeader(Exchange.REDELIVERED); - exchange.getIn().removeHeader(Exchange.REDELIVERY_COUNTER); - exchange.getIn().removeHeader(Exchange.REDELIVERY_MAX_COUNTER); - exchange.adapt(ExtendedExchange.class).setRedeliveryExhausted(false); - - // and remove traces of rollback only and uow exhausted markers - exchange.setRollbackOnly(false); - exchange.removeProperty(Exchange.UNIT_OF_WORK_EXHAUSTED); - - handled = true; - } else { - // must decrement the redelivery counter as we didn't process the redelivery but is - // handling by the failure handler. So we must -1 to not let the counter be out-of-sync - decrementRedeliveryCounter(exchange); - } - - // we should allow using the failure processor if we should not continue - // or in case of continue then the failure processor is NOT a dead letter channel - // because you can continue and still let the failure processor do some routing - // before continue in the main route. - boolean allowFailureProcessor = !shouldContinue || !isDeadLetterChannel; - - if (allowFailureProcessor && processor != null) { - - // prepare original IN message/body if it should be moved instead of current message/body - if (useOriginalInMessage || useOriginalInBody) { - Message original = ExchangeHelper.getOriginalInMessage(exchange); - if (useOriginalInMessage) { - LOG.trace("Using the original IN message instead of current"); - exchange.setIn(original); - } else { - LOG.trace("Using the original IN message body instead of current"); - exchange.getIn().setBody(original.getBody()); - } - if (exchange.hasOut()) { - LOG.trace("Removing the out message to avoid some uncertain behavior"); - exchange.setOut(null); - } - } - - // reset cached streams so they can be read again - MessageHelper.resetStreamCache(exchange.getIn()); - - // invoke custom on prepare - if (onPrepareProcessor != null) { - try { - LOG.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange); - onPrepareProcessor.process(exchange); - } catch (Exception e) { - // a new exception was thrown during prepare - exchange.setException(e); - } - } - - LOG.trace("Failure processor {} is processing Exchange: {}", processor, exchange); - - // store the last to endpoint as the failure endpoint - exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT)); - // and store the route id so we know in which route we failed - Route rc = ExchangeHelper.getRoute(exchange); - if (rc != null) { - exchange.setProperty(Exchange.FAILURE_ROUTE_ID, rc.getRouteId()); - } - - // fire event as we had a failure processor to handle it, which there is a event for - final boolean deadLetterChannel = processor == deadLetter; - - if (camelContext.isEventNotificationApplicable()) { - EventHelper.notifyExchangeFailureHandling(exchange.getContext(), exchange, processor, deadLetterChannel, deadLetterUri); - } - - // the failure processor could also be asynchronous - AsyncProcessor afp = AsyncProcessorConverterHelper.convert(processor); - afp.process(exchange, sync -> { - LOG.trace("Failure processor done: {} processing Exchange: {}", processor, exchange); - try { - prepareExchangeAfterFailure(exchange, isDeadLetterChannel, shouldHandle, shouldContinue); - // fire event as we had a failure processor to handle it, which there is a event for - if (camelContext.isEventNotificationApplicable()) { - EventHelper.notifyExchangeFailureHandled(exchange.getContext(), exchange, processor, deadLetterChannel, deadLetterUri); - } - } finally { - // if the fault was handled asynchronously, this should be reflected in the callback as well - reactiveExecutor.schedule(callback); - } - }); - } else { - try { - // invoke custom on prepare - if (onPrepareProcessor != null) { - try { - LOG.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange); - onPrepareProcessor.process(exchange); - } catch (Exception e) { - // a new exception was thrown during prepare - exchange.setException(e); - } - } - // no processor but we need to prepare after failure as well - prepareExchangeAfterFailure(exchange, isDeadLetterChannel, shouldHandle, shouldContinue); - } finally { - // callback we are done - reactiveExecutor.schedule(callback); - } - } - - // create log message - String msg = "Failed delivery for " + ExchangeHelper.logIds(exchange); - msg = msg + ". Exhausted after delivery attempt: " + redeliveryCounter + " caught: " + caught; - if (processor != null) { - if (isDeadLetterChannel && deadLetterUri != null) { - msg = msg + ". Handled by DeadLetterChannel: [" + URISupport.sanitizeUri(deadLetterUri) + "]"; - } else { - msg = msg + ". Processed by failure processor: " + processor; - } - } - - // log that we failed delivery as we are exhausted - logFailedDelivery(false, false, handled, false, isDeadLetterChannel, exchange, msg, null); - } - - protected void prepareExchangeAfterFailure(final Exchange exchange, final boolean isDeadLetterChannel, - final boolean shouldHandle, final boolean shouldContinue) { - - ExtendedExchange ee = (ExtendedExchange) exchange; - Exception newException = exchange.getException(); - - // we could not process the exchange so we let the failure processor handled it - ExchangeHelper.setFailureHandled(exchange); - - // honor if already set a handling - boolean alreadySet = ee.getErrorHandlerHandled() != null; - if (alreadySet) { - boolean handled = ee.getErrorHandlerHandled() != null && ee.getErrorHandlerHandled(); - LOG.trace("This exchange has already been marked for handling: {}", handled); - if (!handled) { - // exception not handled, put exception back in the exchange - exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); - // and put failure endpoint back as well - exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT)); - } - return; - } - - // dead letter channel is special - if (shouldContinue) { - LOG.trace("This exchange is continued: {}", exchange); - // okay we want to continue then prepare the exchange for that as well - prepareExchangeForContinue(exchange, isDeadLetterChannel); - } else if (shouldHandle) { - LOG.trace("This exchange is handled so its marked as not failed: {}", exchange); - ee.setErrorHandlerHandled(true); - } else { - // okay the redelivery policy are not explicit set to true, so we should allow to check for some - // special situations when using dead letter channel - if (isDeadLetterChannel) { - - // DLC is always handling the first thrown exception, - // but if its a new exception then use the configured option - boolean handled = newException == null || deadLetterHandleNewException; - - // when using DLC then log new exception whether its being handled or not, as otherwise it may appear as - // the DLC swallow new exceptions by default (which is by design to ensure the DLC always complete, - // to avoid causing endless poison messages that fails forever) - if (newException != null && currentRedeliveryPolicy.isLogNewException()) { - String uri = URISupport.sanitizeUri(deadLetterUri); - String msg = "New exception occurred during processing by the DeadLetterChannel[" + uri + "] due " + newException.getMessage(); - if (handled) { - msg += ". The new exception is being handled as deadLetterHandleNewException=true."; - } else { - msg += ". The new exception is not handled as deadLetterHandleNewException=false."; - } - logFailedDelivery(false, true, handled, false, true, exchange, msg, newException); - } - - if (handled) { - LOG.trace("This exchange is handled so its marked as not failed: {}", exchange); - ee.setErrorHandlerHandled(true); - return; - } - } - - // not handled by default - prepareExchangeAfterFailureNotHandled(exchange); - } - } - - private void prepareExchangeAfterFailureNotHandled(Exchange exchange) { - ExtendedExchange ee = (ExtendedExchange) exchange; - - LOG.trace("This exchange is not handled or continued so its marked as failed: {}", ee); - // exception not handled, put exception back in the exchange - ee.setErrorHandlerHandled(false); - ee.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class)); - // and put failure endpoint back as well - ee.setProperty(Exchange.FAILURE_ENDPOINT, ee.getProperty(Exchange.TO_ENDPOINT)); - // and store the route id so we know in which route we failed - String routeId = ExchangeHelper.getAtRouteId(ee); - if (routeId != null) { - ee.setProperty(Exchange.FAILURE_ROUTE_ID, routeId); - } - } - - private void logFailedDelivery(boolean shouldRedeliver, boolean newException, boolean handled, boolean continued, boolean isDeadLetterChannel, - Exchange exchange, String message, Throwable e) { - if (logger == null) { - return; - } - - if (!exchange.isRollbackOnly() && !exchange.isRollbackOnlyLast()) { - if (newException && !currentRedeliveryPolicy.isLogNewException()) { - // do not log new exception - return; - } - - // if we should not rollback, then check whether logging is enabled - - if (!newException && handled && !currentRedeliveryPolicy.isLogHandled()) { - // do not log handled - return; - } - - if (!newException && continued && !currentRedeliveryPolicy.isLogContinued()) { - // do not log handled - return; - } - - if (!newException && shouldRedeliver && !currentRedeliveryPolicy.isLogRetryAttempted()) { - // do not log retry attempts - return; - } - - if (!newException && shouldRedeliver) { - if (currentRedeliveryPolicy.isLogRetryAttempted()) { - if ((currentRedeliveryPolicy.getRetryAttemptedLogInterval() > 1) && (redeliveryCounter % currentRedeliveryPolicy.getRetryAttemptedLogInterval()) != 0) { - // do not log retry attempt because it is excluded by the retryAttemptedLogInterval - return; - } - } else { - // do not log retry attempts - return; - } - } - - if (!newException && !shouldRedeliver && !currentRedeliveryPolicy.isLogExhausted()) { - // do not log exhausted - return; - } - } - - LoggingLevel newLogLevel; - boolean logStackTrace; - if (exchange.isRollbackOnly() || exchange.isRollbackOnlyLast()) { - newLogLevel = currentRedeliveryPolicy.getRetriesExhaustedLogLevel(); - logStackTrace = currentRedeliveryPolicy.isLogStackTrace(); - } else if (shouldRedeliver) { - newLogLevel = currentRedeliveryPolicy.getRetryAttemptedLogLevel(); - logStackTrace = currentRedeliveryPolicy.isLogRetryStackTrace(); - } else { - newLogLevel = currentRedeliveryPolicy.getRetriesExhaustedLogLevel(); - logStackTrace = currentRedeliveryPolicy.isLogStackTrace(); - } - if (e == null) { - e = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class); - } - - if (newException) { - // log at most WARN level - if (newLogLevel == LoggingLevel.ERROR) { - newLogLevel = LoggingLevel.WARN; - } - String msg = message; - if (msg == null) { - msg = "New exception " + ExchangeHelper.logIds(exchange); - // special for logging the new exception - Throwable cause = e; - if (cause != null) { - msg = msg + " due: " + cause.getMessage(); - } - } - - if (e != null && logStackTrace) { - logger.log(msg, e, newLogLevel); - } else { - logger.log(msg, newLogLevel); - } - } else if (exchange.isRollbackOnly() || exchange.isRollbackOnlyLast()) { - String msg = "Rollback " + ExchangeHelper.logIds(exchange); - Throwable cause = exchange.getException() != null ? exchange.getException() : exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class); - if (cause != null) { - msg = msg + " due: " + cause.getMessage(); - } - - // should we include message history - if (!shouldRedeliver && currentRedeliveryPolicy.isLogExhaustedMessageHistory()) { - // only use the exchange formatter if we should log exhausted message body (and if using a custom formatter then always use it) - ExchangeFormatter formatter = customExchangeFormatter - ? exchangeFormatter : (currentRedeliveryPolicy.isLogExhaustedMessageBody() || camelContext.isLogExhaustedMessageBody() ? exchangeFormatter : null); - String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, formatter, false); - if (routeStackTrace != null) { - msg = msg + "\n" + routeStackTrace; - } - } - - if (newLogLevel == LoggingLevel.ERROR) { - // log intended rollback on maximum WARN level (not ERROR) - logger.log(msg, LoggingLevel.WARN); - } else { - // otherwise use the desired logging level - logger.log(msg, newLogLevel); - } - } else { - String msg = message; - // should we include message history - if (!shouldRedeliver && currentRedeliveryPolicy.isLogExhaustedMessageHistory()) { - // only use the exchange formatter if we should log exhausted message body (and if using a custom formatter then always use it) - ExchangeFormatter formatter = customExchangeFormatter - ? exchangeFormatter : (currentRedeliveryPolicy.isLogExhaustedMessageBody() || camelContext.isLogExhaustedMessageBody() ? exchangeFormatter : null); - String routeStackTrace = MessageHelper.dumpMessageHistoryStacktrace(exchange, formatter, e != null && logStackTrace); - if (routeStackTrace != null) { - msg = msg + "\n" + routeStackTrace; - } - } - - if (e != null && logStackTrace) { - logger.log(msg, e, newLogLevel); - } else { - logger.log(msg, newLogLevel); - } - } - } - - /** - * Determines whether or not to continue if we are exhausted. - * - * @param exchange the current exchange - * @return true to continue, or false to exhaust. - */ - private boolean shouldContinue(Exchange exchange) { - if (continuedPredicate != null) { - return continuedPredicate.matches(exchange); - } - // do not continue by default - return false; - } - - /** - * Determines whether or not to handle if we are exhausted. - * - * @param exchange the current exchange - * @return true to handle, or false to exhaust. - */ - private boolean shouldHandle(Exchange exchange) { - if (handledPredicate != null) { - return handledPredicate.matches(exchange); - } - // do not handle by default - return false; - } - - /** - * Increments the redelivery counter and adds the redelivered flag if the - * message has been redelivered - */ - private int incrementRedeliveryCounter(Exchange exchange, Throwable e) { - Message in = exchange.getIn(); - Integer counter = in.getHeader(Exchange.REDELIVERY_COUNTER, Integer.class); - int next = counter != null ? counter + 1 : 1; - in.setHeader(Exchange.REDELIVERY_COUNTER, next); - in.setHeader(Exchange.REDELIVERED, Boolean.TRUE); - // if maximum redeliveries is used, then provide that information as well - if (currentRedeliveryPolicy.getMaximumRedeliveries() > 0) { - in.setHeader(Exchange.REDELIVERY_MAX_COUNTER, currentRedeliveryPolicy.getMaximumRedeliveries()); - } - return next; - } - - /** - * Method for sleeping during redelivery attempts. - *

- * This task is for the synchronous blocking. If using async delayed then a scheduled thread pool - * is used for sleeping and trigger redeliveries. - */ - public boolean sleep() throws InterruptedException { - // for small delays then just sleep - if (redeliveryDelay < 1000) { - currentRedeliveryPolicy.sleep(redeliveryDelay); - return true; - } - - StopWatch watch = new StopWatch(); - - LOG.debug("Sleeping for: {} millis until attempting redelivery", redeliveryDelay); - while (watch.taken() < redeliveryDelay) { - // sleep using 1 sec interval - - long delta = redeliveryDelay - watch.taken(); - long max = Math.min(1000, delta); - if (max > 0) { - LOG.trace("Sleeping for: {} millis until waking up for re-check", max); - Thread.sleep(max); - } - - // are we preparing for shutdown then only do redelivery if allowed - if (preparingShutdown && !currentRedeliveryPolicy.isAllowRedeliveryWhileStopping()) { - LOG.debug("Rejected redelivery while stopping"); - return false; - } - } - - return true; - } - } - - /** - * Prepares the redelivery counter and boolean flag for the failure handle processor - */ - private void decrementRedeliveryCounter(Exchange exchange) { - Message in = exchange.getIn(); - Integer counter = in.getHeader(Exchange.REDELIVERY_COUNTER, Integer.class); - if (counter != null) { - int prev = counter - 1; - in.setHeader(Exchange.REDELIVERY_COUNTER, prev); - // set boolean flag according to counter - in.setHeader(Exchange.REDELIVERED, prev > 0 ? Boolean.TRUE : Boolean.FALSE); - } else { - // not redelivered - in.setHeader(Exchange.REDELIVERY_COUNTER, 0); - in.setHeader(Exchange.REDELIVERED, Boolean.FALSE); - } - } - - /** - * Determines if redelivery is enabled by checking if any of the redelivery policy - * settings may allow redeliveries. - * - * @return true if redelivery is possible, false otherwise - * @throws Exception can be thrown - */ - public boolean determineIfRedeliveryIsEnabled() throws Exception { - // determine if redeliver is enabled either on error handler - if (getRedeliveryPolicy().getMaximumRedeliveries() != 0) { - // must check for != 0 as (-1 means redeliver forever) - return true; - } - if (retryWhilePolicy != null) { - return true; - } - - // or on the exception policies - if (!exceptionPolicies.isEmpty()) { - // walk them to see if any of them have a maximum redeliveries > 0 or retry until set - for (ExceptionPolicy def : exceptionPolicies.values()) { - if (def.determineIfRedeliveryIsEnabled(camelContext)) { - return true; - } - } - } - - return false; - } - - /** - * Gets the number of exchanges that are pending for redelivery - */ - public int getPendingRedeliveryCount() { - int answer = redeliverySleepCounter.get(); - if (executorService instanceof ThreadPoolExecutor) { - answer += ((ThreadPoolExecutor) executorService).getQueue().size(); - } - - return answer; - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(output, outputAsync, deadLetter); - - // determine if redeliver is enabled or not - redeliveryEnabled = determineIfRedeliveryIsEnabled(); - if (LOG.isTraceEnabled()) { - LOG.trace("Redelivery enabled: {} on error handler: {}", redeliveryEnabled, this); - } - - // we only need thread pool if redelivery is enabled - if (redeliveryEnabled) { - if (executorService == null) { - // use default shared executor service - executorService = camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerExecutorService(); - } - if (LOG.isDebugEnabled()) { - LOG.debug("Using ExecutorService: {} for redeliveries on error handler: {}", executorService, this); - } - } - - // reset flag when starting - preparingShutdown = false; - redeliverySleepCounter.set(0); - - // calculate if we can use simple task or not - // if we need redelivery and other things then we cannot) - // however if we dont then its less memory overhead (and a bit less cpu) of using the simple task - simpleTask = deadLetter == null && !redeliveryEnabled && exceptionPolicies.isEmpty() - && onPrepareProcessor == null; - } - - @Override - protected void doStop() throws Exception { - // noop, do not stop any services which we only do when shutting down - // as the error handler can be context scoped, and should not stop in case - // a route stops - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(deadLetter, output, outputAsync); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java deleted file mode 100644 index 9ec836d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java +++ /dev/null @@ -1,785 +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.processor.errorhandler; - -import org.apache.camel.Exchange; -import org.apache.camel.LoggingLevel; -import org.apache.camel.Predicate; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.Serializable; -import java.util.Random; - -/** - * The policy used to decide how many times to redeliver and the time between - * the redeliveries before being sent to a Dead Letter - * Channel - *

- * The default values are: - *

    - *
  • maximumRedeliveries = 0
    • - *
  • redeliveryDelay = 1000L (the initial delay)
    • - *
  • maximumRedeliveryDelay = 60 * 1000L
    • - *
  • asyncDelayedRedelivery = false
    • - *
  • backOffMultiplier = 2
    • - *
  • useExponentialBackOff = false
    • - *
  • collisionAvoidanceFactor = 0.15d
    • - *
  • useCollisionAvoidance = false
    • - *
  • retriesExhaustedLogLevel = LoggingLevel.ERROR
    • - *
  • retryAttemptedLogLevel = LoggingLevel.DEBUG
    • - *
  • retryAttemptedLogInterval = 1
    • - *
  • logRetryAttempted = true
    • - *
  • logRetryStackTrace = false
    • - *
  • logStackTrace = true
    • - *
  • logHandled = false
    • - *
  • logExhausted = true
    • - *
  • logExhaustedMessageHistory = true
    • - *
  • logExhaustedMessageBody = false
    • - *
  • logNewException = true
    • - *
  • allowRedeliveryWhileStopping = true
    • - *
- *

- * Setting the maximumRedeliveries to a negative value such as -1 will then always redeliver (unlimited). - * Setting the maximumRedeliveries to 0 will disable redelivery. - *

- * This policy can be configured either by one of the following two settings: - *

    - *
  • using conventional options, using all the options defined above
    • - *
  • using delay pattern to declare intervals for delays
    • - *
- *

- * Note: If using delay patterns then the following options is not used (delay, backOffMultiplier, useExponentialBackOff, useCollisionAvoidance) - *

- * Using delay pattern: - *
The delay pattern syntax is: limit:delay;limit 2:delay 2;limit 3:delay 3;...;limit N:delay N. - *

- * How it works is best illustrate with an example with this pattern: delayPattern=5:1000;10:5000:20:20000 - *
The delays will be for attempt in range 0..4 = 0 millis, 5..9 = 1000 millis, 10..19 = 5000 millis, >= 20 = 20000 millis. - *

- * If you want to set a starting delay, then use 0 as the first limit, eg: 0:1000;5:5000 will use 1 sec delay - * until attempt number 5 where it will use 5 seconds going forward. - */ -public class RedeliveryPolicy implements Cloneable, Serializable { - protected static Random randomNumberGenerator; - private static final long serialVersionUID = -338222777701473252L; - private static final Logger LOG = LoggerFactory.getLogger(RedeliveryPolicy.class); - - protected long redeliveryDelay = 1000L; - protected int maximumRedeliveries; - protected long maximumRedeliveryDelay = 60 * 1000L; - protected double backOffMultiplier = 2; - protected boolean useExponentialBackOff; - // +/-15% for a 30% spread -cgs - protected double collisionAvoidanceFactor = 0.15d; - protected boolean useCollisionAvoidance; - protected LoggingLevel retriesExhaustedLogLevel = LoggingLevel.ERROR; - protected LoggingLevel retryAttemptedLogLevel = LoggingLevel.DEBUG; - protected int retryAttemptedLogInterval = 1; - protected boolean logStackTrace = true; - protected boolean logRetryStackTrace; - protected boolean logHandled; - protected boolean logContinued; - protected boolean logExhausted = true; - protected boolean logNewException = true; - protected Boolean logExhaustedMessageHistory; - protected Boolean logExhaustedMessageBody; - protected boolean logRetryAttempted = true; - protected String delayPattern; - protected boolean asyncDelayedRedelivery; - protected boolean allowRedeliveryWhileStopping = true; - protected String exchangeFormatterRef; - - public RedeliveryPolicy() { - } - - @Override - public String toString() { - return "RedeliveryPolicy[maximumRedeliveries=" + maximumRedeliveries - + ", redeliveryDelay=" + redeliveryDelay - + ", maximumRedeliveryDelay=" + maximumRedeliveryDelay - + ", asyncDelayedRedelivery=" + asyncDelayedRedelivery - + ", allowRedeliveryWhileStopping=" + allowRedeliveryWhileStopping - + ", retriesExhaustedLogLevel=" + retriesExhaustedLogLevel - + ", retryAttemptedLogLevel=" + retryAttemptedLogLevel - + ", retryAttemptedLogInterval=" + retryAttemptedLogInterval - + ", logRetryAttempted=" + logRetryAttempted - + ", logStackTrace=" + logStackTrace - + ", logRetryStackTrace=" + logRetryStackTrace - + ", logHandled=" + logHandled - + ", logContinued=" + logContinued - + ", logExhausted=" + logExhausted - + ", logNewException=" + logNewException - + ", logExhaustedMessageHistory=" + logExhaustedMessageHistory - + ", logExhaustedMessageBody=" + logExhaustedMessageBody - + ", useExponentialBackOff=" + useExponentialBackOff - + ", backOffMultiplier=" + backOffMultiplier - + ", useCollisionAvoidance=" + useCollisionAvoidance - + ", collisionAvoidanceFactor=" + collisionAvoidanceFactor - + ", delayPattern=" + delayPattern - + ", exchangeFormatterRef=" + exchangeFormatterRef + "]"; - } - - public RedeliveryPolicy copy() { - try { - return (RedeliveryPolicy)clone(); - } catch (CloneNotSupportedException e) { - throw new RuntimeException("Could not clone: " + e, e); - } - } - - /** - * Returns true if the policy decides that the message exchange should be - * redelivered. - * - * @param exchange the current exchange - * @param redeliveryCounter the current retry counter - * @param retryWhile an optional predicate to determine if we should redeliver or not - * @return true to redeliver, false to stop - */ - public boolean shouldRedeliver(Exchange exchange, int redeliveryCounter, Predicate retryWhile) { - // predicate is always used if provided - if (retryWhile != null) { - return retryWhile.matches(exchange); - } - - if (getMaximumRedeliveries() < 0) { - // retry forever if negative value - return true; - } - // redeliver until we hit the max - return redeliveryCounter <= getMaximumRedeliveries(); - } - - - /** - * Calculates the new redelivery delay based on the last one and then sleeps for the necessary amount of time. - *

- * This implementation will block while sleeping. - * - * @param redeliveryDelay previous redelivery delay - * @param redeliveryCounter number of previous redelivery attempts - * @return the calculate delay - * @throws InterruptedException is thrown if the sleep is interrupted likely because of shutdown - */ - public long sleep(long redeliveryDelay, int redeliveryCounter) throws InterruptedException { - redeliveryDelay = calculateRedeliveryDelay(redeliveryDelay, redeliveryCounter); - - if (redeliveryDelay > 0) { - sleep(redeliveryDelay); - } - return redeliveryDelay; - } - - /** - * Sleeps for the given delay - * - * @param redeliveryDelay the delay - * @throws InterruptedException is thrown if the sleep is interrupted likely because of shutdown - */ - public void sleep(long redeliveryDelay) throws InterruptedException { - LOG.debug("Sleeping for: {} millis until attempting redelivery", redeliveryDelay); - Thread.sleep(redeliveryDelay); - } - - /** - * Calculates the new redelivery delay based on the last one - * - * @param previousDelay previous redelivery delay - * @param redeliveryCounter number of previous redelivery attempts - * @return the calculate delay - */ - public long calculateRedeliveryDelay(long previousDelay, int redeliveryCounter) { - if (ObjectHelper.isNotEmpty(delayPattern)) { - // calculate delay using the pattern - return calculateRedeliverDelayUsingPattern(delayPattern, redeliveryCounter); - } - - // calculate the delay using the conventional parameters - long redeliveryDelayResult; - if (previousDelay == 0) { - redeliveryDelayResult = redeliveryDelay; - } else if (useExponentialBackOff && backOffMultiplier > 1) { - redeliveryDelayResult = Math.round(backOffMultiplier * previousDelay); - } else { - redeliveryDelayResult = previousDelay; - } - - if (useCollisionAvoidance) { - - /* - * First random determines +/-, second random determines how far to - * go in that direction. -cgs - */ - Random random = getRandomNumberGenerator(); - double variance = (random.nextBoolean() ? collisionAvoidanceFactor : -collisionAvoidanceFactor) - * random.nextDouble(); - redeliveryDelayResult += redeliveryDelayResult * variance; - } - - // ensure the calculated result is not bigger than the max delay (if configured) - if (maximumRedeliveryDelay > 0 && redeliveryDelayResult > maximumRedeliveryDelay) { - redeliveryDelayResult = maximumRedeliveryDelay; - } - - return redeliveryDelayResult; - } - - /** - * Calculates the delay using the delay pattern - */ - protected static long calculateRedeliverDelayUsingPattern(String delayPattern, int redeliveryCounter) { - String[] groups = delayPattern.split(";"); - // find the group where the redelivery counter matches - long answer = 0; - for (String group : groups) { - long delay = Long.valueOf(StringHelper.after(group, ":")); - int count = Integer.valueOf(StringHelper.before(group, ":")); - if (count > redeliveryCounter) { - break; - } else { - answer = delay; - } - } - - return answer; - } - - // Builder methods - // ------------------------------------------------------------------------- - - /** - * Sets the initial redelivery delay in milliseconds - */ - public RedeliveryPolicy redeliveryDelay(long delay) { - setRedeliveryDelay(delay); - return this; - } - - /** - * Sets the maximum number of times a message exchange will be redelivered - */ - public RedeliveryPolicy maximumRedeliveries(int maximumRedeliveries) { - setMaximumRedeliveries(maximumRedeliveries); - return this; - } - - /** - * Enables collision avoidance which adds some randomization to the backoff - * timings to reduce contention probability - */ - public RedeliveryPolicy useCollisionAvoidance() { - setUseCollisionAvoidance(true); - return this; - } - - /** - * Enables exponential backoff using the {@link #getBackOffMultiplier()} to - * increase the time between retries - */ - public RedeliveryPolicy useExponentialBackOff() { - setUseExponentialBackOff(true); - return this; - } - - /** - * Enables exponential backoff and sets the multiplier used to increase the - * delay between redeliveries - */ - public RedeliveryPolicy backOffMultiplier(double multiplier) { - useExponentialBackOff(); - setBackOffMultiplier(multiplier); - return this; - } - - /** - * Enables collision avoidance and sets the percentage used - */ - public RedeliveryPolicy collisionAvoidancePercent(double collisionAvoidancePercent) { - useCollisionAvoidance(); - setCollisionAvoidancePercent(collisionAvoidancePercent); - return this; - } - - /** - * Sets the maximum redelivery delay if using exponential back off. - * Use -1 if you wish to have no maximum - */ - public RedeliveryPolicy maximumRedeliveryDelay(long maximumRedeliveryDelay) { - setMaximumRedeliveryDelay(maximumRedeliveryDelay); - return this; - } - - /** - * Sets the logging level to use for log messages when retries have been exhausted. - */ - public RedeliveryPolicy retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) { - setRetriesExhaustedLogLevel(retriesExhaustedLogLevel); - return this; - } - - /** - * Sets the logging level to use for log messages when retries are attempted. - */ - public RedeliveryPolicy retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) { - setRetryAttemptedLogLevel(retryAttemptedLogLevel); - return this; - } - - /** - * Sets the interval to log retry attempts - */ - public RedeliveryPolicy retryAttemptedLogInterval(int logRetryAttemptedInterval) { - setRetryAttemptedLogInterval(logRetryAttemptedInterval); - return this; - } - - /** - * Sets whether to log retry attempts - */ - public RedeliveryPolicy logRetryAttempted(boolean logRetryAttempted) { - setLogRetryAttempted(logRetryAttempted); - return this; - } - - /** - * Sets whether to log stacktrace for failed messages. - */ - public RedeliveryPolicy logStackTrace(boolean logStackTrace) { - setLogStackTrace(logStackTrace); - return this; - } - - /** - * Sets whether to log stacktrace for failed redelivery attempts - */ - public RedeliveryPolicy logRetryStackTrace(boolean logRetryStackTrace) { - setLogRetryStackTrace(logRetryStackTrace); - return this; - } - - /** - * Sets whether to log errors even if its handled - */ - public RedeliveryPolicy logHandled(boolean logHandled) { - setLogHandled(logHandled); - return this; - } - - /** - * Sets whether errors should be logged when a new exception occurred during handling a previous exception - */ - public RedeliveryPolicy logNewException(boolean logNewException) { - setLogNewException(logNewException); - return this; - } - - /** - * Sets whether to log exhausted errors - */ - public RedeliveryPolicy logExhausted(boolean logExhausted) { - setLogExhausted(logExhausted); - return this; - } - - /** - * Sets whether to log exhausted errors including message history - */ - public RedeliveryPolicy logExhaustedMessageHistory(boolean logExhaustedMessageHistory) { - setLogExhaustedMessageHistory(logExhaustedMessageHistory); - return this; - } - - /** - * Sets whether to log exhausted errors including message body (requires message history to be enabled) - */ - public RedeliveryPolicy logExhaustedMessageBody(boolean logExhaustedMessageBody) { - setLogExhaustedMessageBody(logExhaustedMessageBody); - return this; - } - - /** - * Sets the delay pattern with delay intervals. - */ - public RedeliveryPolicy delayPattern(String delayPattern) { - setDelayPattern(delayPattern); - return this; - } - - /** - * Disables redelivery by setting maximum redeliveries to 0. - */ - public RedeliveryPolicy disableRedelivery() { - setMaximumRedeliveries(0); - return this; - } - - /** - * Allow asynchronous delayed redelivery. - * - * @see #setAsyncDelayedRedelivery(boolean) - */ - public RedeliveryPolicy asyncDelayedRedelivery() { - setAsyncDelayedRedelivery(true); - return this; - } - - /** - * Controls whether to allow redelivery while stopping/shutting down a route that uses error handling. - * - * @param redeliverWhileStopping true to allow redelivery, false to reject redeliveries - */ - public RedeliveryPolicy allowRedeliveryWhileStopping(boolean redeliverWhileStopping) { - setAllowRedeliveryWhileStopping(redeliverWhileStopping); - return this; - } - - /** - * Sets the reference of the instance of {@link org.apache.camel.spi.ExchangeFormatter} to generate the log message from exchange. - * - * @param exchangeFormatterRef name of the instance of {@link org.apache.camel.spi.ExchangeFormatter} - * @return the builder - */ - public RedeliveryPolicy exchangeFormatterRef(String exchangeFormatterRef) { - setExchangeFormatterRef(exchangeFormatterRef); - return this; - } - - // Properties - // ------------------------------------------------------------------------- - - public long getRedeliveryDelay() { - return redeliveryDelay; - } - - /** - * Sets the initial redelivery delay in milliseconds - */ - public void setRedeliveryDelay(long redeliverDelay) { - this.redeliveryDelay = redeliverDelay; - // if max enabled then also set max to this value in case max was too low - if (maximumRedeliveryDelay > 0 && redeliverDelay > maximumRedeliveryDelay) { - this.maximumRedeliveryDelay = redeliverDelay; - } - } - - public double getBackOffMultiplier() { - return backOffMultiplier; - } - - /** - * Sets the multiplier used to increase the delay between redeliveries if - * {@link #setUseExponentialBackOff(boolean)} is enabled - */ - public void setBackOffMultiplier(double backOffMultiplier) { - this.backOffMultiplier = backOffMultiplier; - } - - public long getCollisionAvoidancePercent() { - return Math.round(collisionAvoidanceFactor * 100); - } - - /** - * Sets the percentage used for collision avoidance if enabled via - * {@link #setUseCollisionAvoidance(boolean)} - */ - public void setCollisionAvoidancePercent(double collisionAvoidancePercent) { - this.collisionAvoidanceFactor = collisionAvoidancePercent * 0.01d; - } - - public double getCollisionAvoidanceFactor() { - return collisionAvoidanceFactor; - } - - /** - * Sets the factor used for collision avoidance if enabled via - * {@link #setUseCollisionAvoidance(boolean)} - */ - public void setCollisionAvoidanceFactor(double collisionAvoidanceFactor) { - this.collisionAvoidanceFactor = collisionAvoidanceFactor; - } - - public int getMaximumRedeliveries() { - return maximumRedeliveries; - } - - /** - * Sets the maximum number of times a message exchange will be redelivered. - * Setting a negative value will retry forever. - */ - public void setMaximumRedeliveries(int maximumRedeliveries) { - this.maximumRedeliveries = maximumRedeliveries; - } - - public long getMaximumRedeliveryDelay() { - return maximumRedeliveryDelay; - } - - /** - * Sets the maximum redelivery delay. - * Use -1 if you wish to have no maximum - */ - public void setMaximumRedeliveryDelay(long maximumRedeliveryDelay) { - this.maximumRedeliveryDelay = maximumRedeliveryDelay; - } - - public boolean isUseCollisionAvoidance() { - return useCollisionAvoidance; - } - - /** - * Enables/disables collision avoidance which adds some randomization to the - * backoff timings to reduce contention probability - */ - public void setUseCollisionAvoidance(boolean useCollisionAvoidance) { - this.useCollisionAvoidance = useCollisionAvoidance; - } - - public boolean isUseExponentialBackOff() { - return useExponentialBackOff; - } - - /** - * Enables/disables exponential backoff using the - * {@link #getBackOffMultiplier()} to increase the time between retries - */ - public void setUseExponentialBackOff(boolean useExponentialBackOff) { - this.useExponentialBackOff = useExponentialBackOff; - } - - protected static synchronized Random getRandomNumberGenerator() { - if (randomNumberGenerator == null) { - randomNumberGenerator = new Random(); - } - return randomNumberGenerator; - } - - /** - * Sets the logging level to use for log messages when retries have been exhausted. - */ - public void setRetriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) { - this.retriesExhaustedLogLevel = retriesExhaustedLogLevel; - } - - public LoggingLevel getRetriesExhaustedLogLevel() { - return retriesExhaustedLogLevel; - } - - /** - * Sets the logging level to use for log messages when retries are attempted. - */ - public void setRetryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) { - this.retryAttemptedLogLevel = retryAttemptedLogLevel; - } - - public LoggingLevel getRetryAttemptedLogLevel() { - return retryAttemptedLogLevel; - } - - public int getRetryAttemptedLogInterval() { - return retryAttemptedLogInterval; - } - - /** - * Sets the interval to log retry attempts - */ - public void setRetryAttemptedLogInterval(int retryAttemptedLogInterval) { - this.retryAttemptedLogInterval = retryAttemptedLogInterval; - } - - public String getDelayPattern() { - return delayPattern; - } - - /** - * Sets an optional delay pattern to use instead of fixed delay. - */ - public void setDelayPattern(String delayPattern) { - this.delayPattern = delayPattern; - } - - public boolean isLogStackTrace() { - return logStackTrace; - } - - /** - * Sets whether stack traces should be logged or not - */ - public void setLogStackTrace(boolean logStackTrace) { - this.logStackTrace = logStackTrace; - } - - public boolean isLogRetryStackTrace() { - return logRetryStackTrace; - } - - /** - * Sets whether stack traces should be logged or not - */ - public void setLogRetryStackTrace(boolean logRetryStackTrace) { - this.logRetryStackTrace = logRetryStackTrace; - } - - public boolean isLogHandled() { - return logHandled; - } - - /** - * Sets whether errors should be logged even if its handled - */ - public void setLogHandled(boolean logHandled) { - this.logHandled = logHandled; - } - - public boolean isLogNewException() { - return logNewException; - } - - /** - * Sets whether errors should be logged when a new exception occurred during handling a previous exception - */ - public void setLogNewException(boolean logNewException) { - this.logNewException = logNewException; - } - - public boolean isLogContinued() { - return logContinued; - } - - /** - * Sets whether errors should be logged even if its continued - */ - public void setLogContinued(boolean logContinued) { - this.logContinued = logContinued; - } - - public boolean isLogRetryAttempted() { - return logRetryAttempted; - } - - /** - * Sets whether retry attempts should be logged or not - */ - public void setLogRetryAttempted(boolean logRetryAttempted) { - this.logRetryAttempted = logRetryAttempted; - } - - public boolean isLogExhausted() { - return logExhausted; - } - - /** - * Sets whether exhausted exceptions should be logged or not - */ - public void setLogExhausted(boolean logExhausted) { - this.logExhausted = logExhausted; - } - - public boolean isLogExhaustedMessageHistory() { - // should default be enabled - return logExhaustedMessageHistory == null || logExhaustedMessageHistory; - } - - /** - * Whether the option logExhaustedMessageHistory has been configured or not - * - * @return null if not configured, or the configured value as true or false - * @see #isLogExhaustedMessageHistory() - */ - public Boolean getLogExhaustedMessageHistory() { - return logExhaustedMessageHistory; - } - - /** - * Sets whether exhausted exceptions should be logged with message history included. - */ - public void setLogExhaustedMessageHistory(boolean logExhaustedMessageHistory) { - this.logExhaustedMessageHistory = logExhaustedMessageHistory; - } - - public boolean isLogExhaustedMessageBody() { - // should default be disabled - return logExhaustedMessageBody != null && logExhaustedMessageBody; - } - - /** - * Whether the option logExhaustedMessageBody has been configured or not - * - * @return null if not configured, or the configured value as true or false - * @see #isLogExhaustedMessageBody() - */ - public Boolean getLogExhaustedMessageBody() { - return logExhaustedMessageBody; - } - - /** - * Sets whether exhausted message body/headers should be logged with message history included - * (requires logExhaustedMessageHistory to be enabled). - */ - public void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody) { - this.logExhaustedMessageBody = logExhaustedMessageBody; - } - - public boolean isAsyncDelayedRedelivery() { - return asyncDelayedRedelivery; - } - - /** - * Sets whether asynchronous delayed redelivery is allowed. - *

- * This is disabled by default. - *

- * When enabled it allows Camel to schedule a future task for delayed - * redelivery which prevents current thread from blocking while waiting. - *

- * Exchange which is transacted will however always use synchronous delayed redelivery - * because the transaction must execute in the same thread context. - * - * @param asyncDelayedRedelivery whether asynchronous delayed redelivery is allowed - */ - public void setAsyncDelayedRedelivery(boolean asyncDelayedRedelivery) { - this.asyncDelayedRedelivery = asyncDelayedRedelivery; - } - - public boolean isAllowRedeliveryWhileStopping() { - return allowRedeliveryWhileStopping; - } - - /** - * Controls whether to allow redelivery while stopping/shutting down a route that uses error handling. - * - * @param allowRedeliveryWhileStopping true to allow redelivery, false to reject redeliveries - */ - public void setAllowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) { - this.allowRedeliveryWhileStopping = allowRedeliveryWhileStopping; - } - - public String getExchangeFormatterRef() { - return exchangeFormatterRef; - } - - /** - * Sets the reference of the instance of {@link org.apache.camel.spi.ExchangeFormatter} to generate the log message from exchange. - */ - public void setExchangeFormatterRef(String exchangeFormatterRef) { - this.exchangeFormatterRef = exchangeFormatterRef; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/package.html deleted file mode 100644 index 890518d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Exception policy startegies for Dead Letter Channel pattern. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java deleted file mode 100644 index fa8bb0e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java +++ /dev/null @@ -1,301 +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.processor.idempotent; - -import org.apache.camel.*; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.IdempotentRepository; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.AsyncProcessorConverterHelper; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.service.ServiceHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; - -/** - * An implementation of the Idempotent Consumer pattern. - *

- * This implementation supports idempotent repositories implemented as {@link IdempotentRepository}. - * - * @see IdempotentRepository - */ -public class IdempotentConsumer extends AsyncProcessorSupport implements CamelContextAware, Navigate, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(IdempotentConsumer.class); - - private CamelContext camelContext; - private String id; - private String routeId; - private final Expression messageIdExpression; - private final AsyncProcessor processor; - private final IdempotentRepository idempotentRepository; - private final boolean eager; - private final boolean completionEager; - private final boolean skipDuplicate; - private final boolean removeOnFailure; - private final AtomicLong duplicateMessageCount = new AtomicLong(); - - public IdempotentConsumer(Expression messageIdExpression, IdempotentRepository idempotentRepository, - boolean eager, boolean completionEager, boolean skipDuplicate, boolean removeOnFailure, Processor processor) { - this.messageIdExpression = messageIdExpression; - this.idempotentRepository = idempotentRepository; - this.eager = eager; - this.completionEager = completionEager; - this.skipDuplicate = skipDuplicate; - this.removeOnFailure = removeOnFailure; - this.processor = AsyncProcessorConverterHelper.convert(processor); - } - - @Override - public String toString() { - return id; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - public String getRouteId() { - return routeId; - } - - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - final AsyncCallback target; - - final String messageId; - try { - messageId = messageIdExpression.evaluate(exchange, String.class); - if (messageId == null) { - exchange.setException(new NoMessageIdException(exchange, messageIdExpression)); - callback.done(true); - return true; - } - } catch (Exception e) { - exchange.setException(e); - callback.done(true); - return true; - } - - try { - boolean newKey; - if (eager) { - // add the key to the repository - newKey = idempotentRepository.add(exchange, messageId); - } else { - // check if we already have the key - newKey = !idempotentRepository.contains(exchange, messageId); - } - - if (!newKey) { - // mark the exchange as duplicate - exchange.setProperty(Exchange.DUPLICATE_MESSAGE, Boolean.TRUE); - - // we already have this key so its a duplicate message - onDuplicate(exchange, messageId); - - if (skipDuplicate) { - // if we should skip duplicate then we are done - LOG.debug("Ignoring duplicate message with id: {} for exchange: {}", messageId, exchange); - callback.done(true); - return true; - } - } - - final Synchronization onCompletion = new IdempotentOnCompletion(idempotentRepository, messageId, eager, removeOnFailure); - target = new IdempotentConsumerCallback(exchange, onCompletion, callback, completionEager); - if (!completionEager) { - // the scope is to do the idempotent completion work as an unit of work on the exchange when its done being routed - exchange.adapt(ExtendedExchange.class).addOnCompletion(onCompletion); - } - } catch (Exception e) { - exchange.setException(e); - callback.done(true); - return true; - } - - // process the exchange - return processor.process(exchange, target); - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(1); - answer.add(processor); - return answer; - } - - @Override - public boolean hasNext() { - return processor != null; - } - - // Properties - // ------------------------------------------------------------------------- - public Expression getMessageIdExpression() { - return messageIdExpression; - } - - public IdempotentRepository getIdempotentRepository() { - return idempotentRepository; - } - - public Processor getProcessor() { - return processor; - } - - public long getDuplicateMessageCount() { - return duplicateMessageCount.get(); - } - - // Implementation methods - // ------------------------------------------------------------------------- - - @Override - protected void doStart() throws Exception { - // must add before start so it will have CamelContext injected first - if (!camelContext.hasService(idempotentRepository)) { - camelContext.addService(idempotentRepository); - } - ServiceHelper.startService(processor, idempotentRepository); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService(processor, idempotentRepository); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(processor, idempotentRepository); - camelContext.removeService(idempotentRepository); - } - - public boolean isEager() { - return eager; - } - - public boolean isCompletionEager() { - return completionEager; - } - - public boolean isSkipDuplicate() { - return skipDuplicate; - } - - public boolean isRemoveOnFailure() { - return removeOnFailure; - } - - /** - * Resets the duplicate message counter to 0L. - */ - public void resetDuplicateMessageCount() { - duplicateMessageCount.set(0L); - } - - private void onDuplicate(Exchange exchange, String messageId) { - duplicateMessageCount.incrementAndGet(); - - onDuplicateMessage(exchange, messageId); - } - - /** - * Clear the idempotent repository - */ - public void clear() { - idempotentRepository.clear(); - } - - /** - * A strategy method to allow derived classes to overload the behaviour of - * processing a duplicate message - * - * @param exchange the exchange - * @param messageId the message ID of this exchange - */ - protected void onDuplicateMessage(Exchange exchange, String messageId) { - // noop - } - - /** - * {@link AsyncCallback} that is invoked when the idempotent consumer block ends - */ - private static class IdempotentConsumerCallback implements AsyncCallback { - private final Exchange exchange; - private final Synchronization onCompletion; - private final AsyncCallback callback; - private final boolean completionEager; - - IdempotentConsumerCallback(Exchange exchange, Synchronization onCompletion, AsyncCallback callback, boolean completionEager) { - this.exchange = exchange; - this.onCompletion = onCompletion; - this.callback = callback; - this.completionEager = completionEager; - } - - @Override - public void done(boolean doneSync) { - try { - if (completionEager) { - if (exchange.isFailed()) { - onCompletion.onFailure(exchange); - } else { - onCompletion.onComplete(exchange); - } - } - // if completion is not eager then the onCompletion is invoked as part of the UoW of the Exchange - } finally { - callback.done(doneSync); - } - } - - @Override - public String toString() { - return "IdempotentConsumerCallback"; - } - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java deleted file mode 100644 index 944a5aa..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java +++ /dev/null @@ -1,95 +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.processor.idempotent; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.IdempotentRepository; -import org.apache.camel.spi.Synchronization; -import org.apache.camel.support.ExchangeHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * On completion strategy for {@link org.apache.camel.processor.idempotent.IdempotentConsumer}. - *

- * This strategy adds the message id to the idempotent repository in cast the exchange - * was processed successfully. In case of failure the message id is not added. - */ -public class IdempotentOnCompletion implements Synchronization { - private static final Logger LOG = LoggerFactory.getLogger(IdempotentOnCompletion.class); - private final IdempotentRepository idempotentRepository; - private final String messageId; - private final boolean eager; - private final boolean removeOnFailure; - - public IdempotentOnCompletion(IdempotentRepository idempotentRepository, String messageId, boolean eager, boolean removeOnFailure) { - this.idempotentRepository = idempotentRepository; - this.messageId = messageId; - this.eager = eager; - this.removeOnFailure = removeOnFailure; - } - - @Override - public void onComplete(Exchange exchange) { - if (ExchangeHelper.isFailureHandled(exchange)) { - // the exchange did not process successfully but was failure handled by the dead letter channel - // and thus moved to the dead letter queue. We should thus not consider it as complete. - onFailedMessage(exchange, messageId); - } else { - onCompletedMessage(exchange, messageId); - } - } - - @Override - public void onFailure(Exchange exchange) { - onFailedMessage(exchange, messageId); - } - - /** - * A strategy method to allow derived classes to overload the behavior of - * processing a completed message - * - * @param exchange the exchange - * @param messageId the message ID of this exchange - */ - protected void onCompletedMessage(Exchange exchange, String messageId) { - if (!eager) { - // if not eager we should add the key when its complete - idempotentRepository.add(exchange, messageId); - } - idempotentRepository.confirm(exchange, messageId); - } - - /** - * A strategy method to allow derived classes to overload the behavior of - * processing a failed message - * - * @param exchange the exchange - * @param messageId the message ID of this exchange - */ - protected void onFailedMessage(Exchange exchange, String messageId) { - if (removeOnFailure) { - idempotentRepository.remove(exchange, messageId); - LOG.debug("Removed from repository as exchange failed: {} with id: {}", exchange, messageId); - } - } - - @Override - public String toString() { - return "IdempotentOnCompletion[" + messageId + ']'; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java deleted file mode 100644 index 452b8b6..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java +++ /dev/null @@ -1,52 +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.processor.idempotent; - -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.RuntimeCamelException; - -/** - * An exception thrown if no message ID could be found on a message which is to be used with the - * Idempotent Consumer pattern. - */ -public class NoMessageIdException extends RuntimeCamelException { - private static final long serialVersionUID = 5755929795399134568L; - - private final Exchange exchange; - private final Expression expression; - - public NoMessageIdException(Exchange exchange, Expression expression) { - super("No message ID could be found using expression: " + expression + " on message exchange: " + exchange); - this.exchange = exchange; - this.expression = expression; - } - - /** - * The exchange which caused this failure - */ - public Exchange getExchange() { - return exchange; - } - - /** - * The expression which was used - */ - public Expression getExpression() { - return expression; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/package.html deleted file mode 100644 index ed38280..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/package.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - -An implementation of the Idempotent Consumer -pattern. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java deleted file mode 100644 index 1948a23..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java +++ /dev/null @@ -1,609 +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.processor.interceptor; - -import org.apache.camel.*; -import org.apache.camel.api.management.mbean.BacklogTracerEventMessage; -import org.apache.camel.spi.CamelEvent.ExchangeCompletedEvent; -import org.apache.camel.spi.CamelEvent.ExchangeEvent; -import org.apache.camel.spi.CamelLogger; -import org.apache.camel.spi.Condition; -import org.apache.camel.spi.Debugger; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.MessageHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -/** - * A {@link Debugger} that has easy debugging functionality which - * can be used from JMX with {@link org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean}. - *

- * This implementation allows to set breakpoints (with or without a condition) and inspect the {@link Exchange} - * dumped in XML in {@link BacklogTracerEventMessage} format. There is operations to resume suspended breakpoints - * to continue routing the {@link Exchange}. There is also step functionality so you can single step a given - * {@link Exchange}. - *

- * This implementation will only break the first {@link Exchange} that arrives to a breakpoint. If Camel routes using - * concurrency then sub-sequent {@link Exchange} will continue to be routed, if there breakpoint already holds a - * suspended {@link Exchange}. - */ -public final class BacklogDebugger extends ServiceSupport { - - private static final Logger LOG = LoggerFactory.getLogger(BacklogDebugger.class); - - private long fallbackTimeout = 300; - private final CamelContext camelContext; - private LoggingLevel loggingLevel = LoggingLevel.INFO; - private final CamelLogger logger = new CamelLogger(LOG, loggingLevel); - private final AtomicBoolean enabled = new AtomicBoolean(); - private final AtomicLong debugCounter = new AtomicLong(0); - private final Debugger debugger; - private final ConcurrentMap breakpoints = new ConcurrentHashMap<>(); - private final ConcurrentMap suspendedBreakpoints = new ConcurrentHashMap<>(); - private final ConcurrentMap suspendedBreakpointMessages = new ConcurrentHashMap<>(); - private volatile String singleStepExchangeId; - private int bodyMaxChars = 128 * 1024; - private boolean bodyIncludeStreams; - private boolean bodyIncludeFiles = true; - - /** - * A suspend {@link Exchange} at a breakpoint. - */ - private static final class SuspendedExchange { - private final Exchange exchange; - private final CountDownLatch latch; - - /** - * @param exchange the suspend exchange - * @param latch the latch to use to continue routing the exchange - */ - private SuspendedExchange(Exchange exchange, CountDownLatch latch) { - this.exchange = exchange; - this.latch = latch; - } - - public Exchange getExchange() { - return exchange; - } - - public CountDownLatch getLatch() { - return latch; - } - } - - private BacklogDebugger(CamelContext camelContext) { - this.camelContext = camelContext; - this.debugger = new DefaultDebugger(camelContext); - } - - /** - * Creates a new backlog debugger. - * - * @param context Camel context - * @return a new backlog debugger - */ - public static BacklogDebugger createDebugger(CamelContext context) { - return new BacklogDebugger(context); - } - - /** - * A helper method to return the BacklogDebugger instance if one is enabled - * - * @return the backlog debugger or null if none can be found - */ - public static BacklogDebugger getBacklogDebugger(CamelContext context) { - return context.hasService(BacklogDebugger.class); - } - - public String getLoggingLevel() { - return loggingLevel.name(); - } - - public void setLoggingLevel(String level) { - loggingLevel = LoggingLevel.valueOf(level); - logger.setLevel(loggingLevel); - } - - public void enableDebugger() { - logger.log("Enabling debugger"); - try { - ServiceHelper.startService(debugger); - enabled.set(true); - } catch (Exception e) { - throw RuntimeCamelException.wrapRuntimeCamelException(e); - } - } - - public void disableDebugger() { - logger.log("Disabling debugger"); - try { - enabled.set(false); - ServiceHelper.stopService(debugger); - } catch (Exception e) { - // ignore - } - clearBreakpoints(); - } - - public boolean isEnabled() { - return enabled.get(); - } - - public boolean hasBreakpoint(String nodeId) { - return breakpoints.containsKey(nodeId); - } - - public boolean isSingleStepMode() { - return singleStepExchangeId != null; - } - - public void addBreakpoint(String nodeId) { - NodeBreakpoint breakpoint = breakpoints.get(nodeId); - if (breakpoint == null) { - logger.log("Adding breakpoint " + nodeId); - breakpoint = new NodeBreakpoint(nodeId, null); - breakpoints.put(nodeId, breakpoint); - debugger.addBreakpoint(breakpoint, breakpoint); - } else { - breakpoint.setCondition(null); - } - } - - public void addConditionalBreakpoint(String nodeId, String language, String predicate) { - Predicate condition = camelContext.resolveLanguage(language).createPredicate(predicate); - NodeBreakpoint breakpoint = breakpoints.get(nodeId); - if (breakpoint == null) { - logger.log("Adding conditional breakpoint " + nodeId + " [" + predicate + "]"); - breakpoint = new NodeBreakpoint(nodeId, condition); - breakpoints.put(nodeId, breakpoint); - debugger.addBreakpoint(breakpoint, breakpoint); - } else if (breakpoint.getCondition() == null) { - logger.log("Updating to conditional breakpoint " + nodeId + " [" + predicate + "]"); - debugger.removeBreakpoint(breakpoint); - breakpoints.put(nodeId, breakpoint); - debugger.addBreakpoint(breakpoint, breakpoint); - } else if (breakpoint.getCondition() != null) { - logger.log("Updating conditional breakpoint " + nodeId + " [" + predicate + "]"); - breakpoint.setCondition(condition); - } - } - - public void removeBreakpoint(String nodeId) { - logger.log("Removing breakpoint " + nodeId); - // when removing a break point then ensure latches is cleared and counted down so we wont have hanging threads - suspendedBreakpointMessages.remove(nodeId); - SuspendedExchange se = suspendedBreakpoints.remove(nodeId); - NodeBreakpoint breakpoint = breakpoints.remove(nodeId); - if (breakpoint != null) { - debugger.removeBreakpoint(breakpoint); - } - if (se != null) { - se.getLatch().countDown(); - } - } - - public void removeAllBreakpoints() { - // stop single stepping - singleStepExchangeId = null; - - for (String nodeId : getSuspendedBreakpointNodeIds()) { - removeBreakpoint(nodeId); - } - } - - public Set getBreakpoints() { - return new LinkedHashSet<>(breakpoints.keySet()); - } - - public void resumeBreakpoint(String nodeId) { - resumeBreakpoint(nodeId, false); - } - - private void resumeBreakpoint(String nodeId, boolean stepMode) { - logger.log("Resume breakpoint " + nodeId); - - if (!stepMode) { - if (singleStepExchangeId != null) { - debugger.stopSingleStepExchange(singleStepExchangeId); - singleStepExchangeId = null; - } - } - - // remember to remove the dumped message as its no longer in need - suspendedBreakpointMessages.remove(nodeId); - SuspendedExchange se = suspendedBreakpoints.remove(nodeId); - if (se != null) { - se.getLatch().countDown(); - } - } - - public void setMessageBodyOnBreakpoint(String nodeId, Object body) { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - boolean remove = body == null; - if (remove) { - removeMessageBodyOnBreakpoint(nodeId); - } else { - Class oldType = se.getExchange().getMessage().getBody() != null ? se.getExchange().getMessage().getBody().getClass() : null; - setMessageBodyOnBreakpoint(nodeId, body, oldType); - } - } - } - - public void setMessageBodyOnBreakpoint(String nodeId, Object body, Class type) { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - boolean remove = body == null; - if (remove) { - removeMessageBodyOnBreakpoint(nodeId); - } else { - logger.log("Breakpoint at node " + nodeId + " is updating message body on exchangeId: " + se.getExchange().getExchangeId() + " with new body: " + body); - // preserve type - if (type != null) { - se.getExchange().getMessage().setBody(body, type); - } else { - se.getExchange().getMessage().setBody(body); - } - } - } - } - - public void removeMessageBodyOnBreakpoint(String nodeId) { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - logger.log("Breakpoint at node " + nodeId + " is removing message body on exchangeId: " + se.getExchange().getExchangeId()); - se.getExchange().getMessage().setBody(null); - } - } - - public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value) throws NoTypeConversionAvailableException { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - Class oldType = se.getExchange().getMessage().getHeader(headerName) != null ? se.getExchange().getMessage().getHeader(headerName).getClass() : null; - setMessageHeaderOnBreakpoint(nodeId, headerName, value, oldType); - } - } - - public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value, Class type) throws NoTypeConversionAvailableException { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - logger.log("Breakpoint at node " + nodeId + " is updating message header on exchangeId: " + se.getExchange().getExchangeId() + " with header: " + headerName + " and value: " + value); - if (type != null) { - Object convertedValue = se.getExchange().getContext().getTypeConverter().mandatoryConvertTo(type, se.getExchange(), value); - se.getExchange().getMessage().setHeader(headerName, convertedValue); - } else { - se.getExchange().getMessage().setHeader(headerName, value); - } - } - } - - public long getFallbackTimeout() { - return fallbackTimeout; - } - - public void setFallbackTimeout(long fallbackTimeout) { - this.fallbackTimeout = fallbackTimeout; - } - - public void removeMessageHeaderOnBreakpoint(String nodeId, String headerName) { - SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - logger.log("Breakpoint at node " + nodeId + " is removing message header on exchangeId: " + se.getExchange().getExchangeId() + " with header: " + headerName); - se.getExchange().getMessage().removeHeader(headerName); - } - } - - public void resumeAll() { - logger.log("Resume all"); - // stop single stepping - singleStepExchangeId = null; - - for (String node : getSuspendedBreakpointNodeIds()) { - // remember to remove the dumped message as its no longer in need - suspendedBreakpointMessages.remove(node); - SuspendedExchange se = suspendedBreakpoints.remove(node); - if (se != null) { - se.getLatch().countDown(); - } - } - } - - public void stepBreakpoint(String nodeId) { - // if we are already in single step mode, then infer stepping - if (isSingleStepMode()) { - logger.log("stepBreakpoint " + nodeId + " is already in single step mode, so stepping instead."); - step(); - } - - logger.log("Step breakpoint " + nodeId); - // we want to step current exchange to next - BacklogTracerEventMessage msg = suspendedBreakpointMessages.get(nodeId); - NodeBreakpoint breakpoint = breakpoints.get(nodeId); - if (msg != null && breakpoint != null) { - singleStepExchangeId = msg.getExchangeId(); - if (debugger.startSingleStepExchange(singleStepExchangeId, new StepBreakpoint())) { - // now resume - resumeBreakpoint(nodeId, true); - } - } - } - - public void step() { - for (String node : getSuspendedBreakpointNodeIds()) { - // remember to remove the dumped message as its no longer in need - suspendedBreakpointMessages.remove(node); - SuspendedExchange se = suspendedBreakpoints.remove(node); - if (se != null) { - se.getLatch().countDown(); - } - } - } - - public Set getSuspendedBreakpointNodeIds() { - return new LinkedHashSet<>(suspendedBreakpoints.keySet()); - } - - /** - * Gets the exchanged suspended at the given breakpoint id or null if there is none at that id. - * - * @param id - node id for the breakpoint - * @return The suspended exchange or null if there isn't one suspended at the given breakpoint. - */ - public Exchange getSuspendedExchange(String id) { - SuspendedExchange suspendedExchange = suspendedBreakpoints.get(id); - return suspendedExchange != null ? suspendedExchange.getExchange() : null; - } - - public void disableBreakpoint(String nodeId) { - logger.log("Disable breakpoint " + nodeId); - NodeBreakpoint breakpoint = breakpoints.get(nodeId); - if (breakpoint != null) { - breakpoint.suspend(); - } - } - - public void enableBreakpoint(String nodeId) { - logger.log("Enable breakpoint " + nodeId); - NodeBreakpoint breakpoint = breakpoints.get(nodeId); - if (breakpoint != null) { - breakpoint.activate(); - } - } - - public int getBodyMaxChars() { - return bodyMaxChars; - } - - public void setBodyMaxChars(int bodyMaxChars) { - this.bodyMaxChars = bodyMaxChars; - } - - public boolean isBodyIncludeStreams() { - return bodyIncludeStreams; - } - - public void setBodyIncludeStreams(boolean bodyIncludeStreams) { - this.bodyIncludeStreams = bodyIncludeStreams; - } - - public boolean isBodyIncludeFiles() { - return bodyIncludeFiles; - } - - public void setBodyIncludeFiles(boolean bodyIncludeFiles) { - this.bodyIncludeFiles = bodyIncludeFiles; - } - - public String dumpTracedMessagesAsXml(String nodeId) { - logger.log("Dump trace message from breakpoint " + nodeId); - BacklogTracerEventMessage msg = suspendedBreakpointMessages.get(nodeId); - if (msg != null) { - return msg.toXml(0); - } else { - return null; - } - } - - public long getDebugCounter() { - return debugCounter.get(); - } - - public void resetDebugCounter() { - logger.log("Reset debug counter"); - debugCounter.set(0); - } - - public boolean beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - return debugger.beforeProcess(exchange, processor, definition); - } - - public boolean afterProcess(Exchange exchange, Processor processor, NamedNode definition, long timeTaken) { - // noop - return false; - } - - @Override - protected void doStart() throws Exception { - // noop - } - - @Override - protected void doStop() throws Exception { - if (enabled.get()) { - disableDebugger(); - } - clearBreakpoints(); - } - - private void clearBreakpoints() { - // make sure to clear state and latches is counted down so we wont have hanging threads - breakpoints.clear(); - for (SuspendedExchange se : suspendedBreakpoints.values()) { - se.getLatch().countDown(); - } - suspendedBreakpoints.clear(); - suspendedBreakpointMessages.clear(); - } - - /** - * Represents a {@link org.apache.camel.spi.Breakpoint} that has a {@link Condition} on a specific node id. - */ - private final class NodeBreakpoint extends org.apache.camel.processor.interceptor.BreakpointSupport implements Condition { - - private final String nodeId; - private Predicate condition; - - private NodeBreakpoint(String nodeId, Predicate condition) { - this.nodeId = nodeId; - this.condition = condition; - } - - public Predicate getCondition() { - return condition; - } - - public void setCondition(Predicate predicate) { - this.condition = predicate; - } - - @Override - public void beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - // store a copy of the message so we can see that from the debugger - long timestamp = System.currentTimeMillis(); - String toNode = definition.getId(); - String routeId = CamelContextHelper.getRouteId(definition); - String exchangeId = exchange.getExchangeId(); - String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 2, isBodyIncludeStreams(), isBodyIncludeFiles(), getBodyMaxChars()); - long uid = debugCounter.incrementAndGet(); - - BacklogTracerEventMessage msg = new DefaultBacklogTracerEventMessage(uid, timestamp, routeId, toNode, exchangeId, messageAsXml); - suspendedBreakpointMessages.put(nodeId, msg); - - // suspend at this breakpoint - final SuspendedExchange se = suspendedBreakpoints.get(nodeId); - if (se != null) { - // now wait until we should continue - logger.log("NodeBreakpoint at node " + toNode + " is waiting to continue for exchangeId: " + exchangeId); - try { - boolean hit = se.getLatch().await(fallbackTimeout, TimeUnit.SECONDS); - if (!hit) { - logger.log("NodeBreakpoint at node " + toNode + " timed out and is continued exchangeId: " + exchangeId, LoggingLevel.WARN); - } else { - logger.log("NodeBreakpoint at node " + toNode + " is continued exchangeId: " + exchangeId); - } - } catch (InterruptedException e) { - // ignore - } - } - } - - @Override - public boolean matchProcess(Exchange exchange, Processor processor, NamedNode definition) { - // must match node - if (!nodeId.equals(definition.getId())) { - return false; - } - - // if condition then must match - if (condition != null && !condition.matches(exchange)) { - return false; - } - - // we only want to break one exchange at a time, so if there is already a suspended breakpoint then do not match - SuspendedExchange se = new SuspendedExchange(exchange, new CountDownLatch(1)); - boolean existing = suspendedBreakpoints.putIfAbsent(nodeId, se) != null; - return !existing; - } - - @Override - public boolean matchEvent(Exchange exchange, ExchangeEvent event) { - return false; - } - } - - /** - * Represents a {@link org.apache.camel.spi.Breakpoint} that is used during single step mode. - */ - private final class StepBreakpoint extends BreakpointSupport implements Condition { - - @Override - public void beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - // store a copy of the message so we can see that from the debugger - long timestamp = System.currentTimeMillis(); - String toNode = definition.getId(); - String routeId = CamelContextHelper.getRouteId(definition); - String exchangeId = exchange.getExchangeId(); - String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 2, isBodyIncludeStreams(), isBodyIncludeFiles(), getBodyMaxChars()); - long uid = debugCounter.incrementAndGet(); - - BacklogTracerEventMessage msg = new DefaultBacklogTracerEventMessage(uid, timestamp, routeId, toNode, exchangeId, messageAsXml); - suspendedBreakpointMessages.put(toNode, msg); - - // suspend at this breakpoint - SuspendedExchange se = new SuspendedExchange(exchange, new CountDownLatch(1)); - suspendedBreakpoints.put(toNode, se); - - // now wait until we should continue - logger.log("StepBreakpoint at node " + toNode + " is waiting to continue for exchangeId: " + exchange.getExchangeId()); - try { - boolean hit = se.getLatch().await(fallbackTimeout, TimeUnit.SECONDS); - if (!hit) { - logger.log("StepBreakpoint at node " + toNode + " timed out and is continued exchangeId: " + exchange.getExchangeId(), LoggingLevel.WARN); - } else { - logger.log("StepBreakpoint at node " + toNode + " is continued exchangeId: " + exchange.getExchangeId()); - } - } catch (InterruptedException e) { - // ignore - } - } - - @Override - public boolean matchProcess(Exchange exchange, Processor processor, NamedNode definition) { - return true; - } - - @Override - public boolean matchEvent(Exchange exchange, ExchangeEvent event) { - return event instanceof ExchangeCompletedEvent; - } - - @Override - public void onEvent(Exchange exchange, ExchangeEvent event, NamedNode definition) { - // when the exchange is complete, we need to turn off single step mode if we were debug stepping the exchange - if (event instanceof ExchangeCompletedEvent) { - String completedId = event.getExchange().getExchangeId(); - - if (singleStepExchangeId != null && singleStepExchangeId.equals(completedId)) { - logger.log("ExchangeId: " + completedId + " is completed, so exiting single step mode."); - singleStepExchangeId = null; - } - } - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java deleted file mode 100644 index 336351f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java +++ /dev/null @@ -1,301 +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.processor.interceptor; - -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.NamedNode; -import org.apache.camel.Predicate; -import org.apache.camel.api.management.mbean.BacklogTracerEventMessage; -import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.PatternHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.StringHelper; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Queue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicLong; - -/** - * A tracer used for message tracing, storing a copy of the message details in a backlog. - *

- * This tracer allows to store message tracers per node in the Camel routes. The tracers - * is stored in a backlog queue (FIFO based) which allows to pull the traced messages on demand. - */ -public final class BacklogTracer extends ServiceSupport { - - // lets limit the tracer to 10 thousand messages in total - public static final int MAX_BACKLOG_SIZE = 10 * 1000; - private final CamelContext camelContext; - private boolean enabled; - private final AtomicLong traceCounter = new AtomicLong(0); - // use a queue with a upper limit to avoid storing too many messages - private final Queue queue = new LinkedBlockingQueue<>(MAX_BACKLOG_SIZE); - // how many of the last messages to keep in the backlog at total - private int backlogSize = 1000; - private boolean removeOnDump = true; - private int bodyMaxChars = 128 * 1024; - private boolean bodyIncludeStreams; - private boolean bodyIncludeFiles = true; - // a pattern to filter tracing nodes - private String tracePattern; - private String[] patterns; - private String traceFilter; - private Predicate predicate; - - private BacklogTracer(CamelContext camelContext) { - this.camelContext = camelContext; - } - - /** - * Creates a new backlog tracer. - * - * @param context Camel context - * @return a new backlog tracer - */ - public static BacklogTracer createTracer(CamelContext context) { - return new BacklogTracer(context); - } - - /** - * Whether or not to trace the given processor definition. - * - * @param definition the processor definition - * @param exchange the exchange - * @return true to trace, false to skip tracing - */ - public boolean shouldTrace(NamedNode definition, Exchange exchange) { - if (!enabled) { - return false; - } - - boolean pattern = true; - boolean filter = true; - - if (patterns != null) { - pattern = shouldTracePattern(definition); - } - if (predicate != null) { - filter = shouldTraceFilter(exchange); - } - - return pattern && filter; - } - - private boolean shouldTracePattern(NamedNode definition) { - for (String pattern : patterns) { - // match either route id, or node id - String id = definition.getId(); - // use matchPattern method from endpoint helper that has a good matcher we use in Camel - if (PatternHelper.matchPattern(id, pattern)) { - return true; - } - String routeId = CamelContextHelper.getRouteId(definition); - if (routeId != null && !Objects.equals(routeId, id)) { - if (PatternHelper.matchPattern(routeId, pattern)) { - return true; - } - } - } - // not matched the pattern - return false; - } - - public void traceEvent(DefaultBacklogTracerEventMessage event) { - if (!enabled) { - return; - } - - // ensure there is space on the queue by polling until at least single slot is free - int drain = queue.size() - backlogSize + 1; - if (drain > 0) { - for (int i = 0; i < drain; i++) { - queue.poll(); - } - } - - queue.add(event); - } - - private boolean shouldTraceFilter(Exchange exchange) { - return predicate.matches(exchange); - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public int getBacklogSize() { - return backlogSize; - } - - public void setBacklogSize(int backlogSize) { - if (backlogSize <= 0) { - throw new IllegalArgumentException("The backlog size must be a positive number, was: " + backlogSize); - } - if (backlogSize > MAX_BACKLOG_SIZE) { - throw new IllegalArgumentException("The backlog size cannot be greater than the max size of " + MAX_BACKLOG_SIZE + ", was: " + backlogSize); - } - this.backlogSize = backlogSize; - } - - public boolean isRemoveOnDump() { - return removeOnDump; - } - - public void setRemoveOnDump(boolean removeOnDump) { - this.removeOnDump = removeOnDump; - } - - public int getBodyMaxChars() { - return bodyMaxChars; - } - - public void setBodyMaxChars(int bodyMaxChars) { - this.bodyMaxChars = bodyMaxChars; - } - - public boolean isBodyIncludeStreams() { - return bodyIncludeStreams; - } - - public void setBodyIncludeStreams(boolean bodyIncludeStreams) { - this.bodyIncludeStreams = bodyIncludeStreams; - } - - public boolean isBodyIncludeFiles() { - return bodyIncludeFiles; - } - - public void setBodyIncludeFiles(boolean bodyIncludeFiles) { - this.bodyIncludeFiles = bodyIncludeFiles; - } - - public String getTracePattern() { - return tracePattern; - } - - public void setTracePattern(String tracePattern) { - this.tracePattern = tracePattern; - if (tracePattern != null) { - // the pattern can have multiple nodes separated by comma - this.patterns = tracePattern.split(","); - } else { - this.patterns = null; - } - } - - public String getTraceFilter() { - return traceFilter; - } - - public void setTraceFilter(String filter) { - this.traceFilter = filter; - if (filter != null) { - // assume simple language - String name = StringHelper.before(filter, ":"); - if (name == null) { - // use simple language by default - name = "simple"; - } - predicate = camelContext.resolveLanguage(name).createPredicate(filter); - } - } - - public long getTraceCounter() { - return traceCounter.get(); - } - - public void resetTraceCounter() { - traceCounter.set(0); - } - - public List dumpTracedMessages(String nodeId) { - List answer = new ArrayList<>(); - if (nodeId != null) { - for (BacklogTracerEventMessage message : queue) { - if (nodeId.equals(message.getToNode()) || nodeId.equals(message.getRouteId())) { - answer.add(message); - } - } - } - - if (removeOnDump) { - queue.removeAll(answer); - } - - return answer; - } - - public String dumpTracedMessagesAsXml(String nodeId) { - List events = dumpTracedMessages(nodeId); - - StringBuilder sb = new StringBuilder(); - sb.append("<").append(BacklogTracerEventMessage.ROOT_TAG).append("s>"); - for (BacklogTracerEventMessage event : events) { - sb.append("\n").append(event.toXml(2)); - } - sb.append("\n"); - return sb.toString(); - } - - public List dumpAllTracedMessages() { - List answer = new ArrayList<>(); - answer.addAll(queue); - if (isRemoveOnDump()) { - queue.clear(); - } - return answer; - } - - public String dumpAllTracedMessagesAsXml() { - List events = dumpAllTracedMessages(); - - StringBuilder sb = new StringBuilder(); - sb.append("<").append(BacklogTracerEventMessage.ROOT_TAG).append("s>"); - for (BacklogTracerEventMessage event : events) { - sb.append("\n").append(event.toXml(2)); - } - sb.append("\n"); - return sb.toString(); - } - - public void clear() { - queue.clear(); - } - - public long incrementTraceCounter() { - return traceCounter.incrementAndGet(); - } - - @Override - protected void doStart() throws Exception { - } - - @Override - protected void doStop() throws Exception { - queue.clear(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BreakpointSupport.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BreakpointSupport.java deleted file mode 100644 index d429853..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BreakpointSupport.java +++ /dev/null @@ -1,63 +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.processor.interceptor; - -import org.apache.camel.Exchange; -import org.apache.camel.NamedNode; -import org.apache.camel.Processor; -import org.apache.camel.spi.Breakpoint; -import org.apache.camel.spi.CamelEvent.ExchangeEvent; - -/** - * A support class for {@link Breakpoint} implementations to use as base class. - *

- * Will be in active state. - */ -public abstract class BreakpointSupport implements Breakpoint { - - private State state = State.Active; - - @Override - public State getState() { - return state; - } - - @Override - public void suspend() { - state = State.Suspended; - } - - @Override - public void activate() { - state = State.Active; - } - - @Override - public void beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - // noop - } - - @Override - public void afterProcess(Exchange exchange, Processor processor, NamedNode definition, long timeTaken) { - // noop - } - - @Override - public void onEvent(Exchange exchange, ExchangeEvent event, NamedNode definition) { - // noop - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java deleted file mode 100644 index 69dcf67..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.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.processor.interceptor; - -import org.apache.camel.api.management.mbean.BacklogTracerEventMessage; - -import java.text.SimpleDateFormat; - -/** - * An event message holding the traced message by the {@link BacklogTracer}. - */ -public final class DefaultBacklogTracerEventMessage implements BacklogTracerEventMessage { - - private static final long serialVersionUID = 1L; - - private final long uid; - private final long timestamp; - private final String routeId; - private final String toNode; - private final String exchangeId; - private final String messageAsXml; - - public DefaultBacklogTracerEventMessage(long uid, long timestamp, String routeId, String toNode, String exchangeId, String messageAsXml) { - this.uid = uid; - this.timestamp = timestamp; - this.routeId = routeId; - this.toNode = toNode; - this.exchangeId = exchangeId; - this.messageAsXml = messageAsXml; - } - - @Override - public long getUid() { - return uid; - } - - @Override - public long getTimestamp() { - return timestamp; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public String getToNode() { - return toNode; - } - - @Override - public String getExchangeId() { - return exchangeId; - } - - @Override - public String getMessageAsXml() { - return messageAsXml; - } - - @Override - public String toString() { - return "DefaultBacklogTracerEventMessage[" + exchangeId + " at " + toNode + "]"; - } - - /** - * Dumps the event message as XML using the {@link #ROOT_TAG} as root tag. - *

- * The timestamp tag is formatted in the format defined by {@link #TIMESTAMP_FORMAT} - * - * @return xml representation of this event - */ - @Override - public String toXml(int indent) { - StringBuilder prefix = new StringBuilder(); - for (int i = 0; i < indent; i++) { - prefix.append(" "); - } - - StringBuilder sb = new StringBuilder(); - sb.append(prefix).append("<").append(ROOT_TAG).append(">\n"); - sb.append(prefix).append(" ").append(uid).append("\n"); - String ts = new SimpleDateFormat(TIMESTAMP_FORMAT).format(timestamp); - sb.append(prefix).append(" ").append(ts).append("\n"); - // route id is optional and we then use an empty value for no route id - sb.append(prefix).append(" ").append(routeId != null ? routeId : "").append("\n"); - if (toNode != null) { - sb.append(prefix).append(" ").append(toNode).append("\n"); - } else { - // if first message the use routeId as toNode - sb.append(prefix).append(" ").append(routeId).append("\n"); - } - sb.append(prefix).append(" ").append(exchangeId).append("\n"); - sb.append(prefix).append(messageAsXml).append("\n"); - sb.append(prefix).append(""); - return sb.toString(); - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java deleted file mode 100644 index e4d4bb4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java +++ /dev/null @@ -1,375 +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.processor.interceptor; - -import org.apache.camel.*; -import org.apache.camel.spi.*; -import org.apache.camel.spi.CamelEvent.ExchangeCompletedEvent; -import org.apache.camel.spi.CamelEvent.ExchangeCreatedEvent; -import org.apache.camel.spi.CamelEvent.ExchangeEvent; -import org.apache.camel.support.EventNotifierSupport; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.ObjectHelper; - -import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * The default implementation of the {@link Debugger}. - */ -public class DefaultDebugger extends ServiceSupport implements Debugger, CamelContextAware { - - private final EventNotifier debugEventNotifier = new DebugEventNotifier(); - private final List breakpoints = new CopyOnWriteArrayList<>(); - private final int maxConcurrentSingleSteps = 1; - private final Map singleSteps = new HashMap<>(maxConcurrentSingleSteps); - private CamelContext camelContext; - - /** - * Holder class for breakpoint and the associated conditions - */ - private static final class BreakpointConditions { - private final Breakpoint breakpoint; - private final List conditions; - - private BreakpointConditions(Breakpoint breakpoint) { - this(breakpoint, new ArrayList()); - } - - private BreakpointConditions(Breakpoint breakpoint, List conditions) { - this.breakpoint = breakpoint; - this.conditions = conditions; - } - - public Breakpoint getBreakpoint() { - return breakpoint; - } - - public List getConditions() { - return conditions; - } - } - - public DefaultDebugger() { - } - - public DefaultDebugger(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public void addBreakpoint(Breakpoint breakpoint) { - breakpoints.add(new BreakpointConditions(breakpoint)); - } - - @Override - public void addBreakpoint(Breakpoint breakpoint, Condition... conditions) { - breakpoints.add(new BreakpointConditions(breakpoint, Arrays.asList(conditions))); - } - - @Override - public void addSingleStepBreakpoint(final Breakpoint breakpoint) { - addSingleStepBreakpoint(breakpoint, new Condition[]{}); - } - - @Override - public void addSingleStepBreakpoint(final Breakpoint breakpoint, Condition... conditions) { - // wrap the breakpoint into single step breakpoint so we can automatic enable/disable the single step mode - Breakpoint singlestep = new Breakpoint() { - @Override - public State getState() { - return breakpoint.getState(); - } - - @Override - public void suspend() { - breakpoint.suspend(); - } - - @Override - public void activate() { - breakpoint.activate(); - } - - @Override - public void beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - breakpoint.beforeProcess(exchange, processor, definition); - } - - @Override - public void afterProcess(Exchange exchange, Processor processor, NamedNode definition, long timeTaken) { - breakpoint.afterProcess(exchange, processor, definition, timeTaken); - } - - @Override - public void onEvent(Exchange exchange, ExchangeEvent event, NamedNode definition) { - if (event instanceof ExchangeCreatedEvent) { - startSingleStepExchange(exchange.getExchangeId(), this); - } else if (event instanceof ExchangeCompletedEvent) { - stopSingleStepExchange(exchange.getExchangeId()); - } - breakpoint.onEvent(exchange, event, definition); - } - - @Override - public String toString() { - return breakpoint.toString(); - } - }; - - addBreakpoint(singlestep, conditions); - } - - @Override - public void removeBreakpoint(Breakpoint breakpoint) { - for (BreakpointConditions condition : breakpoints) { - if (condition.getBreakpoint().equals(breakpoint)) { - breakpoints.remove(condition); - } - } - } - - @Override - public void suspendAllBreakpoints() { - for (BreakpointConditions breakpoint : breakpoints) { - breakpoint.getBreakpoint().suspend(); - } - } - - @Override - public void activateAllBreakpoints() { - for (BreakpointConditions breakpoint : breakpoints) { - breakpoint.getBreakpoint().activate(); - } - } - - @Override - public List getBreakpoints() { - List answer = new ArrayList<>(breakpoints.size()); - for (BreakpointConditions e : breakpoints) { - answer.add(e.getBreakpoint()); - } - return Collections.unmodifiableList(answer); - } - - @Override - public boolean startSingleStepExchange(String exchangeId, Breakpoint breakpoint) { - // can we accept single stepping the given exchange? - if (singleSteps.size() >= maxConcurrentSingleSteps) { - return false; - } - - singleSteps.put(exchangeId, breakpoint); - return true; - } - - @Override - public void stopSingleStepExchange(String exchangeId) { - singleSteps.remove(exchangeId); - } - - @Override - public boolean beforeProcess(Exchange exchange, Processor processor, NamedNode definition) { - // is the exchange in single step mode? - Breakpoint singleStep = singleSteps.get(exchange.getExchangeId()); - if (singleStep != null) { - onBeforeProcess(exchange, processor, definition, singleStep); - return true; - } - - // does any of the breakpoints apply? - boolean match = false; - for (BreakpointConditions breakpoint : breakpoints) { - // breakpoint must be active - if (Breakpoint.State.Active.equals(breakpoint.getBreakpoint().getState())) { - if (matchConditions(exchange, processor, definition, breakpoint)) { - match = true; - onBeforeProcess(exchange, processor, definition, breakpoint.getBreakpoint()); - } - } - } - - return match; - } - - @Override - public boolean afterProcess(Exchange exchange, Processor processor, NamedNode definition, long timeTaken) { - // is the exchange in single step mode? - Breakpoint singleStep = singleSteps.get(exchange.getExchangeId()); - if (singleStep != null) { - onAfterProcess(exchange, processor, definition, timeTaken, singleStep); - return true; - } - - // does any of the breakpoints apply? - boolean match = false; - for (BreakpointConditions breakpoint : breakpoints) { - // breakpoint must be active - if (Breakpoint.State.Active.equals(breakpoint.getBreakpoint().getState())) { - if (matchConditions(exchange, processor, definition, breakpoint)) { - match = true; - onAfterProcess(exchange, processor, definition, timeTaken, breakpoint.getBreakpoint()); - } - } - } - - return match; - } - - @Override - public boolean onEvent(Exchange exchange, ExchangeEvent event) { - // is the exchange in single step mode? - Breakpoint singleStep = singleSteps.get(exchange.getExchangeId()); - if (singleStep != null) { - onEvent(exchange, event, singleStep); - return true; - } - - // does any of the breakpoints apply? - boolean match = false; - for (BreakpointConditions breakpoint : breakpoints) { - // breakpoint must be active - if (Breakpoint.State.Active.equals(breakpoint.getBreakpoint().getState())) { - if (matchConditions(exchange, event, breakpoint)) { - match = true; - onEvent(exchange, event, breakpoint.getBreakpoint()); - } - } - } - - return match; - } - - protected void onBeforeProcess(Exchange exchange, Processor processor, NamedNode definition, Breakpoint breakpoint) { - try { - breakpoint.beforeProcess(exchange, processor, definition); - } catch (Throwable e) { - // ignore - } - } - - protected void onAfterProcess(Exchange exchange, Processor processor, NamedNode definition, long timeTaken, Breakpoint breakpoint) { - try { - breakpoint.afterProcess(exchange, processor, definition, timeTaken); - } catch (Throwable e) { - // ignore - } - } - - @SuppressWarnings("unchecked") - protected void onEvent(Exchange exchange, ExchangeEvent event, Breakpoint breakpoint) { - // try to get the last known definition - LinkedList list = exchange.getProperty(Exchange.MESSAGE_HISTORY, LinkedList.class); - MessageHistory last = list != null ? list.getLast() : null; - NamedNode definition = last != null ? last.getNode() : null; - - try { - breakpoint.onEvent(exchange, event, definition); - } catch (Throwable e) { - // ignore - } - } - - private boolean matchConditions(Exchange exchange, Processor processor, NamedNode definition, BreakpointConditions breakpoint) { - for (Condition condition : breakpoint.getConditions()) { - if (!condition.matchProcess(exchange, processor, definition)) { - return false; - } - } - - return true; - } - - private boolean matchConditions(Exchange exchange, ExchangeEvent event, BreakpointConditions breakpoint) { - for (Condition condition : breakpoint.getConditions()) { - if (!condition.matchEvent(exchange, event)) { - return false; - } - } - - return true; - } - - @Override - protected void doInit() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext", this); - - // must have message history enabled when using this debugger - if (!camelContext.isMessageHistory()) { - camelContext.setMessageHistory(true); - } - - // register our event notifier - camelContext.getManagementStrategy().addEventNotifier(debugEventNotifier); - - ServiceHelper.initService(debugEventNotifier); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService(debugEventNotifier); - } - - @Override - protected void doStop() throws Exception { - breakpoints.clear(); - singleSteps.clear(); - ServiceHelper.stopService(debugEventNotifier); - } - - @Override - public String toString() { - return "DefaultDebugger"; - } - - private final class DebugEventNotifier extends EventNotifierSupport { - - private DebugEventNotifier() { - setIgnoreCamelContextEvents(true); - setIgnoreServiceEvents(true); - } - - @Override - public void notify(CamelEvent event) throws Exception { - ExchangeEvent aee = (ExchangeEvent) event; - Exchange exchange = aee.getExchange(); - onEvent(exchange, aee); - - if (event instanceof ExchangeCompletedEvent) { - // fail safe to ensure we remove single steps when the Exchange is complete - singleSteps.remove(exchange.getExchangeId()); - } - } - - @Override - public boolean isEnabled(CamelEvent event) { - return event instanceof ExchangeEvent; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/package.html deleted file mode 100644 index dea66da..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Helper classes for interceptors. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java deleted file mode 100644 index 3bd48a7..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.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.processor.loadbalancer; - -public class DistributionRatio { - private final int distributionWeight; - private int runtimeWeight; - - public DistributionRatio(int distributionWeight) { - this.distributionWeight = distributionWeight; - this.runtimeWeight = distributionWeight; - } - - public int getDistributionWeight() { - return distributionWeight; - } - - public int getRuntimeWeight() { - return runtimeWeight; - } - - public void reset() { - this.runtimeWeight = distributionWeight; - } - - public boolean decrement() { - if (runtimeWeight > 0) { - runtimeWeight--; - return true; - } else { - return false; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java deleted file mode 100644 index 36219cb..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java +++ /dev/null @@ -1,72 +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.processor.loadbalancer; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - -/** - * Statistics about exception failures for load balancers that reacts on exceptions - */ -public class ExceptionFailureStatistics { - - private final Map, AtomicLong> counters = new HashMap<>(); - private final AtomicLong fallbackCounter = new AtomicLong(); - - public void init(List> exceptions) { - if (exceptions != null) { - for (Class exception : exceptions) { - counters.put(exception, new AtomicLong()); - } - } - } - - public Iterator> getExceptions() { - return counters.keySet().iterator(); - } - - public long getFailureCounter(Class exception) { - AtomicLong counter = counters.get(exception); - if (counter != null) { - return counter.get(); - } else { - return fallbackCounter.get(); - } - } - - public void onHandledFailure(Exception exception) { - Class clazz = exception.getClass(); - - AtomicLong counter = counters.get(clazz); - if (counter != null) { - counter.incrementAndGet(); - } else { - fallbackCounter.incrementAndGet(); - } - } - - public void reset() { - for (AtomicLong counter : counters.values()) { - counter.set(0); - } - fallbackCounter.set(0); - } -} - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java deleted file mode 100644 index b07cb15..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java +++ /dev/null @@ -1,298 +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.processor.loadbalancer; - -import org.apache.camel.*; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * This FailOverLoadBalancer will failover to use next processor when an exception occurred - *

- * This implementation mirrors the logic from the {@link org.apache.camel.processor.Pipeline} in the async variation - * as the failover load balancer is a specialized pipeline. So the trick is to keep doing the same as the - * pipeline to ensure it works the same and the async routing engine is flawless. - */ -public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceable, CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(FailOverLoadBalancer.class); - - private final List> exceptions; - private CamelContext camelContext; - private boolean roundRobin; - private boolean sticky; - private int maximumFailoverAttempts = -1; - - // stateful statistics - private final AtomicInteger counter = new AtomicInteger(-1); - private final AtomicInteger lastGoodIndex = new AtomicInteger(-1); - private final org.apache.camel.processor.loadbalancer.ExceptionFailureStatistics statistics = new org.apache.camel.processor.loadbalancer.ExceptionFailureStatistics(); - - public FailOverLoadBalancer() { - this.exceptions = null; - } - - public FailOverLoadBalancer(List> exceptions) { - this.exceptions = exceptions; - - // validate its all exception types - for (Class type : exceptions) { - if (!ObjectHelper.isAssignableFrom(Throwable.class, type)) { - throw new IllegalArgumentException("Class is not an instance of Throwable: " + type); - } - } - - statistics.init(exceptions); - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - public int getLastGoodIndex() { - return lastGoodIndex.get(); - } - - public List> getExceptions() { - return exceptions; - } - - public boolean isRoundRobin() { - return roundRobin; - } - - public void setRoundRobin(boolean roundRobin) { - this.roundRobin = roundRobin; - } - - public boolean isSticky() { - return sticky; - } - - public void setSticky(boolean sticky) { - this.sticky = sticky; - } - - public int getMaximumFailoverAttempts() { - return maximumFailoverAttempts; - } - - public void setMaximumFailoverAttempts(int maximumFailoverAttempts) { - this.maximumFailoverAttempts = maximumFailoverAttempts; - } - - /** - * Should the given failed Exchange failover? - * - * @param exchange the exchange that failed - * @return true to failover - */ - protected boolean shouldFailOver(Exchange exchange) { - if (exchange == null) { - return false; - } - - boolean answer = false; - - if (exchange.getException() != null) { - if (exceptions == null || exceptions.isEmpty()) { - // always failover if no exceptions defined - answer = true; - } else { - for (Class exception : exceptions) { - // will look in exception hierarchy - if (exchange.getException(exception) != null) { - answer = true; - break; - } - } - } - - if (answer) { - // record the failure in the statistics - statistics.onHandledFailure(exchange.getException()); - } - } - - if (LOG.isTraceEnabled()) { - LOG.trace("Should failover: {} for exchangeId: {}", answer, exchange.getExchangeId()); - } - - return answer; - } - - @Override - public boolean isRunAllowed() { - // determine if we can still run, or the camel context is forcing a shutdown - boolean forceShutdown = camelContext.getShutdownStrategy().forceShutdown(this); - if (forceShutdown) { - LOG.trace("Run not allowed as ShutdownStrategy is forcing shutting down"); - } - return !forceShutdown && super.isRunAllowed(); - } - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - AsyncProcessor[] processors = doGetProcessors(); - exchange.getContext().adapt(ExtendedCamelContext.class).getReactiveExecutor().schedule(new State(exchange, callback, processors)::run); - return false; - } - - protected class State { - - final Exchange exchange; - final AsyncCallback callback; - final AsyncProcessor[] processors; - int index; - int attempts; - // use a copy of the original exchange before failover to avoid populating side effects - // directly into the original exchange - Exchange copy; - - public State(Exchange exchange, AsyncCallback callback, AsyncProcessor[] processors) { - this.exchange = exchange; - this.callback = callback; - this.processors = processors; - - // get the next processor - if (isSticky()) { - int idx = lastGoodIndex.get(); - index = idx > 0 ? idx : 0; - } else if (isRoundRobin()) { - index = counter.updateAndGet(x -> ++x < processors.length ? x : 0); - } - LOG.trace("Failover starting with endpoint index {}", index); - } - - public void run() { - if (copy != null && !shouldFailOver(copy)) { - // remember last good index - lastGoodIndex.set(index); - // and copy the current result to original so it will contain this result of this eip - ExchangeHelper.copyResults(exchange, copy); - if (LOG.isDebugEnabled()) { - LOG.debug("Failover complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange); - } - callback.done(false); - return; - } - - // can we still run - if (!isRunAllowed()) { - LOG.trace("Run not allowed, will reject executing exchange: {}", exchange); - if (exchange.getException() == null) { - exchange.setException(new RejectedExecutionException()); - } - // we cannot process so invoke callback - callback.done(false); - return; - } - - if (copy != null) { - attempts++; - // are we exhausted by attempts? - if (maximumFailoverAttempts > -1 && attempts > maximumFailoverAttempts) { - LOG.debug("Breaking out of failover after {} failover attempts", attempts); - ExchangeHelper.copyResults(exchange, copy); - callback.done(false); - return; - } - - index++; - counter.incrementAndGet(); - } - - if (index >= processors.length) { - // out of bounds - if (isRoundRobin()) { - LOG.trace("Failover is round robin enabled and therefore starting from the first endpoint"); - index = 0; - counter.set(0); - } else { - // no more processors to try - LOG.trace("Breaking out of failover as we reached the end of endpoints to use for failover"); - ExchangeHelper.copyResults(exchange, copy); - callback.done(false); - return; - } - } - - // try again but copy original exchange before we failover - copy = prepareExchangeForFailover(exchange); - AsyncProcessor processor = processors[index]; - - // process the exchange - LOG.debug("Processing failover at attempt {} for {}", attempts, copy); - processor.process(copy, doneSync -> exchange.getContext().adapt(ExtendedCamelContext.class).getReactiveExecutor().schedule(this::run)); - } - - } - - /** - * Prepares the exchange for failover - * - * @param exchange the exchange - * @return a copy of the exchange to use for failover - */ - protected Exchange prepareExchangeForFailover(Exchange exchange) { - // use a copy of the exchange to avoid side effects on the original exchange - return ExchangeHelper.createCopy(exchange, true); - } - - @Override - public String getTraceLabel() { - return "failover"; - } - - public ExceptionFailureStatistics getExceptionFailureStatistics() { - return statistics; - } - - public void reset() { - // reset state - lastGoodIndex.set(-1); - counter.set(-1); - statistics.reset(); - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - - // reset state - reset(); - } - - @Override - protected void doStop() throws Exception { - super.doStop(); - // noop - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java deleted file mode 100644 index e4706cf..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Processor; - -import java.util.List; - -/** - * A strategy for load balancing across a number of {@link Processor} instances - */ -public interface LoadBalancer extends AsyncProcessor { - - /** - * Adds a new processor to the load balancer - * - * @param processor the processor to be added to the load balancer - */ - void addProcessor(AsyncProcessor processor); - - /** - * Removes the given processor from the load balancer - * - * @param processor the processor to be removed from the load balancer - */ - void removeProcessor(AsyncProcessor processor); - - /** - * Returns the current processors available to this load balancer - * - * @return the processors available - */ - List getProcessors(); -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java deleted file mode 100644 index 36f82b3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java +++ /dev/null @@ -1,46 +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.processor.loadbalancer; - -import org.apache.camel.Endpoint; -import org.apache.camel.Processor; -import org.apache.camel.support.DefaultConsumer; - -/** - * Represents a consumer which on starting registers itself with a {@link org.apache.camel.processor.loadbalancer.LoadBalancer} and on closing unregisters - * itself with a load balancer - */ -public class LoadBalancerConsumer extends DefaultConsumer { - private final org.apache.camel.processor.loadbalancer.LoadBalancer loadBalancer; - - public LoadBalancerConsumer(Endpoint endpoint, Processor processor, LoadBalancer loadBalancer) { - super(endpoint, processor); - this.loadBalancer = loadBalancer; - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - loadBalancer.addProcessor(getAsyncProcessor()); - } - - @Override - protected void doStop() throws Exception { - loadBalancer.removeProcessor(getAsyncProcessor()); - super.doStop(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java deleted file mode 100644 index 6930ad8..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Navigate; -import org.apache.camel.Processor; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.service.ServiceHelper; - -import java.lang.reflect.Array; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - -/** - * A default base class for a {@link org.apache.camel.processor.loadbalancer.LoadBalancer} implementation. - */ -public abstract class LoadBalancerSupport extends AsyncProcessorSupport implements LoadBalancer, Navigate, IdAware, RouteIdAware { - - private final AtomicReference processors = new AtomicReference<>(new AsyncProcessor[0]); - private String id; - private String routeId; - - @Override - public void addProcessor(AsyncProcessor processor) { - processors.updateAndGet(op -> doAdd(processor, op)); - } - - @Override - public void removeProcessor(AsyncProcessor processor) { - processors.updateAndGet(op -> doRemove(processor, op)); - } - - private AsyncProcessor[] doAdd(AsyncProcessor processor, AsyncProcessor[] op) { - int len = op.length; - AsyncProcessor[] np = Arrays.copyOf(op, len + 1, op.getClass()); - np[len] = processor; - return np; - } - - private AsyncProcessor[] doRemove(AsyncProcessor processor, AsyncProcessor[] op) { - int len = op.length; - for (int index = 0; index < len; index++) { - if (op[index].equals(processor)) { - AsyncProcessor[] np = (AsyncProcessor[]) Array.newInstance(AsyncProcessor.class, len - 1); - System.arraycopy(op, 0, np, 0, index); - System.arraycopy(op, index + 1, np, index, len - index - 1); - return np; - } - } - return op; - } - - @Override - public List getProcessors() { - return Arrays.asList(processors.get()); - } - - protected AsyncProcessor[] doGetProcessors() { - return processors.get(); - } - - @Override - @SuppressWarnings("unchecked") - public List next() { - if (!hasNext()) { - return null; - } - return (List) getProcessors(); - } - - @Override - public boolean hasNext() { - return doGetProcessors().length > 0; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - protected void doInit() throws Exception { - ServiceHelper.initService((Object[]) processors.get()); - } - - @Override - protected void doStart() throws Exception { - ServiceHelper.startService((Object[]) processors.get()); - } - - @Override - protected void doStop() throws Exception { - ServiceHelper.stopService((Object[]) processors.get()); - } - - @Override - protected void doShutdown() throws Exception { - AsyncProcessor[] p = processors.get(); - ServiceHelper.stopAndShutdownServices((Object[]) p); - for (AsyncProcessor processor : p) { - removeProcessor(processor); - } - } - - @Override - public String toString() { - return getClass().getSimpleName() + Arrays.toString(doGetProcessors()); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java deleted file mode 100644 index bd94128..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java +++ /dev/null @@ -1,48 +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.processor.loadbalancer; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; - -/** - * A base class for {@link LoadBalancer} implementations which choose a single - * destination for each exchange (rather like JMS Queues) - */ -public abstract class QueueLoadBalancer extends LoadBalancerSupport { - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - AsyncProcessor[] list = doGetProcessors(); - if (list.length > 0) { - AsyncProcessor processor = chooseProcessor(list, exchange); - if (processor == null) { - Exception e = new IllegalStateException("No processors could be chosen to process " + exchange); - exchange.setException(e); - } else { - processor.process(exchange, callback); - return false; - } - } - // no processors but indicate we are done - callback.done(false); - return false; - } - - protected abstract AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange); -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java deleted file mode 100644 index de8f219..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; - -import java.util.concurrent.ThreadLocalRandom; - -/** - * Implements the random load balancing policy - */ -public class RandomLoadBalancer extends QueueLoadBalancer { - - private transient int index; - - @Override - protected AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange) { - int size = processors.length; - if (size == 0) { - return null; - } else if (size == 1) { - // there is only 1 - return processors[0]; - } - - // pick a random - index = ThreadLocalRandom.current().nextInt(size); - return processors[index]; - } - - public int getLastChosenProcessorIndex() { - return index; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java deleted file mode 100644 index c8858e4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * Implements the round robin load balancing policy - */ -public class RoundRobinLoadBalancer extends QueueLoadBalancer { - private AtomicInteger counter = new AtomicInteger(-1); - - @Override - protected AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange) { - int size = processors.length; - int c = counter.updateAndGet(x -> ++x < size ? x : 0); - return processors[c]; - } - - public int getLastChosenProcessorIndex() { - return counter.get(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java deleted file mode 100644 index 97c10c5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; -import org.apache.camel.Expression; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Implements a sticky load balancer using an {@link Expression} to calculate - * a correlation key to perform the sticky load balancing; rather like jsessionid in the web - * or JMSXGroupID in JMS. - */ -public class StickyLoadBalancer extends QueueLoadBalancer { - private Expression correlationExpression; - private org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer loadBalancer; - private int numberOfHashGroups = 64 * 1024; - private final Map stickyMap = new ConcurrentHashMap<>(); - - public StickyLoadBalancer(Expression correlationExpression) { - this.correlationExpression = correlationExpression; - this.loadBalancer = new RoundRobinLoadBalancer(); - } - - @Override - protected AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange) { - Object value = correlationExpression.evaluate(exchange, Object.class); - Object key = getStickyKey(value); - - AsyncProcessor processor; - processor = stickyMap.computeIfAbsent(key, k -> loadBalancer.chooseProcessor(processors, exchange)); - return processor; - } - - @Override - public void removeProcessor(AsyncProcessor processor) { - stickyMap.values().remove(processor); - super.removeProcessor(processor); - } - - public int getLastChosenProcessorIndex() { - return loadBalancer.getLastChosenProcessorIndex(); - } - - public Expression getCorrelationExpression() { - return correlationExpression; - } - - // Properties - //------------------------------------------------------------------------- - - public int getNumberOfHashGroups() { - return numberOfHashGroups; - } - - public void setNumberOfHashGroups(int numberOfHashGroups) { - this.numberOfHashGroups = numberOfHashGroups; - } - - // Implementation methods - //------------------------------------------------------------------------- - - /** - * A strategy to create the key for the sticky load balancing map. - * The default implementation uses the hash code of the value - * then modulos by the numberOfHashGroups to avoid the sticky map getting too big - * - * @param value the correlation value - * @return the key to be used in the sticky map - */ - protected Object getStickyKey(Object value) { - int hashCode = 37; - if (value != null) { - hashCode = value.hashCode(); - } - if (numberOfHashGroups > 0) { - hashCode = hashCode % numberOfHashGroups; - } - return hashCode; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java deleted file mode 100644 index fa06173..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java +++ /dev/null @@ -1,83 +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.processor.loadbalancer; - -import org.apache.camel.*; - -/** - * A {@link LoadBalancer} implementations which sends to all destinations - * (rather like JMS Topics). - *

- * The {@link org.apache.camel.processor.MulticastProcessor} is more powerful as it offers - * option to run in parallel and decide whether or not to stop on failure etc. - */ -public class TopicLoadBalancer extends LoadBalancerSupport { - - @Override - public boolean process(final Exchange exchange, final AsyncCallback callback) { - AsyncProcessor[] processors = doGetProcessors(); - exchange.getContext().adapt(ExtendedCamelContext.class).getReactiveExecutor().schedule(new State(exchange, callback, processors)::run); - return false; - } - - protected class State { - final Exchange exchange; - final AsyncCallback callback; - final AsyncProcessor[] processors; - int index; - - public State(Exchange exchange, AsyncCallback callback, AsyncProcessor[] processors) { - this.exchange = exchange; - this.callback = callback; - this.processors = processors; - } - - public void run() { - if (index < processors.length) { - AsyncProcessor processor = processors[index++]; - Exchange copy = copyExchangeStrategy(processor, exchange); - processor.process(copy, doneSync -> done(copy)); - } else { - callback.done(false); - } - } - - public void done(Exchange current) { - if (current.getException() != null) { - exchange.setException(current.getException()); - callback.done(false); - } else { - exchange.getContext().adapt(ExtendedCamelContext.class).getReactiveExecutor().schedule(this::run); - } - } - } - - /** - * Strategy method to copy the exchange before sending to another endpoint. - * Derived classes such as the {@link org.apache.camel.processor.Pipeline Pipeline} - * will not clone the exchange - * - * @param processor the processor that will send the exchange - * @param exchange the exchange - * @return the current exchange if no copying is required such as for a - * pipeline otherwise a new copy of the exchange is returned. - */ - protected Exchange copyExchangeStrategy(Processor processor, Exchange exchange) { - return exchange.copy(); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java deleted file mode 100644 index 6916a1f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.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.processor.loadbalancer; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -public abstract class WeightedLoadBalancer extends QueueLoadBalancer { - protected final List ratios; - protected final int distributionRatioSum; - protected int runtimeRatioSum; - - transient int lastIndex = -1; - - public WeightedLoadBalancer(List distributionRatios) { - List ratios = distributionRatios.stream() - .map(org.apache.camel.processor.loadbalancer.DistributionRatio::new) - .collect(Collectors.toList()); - this.ratios = Collections.unmodifiableList(ratios); - this.distributionRatioSum = ratios.stream() - .mapToInt(org.apache.camel.processor.loadbalancer.DistributionRatio::getDistributionWeight).sum(); - this.runtimeRatioSum = distributionRatioSum; - } - - public int getLastChosenProcessorIndex() { - return lastIndex; - } - - @Override - protected void doStart() throws Exception { - super.doStart(); - if (getProcessors().size() != ratios.size()) { - throw new IllegalArgumentException("Loadbalacing with " + getProcessors().size() - + " should match number of distributions " + ratios.size()); - } - } - - protected void decrementSum() { - if (--runtimeRatioSum == 0) { - // every processor is exhausted, reload for a new distribution round - reset(); - } - } - - protected void reset() { - for (org.apache.camel.processor.loadbalancer.DistributionRatio ratio : ratios) { - ratio.reset(); - } - runtimeRatioSum = distributionRatioSum; - } - - public List getRatios() { - return ratios; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java deleted file mode 100644 index 5f621e1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; - -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; - -public class WeightedRandomLoadBalancer extends WeightedLoadBalancer { - - public WeightedRandomLoadBalancer(List distributionRatioList) { - super(distributionRatioList); - } - - @Override - protected synchronized AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange) { - int randomWeight = ThreadLocalRandom.current().nextInt(runtimeRatioSum); - int choiceWeight = 0; - int index = 0; - while (true) { - DistributionRatio ratio = getRatios().get(index); - choiceWeight += ratio.getRuntimeWeight(); - if (randomWeight < choiceWeight) { - ratio.decrement(); - decrementSum(); - lastIndex = index; - return processors[index]; - } - index++; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java deleted file mode 100644 index 561d804..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.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.processor.loadbalancer; - -import org.apache.camel.AsyncProcessor; -import org.apache.camel.Exchange; - -import java.util.List; - -public class WeightedRoundRobinLoadBalancer extends WeightedLoadBalancer { - - int counter = -1; - - public WeightedRoundRobinLoadBalancer(List distributionRatios) { - super(distributionRatios); - } - - @Override - protected synchronized AsyncProcessor chooseProcessor(AsyncProcessor[] processors, Exchange exchange) { - int counter = this.counter; - List ratios = getRatios(); - while (true) { - if (++counter >= ratios.size()) { - counter = 0; - } - DistributionRatio ratio = ratios.get(counter); - if (ratio.decrement()) { - this.counter = lastIndex = counter; - decrementSum(); - return processors[counter]; - } - } - } - - @Override - protected void reset() { - super.reset(); - counter = -1; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/package.html deleted file mode 100644 index c878349..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Various load balancer processors - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/package.html deleted file mode 100644 index d18bd39..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/package.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - -A collection of Processor -implementations which are used to implement the -Enterprise Integration Patterns - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java deleted file mode 100644 index 20c71d9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java +++ /dev/null @@ -1,76 +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.processor.resequencer; - -import org.apache.camel.Exchange; -import org.apache.camel.Expression; - -/** - * Compares elements of an {@link Exchange} sequence by comparing - * long values returned by this comparator's - * expression. - */ -public class DefaultExchangeComparator implements ExpressionResultComparator { - - private Expression expression; - - @Override - public void setExpression(Expression expression) { - this.expression = expression; - } - - @Override - public boolean predecessor(Exchange o1, Exchange o2) { - long n1 = getSequenceNumber(o1); - long n2 = getSequenceNumber(o2); - return n1 == (n2 - 1L); - } - - @Override - public boolean successor(Exchange o1, Exchange o2) { - long n1 = getSequenceNumber(o1); - long n2 = getSequenceNumber(o2); - return n2 == (n1 - 1L); - } - - @Override - public int compare(Exchange o1, Exchange o2) { - Long n1 = getSequenceNumber(o1); - Long n2 = getSequenceNumber(o2); - return n1.compareTo(n2); - } - - private Long getSequenceNumber(Exchange exchange) { - return expression.evaluate(exchange, Long.class); - } - - @Override - public boolean isValid(Exchange exchange) { - Long num = null; - try { - num = expression.evaluate(exchange, Long.class); - } catch (Exception e) { - // ignore - } - return num != null; - } - - @Override - public String toString() { - return "Comparator[" + expression + "]"; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Element.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Element.java deleted file mode 100644 index 3edb3f1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Element.java +++ /dev/null @@ -1,100 +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.processor.resequencer; - -/** - * A container for objects to be resequenced. This container can be scheduled - * for timing out. Non-scheduled objects or already timed-out objects are ready - * for being released by the {@link ResequencerEngine}. - */ -class Element implements TimeoutHandler { - - /** - * The contained object. - */ - private E object; - - /** - * Not null if this element is currently beeing scheduled for - * timing out. - */ - private Timeout timeout; - - /** - * Creates a new container instance. - * - * @param object contained object. - */ - Element(E object) { - this.object = object; - } - - /** - * Returns the contained object. - * - * @return the contained object. - */ - public E getObject() { - return object; - } - - /** - * Returns true if this element is currently scheduled for - * timing out. - * - * @return true if scheduled or false if not - * scheduled or already timed-out. - */ - public synchronized boolean scheduled() { - return timeout != null; - } - - /** - * Schedules the given timeout task. Before this methods calls the - * {@link Timeout#schedule()} method it sets this element as timeout - * listener. - * - * @param t a timeout task. - */ - public synchronized void schedule(Timeout t) { - this.timeout = t; - this.timeout.setTimeoutHandler(this); - this.timeout.schedule(); - } - - /** - * Cancels the scheduled timeout for this element. If this element is not - * scheduled or has already timed-out this method has no effect. - */ - public synchronized void cancel() { - if (timeout != null) { - timeout.cancel(); - } - timeout(null); - } - - /** - * Marks this element as timed-out. - * - * @param t timeout task that caused the notification. - */ - @Override - public synchronized void timeout(Timeout t) { - this.timeout = null; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java deleted file mode 100644 index 460babe..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java +++ /dev/null @@ -1,64 +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.processor.resequencer; - -/** - * A strategy for comparing {@link Element} instances. This strategy uses - * another {@link SequenceElementComparator} instance for comparing elements - * contained by {@link Element} instances. - */ -class ElementComparator implements SequenceElementComparator> { - - /** - * A sequence element comparator this comparator delegates to. - */ - private final SequenceElementComparator comparator; - - /** - * Creates a new element comparator instance. - * - * @param comparator a sequence element comparator this comparator delegates to. - */ - ElementComparator(SequenceElementComparator comparator) { - this.comparator = comparator; - } - - @Override - public boolean predecessor(Element o1, Element o2) { - return comparator.predecessor(o1.getObject(), o2.getObject()); - } - - @Override - public boolean successor(Element o1, Element o2) { - return comparator.successor(o1.getObject(), o2.getObject()); - } - - @Override - public int compare(Element o1, Element o2) { - return comparator.compare(o1.getObject(), o2.getObject()); - } - - @Override - public boolean isValid(Element o1) { - return comparator.isValid(o1.getObject()); - } - - @Override - public String toString() { - return comparator.toString(); - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java deleted file mode 100644 index 026b25a..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java +++ /dev/null @@ -1,35 +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.processor.resequencer; - -import org.apache.camel.Exchange; -import org.apache.camel.Expression; - -/** - * A {@link org.apache.camel.processor.resequencer.SequenceElementComparator} that compares {@link Exchange}s based on - * the result of an expression evaluation. - */ -public interface ExpressionResultComparator extends SequenceElementComparator { - - /** - * Set the expression used for comparing {@link Exchange}s. - * - * @param expression the expression - */ - void setExpression(Expression expression); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java deleted file mode 100644 index 01ae51e..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java +++ /dev/null @@ -1,30 +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.processor.resequencer; - -import org.apache.camel.RuntimeCamelException; - -/** - * An exception thrown if message is rejected by the resequencer - */ -public class MessageRejectedException extends RuntimeCamelException { - private static final long serialVersionUID = 5755929795399134568L; - - public MessageRejectedException(String message) { - super(message); - } -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java deleted file mode 100644 index d067018..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java +++ /dev/null @@ -1,331 +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.processor.resequencer; - -import org.apache.camel.util.concurrent.ThreadHelper; - -import java.util.Timer; - -/** - * Resequences elements based on a given {@link org.apache.camel.processor.resequencer.SequenceElementComparator}. - * This resequencer is designed for resequencing element streams. Stream-based - * resequencing has the advantage that the number of elements to be resequenced - * need not be known in advance. Resequenced elements are delivered via a - * {@link SequenceSender}. - *

- * The resequencer's behaviour for a given comparator is controlled by the - * timeout property. This is the timeout (in milliseconds) for a - * given element managed by this resequencer. An out-of-sequence element can - * only be marked as ready-for-delivery if it either times out or if it - * has an immediate predecessor (in that case it is in-sequence). If an - * immediate predecessor of a waiting element arrives the timeout task for the - * waiting element will be cancelled (which marks it as ready-for-delivery). - *

- * If the maximum out-of-sequence time difference between elements within a - * stream is known, the timeout value should be set to this - * value. In this case it is guaranteed that all elements of a stream will be - * delivered in sequence via the {@link SequenceSender}. The lower the - * timeout value is compared to the out-of-sequence time - * difference between elements within a stream the higher the probability is for - * out-of-sequence elements delivered by this resequencer. Delivery of elements - * must be explicitly triggered by applications using the {@link #deliver()} or - * {@link #deliverNext()} methods. Only elements that are ready-for-delivery - * are delivered by these methods. The longer an application waits to trigger a - * delivery the more elements may become ready-for-delivery. - *

- * The resequencer remembers the last-delivered element. If an element arrives - * which is the immediate successor of the last-delivered element it is - * ready-for-delivery immediately. After delivery the last-delivered - * element is adjusted accordingly. If the last-delivered element is - * null i.e. the resequencer was newly created the first arriving - * element needs timeout milliseconds in any case for becoming - * ready-for-delivery. - *

- */ -public class ResequencerEngine { - - /** - * The element that most recently hash been delivered or null - * if no element has been delivered yet. - */ - private org.apache.camel.processor.resequencer.Element lastDelivered; - - /** - * Minimum amount of time to wait for out-of-sequence elements. - */ - private long timeout; - - /** - * A sequence of elements for sorting purposes. - */ - private Sequence> sequence; - - /** - * A timer for scheduling timeout notifications. - */ - private Timer timer; - - /** - * A strategy for sending sequence elements. - */ - private SequenceSender sequenceSender; - - /** - * Indicates whether an error should be thrown if message older (based on Comparator) than the last delivered message is received. - */ - private Boolean rejectOld; - - /** - * Creates a new resequencer instance with a default timeout of 2000 - * milliseconds. - * - * @param comparator a sequence element comparator. - */ - public ResequencerEngine(org.apache.camel.processor.resequencer.SequenceElementComparator comparator) { - this.sequence = createSequence(comparator); - this.timeout = 2000L; - this.lastDelivered = null; - } - - public void start() { - timer = new Timer(ThreadHelper.resolveThreadName("Camel Thread ${counter} - ${name}", "Stream Resequencer Timer"), true); - } - - /** - * Stops this resequencer (i.e. this resequencer's {@link Timer} instance). - */ - public void stop() { - timer.cancel(); - } - - /** - * Returns the number of elements currently maintained by this resequencer. - * - * @return the number of elements currently maintained by this resequencer. - */ - public synchronized int size() { - return sequence.size(); - } - - /** - * Returns this resequencer's timeout value. - * - * @return the timeout in milliseconds. - */ - public long getTimeout() { - return timeout; - } - - /** - * Sets this sequencer's timeout value. - * - * @param timeout the timeout in milliseconds. - */ - public void setTimeout(long timeout) { - this.timeout = timeout; - } - - public Boolean getRejectOld() { - return rejectOld; - } - - public void setRejectOld(Boolean rejectOld) { - this.rejectOld = rejectOld; - } - - /** - * Returns the sequence sender. - * - * @return the sequence sender. - */ - public SequenceSender getSequenceSender() { - return sequenceSender; - } - - /** - * Sets the sequence sender. - * - * @param sequenceSender a sequence element sender. - */ - public void setSequenceSender(SequenceSender sequenceSender) { - this.sequenceSender = sequenceSender; - } - - /** - * Returns the last delivered element. - * - * @return the last delivered element or null if no delivery - * has been made yet. - */ - E getLastDelivered() { - if (lastDelivered == null) { - return null; - } - return lastDelivered.getObject(); - } - - /** - * Sets the last delivered element. This is for testing purposes only. - * - * @param o an element. - */ - void setLastDelivered(E o) { - lastDelivered = new org.apache.camel.processor.resequencer.Element<>(o); - } - - /** - * Inserts the given element into this resequencer. If the element is not - * ready for immediate delivery and has no immediate presecessor then it is - * scheduled for timing out. After being timed out it is ready for delivery. - * - * @param o an element. - * @throws IllegalArgumentException if the element cannot be used with this resequencer engine - */ - public synchronized void insert(E o) { - // wrap object into internal element - org.apache.camel.processor.resequencer.Element element = new org.apache.camel.processor.resequencer.Element<>(o); - - // validate the exchange has no problem - if (!sequence.comparator().isValid(element)) { - throw new IllegalArgumentException("Element cannot be used in comparator: " + sequence.comparator()); - } - - // validate the exchange shouldn't be 'rejected' (if applicable) - if (rejectOld != null && rejectOld.booleanValue() && beforeLastDelivered(element)) { - throw new MessageRejectedException("rejecting message [" + element.getObject() - + "], it should have been sent before the last delivered message [" + lastDelivered.getObject() + "]"); - } - - // add element to sequence in proper order - sequence.add(element); - - org.apache.camel.processor.resequencer.Element successor = sequence.successor(element); - - // check if there is an immediate successor and cancel - // timer task (no need to wait any more for timeout) - if (successor != null) { - successor.cancel(); - } - - // start delivery if current element is successor of last delivered element - if (successorOfLastDelivered(element)) { - // nothing to schedule - } else if (sequence.predecessor(element) != null) { - // nothing to schedule - } else { - element.schedule(defineTimeout()); - } - } - - /** - * Delivers all elements which are currently ready to deliver. - * - * @throws Exception thrown by {@link SequenceSender#sendElement(Object)}. - * - * @see ResequencerEngine#deliverNext() - */ - public synchronized void deliver() throws Exception { - while (deliverNext()) { - // do nothing here - } - } - - /** - * Attempts to deliver a single element from the head of the resequencer - * queue (sequence). Only elements which have not been scheduled for timing - * out or which already timed out can be delivered. Elements are delivered via - * {@link SequenceSender#sendElement(Object)}. - * - * @return true if the element has been delivered - * false otherwise. - * - * @throws Exception thrown by {@link SequenceSender#sendElement(Object)}. - * - */ - public boolean deliverNext() throws Exception { - if (sequence.size() == 0) { - return false; - } - // inspect element with lowest sequence value - org.apache.camel.processor.resequencer.Element element = sequence.first(); - - // if element is scheduled do not deliver and return - if (element.scheduled()) { - return false; - } - - // remove deliverable element from sequence - sequence.remove(element); - - // set the delivered element to last delivered element - lastDelivered = element; - - // deliver the sequence element - sequenceSender.sendElement(element.getObject()); - - // element has been delivered - return true; - } - - /** - * Returns true if the given element is the immediate - * successor of the last delivered element. - * - * @param element an element. - * @return true if the given element is the immediate - * successor of the last delivered element. - */ - private boolean successorOfLastDelivered(org.apache.camel.processor.resequencer.Element element) { - if (lastDelivered == null) { - return false; - } - if (sequence.comparator().successor(element, lastDelivered)) { - return true; - } - return false; - } - - /** - * Retuns true if the given element is before the last delivered element. - * - * @param element an element. - * @return true if the given element is before the last delivered element. - */ - private boolean beforeLastDelivered(org.apache.camel.processor.resequencer.Element element) { - if (lastDelivered == null) { - return false; - } - if (sequence.comparator().compare(element, lastDelivered) < 0) { - return true; - } - return false; - } - - /** - * Creates a timeout task based on the timeout setting of this resequencer. - * - * @return a new timeout task. - */ - private Timeout defineTimeout() { - return new Timeout(timer, timeout); - } - - private static Sequence> createSequence(SequenceElementComparator comparator) { - return new Sequence<>(new org.apache.camel.processor.resequencer.ElementComparator<>(comparator)); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Sequence.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Sequence.java deleted file mode 100644 index 77d1194..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Sequence.java +++ /dev/null @@ -1,137 +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.processor.resequencer; - -import java.util.TreeSet; - -/** - * A sorted set of elements with additional methods for obtaining immediate - * successors and immediate predecessors of a given element in the sequence. - * Successors and predecessors are calculated by using a - * {@link org.apache.camel.processor.resequencer.SequenceElementComparator}. - */ -public class Sequence extends TreeSet { - - private static final long serialVersionUID = 5647393631147741711L; - - private org.apache.camel.processor.resequencer.SequenceElementComparator comparator; - - /** - * Creates a new {@link Sequence} instance. - * - * @param comparator a strategy for comparing elements of this sequence. - */ - public Sequence(org.apache.camel.processor.resequencer.SequenceElementComparator comparator) { - super(comparator); - this.comparator = comparator; - } - - /** - * Returns the immediate predecessor of the given element in this sequence - * or null if no predecessor exists. - * - * @param e an element which is compared to elements of this sequence. - * @return an element of this sequence or null. - */ - public E predecessor(E e) { - E elem = lower(e); - if (elem == null) { - return null; - } - if (comparator.predecessor(elem, e)) { - return elem; - } - return null; - } - - /** - * Returns the immediate successor of the given element in this sequence - * or null if no successor exists. - * - * @param e an element which is compared to elements of this sequence. - * @return an element of this sequence or null. - */ - public E successor(E e) { - E elem = higher(e); - if (elem == null) { - return null; - } - if (comparator.successor(elem, e)) { - return elem; - } - return null; - } - - /** - * Returns this sequence's comparator. - * - * @return this sequence's comparator. - */ - @Override - public SequenceElementComparator comparator() { - return comparator; - } - - /** - * Returns the next higher element in the sequence to the given element. If - * the given element doesn't exist or if it is the last element in the - * sequence null is returned. Please note that this - * method is provided for compatibility with Java 5 SE. On a Java 6 SE - * platform the same method implemented by the {@link TreeSet} - * class should be used for better performance. - * - * @param e an element which is compared to elements of this sequence. - * @return an element of this sequence or null. - */ - @Override - public E higher(E e) { - boolean found = false; - for (E current : this) { - if (found) { - return current; - } - if (comparator.compare(e, current) == 0) { - found = true; - } - } - return null; - } - - /** - * Returns the next lower element in the sequence to the given element. If - * the given element doesn't exist or if it is the first element in the - * sequence null is returned. Please note that this - * method is provided for compatibility with Java 5 SE. On a Java 6 SE - * platform the same method implemented by the {@link TreeSet} - * class should be used for better performance. - * - * @param e an element which is compared to elements of this sequence. - * @return an element of this sequence or null. - */ - @Override - public E lower(E e) { - E last = null; - for (E current : this) { - if (comparator.compare(e, current) == 0) { - return last; - } - last = current; - } - return last; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java deleted file mode 100644 index fc160b1..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.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.processor.resequencer; - -import java.util.Comparator; - -/** - * A strategy for comparing elements of a sequence. - */ -public interface SequenceElementComparator extends Comparator { - - /** - * Returns true if o1 is an immediate predecessor - * of o2. - * - * @param o1 a sequence element. - * @param o2 a sequence element. - * @return true if its an immediate predecessor - */ - boolean predecessor(E o1, E o2); - - /** - * Returns true if o1 is an immediate successor - * of o2. - * - * @param o1 a sequence element. - * @param o2 a sequence element. - * @return true if its an immediate successor - */ - boolean successor(E o1, E o2); - - /** - * Returns true if the o1 can be used in this comparator. - * - * @param o1 a sequence element - * @return true if its usable for this comparator - */ - boolean isValid(E o1); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java deleted file mode 100644 index 3bc001f..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java +++ /dev/null @@ -1,35 +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.processor.resequencer; - -/** - * An interface used by the {@link org.apache.camel.processor.resequencer.ResequencerEngine#deliver()} and - * {@link ResequencerEngine#deliverNext()} methods to send out re-ordered - * elements. - * - */ -public interface SequenceSender { - - /** - * Sends the given element. - * - * @param o a re-ordered element. - * @throws Exception if delivery fails. - */ - void sendElement(E o) throws Exception; - -} \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Timeout.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Timeout.java deleted file mode 100644 index 8e5136c..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/Timeout.java +++ /dev/null @@ -1,83 +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.processor.resequencer; - -import java.util.Timer; -import java.util.TimerTask; - -/** - * A timer task that notifies handlers about scheduled timeouts. - * - * @see Timer - * @see TimerTask - */ -public class Timeout extends TimerTask { - - private org.apache.camel.processor.resequencer.TimeoutHandler timeoutHandler; - - private Timer timer; - - private long timeout; - - /** - * Creates a new timeout task using the given {@link Timer} instance and - * timeout value. The task is not scheduled immediately. It will be - * scheduled by calling this task's {@link #schedule()} method. - * - * @param timer a timer - * @param timeout a timeout value. - */ - public Timeout(Timer timer, long timeout) { - this.timeout = timeout; - this.timer = timer; - } - - /** - * Returns the timeout handler that has been registered for notification. - * - * @return the timeout handler. - */ - public org.apache.camel.processor.resequencer.TimeoutHandler getTimeoutHandlers() { - return timeoutHandler; - } - - /** - * Sets a timeout handler for receiving timeout notifications. - * - * @param timeoutHandler - * a timeout handler. - */ - public void setTimeoutHandler(TimeoutHandler timeoutHandler) { - this.timeoutHandler = timeoutHandler; - } - - /** - * Schedules this timeout task. - */ - public void schedule() { - timer.schedule(this, timeout); - } - - /** - * Notifies the timeout handler about the scheduled timeout. - */ - @Override - public void run() { - timeoutHandler.timeout(this); - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java deleted file mode 100644 index 318df60..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java +++ /dev/null @@ -1,31 +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.processor.resequencer; - -/** - * Implemented by classes that handle timeout notifications. - */ -public interface TimeoutHandler { - - /** - * Handles a timeout notification. - * - * @param timeout the timer task that caused this timeout notification. - */ - void timeout(Timeout timeout); - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/package.html deleted file mode 100644 index 7c81429..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/resequencer/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Helper classes for the Resequencer pattern. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java deleted file mode 100644 index b5936e3..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java +++ /dev/null @@ -1,46 +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.processor.saga; - -import org.apache.camel.*; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Saga processor implementing the MANDATORY propagation mode. - */ -public class MandatorySagaProcessor extends SagaProcessor { - - public MandatorySagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((coordinator, ex) -> ifNotException(ex, exchange, callback, () -> { - if (coordinator == null) { - exchange.setException(new CamelExchangeException("Exchange is not part of a saga", exchange)); - callback.done(false); - } else { - coordinator.beginStep(exchange, step).whenComplete((done, ex2) -> ifNotException(ex2, exchange, callback, () -> { - super.process(exchange, doneSync -> callback.done(false)); - })); - } - })); - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java deleted file mode 100644 index 731fe14..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.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.processor.saga; - -import org.apache.camel.*; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Saga processor implementing the NEVER propagation mode. - */ -public class NeverSagaProcessor extends SagaProcessor { - - public NeverSagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - if (!step.isEmpty()) { - throw new IllegalArgumentException("Saga configuration is not allowed when propagation is set to NEVER"); - } - if (completionMode != null && completionMode != SagaCompletionMode.defaultCompletionMode()) { - throw new IllegalArgumentException("CompletionMode cannot be specified when propagation is NEVER"); - } - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((coordinator, ex) -> ifNotException(ex, exchange, callback, () -> { - if (coordinator != null) { - exchange.setException(new CamelExchangeException("Route cannot handle exchanges that are joining a saga", exchange)); - callback.done(false); - } else { - super.process(exchange, doneSync -> callback.done(false)); - } - })); - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java deleted file mode 100644 index 7249935..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.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.processor.saga; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Saga processor implementing the NOT_SUPPORTED propagation mode. - */ -public class NotSupportedSagaProcessor extends SagaProcessor { - - public NotSupportedSagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - if (!step.isEmpty()) { - throw new IllegalArgumentException("Saga configuration is not allowed when propagation is set to NOT_SUPPORTED"); - } - if (completionMode != null && completionMode != SagaCompletionMode.defaultCompletionMode()) { - throw new IllegalArgumentException("CompletionMode cannot be specified when propagation is NOT_SUPPORTED"); - } - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((coordinator, ex) -> ifNotException(ex, exchange, callback, () -> { - setCurrentSagaCoordinator(exchange, null); - - super.process(exchange, doneSync -> { - // Restore existing coordinator - setCurrentSagaCoordinator(exchange, coordinator); - callback.done(false); - }); - })); - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java deleted file mode 100644 index 06b3b6d..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.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.processor.saga; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.saga.CamelSagaCoordinator; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -import java.util.concurrent.CompletableFuture; - -/** - * Saga processor implementing the REQUIRED propagation mode. - */ -public class RequiredSagaProcessor extends SagaProcessor { - - public RequiredSagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((existingCoordinator, ex) -> ifNotException(ex, exchange, callback, () -> { - CompletableFuture coordinatorFuture; - final boolean inheritedCoordinator; - if (existingCoordinator != null) { - coordinatorFuture = CompletableFuture.completedFuture(existingCoordinator); - inheritedCoordinator = true; - } else { - coordinatorFuture = sagaService.newSaga(); - inheritedCoordinator = false; - } - - coordinatorFuture.whenComplete((coordinator, ex2) -> ifNotException(ex2, exchange, !inheritedCoordinator, coordinator, existingCoordinator, callback, () -> { - setCurrentSagaCoordinator(exchange, coordinator); - coordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, !inheritedCoordinator, coordinator, existingCoordinator, callback, () -> { - super.process(exchange, doneSync -> { - if (!inheritedCoordinator) { - // Saga starts and ends here - handleSagaCompletion(exchange, coordinator, null, callback); - } else { - callback.done(false); - } - }); - })); - })); - })); - - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java deleted file mode 100644 index 42b9078..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java +++ /dev/null @@ -1,51 +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.processor.saga; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Saga processor implementing the REQUIRES_NEW propagation mode. - */ -public class RequiresNewSagaProcessor extends SagaProcessor { - - public RequiresNewSagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((existingCoordinator, ex) -> ifNotException(ex, exchange, callback, () -> - sagaService.newSaga().whenComplete((newCoordinator, ex2) -> ifNotException(ex2, exchange, true, newCoordinator, existingCoordinator, callback, () -> { - setCurrentSagaCoordinator(exchange, newCoordinator); - - newCoordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, true, newCoordinator, existingCoordinator, callback, () -> { - // Always finalizes the saga - super.process(exchange, doneSync -> handleSagaCompletion(exchange, newCoordinator, existingCoordinator, callback)); - })); - - })))); - - return false; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaCompletionMode.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaCompletionMode.java deleted file mode 100644 index e1845f5..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaCompletionMode.java +++ /dev/null @@ -1,38 +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.processor.saga; - -/** - * Enumerates all saga completion modes. - */ -public enum SagaCompletionMode { - - /** - * Complete the saga automatically as soon as the exchange is processed. - */ - AUTO, - - /** - * Complete the saga explicitly using the "saga:complete" endpoint. - */ - MANUAL; - - public static SagaCompletionMode defaultCompletionMode() { - return AUTO; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java deleted file mode 100644 index 86aebf2..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.processor.saga; - -import org.apache.camel.*; -import org.apache.camel.saga.CamelSagaCoordinator; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.util.ObjectHelper; - -import java.util.concurrent.CompletableFuture; - -/** - * Processor for handling sagas. - */ -public abstract class SagaProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - - protected CamelContext camelContext; - - protected CamelSagaService sagaService; - - protected CamelSagaStep step; - - protected SagaCompletionMode completionMode; - - private String id; - private String routeId; - - public SagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, SagaCompletionMode completionMode, CamelSagaStep step) { - super(ObjectHelper.notNull(childProcessor, "childProcessor")); - this.camelContext = ObjectHelper.notNull(camelContext, "camelContext"); - this.sagaService = ObjectHelper.notNull(sagaService, "sagaService"); - this.completionMode = ObjectHelper.notNull(completionMode, "completionMode"); - this.step = ObjectHelper.notNull(step, "step"); - } - - protected CompletableFuture getCurrentSagaCoordinator(Exchange exchange) { - String currentSaga = exchange.getIn().getHeader(Exchange.SAGA_LONG_RUNNING_ACTION, String.class); - if (currentSaga != null) { - return sagaService.getSaga(currentSaga); - } - - return CompletableFuture.completedFuture(null); - } - - protected void setCurrentSagaCoordinator(Exchange exchange, CamelSagaCoordinator coordinator) { - if (coordinator != null) { - exchange.getIn().setHeader(Exchange.SAGA_LONG_RUNNING_ACTION, coordinator.getId()); - } else { - exchange.getIn().removeHeader(Exchange.SAGA_LONG_RUNNING_ACTION); - } - } - - protected void handleSagaCompletion(Exchange exchange, CamelSagaCoordinator coordinator, CamelSagaCoordinator previousCoordinator, AsyncCallback callback) { - if (this.completionMode == SagaCompletionMode.AUTO) { - if (exchange.getException() != null) { - coordinator.compensate().whenComplete((done, ex) -> ifNotException(ex, exchange, callback, () -> { - setCurrentSagaCoordinator(exchange, previousCoordinator); - callback.done(false); - })); - } else { - coordinator.complete().whenComplete((done, ex) -> ifNotException(ex, exchange, callback, () -> { - setCurrentSagaCoordinator(exchange, previousCoordinator); - callback.done(false); - })); - } - } else if (this.completionMode == SagaCompletionMode.MANUAL) { - // Completion will be handled manually by the user - callback.done(false); - } else { - throw new IllegalStateException("Unsupported completion mode: " + this.completionMode); - } - } - - public CamelSagaService getSagaService() { - return sagaService; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - @Override - public String toString() { - return "id"; - } - - @Override - public String getTraceLabel() { - return "saga"; - } - - protected void ifNotException(Throwable ex, Exchange exchange, AsyncCallback callback, Runnable code) { - ifNotException(ex, exchange, false, null, null, callback, code); - } - - protected void ifNotException(Throwable ex, Exchange exchange, boolean handleCompletion, CamelSagaCoordinator coordinator, - CamelSagaCoordinator previousCoordinator, AsyncCallback callback, Runnable code) { - if (ex != null) { - exchange.setException(ex); - if (handleCompletion) { - handleSagaCompletion(exchange, coordinator, previousCoordinator, callback); - } else { - callback.done(false); - } - } else { - code.run(); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java deleted file mode 100644 index 43493ed..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java +++ /dev/null @@ -1,97 +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.processor.saga; - -import org.apache.camel.CamelContext; -import org.apache.camel.Processor; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Builder of Saga processors. - */ -public class SagaProcessorBuilder { - - private CamelContext camelContext; - - private Processor childProcessor; - - private CamelSagaService sagaService; - - private CamelSagaStep step; - - private SagaPropagation propagation; - - private SagaCompletionMode completionMode; - - public SagaProcessorBuilder() { - } - - public SagaProcessorBuilder camelContext(CamelContext camelContext) { - this.camelContext = camelContext; - return this; - } - - public SagaProcessorBuilder childProcessor(Processor childProcessor) { - this.childProcessor = childProcessor; - return this; - } - - public SagaProcessorBuilder sagaService(CamelSagaService sagaService) { - this.sagaService = sagaService; - return this; - } - - public SagaProcessorBuilder step(CamelSagaStep step) { - this.step = step; - return this; - } - - public SagaProcessorBuilder propagation(SagaPropagation propagation) { - this.propagation = propagation; - return this; - } - - public SagaProcessorBuilder completionMode(SagaCompletionMode completionMode) { - this.completionMode = completionMode; - return this; - } - - public SagaProcessor build() { - if (propagation == null) { - throw new IllegalStateException("A propagation mode has not been set"); - } - - switch (propagation) { - case REQUIRED: - return new RequiredSagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - case REQUIRES_NEW: - return new RequiresNewSagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - case SUPPORTS: - return new SupportsSagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - case NOT_SUPPORTED: - return new NotSupportedSagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - case NEVER: - return new NeverSagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - case MANDATORY: - return new MandatorySagaProcessor(camelContext, childProcessor, sagaService, completionMode, step); - default: - throw new IllegalStateException("Unsupported propagation mode: " + propagation); - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaPropagation.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaPropagation.java deleted file mode 100644 index 8760ed9..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaPropagation.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.processor.saga; - -/** - * Enumerates all saga propagation modes. - */ -public enum SagaPropagation { - - /** - * Join the existing saga or create a new one if it does not exist. - */ - REQUIRED, - - /** - * Always create a new saga. Suspend the old saga and resume it when the new one terminates. - */ - REQUIRES_NEW, - - /** - * A saga must be already present. The existing saga is joined. - */ - MANDATORY, - - /** - * If a saga already exists, then join it. - */ - SUPPORTS, - - /** - * If a saga already exists, it is suspended and resumed when the current block completes. - */ - NOT_SUPPORTED, - - /** - * The current block must never be invoked within a saga. - */ - NEVER - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java deleted file mode 100644 index 1a03a31..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java +++ /dev/null @@ -1,52 +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.processor.saga; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.saga.CamelSagaService; -import org.apache.camel.saga.CamelSagaStep; - -/** - * Saga processor implementing the SUPPORTS propagation mode. - */ -public class SupportsSagaProcessor extends SagaProcessor { - - public SupportsSagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService, org.apache.camel.processor.saga.SagaCompletionMode completionMode, CamelSagaStep step) { - super(camelContext, childProcessor, sagaService, completionMode, step); - if (completionMode != null && completionMode != SagaCompletionMode.defaultCompletionMode()) { - throw new IllegalArgumentException("CompletionMode cannot be specified when propagation is SUPPORTS"); - } - } - - @Override - public boolean process(Exchange exchange, AsyncCallback callback) { - getCurrentSagaCoordinator(exchange).whenComplete((coordinator, ex) -> ifNotException(ex, exchange, callback, () -> { - if (coordinator != null) { - coordinator.beginStep(exchange, step).whenComplete((done, ex2) -> ifNotException(ex2, exchange, callback, () -> { - // Never completes the saga - super.process(exchange, doneSync -> callback.done(false)); - })); - } else { - super.process(exchange, doneSync -> callback.done(false)); - } - })); - return false; - } -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/package.html b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/package.html deleted file mode 100644 index 69393d4..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/processor/saga/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -Saga EIP implementation. - - - diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java deleted file mode 100644 index 65fe670..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java +++ /dev/null @@ -1,31 +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.throttling; - -/** - * Used by the {@link ThrottlingExceptionRoutePolicy} to allow custom code - * to handle the half open circuit state and how to determine if a route - * should be closed - */ -public interface ThrottlingExceptionHalfOpenHandler { - - /** - * Check the state of the Camel route - * @return true to close the route and false to leave open - */ - boolean isReadyToBeClosed(); -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java deleted file mode 100644 index 4fcda48..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java +++ /dev/null @@ -1,372 +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.throttling; - -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; -import org.apache.camel.Route; -import org.apache.camel.spi.RoutePolicy; -import org.apache.camel.support.RoutePolicySupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -/** - * Modeled after the circuit breaker {@link ThrottlingInflightRoutePolicy} - * this {@link RoutePolicy} will stop consuming from an endpoint based on the type of exceptions that are - * thrown and the threshold setting. - * - * the scenario: if a route cannot process data from an endpoint due to problems with resources used by the route - * (ie database down) then it will stop consuming new messages from the endpoint by stopping the consumer. - * The implementation is comparable to the Circuit Breaker pattern. After a set amount of time, it will move - * to a half open state and attempt to determine if the consumer can be started. - * There are two ways to determine if a route can be closed after being opened - * (1) start the consumer and check the failure threshold - * (2) call the {@link ThrottlingExceptionHalfOpenHandler} - * The second option allows a custom check to be performed without having to take on the possibility of - * multiple messages from the endpoint. The idea is that a handler could run a simple test (ie select 1 from dual) - * to determine if the processes that cause the route to be open are now available - */ -public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implements CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicy.class); - - private static final int STATE_CLOSED = 0; - private static final int STATE_HALF_OPEN = 1; - private static final int STATE_OPEN = 2; - - private CamelContext camelContext; - private final Lock lock = new ReentrantLock(); - - // configuration - private int failureThreshold; - private long failureWindow; - private long halfOpenAfter; - private final List> throttledExceptions; - - // handler for half open circuit - // can be used instead of resuming route - // to check on resources - private ThrottlingExceptionHalfOpenHandler halfOpenHandler; - - // stateful information - private final AtomicInteger failures = new AtomicInteger(); - private final AtomicInteger state = new AtomicInteger(STATE_CLOSED); - private final AtomicBoolean keepOpen = new AtomicBoolean(false); - private volatile Timer halfOpenTimer; - private volatile long lastFailure; - private volatile long openedAt; - - public ThrottlingExceptionRoutePolicy(int threshold, long failureWindow, long halfOpenAfter, List> handledExceptions) { - this(threshold, failureWindow, halfOpenAfter, handledExceptions, false); - } - - public ThrottlingExceptionRoutePolicy(int threshold, long failureWindow, long halfOpenAfter, List> handledExceptions, boolean keepOpen) { - this.throttledExceptions = handledExceptions; - this.failureWindow = failureWindow; - this.halfOpenAfter = halfOpenAfter; - this.failureThreshold = threshold; - this.keepOpen.set(keepOpen); - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void onInit(Route route) { - LOG.debug("Initializing ThrottlingExceptionRoutePolicy route policy"); - logState(); - } - - @Override - public void onStart(Route route) { - // if keepOpen then start w/ the circuit open - if (keepOpen.get()) { - openCircuit(route); - } - } - - @Override - public void onExchangeDone(Route route, Exchange exchange) { - if (keepOpen.get()) { - if (state.get() != STATE_OPEN) { - LOG.debug("opening circuit b/c keepOpen is on"); - openCircuit(route); - } - } else { - if (hasFailed(exchange)) { - // record the failure - failures.incrementAndGet(); - lastFailure = System.currentTimeMillis(); - } - - // check for state change - calculateState(route); - } - } - - /** - * uses similar approach as circuit breaker - * if the exchange has an exception that we are watching - * then we count that as a failure otherwise we ignore it - */ - private boolean hasFailed(Exchange exchange) { - if (exchange == null) { - return false; - } - - boolean answer = false; - - if (exchange.getException() != null) { - if (throttledExceptions == null || throttledExceptions.isEmpty()) { - // if no exceptions defined then always fail - // (ie) assume we throttle on all exceptions - answer = true; - } else { - for (Class exception : throttledExceptions) { - // will look in exception hierarchy - if (exchange.getException(exception) != null) { - answer = true; - break; - } - } - } - } - - if (LOG.isDebugEnabled()) { - String exceptionName = exchange.getException() == null ? "none" : exchange.getException().getClass().getSimpleName(); - LOG.debug("hasFailed ({}) with Throttled Exception: {} for exchangeId: {}", answer, exceptionName, exchange.getExchangeId()); - } - return answer; - } - - private void calculateState(Route route) { - - // have we reached the failure limit? - boolean failureLimitReached = isThresholdExceeded(); - - if (state.get() == STATE_CLOSED) { - if (failureLimitReached) { - LOG.debug("Opening circuit..."); - openCircuit(route); - } - } else if (state.get() == STATE_HALF_OPEN) { - if (failureLimitReached) { - LOG.debug("Opening circuit..."); - openCircuit(route); - } else { - LOG.debug("Closing circuit..."); - closeCircuit(route); - } - } else if (state.get() == STATE_OPEN) { - if (!keepOpen.get()) { - long elapsedTimeSinceOpened = System.currentTimeMillis() - openedAt; - if (halfOpenAfter <= elapsedTimeSinceOpened) { - LOG.debug("Checking an open circuit..."); - if (halfOpenHandler != null) { - if (halfOpenHandler.isReadyToBeClosed()) { - LOG.debug("Closing circuit..."); - closeCircuit(route); - } else { - LOG.debug("Opening circuit..."); - openCircuit(route); - } - } else { - LOG.debug("Half opening circuit..."); - halfOpenCircuit(route); - } - } else { - LOG.debug("keeping circuit open (time not elapsed)..."); - } - } else { - LOG.debug("keeping circuit open (keepOpen is true)..."); - this.addHalfOpenTimer(route); - } - } - - } - - protected boolean isThresholdExceeded() { - boolean output = false; - logState(); - // failures exceed the threshold - // AND the last of those failures occurred within window - if ((failures.get() >= failureThreshold) && (lastFailure >= System.currentTimeMillis() - failureWindow)) { - output = true; - } - - return output; - } - - protected void openCircuit(Route route) { - try { - lock.lock(); - suspendOrStopConsumer(route.getConsumer()); - state.set(STATE_OPEN); - openedAt = System.currentTimeMillis(); - this.addHalfOpenTimer(route); - logState(); - } catch (Exception e) { - handleException(e); - } finally { - lock.unlock(); - } - } - - protected void addHalfOpenTimer(Route route) { - halfOpenTimer = new Timer(); - halfOpenTimer.schedule(new HalfOpenTask(route), halfOpenAfter); - } - - protected void halfOpenCircuit(Route route) { - try { - lock.lock(); - resumeOrStartConsumer(route.getConsumer()); - state.set(STATE_HALF_OPEN); - logState(); - } catch (Exception e) { - handleException(e); - } finally { - lock.unlock(); - } - } - - protected void closeCircuit(Route route) { - try { - lock.lock(); - resumeOrStartConsumer(route.getConsumer()); - failures.set(0); - lastFailure = 0; - openedAt = 0; - state.set(STATE_CLOSED); - logState(); - } catch (Exception e) { - handleException(e); - } finally { - lock.unlock(); - } - } - - private void logState() { - if (LOG.isDebugEnabled()) { - LOG.debug(dumpState()); - } - } - - public String dumpState() { - int num = state.get(); - String routeState = stateAsString(num); - if (failures.get() > 0) { - return String.format("State %s, failures %d, last failure %d ms ago", routeState, failures.get(), System.currentTimeMillis() - lastFailure); - } else { - return String.format("State %s, failures %d", routeState, failures.get()); - } - } - - private static String stateAsString(int num) { - if (num == STATE_CLOSED) { - return "closed"; - } else if (num == STATE_HALF_OPEN) { - return "half opened"; - } else { - return "opened"; - } - } - - class HalfOpenTask extends TimerTask { - private final Route route; - - HalfOpenTask(Route route) { - this.route = route; - } - - @Override - public void run() { - halfOpenTimer.cancel(); - calculateState(route); - } - } - - public ThrottlingExceptionHalfOpenHandler getHalfOpenHandler() { - return halfOpenHandler; - } - - public void setHalfOpenHandler(ThrottlingExceptionHalfOpenHandler halfOpenHandler) { - this.halfOpenHandler = halfOpenHandler; - } - - public boolean getKeepOpen() { - return this.keepOpen.get(); - } - - public void setKeepOpen(boolean keepOpen) { - LOG.debug("keep open: {}", keepOpen); - this.keepOpen.set(keepOpen); - } - - public int getFailureThreshold() { - return failureThreshold; - } - - public void setFailureThreshold(int failureThreshold) { - this.failureThreshold = failureThreshold; - } - - public long getFailureWindow() { - return failureWindow; - } - - public void setFailureWindow(long failureWindow) { - this.failureWindow = failureWindow; - } - - public long getHalfOpenAfter() { - return halfOpenAfter; - } - - public void setHalfOpenAfter(long halfOpenAfter) { - this.halfOpenAfter = halfOpenAfter; - } - - public int getFailures() { - return failures.get(); - } - - public long getLastFailure() { - return lastFailure; - } - - public long getOpenedAt() { - return openedAt; - } - -} diff --git a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java b/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java deleted file mode 100644 index 527a894..0000000 --- a/underlying/camel.entaxy/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java +++ /dev/null @@ -1,299 +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.throttling; - -import org.apache.camel.*; -import org.apache.camel.spi.CamelEvent; -import org.apache.camel.spi.CamelEvent.ExchangeCompletedEvent; -import org.apache.camel.spi.CamelLogger; -import org.apache.camel.support.EventNotifierSupport; -import org.apache.camel.support.RoutePolicySupport; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -/** - * A throttle based {@link org.apache.camel.spi.RoutePolicy} which is capable of dynamic - * throttling a route based on number of current inflight exchanges. - *

- * This implementation supports two scopes {@link ThrottlingScope#Context} and {@link ThrottlingScope#Route} (is default). - * If context scope is selected then this implementation will use a {@link org.apache.camel.spi.EventNotifier} to listen - * for events when {@link Exchange}s is done, and trigger the {@link #throttle(Route, Exchange)} - * method. If the route scope is selected then no {@link org.apache.camel.spi.EventNotifier} is in use, as there is already - * a {@link org.apache.camel.spi.Synchronization} callback on the current {@link Exchange} which triggers the - * {@link #throttle(Route, Exchange)} when the current {@link Exchange} is done. - */ -public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements CamelContextAware { - - private static final Logger LOG = LoggerFactory.getLogger(ThrottlingInflightRoutePolicy.class); - - public enum ThrottlingScope { - Context, Route - } - - private final Set routes = new LinkedHashSet<>(); - private ContextScopedEventNotifier eventNotifier; - private CamelContext camelContext; - private final Lock lock = new ReentrantLock(); - private ThrottlingScope scope = ThrottlingScope.Route; - private int maxInflightExchanges = 1000; - private int resumePercentOfMax = 70; - private int resumeInflightExchanges = 700; - private LoggingLevel loggingLevel = LoggingLevel.INFO; - private CamelLogger logger; - - public ThrottlingInflightRoutePolicy() { - } - - @Override - public String toString() { - return "ThrottlingInflightRoutePolicy[" + maxInflightExchanges + " / " + resumePercentOfMax + "% using scope " + scope + "]"; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public void onInit(Route route) { - // we need to remember the routes we apply for - routes.add(route); - } - - @Override - public void onExchangeDone(Route route, Exchange exchange) { - // if route scoped then throttle directly - // as context scoped is handled using an EventNotifier instead - if (scope == ThrottlingScope.Route) { - throttle(route, exchange); - } - } - - /** - * Throttles the route when {@link Exchange}s is done. - * - * @param route the route - * @param exchange the exchange - */ - protected void throttle(Route route, Exchange exchange) { - // this works the best when this logic is executed when the exchange is done - Consumer consumer = route.getConsumer(); - - int size = getSize(route, exchange); - boolean stop = maxInflightExchanges > 0 && size > maxInflightExchanges; - if (LOG.isTraceEnabled()) { - LOG.trace("{} > 0 && {} > {} evaluated as {}", maxInflightExchanges, size, maxInflightExchanges, stop); - } - if (stop) { - try { - lock.lock(); - stopConsumer(size, consumer); - } catch (Exception e) { - handleException(e); - } finally { - lock.unlock(); - } - } - - // reload size in case a race condition with too many at once being invoked - // so we need to ensure that we read the most current size and start the consumer if we are already to low - size = getSize(route, exchange); - boolean start = size <= resumeInflightExchanges; - if (LOG.isTraceEnabled()) { - LOG.trace("{} <= {} evaluated as {}", size, resumeInflightExchanges, start); - } - if (start) { - try { - lock.lock(); - startConsumer(size, consumer); - } catch (Exception e) { - handleException(e); - } finally { - lock.unlock(); - } - } - } - - public int getMaxInflightExchanges() { - return maxInflightExchanges; - } - - /** - * Sets the upper limit of number of concurrent inflight exchanges at which point reached - * the throttler should suspend the route. - *

- * Is default 1000. - * - * @param maxInflightExchanges the upper limit of concurrent inflight exchanges - */ - public void setMaxInflightExchanges(int maxInflightExchanges) { - this.maxInflightExchanges = maxInflightExchanges; - // recalculate, must be at least at 1 - this.resumeInflightExchanges = Math.max(resumePercentOfMax * maxInflightExchanges / 100, 1); - } - - public int getResumePercentOfMax() { - return resumePercentOfMax; - } - - /** - * Sets at which percentage of the max the throttler should start resuming the route. - *

- * Will by default use 70%. - * - * @param resumePercentOfMax the percentage must be between 0 and 100 - */ - public void setResumePercentOfMax(int resumePercentOfMax) { - if (resumePercentOfMax < 0 || resumePercentOfMax > 100) { - throw new IllegalArgumentException("Must be a percentage between 0 and 100, was: " + resumePercentOfMax); - } - - this.resumePercentOfMax = resumePercentOfMax; - // recalculate, must be at least at 1 - this.resumeInflightExchanges = Math.max(resumePercentOfMax * maxInflightExchanges / 100, 1); - } - - public ThrottlingScope getScope() { - return scope; - } - - /** - * Sets which scope the throttling should be based upon, either route or total scoped. - * - * @param scope the scope - */ - public void setScope(ThrottlingScope scope) { - this.scope = scope; - } - - public LoggingLevel getLoggingLevel() { - return loggingLevel; - } - - public CamelLogger getLogger() { - if (logger == null) { - logger = createLogger(); - } - return logger; - } - - /** - * Sets the logger to use for logging throttling activity. - * - * @param logger the logger - */ - public void setLogger(CamelLogger logger) { - this.logger = logger; - } - - /** - * Sets the logging level to report the throttling activity. - *

- * Is default INFO level. - * - * @param loggingLevel the logging level - */ - public void setLoggingLevel(LoggingLevel loggingLevel) { - this.loggingLevel = loggingLevel; - } - - protected CamelLogger createLogger() { - return new CamelLogger(LOG, getLoggingLevel()); - } - - private int getSize(Route route, Exchange exchange) { - if (scope == ThrottlingScope.Context) { - return exchange.getContext().getInflightRepository().size(); - } else { - return exchange.getContext().getInflightRepository().size(route.getId()); - } - } - - private void startConsumer(int size, Consumer consumer) throws Exception { - boolean started = resumeOrStartConsumer(consumer); - if (started) { - getLogger().log("Throttling consumer: " + size + " <= " + resumeInflightExchanges + " inflight exchange by resuming consumer: " + consumer); - } - } - - private void stopConsumer(int size, Consumer consumer) throws Exception { - boolean stopped = suspendOrStopConsumer(consumer); - if (stopped) { - getLogger().log("Throttling consumer: " + size + " > " + maxInflightExchanges + " inflight exchange by suspending consumer: " + consumer); - } - } - - @Override - protected void doStart() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext", this); - if (scope == ThrottlingScope.Context) { - eventNotifier = new ContextScopedEventNotifier(); - // must start the notifier before it can be used - ServiceHelper.startService(eventNotifier); - // we are in context scope, so we need to use an event notifier to keep track - // when any exchanges is done on the camel context. - // This ensures we can trigger accordingly to context scope - camelContext.getManagementStrategy().addEventNotifier(eventNotifier); - } - } - - @Override - protected void doStop() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext", this); - if (scope == ThrottlingScope.Context) { - camelContext.getManagementStrategy().removeEventNotifier(eventNotifier); - } - } - - /** - * {@link org.apache.camel.spi.EventNotifier} to keep track on when {@link Exchange} - * is done, so we can throttle accordingly. - */ - private class ContextScopedEventNotifier extends EventNotifierSupport { - - @Override - public void notify(CamelEvent event) throws Exception { - ExchangeCompletedEvent completedEvent = (ExchangeCompletedEvent) event; - for (Route route : routes) { - throttle(route, completedEvent.getExchange()); - } - } - - @Override - public boolean isEnabled(CamelEvent event) { - return event instanceof ExchangeCompletedEvent; - } - - @Override - public String toString() { - return "ContextScopedEventNotifier"; - } - } - -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/pom.xml b/underlying/camel.entaxy/core/camel-core-engine/pom.xml deleted file mode 100644 index 77ff694..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/pom.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - 4.0.0 - - - org.apache.camel - core - 3.4.5-ENTAXY - .. - - - camel-core-engine - jar - - Camel :: Core Engine :: Entaxy - Just the Camel Core engine without any core components - - - 3.0.0 - - - org.apache.camel.spring.util;${camel.osgi.import.strict.version}, - org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version}, - org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version}, - org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version}, - org.apache.camel.component.caffeine;${camel.osgi.import.strict.version}, - net.sf.saxon - - - javax.xml.bind*;version="[2.2,3.0)", - * - - - - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta-jaxb-version} - true - - - - - org.apache.camel - camel-api - ${camel.version} - - - org.apache.camel - camel-base - 3.4.5-ENTAXY - - - org.apache.camel - camel-management-api - ${camel.version} - - - org.apache.camel - camel-support - ${camel.version} - - - org.apache.camel - camel-util - ${camel.version} - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - ${lifecycle-mapping-version} - - - - - - org.apache.camel - camel-package-maven-plugin - ${camel.version} - - generate-eips-list - - - - - - - - - - - - - - - - - org.apache.camel - camel-bundle-plugin - - - <_plugin> - org.apache.felix.bundleplugin.BlueprintPlugin, - aQute.lib.spring.SpringXMLType, - org.apache.felix.bundleplugin.JpaPlugin, - org.apache.camel.maven.bundle.CamelPlugin - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://download.oracle.com/javase/7/docs/api/ - http://download.oracle.com/javaee/7/api/ - - true - 256m - ${camel.javadoc.offline} - - - Camel API - org.apache.camel - - - Fluent API (DSL) for building EIP rules - org.apache.camel.builder:org.apache.camel.builder.* - - - EIP model - org.apache.camel.model:org.apache.camel.model.* - - - Camel Components - org.apache.camel.component:org.apache.camel.component.* - - - Language APIs and plugins for Expressions and Predicates - org.apache.camel.language:org.apache.camel.language.* - - - Processors to implement the Enterprise Integration Patterns - org.apache.camel.processor:org.apache.camel.processor.* - - - Strategy APIs for implementors extending Camel - org.apache.camel.spi - - - Support APIs for implementors - org.apache.camel.support:org.apache.camel.support.* - - - Management (JMX) API - - org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean - - - - Camel Runtime - org.apache.camel.impl:org.apache.camel.impl.* - - - Type conversion helper classes - org.apache.camel.converter:org.apache.camel.converter.* - - - Utility classes - org.apache.camel.util:org.apache.camel.util.* - - - - - - - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - package - package - - jar - - - - - - http://download.oracle.com/javase/7/docs/api/ - http://download.oracle.com/javaee/7/api/ - - true - 256m - ${camel.javadoc.offline} - - - Camel API - org.apache.camel - - - Fluent API (DSL) for building EIP rules - org.apache.camel.builder:org.apache.camel.builder.* - - - EIP model - org.apache.camel.model:org.apache.camel.model.* - - - Camel Components - org.apache.camel.component:org.apache.camel.component.* - - - Language APIs and plugins for Expressions and Predicates - org.apache.camel.language:org.apache.camel.language.* - - - Processors to implement the Enterprise Integration Patterns - org.apache.camel.processor:org.apache.camel.processor.* - - - Strategy APIs for implementors extending Camel - org.apache.camel.spi - - - Support APIs for implementors - org.apache.camel.support:org.apache.camel.support.* - - - Management (JMX) API - - org.apache.camel.management:org.apache.camel.management.*:org.apache.camel.api.management.mbean - - - - Camel Runtime - org.apache.camel.impl:org.apache.camel.impl.* - - - Type conversion helper classes - org.apache.camel.converter:org.apache.camel.converter.* - - - Utility classes - org.apache.camel.util:org.apache.camel.util.* - - - - - - - - - - - aix - - - aix - - - - - - - - xalan - - - - xalan - xalan - ${xalan-version} - - - - - xerces - - - - xerces - xercesImpl - ${xerces-version} - - - - - woodstox - - true - - - - - org.codehaus.woodstox - woodstox-core-asl - test - - - - - - jdk9+-build - - [9,) - - - - - org.codehaus.woodstox - woodstox-core-asl - test - - - - - - maven-surefire-plugin - - - - org/apache/camel/component/file/stress/**.java - **/DistributedCompletionIntervalTest.java - **/DistributedConcurrentPerCorrelationKeyTest.java - ${platform.skip.tests} - - 3000 - - - myserver - 8081 - - - - - - - - - \ No newline at end of file diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java b/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java deleted file mode 100644 index 2ba64b3..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java +++ /dev/null @@ -1,375 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.impl; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.ExtendedCamelContext; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class ExtendedCamelContextConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.ExtendedCamelContext target = (org.apache.camel.ExtendedCamelContext) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowuseoriginalmessage": - case "AllowUseOriginalMessage": target.setAllowUseOriginalMessage(property(camelContext, java.lang.Boolean.class, value)); return true; - case "applicationcontextclassloader": - case "ApplicationContextClassLoader": target.setApplicationContextClassLoader(property(camelContext, java.lang.ClassLoader.class, value)); return true; - case "asyncprocessorawaitmanager": - case "AsyncProcessorAwaitManager": target.setAsyncProcessorAwaitManager(property(camelContext, org.apache.camel.spi.AsyncProcessorAwaitManager.class, value)); return true; - case "autostartup": - case "AutoStartup": target.setAutoStartup(property(camelContext, java.lang.Boolean.class, value)); return true; - case "backlogtracing": - case "BacklogTracing": target.setBacklogTracing(property(camelContext, java.lang.Boolean.class, value)); return true; - case "beanintrospection": - case "BeanIntrospection": target.setBeanIntrospection(property(camelContext, org.apache.camel.spi.BeanIntrospection.class, value)); return true; - case "caseinsensitiveheaders": - case "CaseInsensitiveHeaders": target.setCaseInsensitiveHeaders(property(camelContext, java.lang.Boolean.class, value)); return true; - case "classresolver": - case "ClassResolver": target.setClassResolver(property(camelContext, org.apache.camel.spi.ClassResolver.class, value)); return true; - case "componentnameresolver": - case "ComponentNameResolver": target.setComponentNameResolver(property(camelContext, org.apache.camel.spi.ComponentNameResolver.class, value)); return true; - case "componentresolver": - case "ComponentResolver": target.setComponentResolver(property(camelContext, org.apache.camel.spi.ComponentResolver.class, value)); return true; - case "configurerresolver": - case "ConfigurerResolver": target.setConfigurerResolver(property(camelContext, org.apache.camel.spi.ConfigurerResolver.class, value)); return true; - case "dataformatresolver": - case "DataFormatResolver": target.setDataFormatResolver(property(camelContext, org.apache.camel.spi.DataFormatResolver.class, value)); return true; - case "debugger": - case "Debugger": target.setDebugger(property(camelContext, org.apache.camel.spi.Debugger.class, value)); return true; - case "debugging": - case "Debugging": target.setDebugging(property(camelContext, java.lang.Boolean.class, value)); return true; - case "delayer": - case "Delayer": target.setDelayer(property(camelContext, java.lang.Long.class, value)); return true; - case "errorhandlerfactory": - case "ErrorHandlerFactory": target.setErrorHandlerFactory(property(camelContext, org.apache.camel.ErrorHandlerFactory.class, value)); return true; - case "eventnotificationapplicable": - case "EventNotificationApplicable": target.setEventNotificationApplicable(property(camelContext, boolean.class, value)); return true; - case "executorservicemanager": - case "ExecutorServiceManager": target.setExecutorServiceManager(property(camelContext, org.apache.camel.spi.ExecutorServiceManager.class, value)); return true; - case "factoryfinderresolver": - case "FactoryFinderResolver": target.setFactoryFinderResolver(property(camelContext, org.apache.camel.spi.FactoryFinderResolver.class, value)); return true; - case "globaloptions": - case "GlobalOptions": target.setGlobalOptions(property(camelContext, java.util.Map.class, value)); return true; - case "headersmapfactory": - case "HeadersMapFactory": target.setHeadersMapFactory(property(camelContext, org.apache.camel.spi.HeadersMapFactory.class, value)); return true; - case "inflightrepository": - case "InflightRepository": target.setInflightRepository(property(camelContext, org.apache.camel.spi.InflightRepository.class, value)); return true; - case "injector": - case "Injector": target.setInjector(property(camelContext, org.apache.camel.spi.Injector.class, value)); return true; - case "languageresolver": - case "LanguageResolver": target.setLanguageResolver(property(camelContext, org.apache.camel.spi.LanguageResolver.class, value)); return true; - case "loadtypeconverters": - case "LoadTypeConverters": target.setLoadTypeConverters(property(camelContext, java.lang.Boolean.class, value)); return true; - case "logexhaustedmessagebody": - case "LogExhaustedMessageBody": target.setLogExhaustedMessageBody(property(camelContext, java.lang.Boolean.class, value)); return true; - case "logmask": - case "LogMask": target.setLogMask(property(camelContext, java.lang.Boolean.class, value)); return true; - case "mdcloggingkeyspattern": - case "MDCLoggingKeysPattern": target.setMDCLoggingKeysPattern(property(camelContext, java.lang.String.class, value)); return true; - case "managementname": - case "ManagementName": target.setManagementName(property(camelContext, java.lang.String.class, value)); return true; - case "managementnamestrategy": - case "ManagementNameStrategy": target.setManagementNameStrategy(property(camelContext, org.apache.camel.spi.ManagementNameStrategy.class, value)); return true; - case "managementstrategy": - case "ManagementStrategy": target.setManagementStrategy(property(camelContext, org.apache.camel.spi.ManagementStrategy.class, value)); return true; - case "messagehistory": - case "MessageHistory": target.setMessageHistory(property(camelContext, java.lang.Boolean.class, value)); return true; - case "messagehistoryfactory": - case "MessageHistoryFactory": target.setMessageHistoryFactory(property(camelContext, org.apache.camel.spi.MessageHistoryFactory.class, value)); return true; - case "modeljaxbcontextfactory": - case "ModelJAXBContextFactory": target.setModelJAXBContextFactory(property(camelContext, org.apache.camel.spi.ModelJAXBContextFactory.class, value)); return true; - case "modeltoxmldumper": - case "ModelToXMLDumper": target.setModelToXMLDumper(property(camelContext, org.apache.camel.spi.ModelToXMLDumper.class, value)); return true; - case "name": - case "Name": target.setName(property(camelContext, java.lang.String.class, value)); return true; - case "namestrategy": - case "NameStrategy": target.setNameStrategy(property(camelContext, org.apache.camel.spi.CamelContextNameStrategy.class, value)); return true; - case "nodeidfactory": - case "NodeIdFactory": target.setNodeIdFactory(property(camelContext, org.apache.camel.spi.NodeIdFactory.class, value)); return true; - case "packagescanclassresolver": - case "PackageScanClassResolver": target.setPackageScanClassResolver(property(camelContext, org.apache.camel.spi.PackageScanClassResolver.class, value)); return true; - case "packagescanresourceresolver": - case "PackageScanResourceResolver": target.setPackageScanResourceResolver(property(camelContext, org.apache.camel.spi.PackageScanResourceResolver.class, value)); return true; - case "processorfactory": - case "ProcessorFactory": target.setProcessorFactory(property(camelContext, org.apache.camel.spi.ProcessorFactory.class, value)); return true; - case "propertiescomponent": - case "PropertiesComponent": target.setPropertiesComponent(property(camelContext, org.apache.camel.spi.PropertiesComponent.class, value)); return true; - case "reactiveexecutor": - case "ReactiveExecutor": target.setReactiveExecutor(property(camelContext, org.apache.camel.spi.ReactiveExecutor.class, value)); return true; - case "registry": - case "Registry": target.setRegistry(property(camelContext, org.apache.camel.spi.Registry.class, value)); return true; - case "restbindingjaxbdataformatfactory": - case "RestBindingJaxbDataFormatFactory": target.setRestBindingJaxbDataFormatFactory(property(camelContext, org.apache.camel.spi.RestBindingJaxbDataFormatFactory.class, value)); return true; - case "restconfiguration": - case "RestConfiguration": target.setRestConfiguration(property(camelContext, org.apache.camel.spi.RestConfiguration.class, value)); return true; - case "restregistry": - case "RestRegistry": target.setRestRegistry(property(camelContext, org.apache.camel.spi.RestRegistry.class, value)); return true; - case "routecontroller": - case "RouteController": target.setRouteController(property(camelContext, org.apache.camel.spi.RouteController.class, value)); return true; - case "runtimecamelcatalog": - case "RuntimeCamelCatalog": target.setRuntimeCamelCatalog(property(camelContext, org.apache.camel.catalog.RuntimeCamelCatalog.class, value)); return true; - case "runtimeendpointregistry": - case "RuntimeEndpointRegistry": target.setRuntimeEndpointRegistry(property(camelContext, org.apache.camel.spi.RuntimeEndpointRegistry.class, value)); return true; - case "sslcontextparameters": - case "SSLContextParameters": target.setSSLContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true; - case "shutdownroute": - case "ShutdownRoute": target.setShutdownRoute(property(camelContext, org.apache.camel.ShutdownRoute.class, value)); return true; - case "shutdownrunningtask": - case "ShutdownRunningTask": target.setShutdownRunningTask(property(camelContext, org.apache.camel.ShutdownRunningTask.class, value)); return true; - case "shutdownstrategy": - case "ShutdownStrategy": target.setShutdownStrategy(property(camelContext, org.apache.camel.spi.ShutdownStrategy.class, value)); return true; - case "streamcaching": - case "StreamCaching": target.setStreamCaching(property(camelContext, java.lang.Boolean.class, value)); return true; - case "streamcachingstrategy": - case "StreamCachingStrategy": target.setStreamCachingStrategy(property(camelContext, org.apache.camel.spi.StreamCachingStrategy.class, value)); return true; - case "tracer": - case "Tracer": target.setTracer(property(camelContext, org.apache.camel.spi.Tracer.class, value)); return true; - case "tracing": - case "Tracing": target.setTracing(property(camelContext, java.lang.Boolean.class, value)); return true; - case "tracingpattern": - case "TracingPattern": target.setTracingPattern(property(camelContext, java.lang.String.class, value)); return true; - case "typeconverterregistry": - case "TypeConverterRegistry": target.setTypeConverterRegistry(property(camelContext, org.apache.camel.spi.TypeConverterRegistry.class, value)); return true; - case "typeconverterstatisticsenabled": - case "TypeConverterStatisticsEnabled": target.setTypeConverterStatisticsEnabled(property(camelContext, java.lang.Boolean.class, value)); return true; - case "unitofworkfactory": - case "UnitOfWorkFactory": target.setUnitOfWorkFactory(property(camelContext, org.apache.camel.spi.UnitOfWorkFactory.class, value)); return true; - case "usebreadcrumb": - case "UseBreadcrumb": target.setUseBreadcrumb(property(camelContext, java.lang.Boolean.class, value)); return true; - case "usedatatype": - case "UseDataType": target.setUseDataType(property(camelContext, java.lang.Boolean.class, value)); return true; - case "usemdclogging": - case "UseMDCLogging": target.setUseMDCLogging(property(camelContext, java.lang.Boolean.class, value)); return true; - case "uuidgenerator": - case "UuidGenerator": target.setUuidGenerator(property(camelContext, org.apache.camel.spi.UuidGenerator.class, value)); return true; - case "xmlroutesdefinitionloader": - case "XMLRoutesDefinitionLoader": target.setXMLRoutesDefinitionLoader(property(camelContext, org.apache.camel.spi.XMLRoutesDefinitionLoader.class, value)); return true; - default: return false; - } - } - - @Override - public Map getAllOptions(Object target) { - Map answer = new CaseInsensitiveMap(); - answer.put("AllowUseOriginalMessage", java.lang.Boolean.class); - answer.put("ApplicationContextClassLoader", java.lang.ClassLoader.class); - answer.put("AsyncProcessorAwaitManager", org.apache.camel.spi.AsyncProcessorAwaitManager.class); - answer.put("AutoStartup", java.lang.Boolean.class); - answer.put("BacklogTracing", java.lang.Boolean.class); - answer.put("BeanIntrospection", org.apache.camel.spi.BeanIntrospection.class); - answer.put("CaseInsensitiveHeaders", java.lang.Boolean.class); - answer.put("ClassResolver", org.apache.camel.spi.ClassResolver.class); - answer.put("ComponentNameResolver", org.apache.camel.spi.ComponentNameResolver.class); - answer.put("ComponentResolver", org.apache.camel.spi.ComponentResolver.class); - answer.put("ConfigurerResolver", org.apache.camel.spi.ConfigurerResolver.class); - answer.put("DataFormatResolver", org.apache.camel.spi.DataFormatResolver.class); - answer.put("Debugger", org.apache.camel.spi.Debugger.class); - answer.put("Debugging", java.lang.Boolean.class); - answer.put("Delayer", java.lang.Long.class); - answer.put("ErrorHandlerFactory", org.apache.camel.ErrorHandlerFactory.class); - answer.put("EventNotificationApplicable", boolean.class); - answer.put("ExecutorServiceManager", org.apache.camel.spi.ExecutorServiceManager.class); - answer.put("FactoryFinderResolver", org.apache.camel.spi.FactoryFinderResolver.class); - answer.put("GlobalOptions", java.util.Map.class); - answer.put("HeadersMapFactory", org.apache.camel.spi.HeadersMapFactory.class); - answer.put("InflightRepository", org.apache.camel.spi.InflightRepository.class); - answer.put("Injector", org.apache.camel.spi.Injector.class); - answer.put("LanguageResolver", org.apache.camel.spi.LanguageResolver.class); - answer.put("LoadTypeConverters", java.lang.Boolean.class); - answer.put("LogExhaustedMessageBody", java.lang.Boolean.class); - answer.put("LogMask", java.lang.Boolean.class); - answer.put("MDCLoggingKeysPattern", java.lang.String.class); - answer.put("ManagementName", java.lang.String.class); - answer.put("ManagementNameStrategy", org.apache.camel.spi.ManagementNameStrategy.class); - answer.put("ManagementStrategy", org.apache.camel.spi.ManagementStrategy.class); - answer.put("MessageHistory", java.lang.Boolean.class); - answer.put("MessageHistoryFactory", org.apache.camel.spi.MessageHistoryFactory.class); - answer.put("ModelJAXBContextFactory", org.apache.camel.spi.ModelJAXBContextFactory.class); - answer.put("ModelToXMLDumper", org.apache.camel.spi.ModelToXMLDumper.class); - answer.put("Name", java.lang.String.class); - answer.put("NameStrategy", org.apache.camel.spi.CamelContextNameStrategy.class); - answer.put("NodeIdFactory", org.apache.camel.spi.NodeIdFactory.class); - answer.put("PackageScanClassResolver", org.apache.camel.spi.PackageScanClassResolver.class); - answer.put("PackageScanResourceResolver", org.apache.camel.spi.PackageScanResourceResolver.class); - answer.put("ProcessorFactory", org.apache.camel.spi.ProcessorFactory.class); - answer.put("PropertiesComponent", org.apache.camel.spi.PropertiesComponent.class); - answer.put("ReactiveExecutor", org.apache.camel.spi.ReactiveExecutor.class); - answer.put("Registry", org.apache.camel.spi.Registry.class); - answer.put("RestBindingJaxbDataFormatFactory", org.apache.camel.spi.RestBindingJaxbDataFormatFactory.class); - answer.put("RestConfiguration", org.apache.camel.spi.RestConfiguration.class); - answer.put("RestRegistry", org.apache.camel.spi.RestRegistry.class); - answer.put("RouteController", org.apache.camel.spi.RouteController.class); - answer.put("RuntimeCamelCatalog", org.apache.camel.catalog.RuntimeCamelCatalog.class); - answer.put("RuntimeEndpointRegistry", org.apache.camel.spi.RuntimeEndpointRegistry.class); - answer.put("SSLContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class); - answer.put("ShutdownRoute", org.apache.camel.ShutdownRoute.class); - answer.put("ShutdownRunningTask", org.apache.camel.ShutdownRunningTask.class); - answer.put("ShutdownStrategy", org.apache.camel.spi.ShutdownStrategy.class); - answer.put("StreamCaching", java.lang.Boolean.class); - answer.put("StreamCachingStrategy", org.apache.camel.spi.StreamCachingStrategy.class); - answer.put("Tracer", org.apache.camel.spi.Tracer.class); - answer.put("Tracing", java.lang.Boolean.class); - answer.put("TracingPattern", java.lang.String.class); - answer.put("TypeConverterRegistry", org.apache.camel.spi.TypeConverterRegistry.class); - answer.put("TypeConverterStatisticsEnabled", java.lang.Boolean.class); - answer.put("UnitOfWorkFactory", org.apache.camel.spi.UnitOfWorkFactory.class); - answer.put("UseBreadcrumb", java.lang.Boolean.class); - answer.put("UseDataType", java.lang.Boolean.class); - answer.put("UseMDCLogging", java.lang.Boolean.class); - answer.put("UuidGenerator", org.apache.camel.spi.UuidGenerator.class); - answer.put("XMLRoutesDefinitionLoader", org.apache.camel.spi.XMLRoutesDefinitionLoader.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.ExtendedCamelContext target = (org.apache.camel.ExtendedCamelContext) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowuseoriginalmessage": - case "AllowUseOriginalMessage": return target.isAllowUseOriginalMessage(); - case "applicationcontextclassloader": - case "ApplicationContextClassLoader": return target.getApplicationContextClassLoader(); - case "asyncprocessorawaitmanager": - case "AsyncProcessorAwaitManager": return target.getAsyncProcessorAwaitManager(); - case "autostartup": - case "AutoStartup": return target.isAutoStartup(); - case "backlogtracing": - case "BacklogTracing": return target.isBacklogTracing(); - case "beanintrospection": - case "BeanIntrospection": return target.getBeanIntrospection(); - case "caseinsensitiveheaders": - case "CaseInsensitiveHeaders": return target.isCaseInsensitiveHeaders(); - case "classresolver": - case "ClassResolver": return target.getClassResolver(); - case "componentnameresolver": - case "ComponentNameResolver": return target.getComponentNameResolver(); - case "componentresolver": - case "ComponentResolver": return target.getComponentResolver(); - case "configurerresolver": - case "ConfigurerResolver": return target.getConfigurerResolver(); - case "dataformatresolver": - case "DataFormatResolver": return target.getDataFormatResolver(); - case "debugger": - case "Debugger": return target.getDebugger(); - case "debugging": - case "Debugging": return target.isDebugging(); - case "delayer": - case "Delayer": return target.getDelayer(); - case "errorhandlerfactory": - case "ErrorHandlerFactory": return target.getErrorHandlerFactory(); - case "eventnotificationapplicable": - case "EventNotificationApplicable": return target.isEventNotificationApplicable(); - case "executorservicemanager": - case "ExecutorServiceManager": return target.getExecutorServiceManager(); - case "factoryfinderresolver": - case "FactoryFinderResolver": return target.getFactoryFinderResolver(); - case "globaloptions": - case "GlobalOptions": return target.getGlobalOptions(); - case "headersmapfactory": - case "HeadersMapFactory": return target.getHeadersMapFactory(); - case "inflightrepository": - case "InflightRepository": return target.getInflightRepository(); - case "injector": - case "Injector": return target.getInjector(); - case "languageresolver": - case "LanguageResolver": return target.getLanguageResolver(); - case "loadtypeconverters": - case "LoadTypeConverters": return target.isLoadTypeConverters(); - case "logexhaustedmessagebody": - case "LogExhaustedMessageBody": return target.isLogExhaustedMessageBody(); - case "logmask": - case "LogMask": return target.isLogMask(); - case "mdcloggingkeyspattern": - case "MDCLoggingKeysPattern": return target.getMDCLoggingKeysPattern(); - case "managementname": - case "ManagementName": return target.getManagementName(); - case "managementnamestrategy": - case "ManagementNameStrategy": return target.getManagementNameStrategy(); - case "managementstrategy": - case "ManagementStrategy": return target.getManagementStrategy(); - case "messagehistory": - case "MessageHistory": return target.isMessageHistory(); - case "messagehistoryfactory": - case "MessageHistoryFactory": return target.getMessageHistoryFactory(); - case "modeljaxbcontextfactory": - case "ModelJAXBContextFactory": return target.getModelJAXBContextFactory(); - case "modeltoxmldumper": - case "ModelToXMLDumper": return target.getModelToXMLDumper(); - case "name": - case "Name": return target.getName(); - case "namestrategy": - case "NameStrategy": return target.getNameStrategy(); - case "nodeidfactory": - case "NodeIdFactory": return target.getNodeIdFactory(); - case "packagescanclassresolver": - case "PackageScanClassResolver": return target.getPackageScanClassResolver(); - case "packagescanresourceresolver": - case "PackageScanResourceResolver": return target.getPackageScanResourceResolver(); - case "processorfactory": - case "ProcessorFactory": return target.getProcessorFactory(); - case "propertiescomponent": - case "PropertiesComponent": return target.getPropertiesComponent(); - case "reactiveexecutor": - case "ReactiveExecutor": return target.getReactiveExecutor(); - case "registry": - case "Registry": return target.getRegistry(); - case "restbindingjaxbdataformatfactory": - case "RestBindingJaxbDataFormatFactory": return target.getRestBindingJaxbDataFormatFactory(); - case "restconfiguration": - case "RestConfiguration": return target.getRestConfiguration(); - case "restregistry": - case "RestRegistry": return target.getRestRegistry(); - case "routecontroller": - case "RouteController": return target.getRouteController(); - case "runtimecamelcatalog": - case "RuntimeCamelCatalog": return target.getRuntimeCamelCatalog(); - case "runtimeendpointregistry": - case "RuntimeEndpointRegistry": return target.getRuntimeEndpointRegistry(); - case "sslcontextparameters": - case "SSLContextParameters": return target.getSSLContextParameters(); - case "shutdownroute": - case "ShutdownRoute": return target.getShutdownRoute(); - case "shutdownrunningtask": - case "ShutdownRunningTask": return target.getShutdownRunningTask(); - case "shutdownstrategy": - case "ShutdownStrategy": return target.getShutdownStrategy(); - case "streamcaching": - case "StreamCaching": return target.isStreamCaching(); - case "streamcachingstrategy": - case "StreamCachingStrategy": return target.getStreamCachingStrategy(); - case "tracer": - case "Tracer": return target.getTracer(); - case "tracing": - case "Tracing": return target.isTracing(); - case "tracingpattern": - case "TracingPattern": return target.getTracingPattern(); - case "typeconverterregistry": - case "TypeConverterRegistry": return target.getTypeConverterRegistry(); - case "typeconverterstatisticsenabled": - case "TypeConverterStatisticsEnabled": return target.isTypeConverterStatisticsEnabled(); - case "unitofworkfactory": - case "UnitOfWorkFactory": return target.getUnitOfWorkFactory(); - case "usebreadcrumb": - case "UseBreadcrumb": return target.isUseBreadcrumb(); - case "usedatatype": - case "UseDataType": return target.isUseDataType(); - case "usemdclogging": - case "UseMDCLogging": return target.isUseMDCLogging(); - case "uuidgenerator": - case "UuidGenerator": return target.getUuidGenerator(); - case "xmlroutesdefinitionloader": - case "XMLRoutesDefinitionLoader": return target.getXMLRoutesDefinitionLoader(); - default: return null; - } - } -} - diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java b/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java deleted file mode 100644 index 9d2c49d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/FaultToleranceConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,110 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.FaultToleranceConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class FaultToleranceConfigurationDefinitionConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.model.FaultToleranceConfigurationDefinition target = (org.apache.camel.model.FaultToleranceConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "bulkheadenabled": - case "BulkheadEnabled": target.setBulkheadEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadexecutorserviceref": - case "BulkheadExecutorServiceRef": target.setBulkheadExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": target.setBulkheadMaxConcurrentCalls(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadwaitingtaskqueue": - case "BulkheadWaitingTaskQueue": target.setBulkheadWaitingTaskQueue(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerref": - case "CircuitBreakerRef": target.setCircuitBreakerRef(property(camelContext, java.lang.String.class, value)); return true; - case "delay": - case "Delay": target.setDelay(property(camelContext, java.lang.String.class, value)); return true; - case "failureratio": - case "FailureRatio": target.setFailureRatio(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "requestvolumethreshold": - case "RequestVolumeThreshold": target.setRequestVolumeThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "successthreshold": - case "SuccessThreshold": target.setSuccessThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutduration": - case "TimeoutDuration": target.setTimeoutDuration(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutenabled": - case "TimeoutEnabled": target.setTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutpoolsize": - case "TimeoutPoolSize": target.setTimeoutPoolSize(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutscheduledexecutorserviceref": - case "TimeoutScheduledExecutorServiceRef": target.setTimeoutScheduledExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map getAllOptions(Object target) { - Map answer = new CaseInsensitiveMap(); - answer.put("BulkheadEnabled", java.lang.String.class); - answer.put("BulkheadExecutorServiceRef", java.lang.String.class); - answer.put("BulkheadMaxConcurrentCalls", java.lang.String.class); - answer.put("BulkheadWaitingTaskQueue", java.lang.String.class); - answer.put("CircuitBreakerRef", java.lang.String.class); - answer.put("Delay", java.lang.String.class); - answer.put("FailureRatio", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("RequestVolumeThreshold", java.lang.String.class); - answer.put("SuccessThreshold", java.lang.String.class); - answer.put("TimeoutDuration", java.lang.String.class); - answer.put("TimeoutEnabled", java.lang.String.class); - answer.put("TimeoutPoolSize", java.lang.String.class); - answer.put("TimeoutScheduledExecutorServiceRef", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.FaultToleranceConfigurationDefinition target = (org.apache.camel.model.FaultToleranceConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "bulkheadenabled": - case "BulkheadEnabled": return target.getBulkheadEnabled(); - case "bulkheadexecutorserviceref": - case "BulkheadExecutorServiceRef": return target.getBulkheadExecutorServiceRef(); - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": return target.getBulkheadMaxConcurrentCalls(); - case "bulkheadwaitingtaskqueue": - case "BulkheadWaitingTaskQueue": return target.getBulkheadWaitingTaskQueue(); - case "circuitbreakerref": - case "CircuitBreakerRef": return target.getCircuitBreakerRef(); - case "delay": - case "Delay": return target.getDelay(); - case "failureratio": - case "FailureRatio": return target.getFailureRatio(); - case "id": - case "Id": return target.getId(); - case "requestvolumethreshold": - case "RequestVolumeThreshold": return target.getRequestVolumeThreshold(); - case "successthreshold": - case "SuccessThreshold": return target.getSuccessThreshold(); - case "timeoutduration": - case "TimeoutDuration": return target.getTimeoutDuration(); - case "timeoutenabled": - case "TimeoutEnabled": return target.getTimeoutEnabled(); - case "timeoutpoolsize": - case "TimeoutPoolSize": return target.getTimeoutPoolSize(); - case "timeoutscheduledexecutorserviceref": - case "TimeoutScheduledExecutorServiceRef": return target.getTimeoutScheduledExecutorServiceRef(); - default: return null; - } - } -} - diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java b/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java deleted file mode 100644 index c2bc575..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/HystrixConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,200 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.HystrixConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class HystrixConfigurationDefinitionConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.model.HystrixConfigurationDefinition target = (org.apache.camel.model.HystrixConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowmaximumsizetodivergefromcoresize": - case "AllowMaximumSizeToDivergeFromCoreSize": target.setAllowMaximumSizeToDivergeFromCoreSize(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerenabled": - case "CircuitBreakerEnabled": target.setCircuitBreakerEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakererrorthresholdpercentage": - case "CircuitBreakerErrorThresholdPercentage": target.setCircuitBreakerErrorThresholdPercentage(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerforceclosed": - case "CircuitBreakerForceClosed": target.setCircuitBreakerForceClosed(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerforceopen": - case "CircuitBreakerForceOpen": target.setCircuitBreakerForceOpen(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerrequestvolumethreshold": - case "CircuitBreakerRequestVolumeThreshold": target.setCircuitBreakerRequestVolumeThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakersleepwindowinmilliseconds": - case "CircuitBreakerSleepWindowInMilliseconds": target.setCircuitBreakerSleepWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "corepoolsize": - case "CorePoolSize": target.setCorePoolSize(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationsemaphoremaxconcurrentrequests": - case "ExecutionIsolationSemaphoreMaxConcurrentRequests": target.setExecutionIsolationSemaphoreMaxConcurrentRequests(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationstrategy": - case "ExecutionIsolationStrategy": target.setExecutionIsolationStrategy(property(camelContext, java.lang.String.class, value)); return true; - case "executionisolationthreadinterruptontimeout": - case "ExecutionIsolationThreadInterruptOnTimeout": target.setExecutionIsolationThreadInterruptOnTimeout(property(camelContext, java.lang.String.class, value)); return true; - case "executiontimeoutenabled": - case "ExecutionTimeoutEnabled": target.setExecutionTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "executiontimeoutinmilliseconds": - case "ExecutionTimeoutInMilliseconds": target.setExecutionTimeoutInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "fallbackenabled": - case "FallbackEnabled": target.setFallbackEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "fallbackisolationsemaphoremaxconcurrentrequests": - case "FallbackIsolationSemaphoreMaxConcurrentRequests": target.setFallbackIsolationSemaphoreMaxConcurrentRequests(property(camelContext, java.lang.String.class, value)); return true; - case "groupkey": - case "GroupKey": target.setGroupKey(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "keepalivetime": - case "KeepAliveTime": target.setKeepAliveTime(property(camelContext, java.lang.String.class, value)); return true; - case "maxqueuesize": - case "MaxQueueSize": target.setMaxQueueSize(property(camelContext, java.lang.String.class, value)); return true; - case "maximumsize": - case "MaximumSize": target.setMaximumSize(property(camelContext, java.lang.String.class, value)); return true; - case "metricshealthsnapshotintervalinmilliseconds": - case "MetricsHealthSnapshotIntervalInMilliseconds": target.setMetricsHealthSnapshotIntervalInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilebucketsize": - case "MetricsRollingPercentileBucketSize": target.setMetricsRollingPercentileBucketSize(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentileenabled": - case "MetricsRollingPercentileEnabled": target.setMetricsRollingPercentileEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilewindowbuckets": - case "MetricsRollingPercentileWindowBuckets": target.setMetricsRollingPercentileWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingpercentilewindowinmilliseconds": - case "MetricsRollingPercentileWindowInMilliseconds": target.setMetricsRollingPercentileWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingstatisticalwindowbuckets": - case "MetricsRollingStatisticalWindowBuckets": target.setMetricsRollingStatisticalWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "metricsrollingstatisticalwindowinmilliseconds": - case "MetricsRollingStatisticalWindowInMilliseconds": target.setMetricsRollingStatisticalWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - case "queuesizerejectionthreshold": - case "QueueSizeRejectionThreshold": target.setQueueSizeRejectionThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "requestlogenabled": - case "RequestLogEnabled": target.setRequestLogEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolkey": - case "ThreadPoolKey": target.setThreadPoolKey(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolrollingnumberstatisticalwindowbuckets": - case "ThreadPoolRollingNumberStatisticalWindowBuckets": target.setThreadPoolRollingNumberStatisticalWindowBuckets(property(camelContext, java.lang.String.class, value)); return true; - case "threadpoolrollingnumberstatisticalwindowinmilliseconds": - case "ThreadPoolRollingNumberStatisticalWindowInMilliseconds": target.setThreadPoolRollingNumberStatisticalWindowInMilliseconds(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map getAllOptions(Object target) { - Map answer = new CaseInsensitiveMap(); - answer.put("AllowMaximumSizeToDivergeFromCoreSize", java.lang.String.class); - answer.put("CircuitBreakerEnabled", java.lang.String.class); - answer.put("CircuitBreakerErrorThresholdPercentage", java.lang.String.class); - answer.put("CircuitBreakerForceClosed", java.lang.String.class); - answer.put("CircuitBreakerForceOpen", java.lang.String.class); - answer.put("CircuitBreakerRequestVolumeThreshold", java.lang.String.class); - answer.put("CircuitBreakerSleepWindowInMilliseconds", java.lang.String.class); - answer.put("CorePoolSize", java.lang.String.class); - answer.put("ExecutionIsolationSemaphoreMaxConcurrentRequests", java.lang.String.class); - answer.put("ExecutionIsolationStrategy", java.lang.String.class); - answer.put("ExecutionIsolationThreadInterruptOnTimeout", java.lang.String.class); - answer.put("ExecutionTimeoutEnabled", java.lang.String.class); - answer.put("ExecutionTimeoutInMilliseconds", java.lang.String.class); - answer.put("FallbackEnabled", java.lang.String.class); - answer.put("FallbackIsolationSemaphoreMaxConcurrentRequests", java.lang.String.class); - answer.put("GroupKey", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("KeepAliveTime", java.lang.String.class); - answer.put("MaxQueueSize", java.lang.String.class); - answer.put("MaximumSize", java.lang.String.class); - answer.put("MetricsHealthSnapshotIntervalInMilliseconds", java.lang.String.class); - answer.put("MetricsRollingPercentileBucketSize", java.lang.String.class); - answer.put("MetricsRollingPercentileEnabled", java.lang.String.class); - answer.put("MetricsRollingPercentileWindowBuckets", java.lang.String.class); - answer.put("MetricsRollingPercentileWindowInMilliseconds", java.lang.String.class); - answer.put("MetricsRollingStatisticalWindowBuckets", java.lang.String.class); - answer.put("MetricsRollingStatisticalWindowInMilliseconds", java.lang.String.class); - answer.put("QueueSizeRejectionThreshold", java.lang.String.class); - answer.put("RequestLogEnabled", java.lang.String.class); - answer.put("ThreadPoolKey", java.lang.String.class); - answer.put("ThreadPoolRollingNumberStatisticalWindowBuckets", java.lang.String.class); - answer.put("ThreadPoolRollingNumberStatisticalWindowInMilliseconds", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.HystrixConfigurationDefinition target = (org.apache.camel.model.HystrixConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "allowmaximumsizetodivergefromcoresize": - case "AllowMaximumSizeToDivergeFromCoreSize": return target.getAllowMaximumSizeToDivergeFromCoreSize(); - case "circuitbreakerenabled": - case "CircuitBreakerEnabled": return target.getCircuitBreakerEnabled(); - case "circuitbreakererrorthresholdpercentage": - case "CircuitBreakerErrorThresholdPercentage": return target.getCircuitBreakerErrorThresholdPercentage(); - case "circuitbreakerforceclosed": - case "CircuitBreakerForceClosed": return target.getCircuitBreakerForceClosed(); - case "circuitbreakerforceopen": - case "CircuitBreakerForceOpen": return target.getCircuitBreakerForceOpen(); - case "circuitbreakerrequestvolumethreshold": - case "CircuitBreakerRequestVolumeThreshold": return target.getCircuitBreakerRequestVolumeThreshold(); - case "circuitbreakersleepwindowinmilliseconds": - case "CircuitBreakerSleepWindowInMilliseconds": return target.getCircuitBreakerSleepWindowInMilliseconds(); - case "corepoolsize": - case "CorePoolSize": return target.getCorePoolSize(); - case "executionisolationsemaphoremaxconcurrentrequests": - case "ExecutionIsolationSemaphoreMaxConcurrentRequests": return target.getExecutionIsolationSemaphoreMaxConcurrentRequests(); - case "executionisolationstrategy": - case "ExecutionIsolationStrategy": return target.getExecutionIsolationStrategy(); - case "executionisolationthreadinterruptontimeout": - case "ExecutionIsolationThreadInterruptOnTimeout": return target.getExecutionIsolationThreadInterruptOnTimeout(); - case "executiontimeoutenabled": - case "ExecutionTimeoutEnabled": return target.getExecutionTimeoutEnabled(); - case "executiontimeoutinmilliseconds": - case "ExecutionTimeoutInMilliseconds": return target.getExecutionTimeoutInMilliseconds(); - case "fallbackenabled": - case "FallbackEnabled": return target.getFallbackEnabled(); - case "fallbackisolationsemaphoremaxconcurrentrequests": - case "FallbackIsolationSemaphoreMaxConcurrentRequests": return target.getFallbackIsolationSemaphoreMaxConcurrentRequests(); - case "groupkey": - case "GroupKey": return target.getGroupKey(); - case "id": - case "Id": return target.getId(); - case "keepalivetime": - case "KeepAliveTime": return target.getKeepAliveTime(); - case "maxqueuesize": - case "MaxQueueSize": return target.getMaxQueueSize(); - case "maximumsize": - case "MaximumSize": return target.getMaximumSize(); - case "metricshealthsnapshotintervalinmilliseconds": - case "MetricsHealthSnapshotIntervalInMilliseconds": return target.getMetricsHealthSnapshotIntervalInMilliseconds(); - case "metricsrollingpercentilebucketsize": - case "MetricsRollingPercentileBucketSize": return target.getMetricsRollingPercentileBucketSize(); - case "metricsrollingpercentileenabled": - case "MetricsRollingPercentileEnabled": return target.getMetricsRollingPercentileEnabled(); - case "metricsrollingpercentilewindowbuckets": - case "MetricsRollingPercentileWindowBuckets": return target.getMetricsRollingPercentileWindowBuckets(); - case "metricsrollingpercentilewindowinmilliseconds": - case "MetricsRollingPercentileWindowInMilliseconds": return target.getMetricsRollingPercentileWindowInMilliseconds(); - case "metricsrollingstatisticalwindowbuckets": - case "MetricsRollingStatisticalWindowBuckets": return target.getMetricsRollingStatisticalWindowBuckets(); - case "metricsrollingstatisticalwindowinmilliseconds": - case "MetricsRollingStatisticalWindowInMilliseconds": return target.getMetricsRollingStatisticalWindowInMilliseconds(); - case "queuesizerejectionthreshold": - case "QueueSizeRejectionThreshold": return target.getQueueSizeRejectionThreshold(); - case "requestlogenabled": - case "RequestLogEnabled": return target.getRequestLogEnabled(); - case "threadpoolkey": - case "ThreadPoolKey": return target.getThreadPoolKey(); - case "threadpoolrollingnumberstatisticalwindowbuckets": - case "ThreadPoolRollingNumberStatisticalWindowBuckets": return target.getThreadPoolRollingNumberStatisticalWindowBuckets(); - case "threadpoolrollingnumberstatisticalwindowinmilliseconds": - case "ThreadPoolRollingNumberStatisticalWindowInMilliseconds": return target.getThreadPoolRollingNumberStatisticalWindowInMilliseconds(); - default: return null; - } - } -} - diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java b/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java deleted file mode 100644 index f397b9c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/java/org/apache/camel/model/Resilience4jConfigurationDefinitionConfigurer.java +++ /dev/null @@ -1,140 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.model; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.model.Resilience4jConfigurationDefinition; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class Resilience4jConfigurationDefinitionConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.model.Resilience4jConfigurationDefinition target = (org.apache.camel.model.Resilience4jConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "automatictransitionfromopentohalfopenenabled": - case "AutomaticTransitionFromOpenToHalfOpenEnabled": target.setAutomaticTransitionFromOpenToHalfOpenEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadenabled": - case "BulkheadEnabled": target.setBulkheadEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": target.setBulkheadMaxConcurrentCalls(property(camelContext, java.lang.String.class, value)); return true; - case "bulkheadmaxwaitduration": - case "BulkheadMaxWaitDuration": target.setBulkheadMaxWaitDuration(property(camelContext, java.lang.String.class, value)); return true; - case "circuitbreakerref": - case "CircuitBreakerRef": target.setCircuitBreakerRef(property(camelContext, java.lang.String.class, value)); return true; - case "configref": - case "ConfigRef": target.setConfigRef(property(camelContext, java.lang.String.class, value)); return true; - case "failureratethreshold": - case "FailureRateThreshold": target.setFailureRateThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "id": - case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true; - case "minimumnumberofcalls": - case "MinimumNumberOfCalls": target.setMinimumNumberOfCalls(property(camelContext, java.lang.String.class, value)); return true; - case "permittednumberofcallsinhalfopenstate": - case "PermittedNumberOfCallsInHalfOpenState": target.setPermittedNumberOfCallsInHalfOpenState(property(camelContext, java.lang.String.class, value)); return true; - case "slidingwindowsize": - case "SlidingWindowSize": target.setSlidingWindowSize(property(camelContext, java.lang.String.class, value)); return true; - case "slidingwindowtype": - case "SlidingWindowType": target.setSlidingWindowType(property(camelContext, java.lang.String.class, value)); return true; - case "slowcalldurationthreshold": - case "SlowCallDurationThreshold": target.setSlowCallDurationThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "slowcallratethreshold": - case "SlowCallRateThreshold": target.setSlowCallRateThreshold(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutcancelrunningfuture": - case "TimeoutCancelRunningFuture": target.setTimeoutCancelRunningFuture(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutduration": - case "TimeoutDuration": target.setTimeoutDuration(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutenabled": - case "TimeoutEnabled": target.setTimeoutEnabled(property(camelContext, java.lang.String.class, value)); return true; - case "timeoutexecutorserviceref": - case "TimeoutExecutorServiceRef": target.setTimeoutExecutorServiceRef(property(camelContext, java.lang.String.class, value)); return true; - case "waitdurationinopenstate": - case "WaitDurationInOpenState": target.setWaitDurationInOpenState(property(camelContext, java.lang.String.class, value)); return true; - case "writablestacktraceenabled": - case "WritableStackTraceEnabled": target.setWritableStackTraceEnabled(property(camelContext, java.lang.String.class, value)); return true; - default: return false; - } - } - - @Override - public Map getAllOptions(Object target) { - Map answer = new CaseInsensitiveMap(); - answer.put("AutomaticTransitionFromOpenToHalfOpenEnabled", java.lang.String.class); - answer.put("BulkheadEnabled", java.lang.String.class); - answer.put("BulkheadMaxConcurrentCalls", java.lang.String.class); - answer.put("BulkheadMaxWaitDuration", java.lang.String.class); - answer.put("CircuitBreakerRef", java.lang.String.class); - answer.put("ConfigRef", java.lang.String.class); - answer.put("FailureRateThreshold", java.lang.String.class); - answer.put("Id", java.lang.String.class); - answer.put("MinimumNumberOfCalls", java.lang.String.class); - answer.put("PermittedNumberOfCallsInHalfOpenState", java.lang.String.class); - answer.put("SlidingWindowSize", java.lang.String.class); - answer.put("SlidingWindowType", java.lang.String.class); - answer.put("SlowCallDurationThreshold", java.lang.String.class); - answer.put("SlowCallRateThreshold", java.lang.String.class); - answer.put("TimeoutCancelRunningFuture", java.lang.String.class); - answer.put("TimeoutDuration", java.lang.String.class); - answer.put("TimeoutEnabled", java.lang.String.class); - answer.put("TimeoutExecutorServiceRef", java.lang.String.class); - answer.put("WaitDurationInOpenState", java.lang.String.class); - answer.put("WritableStackTraceEnabled", java.lang.String.class); - return answer; - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.model.Resilience4jConfigurationDefinition target = (org.apache.camel.model.Resilience4jConfigurationDefinition) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "automatictransitionfromopentohalfopenenabled": - case "AutomaticTransitionFromOpenToHalfOpenEnabled": return target.getAutomaticTransitionFromOpenToHalfOpenEnabled(); - case "bulkheadenabled": - case "BulkheadEnabled": return target.getBulkheadEnabled(); - case "bulkheadmaxconcurrentcalls": - case "BulkheadMaxConcurrentCalls": return target.getBulkheadMaxConcurrentCalls(); - case "bulkheadmaxwaitduration": - case "BulkheadMaxWaitDuration": return target.getBulkheadMaxWaitDuration(); - case "circuitbreakerref": - case "CircuitBreakerRef": return target.getCircuitBreakerRef(); - case "configref": - case "ConfigRef": return target.getConfigRef(); - case "failureratethreshold": - case "FailureRateThreshold": return target.getFailureRateThreshold(); - case "id": - case "Id": return target.getId(); - case "minimumnumberofcalls": - case "MinimumNumberOfCalls": return target.getMinimumNumberOfCalls(); - case "permittednumberofcallsinhalfopenstate": - case "PermittedNumberOfCallsInHalfOpenState": return target.getPermittedNumberOfCallsInHalfOpenState(); - case "slidingwindowsize": - case "SlidingWindowSize": return target.getSlidingWindowSize(); - case "slidingwindowtype": - case "SlidingWindowType": return target.getSlidingWindowType(); - case "slowcalldurationthreshold": - case "SlowCallDurationThreshold": return target.getSlowCallDurationThreshold(); - case "slowcallratethreshold": - case "SlowCallRateThreshold": return target.getSlowCallRateThreshold(); - case "timeoutcancelrunningfuture": - case "TimeoutCancelRunningFuture": return target.getTimeoutCancelRunningFuture(); - case "timeoutduration": - case "TimeoutDuration": return target.getTimeoutDuration(); - case "timeoutenabled": - case "TimeoutEnabled": return target.getTimeoutEnabled(); - case "timeoutexecutorserviceref": - case "TimeoutExecutorServiceRef": return target.getTimeoutExecutorServiceRef(); - case "waitdurationinopenstate": - case "WaitDurationInOpenState": return target.getWaitDurationInOpenState(); - case "writablestacktraceenabled": - case "WritableStackTraceEnabled": return target.getWritableStackTraceEnabled(); - default: return null; - } - } -} - diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext deleted file mode 100644 index 2a6d7b3..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/ExtendedCamelContext +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.impl.ExtendedCamelContextConfigurer diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition deleted file mode 100644 index c84d003..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/FaultToleranceConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.FaultToleranceConfigurationDefinitionConfigurer diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition deleted file mode 100644 index 495b0f6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/HystrixConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.HystrixConfigurationDefinitionConfigurer diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition deleted file mode 100644 index b2c684d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/configurer/Resilience4jConfigurationDefinition +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.model.Resilience4jConfigurationDefinitionConfigurer diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties deleted file mode 100644 index 9259476..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ /dev/null @@ -1,199 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -aggregate -any23 -apiKey -asn1 -avro -barcode -base64 -basicAuth -batch-config -bean -beanio -bindy -blacklistServiceFilter -cachingServiceDiscovery -cbor -choice -circuitBreaker -claimCheck -combinedServiceDiscovery -combinedServiceFilter -constant -consulServiceDiscovery -contextScan -convertBodyTo -crypto -csv -customDataFormat -customLoadBalancer -customServiceFilter -dataFormats -defaultLoadBalancer -delay -delete -description -dnsServiceDiscovery -doCatch -doFinally -doTry -dynamicRouter -enrich -etcdServiceDiscovery -exchangeProperty -expression -failover -faultToleranceConfiguration -fhirJson -fhirXml -filter -flatpack -from -get -globalOption -globalOptions -grok -groovy -gzipdeflater -head -header -healthyServiceFilter -hl7 -hl7terser -hystrixConfiguration -ical -idempotentConsumer -inOnly -inOut -inputType -intercept -interceptFrom -interceptSendToEndpoint -jacksonxml -jaxb -json -jsonApi -jsonpath -kubernetesServiceDiscovery -language -loadBalance -loadBalancerConfiguration -log -loop -lzf -marshal -method -mime-multipart -multicast -mvel -oauth2 -ognl -onCompletion -onException -onFallback -optimisticLockRetryPolicy -otherwise -outputType -packageScan -param -passThroughServiceFilter -patch -pgp -pipeline -policy -pollEnrich -post -process -property -protobuf -put -random -recipientList -redeliveryPolicy -ref -removeHeader -removeHeaders -removeProperties -removeProperty -resequence -resilience4jConfiguration -responseHeader -responseMessage -rest -restBinding -restConfiguration -restContextRef -restProperty -rests -ribbonLoadBalancer -rollback -roundRobin -route -routeBuilder -routeContextRef -routes -routingSlip -rss -saga -sample -script -secureXML -security -securityDefinitions -serviceCall -serviceCallConfiguration -serviceChooserConfiguration -serviceDiscoveryConfiguration -serviceExpression -serviceFilterConfiguration -setBody -setExchangePattern -setHeader -setProperty -simple -soapjaxb -sort -spel -split -staticServiceDiscovery -step -sticky -stop -stream-config -syslog -tarfile -threadPoolProfile -threads -thrift -throttle -throwException -tidyMarkup -to -toD -tokenize -topic -transacted -transform -transformers -typeFilter -univocity-csv -univocity-fixed -univocity-header -univocity-tsv -unmarshal -validate -validators -verb -weighted -when -whenSkipSendToEndpoint -wireTap -xmlrpc -xpath -xquery -xstream -xtokenize -yaml -zipdeflater -zipfile -zookeeperServiceDiscovery diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/aggregate.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/aggregate.json deleted file mode 100644 index 22ffe1b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/aggregate.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "aggregate", - "title": "Aggregate", - "description": "Aggregates many messages into a single message", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.AggregateDefinition", - "input": true, - "output": false - }, - "properties": { - "correlationExpression": { "kind": "expression", "displayName": "Correlation Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "The expression used to calculate the correlation key to use for aggregation. The Exchange which has the same correlation key is aggregated together. If the correlation key could not be evaluated an Exception is thrown. You can disable this by using the ignoreBadCorrelationKeys option." }, - "completionPredicate": { "kind": "expression", "displayName": "Completion Predicate", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "A Predicate to indicate when an aggregated exchange is complete. If this is not specified and the AggregationStrategy object implements Predicate, the aggregationStrategy object will be used as the completionPredicate." }, - "completionTimeoutExpression": { "kind": "expression", "displayName": "Completion Timeout Expression", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Time in millis that an aggregated exchange should be inactive before its complete (timeout). This option can be set as either a fixed value or using an Expression which allows you to evaluate a timeout dynamically - will use Long as result. If both are set Camel will fallback to use the fixed value if the Expression result was null or 0. You cannot use this option together with completionInterval, only one of the two can be used. By default the timeout checker runs every second, you can use the completionTimeoutCheckerInterval option to configure how frequently to run the checker. The timeout is an approximation and there is no guarantee that the a timeout is triggered exactly after the timeout value. It is not recommended to use very low timeout values or checker intervals." }, - "completionSizeExpression": { "kind": "expression", "displayName": "Completion Size Expression", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Number of messages aggregated before the aggregation is complete. This option can be set as either a fixed value or using an Expression which allows you to evaluate a size dynamically - will use Integer as result. If both are set Camel will fallback to use the fixed value if the Expression result was null or 0." }, - "optimisticLockRetryPolicy": { "kind": "element", "displayName": "Optimistic Lock Retry Policy", "required": false, "type": "object", "javaType": "org.apache.camel.model.OptimisticLockRetryPolicyDefinition", "deprecated": false, "secret": false, "description": "Allows to configure retry settings when using optimistic locking." }, - "parallelProcessing": { "kind": "attribute", "displayName": "Parallel Processing", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When aggregated are completed they are being send out of the aggregator. This option indicates whether or not Camel should use a thread pool with multiple threads for concurrency. If no custom thread pool has been specified then Camel creates a default pool with 10 concurrent threads." }, - "optimisticLocking": { "kind": "attribute", "displayName": "Optimistic Locking", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Turns on using optimistic locking, which requires the aggregationRepository being used, is supporting this by implementing org.apache.camel.spi.OptimisticLockingAggregationRepository ." }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If using parallelProcessing you can specify a custom thread pool to be used. In fact also if you are not using parallelProcessing this custom thread pool is used to send out aggregated exchanges as well." }, - "timeoutCheckerExecutorServiceRef": { "kind": "attribute", "displayName": "Timeout Checker Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If using either of the completionTimeout, completionTimeoutExpression, or completionInterval options a background thread is created to check for the completion for every aggregator. Set this option to provide a custom thread pool to be used rather than creating a new thread for every aggregator." }, - "aggregationRepositoryRef": { "kind": "attribute", "displayName": "Aggregation Repository Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the custom aggregate repository to use. Will by default use org.apache.camel.processor.aggregate.MemoryAggregationRepository" }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A reference to lookup the AggregationStrategy in the Registry. Configuring an AggregationStrategy is required, and is used to merge the incoming Exchange with the existing already merged exchanges. At first call the oldExchange parameter is null. On subsequent invocations the oldExchange contains the merged exchanges and newExchange is of course the new incoming Exchange." }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used for the very first aggregation. If this option is true then null values is used as the oldExchange (at the very first aggregation), when using POJOs as the AggregationStrategy." }, - "completionSize": { "kind": "attribute", "displayName": "Completion Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Number of messages aggregated before the aggregation is complete. This option can be set as either a fixed value or using an Expression which allows you to evaluate a size dynamically - will use Integer as result. If both are set Camel will fallback to use the fixed value if the Expression result was null or 0." }, - "completionInterval": { "kind": "attribute", "displayName": "Completion Interval", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A repeating period in millis by which the aggregator will complete all current aggregated exchanges. Camel has a background task which is triggered every period. You cannot use this option together with completionTimeout, only one of them can be used." }, - "completionTimeout": { "kind": "attribute", "displayName": "Completion Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Time in millis that an aggregated exchange should be inactive before its complete (timeout). This option can be set as either a fixed value or using an Expression which allows you to evaluate a timeout dynamically - will use Long as result. If both are set Camel will fallback to use the fixed value if the Expression result was null or 0. You cannot use this option together with completionInterval, only one of the two can be used. By default the timeout checker runs every second, you can use the completionTimeoutCheckerInterval option to configure how frequently to run the checker. The timeout is an approximation and there is no guarantee that the a timeout is triggered exactly after the timeout value. It is not recommended to use very low timeout values or checker intervals." }, - "completionTimeoutCheckerInterval": { "kind": "attribute", "displayName": "Completion Timeout Checker Interval", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Interval in millis that is used by the background task that checks for timeouts ( org.apache.camel.TimeoutMap ). By default the timeout checker runs every second. The timeout is an approximation and there is no guarantee that the a timeout is triggered exactly after the timeout value. It is not recommended to use very low timeout values or checker intervals." }, - "completionFromBatchConsumer": { "kind": "attribute", "displayName": "Completion From Batch Consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables the batch completion mode where we aggregate from a org.apache.camel.BatchConsumer and aggregate the total number of exchanges the org.apache.camel.BatchConsumer has reported as total by checking the exchange property org.apache.camel.Exchange#BATCH_COMPLETE when its complete. This option cannot be used together with discardOnAggregationFailure." }, - "completionOnNewCorrelationGroup": { "kind": "attribute", "displayName": "Completion On New Correlation Group", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables completion on all previous groups when a new incoming correlation group. This can for example be used to complete groups with same correlation keys when they are in consecutive order. Notice when this is enabled then only 1 correlation group can be in progress as when a new correlation group starts, then the previous groups is forced completed." }, - "eagerCheckCompletion": { "kind": "attribute", "displayName": "Eager Check Completion", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange." }, - "ignoreInvalidCorrelationKeys": { "kind": "attribute", "displayName": "Ignore Invalid Correlation Keys", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If a correlation key cannot be successfully evaluated it will be ignored by logging a DEBUG and then just ignore the incoming Exchange." }, - "closeCorrelationKeyOnCompletion": { "kind": "attribute", "displayName": "Close Correlation Key On Completion", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Closes a correlation key when its complete. Any late received exchanges which has a correlation key that has been closed, it will be defined and a ClosedCorrelationKeyException is thrown." }, - "discardOnCompletionTimeout": { "kind": "attribute", "displayName": "Discard On Completion Timeout", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Discards the aggregated message on completion timeout. This means on timeout the aggregated message is dropped and not sent out of the aggregator." }, - "discardOnAggregationFailure": { "kind": "attribute", "displayName": "Discard On Aggregation Failure", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Discards the aggregated message when aggregation failed (an exception was thrown from AggregationStrategy . This means the partly aggregated message is dropped and not sent out of the aggregator. This option cannot be used together with completionFromBatchConsumer." }, - "forceCompletionOnStop": { "kind": "attribute", "displayName": "Force Completion On Stop", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Indicates to complete all current aggregated exchanges when the context is stopped" }, - "completeAllOnStop": { "kind": "attribute", "displayName": "Complete All On Stop", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Indicates to wait to complete all current and partial (pending) aggregated exchanges when the context is stopped. This also means that we will wait for all pending exchanges which are stored in the aggregation repository to complete so the repository is empty before we can stop. You may want to enable this when using the memory based aggregation repository that is memory based only, and do not store data on disk. When this option is enabled, then the aggregator is waiting to complete all those exchanges before its stopped, when stopping CamelContext or the route using it." }, - "aggregateControllerRef": { "kind": "attribute", "displayName": "Aggregate Controller Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a org.apache.camel.processor.aggregate.AggregateController to allow external sources to control this aggregator." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/bean.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/bean.json deleted file mode 100644 index 2fdeb6b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/bean.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "bean", - "title": "Bean", - "description": "Calls a java bean", - "deprecated": false, - "label": "eip,endpoint", - "javaType": "org.apache.camel.model.BeanDefinition", - "input": true, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a bean to use" }, - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the method name on the bean to use" }, - "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Class of the bean" }, - "cache": { "kind": "attribute", "displayName": "Cache", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true, "secret": false, "defaultValue": true, "description": "Use singleton option instead" }, - "scope": { "kind": "attribute", "displayName": "Scope", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype", "Request", "Singleton" ], "deprecated": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is calling the bean at the same time. When using request scope the bean is created or looked up once per request (exchange). This can be used if you want to store state on a bean while processing a request and you want to call the same bean instance multiple times while processing the request. The bean does not have to be thread-safe as the instance is only called from the same request. When using delegate scope, then the bean will be looked up or created per call. However in case of lookup then this is delegated to the bean registry such as Spring or CDI (if in use), which depends on their configuration can act as either singleton or prototype scope. so when using delegate then this depends on the delegated registry." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/choice.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/choice.json deleted file mode 100644 index 72671fd..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/choice.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "choice", - "title": "Choice", - "description": "Routes messages based on a series of predicates", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.ChoiceDefinition", - "input": true, - "output": false - }, - "properties": { - "whenClauses": { "kind": "element", "displayName": "When Clauses", "required": false, "type": "array", "javaType": "java.util.List", "oneOf": [ "when" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets the when clauses" }, - "otherwise": { "kind": "element", "displayName": "Otherwise", "required": false, "type": "object", "javaType": "org.apache.camel.model.OtherwiseDefinition", "oneOf": [ "otherwise" ], "deprecated": false, "secret": false, "description": "Sets the otherwise node" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/circuitBreaker.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/circuitBreaker.json deleted file mode 100644 index 648c766..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/circuitBreaker.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "circuitBreaker", - "title": "Circuit Breaker", - "deprecated": false, - "label": "eip,routing,circuitbreaker", - "javaType": "org.apache.camel.model.CircuitBreakerDefinition", - "input": true, - "output": false - }, - "properties": { - "hystrixConfiguration": { "kind": "element", "displayName": "Hystrix Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", "deprecated": false, "secret": false, "description": "Configures the circuit breaker to use Hystrix with the given configuration." }, - "resilience4jConfiguration": { "kind": "element", "displayName": "Resilience4j Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition", "deprecated": false, "secret": false, "description": "Configures the circuit breaker to use Resilience4j with the given configuration." }, - "faultToleranceConfiguration": { "kind": "element", "displayName": "Fault Tolerance Configuration", "required": false, "type": "object", "javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition", "deprecated": false, "secret": false, "description": "Configures the circuit breaker to use MicroProfile Fault Tolerance with the given configuration." }, - "configurationRef": { "kind": "attribute", "displayName": "Configuration Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a circuit breaker configuration (such as hystrix, resillience4j, or microprofile-fault-tolerance) to use for configuring the circuit breaker EIP." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/claimCheck.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/claimCheck.json deleted file mode 100644 index bf2957c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/claimCheck.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "claimCheck", - "title": "Claim Check", - "description": "The Claim Check EIP allows you to replace message content with a claim check (a unique key), which can be used to retrieve the message content at a later time.", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.ClaimCheckDefinition", - "input": true, - "output": false - }, - "properties": { - "operation": { "kind": "attribute", "displayName": "Operation", "required": false, "type": "enum", "javaType": "org.apache.camel.model.ClaimCheckOperation", "enum": [ "Get", "GetAndRemove", "Pop", "Push", "Set" ], "deprecated": false, "secret": false, "description": "The claim check operation to use. The following operations is supported: Get - Gets (does not remove) the claim check by the given key. GetAndRemove - Gets and remove the claim check by the given key. Set - Sets a new (will override if key already exists) claim check with the given key. Push - Sets a new claim check on the stack (does not use key). Pop - Gets the latest claim check from the stack (does not use key)." }, - "key": { "kind": "attribute", "displayName": "Key", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a specific key for claim check id (for dynamic keys use simple language syntax as the key)." }, - "filter": { "kind": "attribute", "displayName": "Filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Specified a filter to control what data gets merging data back from the claim check repository. The following syntax is supported: body - to aggregate the message body attachments - to aggregate all the message attachments headers - to aggregate all the message headers header:pattern - to aggregate all the message headers that matches the pattern. The pattern uses the following rules are applied in this order: exact match, returns true wildcard match (pattern ends with a and the name starts with the pattern), returns true regular expression match, returns true otherwise returns false You can specify multiple rules separated by comma. For example to include the message body and all headers starting with foo body,header:foo. The syntax supports the following prefixes which can be used to specify include,exclude, or remove - to include (which is the default mode) - - to exclude (exclude takes precedence over include) -- - to remove (remove takes precedence) For example to exclude a header name foo, and remove all headers starting with bar -header:foo,--headers:bar Note you cannot have both include and exclude header:pattern at the same time." }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom AggregationStrategy instead of the default implementation. Notice you cannot use both custom aggregation strategy and configure data at the same time." }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json deleted file mode 100644 index 3524f77..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/blacklistServiceFilter.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "blacklistServiceFilter", - "title": "Blacklist Service Filter", - "deprecated": false, - "label": "routing,cloud,service-filter", - "javaType": "org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "servers": { "kind": "element", "displayName": "Servers", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the server blacklist. Each entry can be a list of servers separated by comma in the format: servicehost:port,servicehost2:port,servicehost3:port" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json deleted file mode 100644 index ed0095e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/cachingServiceDiscovery.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "cachingServiceDiscovery", - "title": "Caching Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "60", "description": "Set the time the services will be retained." }, - "units": { "kind": "attribute", "displayName": "Units", "required": false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "DAYS", "HOURS", "MICROSECONDS", "MILLISECONDS", "MINUTES", "NANOSECONDS", "SECONDS" ], "deprecated": false, "secret": false, "defaultValue": "SECONDS", "description": "Set the time unit for the timeout." }, - "serviceDiscoveryConfiguration": { "kind": "element", "displayName": "Service Discovery Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration", "oneOf": [ "combinedServiceDiscovery", "consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery", "kubernetesServiceDiscovery", "staticServiceDiscovery" ], "deprecated": false, "secret": false, "description": "Set the service-call configuration to use" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json deleted file mode 100644 index 2c63931..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceDiscovery.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "combinedServiceDiscovery", - "title": "Combined Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "serviceDiscoveryConfigurations": { "kind": "element", "displayName": "Service Discovery Configurations", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "cachingServiceDiscovery", "consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery", "kubernetesServiceDiscovery", "staticServiceDiscovery" ], "deprecated": false, "secret": false, "description": "List of ServiceDiscovery configuration to use" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json deleted file mode 100644 index 7a9da33..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/combinedServiceFilter.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "combinedServiceFilter", - "title": "Combined Service Filter", - "deprecated": false, - "label": "routing,cloud,service-filter", - "javaType": "org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "serviceFilterConfigurations": { "kind": "element", "displayName": "Service Filter Configurations", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "blacklistServiceFilter", "customServiceFilter", "healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false, "secret": false, "description": "List of ServiceFilter configuration to use" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json deleted file mode 100644 index 9c1357a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/consulServiceDiscovery.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "consulServiceDiscovery", - "title": "Consul Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "url": { "kind": "attribute", "displayName": "Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The Consul agent URL" }, - "datacenter": { "kind": "attribute", "displayName": "Datacenter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The data center" }, - "aclToken": { "kind": "attribute", "displayName": "Acl Token", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the ACL token to be used with Consul" }, - "userName": { "kind": "attribute", "displayName": "User Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the username to be used for basic authentication" }, - "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the password to be used for basic authentication" }, - "connectTimeoutMillis": { "kind": "attribute", "displayName": "Connect Timeout Millis", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Connect timeout for OkHttpClient" }, - "readTimeoutMillis": { "kind": "attribute", "displayName": "Read Timeout Millis", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Read timeout for OkHttpClient" }, - "writeTimeoutMillis": { "kind": "attribute", "displayName": "Write Timeout Millis", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Write timeout for OkHttpClient" }, - "blockSeconds": { "kind": "attribute", "displayName": "Block Seconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "The seconds to wait for a watch event, default 10 seconds" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json deleted file mode 100644 index 9442a70..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/customServiceFilter.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "customServiceFilter", - "title": "Custom Service Filter", - "deprecated": false, - "label": "routing,cloud,service-filter", - "javaType": "org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference of a ServiceFilter" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json deleted file mode 100644 index c90f7b0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/defaultLoadBalancer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "defaultLoadBalancer", - "title": "Default Load Balancer", - "deprecated": false, - "label": "routing,cloud,load-balancing", - "javaType": "org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json deleted file mode 100644 index f0673e4..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/dnsServiceDiscovery.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "dnsServiceDiscovery", - "title": "Dns Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "proto": { "kind": "attribute", "displayName": "Proto", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "_tcp", "description": "The transport protocol of the desired service." }, - "domain": { "kind": "attribute", "displayName": "Domain", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The domain name;" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json deleted file mode 100644 index 6f6d556..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/etcdServiceDiscovery.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "etcdServiceDiscovery", - "title": "Etcd Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.EtcdServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "uris": { "kind": "attribute", "displayName": "Uris", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URIs the client can connect to." }, - "userName": { "kind": "attribute", "displayName": "User Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user name to use for basic authentication." }, - "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password to use for basic authentication." }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "To set the maximum time an action could take to complete." }, - "servicePath": { "kind": "attribute", "displayName": "Service Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\/services\/", "description": "The path to look for for service discovery" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "on-demand", "watch" ], "deprecated": false, "secret": false, "defaultValue": "on-demand", "description": "To set the discovery type, valid values are on-demand and watch." }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json deleted file mode 100644 index df31637..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/healthyServiceFilter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "healthyServiceFilter", - "title": "Healthy Service Filter", - "deprecated": false, - "label": "routing,cloud,service-filter", - "javaType": "org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/jaxb.index deleted file mode 100644 index fbeb9df..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/jaxb.index +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -BlacklistServiceCallServiceFilterConfiguration -CachingServiceCallServiceDiscoveryConfiguration -CombinedServiceCallServiceDiscoveryConfiguration -CombinedServiceCallServiceFilterConfiguration -ConsulServiceCallServiceDiscoveryConfiguration -CustomServiceCallServiceFilterConfiguration -DefaultServiceCallServiceLoadBalancerConfiguration -DnsServiceCallServiceDiscoveryConfiguration -EtcdServiceCallServiceDiscoveryConfiguration -HealthyServiceCallServiceFilterConfiguration -KubernetesServiceCallServiceDiscoveryConfiguration -PassThroughServiceCallServiceFilterConfiguration -RibbonServiceCallServiceLoadBalancerConfiguration -ServiceCallConfiguration -ServiceCallConfigurationDefinition -ServiceCallDefinition -ServiceCallExpressionConfiguration -ServiceCallServiceChooserConfiguration -ServiceCallServiceDiscoveryConfiguration -ServiceCallServiceFilterConfiguration -ServiceCallServiceLoadBalancerConfiguration -StaticServiceCallServiceDiscoveryConfiguration -ZooKeeperServiceCallServiceDiscoveryConfiguration diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json deleted file mode 100644 index 0a2df24..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/kubernetesServiceDiscovery.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "kubernetesServiceDiscovery", - "title": "Kubernetes Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "lookup": { "kind": "attribute", "displayName": "Lookup", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "client", "dns", "environment" ], "deprecated": false, "secret": false, "defaultValue": "environment", "description": "How to perform service lookup. Possible values: client, dns, environment. When using client, then the client queries the kubernetes master to obtain a list of active pods that provides the service, and then random (or round robin) select a pod. When using dns the service name is resolved as name.namespace.svc.dnsDomain. When using dnssrv the service name is resolved with SRV query for _._...svc... When using environment then environment variables are used to lookup the service. By default environment is used." }, - "dnsDomain": { "kind": "attribute", "displayName": "Dns Domain", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the DNS domain to use for DNS lookup." }, - "portName": { "kind": "attribute", "displayName": "Port Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Port Name to use for DNS\/DNSSRV lookup." }, - "portProtocol": { "kind": "attribute", "displayName": "Port Protocol", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Port Protocol to use for DNS\/DNSSRV lookup." }, - "namespace": { "kind": "attribute", "displayName": "Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the namespace to use. Will by default use namespace from the ENV variable KUBERNETES_MASTER." }, - "apiVersion": { "kind": "attribute", "displayName": "Api Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the API version when using client lookup" }, - "masterUrl": { "kind": "attribute", "displayName": "Master Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the URL to the master when using client lookup" }, - "username": { "kind": "attribute", "displayName": "Username", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the username for authentication when using client lookup" }, - "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the password for authentication when using client lookup" }, - "oauthToken": { "kind": "attribute", "displayName": "Oauth Token", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the OAUTH token for authentication (instead of username\/password) when using client lookup" }, - "caCertData": { "kind": "attribute", "displayName": "Ca Cert Data", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Certificate Authority data when using client lookup" }, - "caCertFile": { "kind": "attribute", "displayName": "Ca Cert File", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Certificate Authority data that are loaded from the file when using client lookup" }, - "clientCertData": { "kind": "attribute", "displayName": "Client Cert Data", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Certificate data when using client lookup" }, - "clientCertFile": { "kind": "attribute", "displayName": "Client Cert File", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Certificate data that are loaded from the file when using client lookup" }, - "clientKeyAlgo": { "kind": "attribute", "displayName": "Client Key Algo", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Keystore algorithm, such as RSA when using client lookup" }, - "clientKeyData": { "kind": "attribute", "displayName": "Client Key Data", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Keystore data when using client lookup" }, - "clientKeyFile": { "kind": "attribute", "displayName": "Client Key File", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Keystore data that are loaded from the file when using client lookup" }, - "clientKeyPassphrase": { "kind": "attribute", "displayName": "Client Key Passphrase", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Client Keystore passphrase when using client lookup" }, - "trustCerts": { "kind": "attribute", "displayName": "Trust Certs", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether to turn on trust certificate check when using client lookup" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json deleted file mode 100644 index 49f3a4c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/loadBalancerConfiguration.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "loadBalancerConfiguration", - "title": "Load Balancer Configuration", - "deprecated": false, - "label": "routing,cloud,load-balancing", - "javaType": "org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json deleted file mode 100644 index c4891ce..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/passThroughServiceFilter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "passThroughServiceFilter", - "title": "Pass Through Service Filter", - "deprecated": false, - "label": "routing,cloud,service-filter", - "javaType": "org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json deleted file mode 100644 index a8d3a0c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/ribbonLoadBalancer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "ribbonLoadBalancer", - "title": "Ribbon Load Balancer", - "deprecated": false, - "label": "routing,cloud,load-balancing", - "javaType": "org.apache.camel.model.cloud.RibbonServiceCallServiceLoadBalancerConfiguration", - "input": false, - "output": false - }, - "properties": { - "namespace": { "kind": "attribute", "displayName": "Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The namespace" }, - "username": { "kind": "attribute", "displayName": "Username", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The username" }, - "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password" }, - "clientName": { "kind": "attribute", "displayName": "Client Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Ribbon client name" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json deleted file mode 100644 index aacfb7a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCall.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceCall", - "title": "Service Call", - "description": "To call remote services", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.cloud.ServiceCallDefinition", - "input": true, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the service to use" }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The uri of the endpoint to send to. The uri can be dynamic computed using the org.apache.camel.language.simple.SimpleLanguage expression." }, - "component": { "kind": "attribute", "displayName": "Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "http", "description": "The component to use." }, - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": true, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the optional ExchangePattern used to invoke this endpoint" }, - "configurationRef": { "kind": "attribute", "displayName": "Configuration Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a ServiceCall configuration to use" }, - "serviceDiscoveryRef": { "kind": "attribute", "displayName": "Service Discovery Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceDiscovery to use." }, - "serviceFilterRef": { "kind": "attribute", "displayName": "Service Filter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceFilter to use." }, - "serviceChooserRef": { "kind": "attribute", "displayName": "Service Chooser Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceChooser to use." }, - "loadBalancerRef": { "kind": "attribute", "displayName": "Load Balancer Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceLoadBalancer to use." }, - "expressionRef": { "kind": "attribute", "displayName": "Expression Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set a reference to a custom Expression to use." }, - "serviceDiscoveryConfiguration": { "kind": "element", "displayName": "Service Discovery Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration", "oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery", "consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery", "kubernetesServiceDiscovery", "staticServiceDiscovery", "zookeeperServiceDiscovery" ], "deprecated": false, "secret": false, "description": "Configures the ServiceDiscovery using the given configuration." }, - "serviceFilterConfiguration": { "kind": "element", "displayName": "Service Filter Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf": [ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter", "healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false, "secret": false, "description": "Configures the ServiceFilter using the given configuration." }, - "loadBalancerConfiguration": { "kind": "element", "displayName": "Load Balancer Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration", "oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false, "secret": false, "description": "Configures the LoadBalancer using the given configuration." }, - "expressionConfiguration": { "kind": "element", "displayName": "Expression Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", "oneOf": [ "expressionConfiguration" ], "deprecated": false, "secret": false, "description": "Configures the Expression using the given configuration." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json deleted file mode 100644 index 4b4a245..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceCallConfiguration.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceCallConfiguration", - "title": "Service Call Configuration", - "description": "Remote service call configuration", - "deprecated": false, - "label": "routing,cloud", - "javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition", - "input": false, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The uri of the endpoint to send to. The uri can be dynamic computed using the org.apache.camel.language.simple.SimpleLanguage expression." }, - "component": { "kind": "attribute", "displayName": "Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "http", "description": "The component to use." }, - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the optional ExchangePattern used to invoke this endpoint" }, - "serviceDiscoveryRef": { "kind": "attribute", "displayName": "Service Discovery Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceDiscovery to use." }, - "serviceFilterRef": { "kind": "attribute", "displayName": "Service Filter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceFilter to use." }, - "serviceChooserRef": { "kind": "attribute", "displayName": "Service Chooser Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceChooser to use." }, - "loadBalancerRef": { "kind": "attribute", "displayName": "Load Balancer Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a custom ServiceLoadBalancer to use." }, - "expressionRef": { "kind": "attribute", "displayName": "Expression Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set a reference to a custom Expression to use." }, - "serviceDiscoveryConfiguration": { "kind": "element", "displayName": "Service Discovery Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration", "oneOf": [ "cachingServiceDiscovery", "combinedServiceDiscovery", "consulServiceDiscovery", "dnsServiceDiscovery", "etcdServiceDiscovery", "kubernetesServiceDiscovery", "staticServiceDiscovery", "zookeeperServiceDiscovery" ], "deprecated": false, "secret": false, "description": "Configures the ServiceDiscovery using the given configuration." }, - "serviceFilterConfiguration": { "kind": "element", "displayName": "Service Filter Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", "oneOf": [ "blacklistServiceFilter", "combinedServiceFilter", "customServiceFilter", "healthyServiceFilter", "passThroughServiceFilter" ], "deprecated": false, "secret": false, "description": "Configures the ServiceFilter using the given configuration." }, - "loadBalancerConfiguration": { "kind": "element", "displayName": "Load Balancer Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallServiceLoadBalancerConfiguration", "oneOf": [ "defaultLoadBalancer", "ribbonLoadBalancer" ], "deprecated": false, "secret": false, "description": "Configures theL oadBalancer using the given configuration." }, - "expressionConfiguration": { "kind": "element", "displayName": "Expression Configuration", "required": true, "type": "object", "javaType": "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", "oneOf": [ "expression" ], "deprecated": false, "secret": false, "description": "Configures the Expression using the given configuration." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json deleted file mode 100644 index bd7b205..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceChooserConfiguration.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceChooserConfiguration", - "title": "Service Chooser Configuration", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.ServiceCallServiceChooserConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json deleted file mode 100644 index 04d8de1..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceDiscoveryConfiguration.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceDiscoveryConfiguration", - "title": "Service Discovery Configuration", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.ServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json deleted file mode 100644 index a4cb936..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceExpression.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceExpression", - "title": "Service Expression", - "deprecated": false, - "label": "routing,cloud", - "javaType": "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration", - "input": false, - "output": false - }, - "properties": { - "hostHeader": { "kind": "attribute", "displayName": "Host Header", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelServiceCallServiceHost", "description": "The header that holds the service host information, default ServiceCallConstants.SERVICE_HOST" }, - "portHeader": { "kind": "attribute", "displayName": "Port Header", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelServiceCallServicePort", "description": "The header that holds the service port information, default ServiceCallConstants.SERVICE_PORT" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json deleted file mode 100644 index 1438395..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/serviceFilterConfiguration.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "serviceFilterConfiguration", - "title": "Service Filter Configuration", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.ServiceCallServiceFilterConfiguration", - "input": false, - "output": false - }, - "properties": { - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json deleted file mode 100644 index adf84a1..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/staticServiceDiscovery.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "staticServiceDiscovery", - "title": "Static Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "servers": { "kind": "element", "displayName": "Servers", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the server list. Each entry can be a list of servers separated by comma in the format: servicehost:port,servicehost2:port,servicehost3:port" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json deleted file mode 100644 index 08c127f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/cloud/zookeeperServiceDiscovery.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "zookeeperServiceDiscovery", - "title": "Zookeeper Service Discovery", - "deprecated": false, - "label": "routing,cloud,service-discovery", - "javaType": "org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration", - "input": false, - "output": false - }, - "properties": { - "nodes": { "kind": "attribute", "displayName": "Nodes", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A comma separate list of servers to connect to in the form host:port" }, - "namespace": { "kind": "attribute", "displayName": "Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "As ZooKeeper is a shared space, users of a given cluster should stay within a pre-defined namespace. If a namespace is set here, all paths will get pre-pended with the namespace" }, - "reconnectBaseSleepTime": { "kind": "attribute", "displayName": "Reconnect Base Sleep Time", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Initial amount of time to wait between retries." }, - "reconnectMaxSleepTime": { "kind": "attribute", "displayName": "Reconnect Max Sleep Time", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Max time in ms to sleep on each retry" }, - "reconnectMaxRetries": { "kind": "attribute", "displayName": "Reconnect Max Retries", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Max number of times to retry" }, - "sessionTimeout": { "kind": "attribute", "displayName": "Session Timeout", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Session timeout." }, - "connectionTimeout": { "kind": "attribute", "displayName": "Connection Timeout", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Connection timeout." }, - "basePath": { "kind": "attribute", "displayName": "Base Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set the base path to store in ZK" }, - "properties": { "kind": "element", "displayName": "Properties", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set client properties to use. These properties are specific to what service call implementation are in use. For example if using ribbon, then the client properties are define in com.netflix.client.config.CommonClientConfigKey." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/batch-config.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/batch-config.json deleted file mode 100644 index 80abc0c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/batch-config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "batch-config", - "title": "Batch-config", - "description": "Configures batch-processing resequence eip.", - "deprecated": false, - "label": "eip,routing,resequence", - "javaType": "org.apache.camel.model.config.BatchResequencerConfig", - "input": false, - "output": false - }, - "properties": { - "batchSize": { "kind": "attribute", "displayName": "Batch Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "100", "description": "Sets the size of the batch to be re-ordered. The default size is 100." }, - "batchTimeout": { "kind": "attribute", "displayName": "Batch Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Sets the timeout for collecting elements to be re-ordered. The default timeout is 1000 msec." }, - "allowDuplicates": { "kind": "attribute", "displayName": "Allow Duplicates", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow duplicates." }, - "reverse": { "kind": "attribute", "displayName": "Reverse", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to reverse the ordering." }, - "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/jaxb.index deleted file mode 100644 index 44d5211..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/jaxb.index +++ /dev/null @@ -1,4 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -BatchResequencerConfig -ResequencerConfig -StreamResequencerConfig diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/stream-config.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/stream-config.json deleted file mode 100644 index bcd6f6c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/config/stream-config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "stream-config", - "title": "Stream-config", - "description": "Configures stream-processing resequence eip.", - "deprecated": false, - "label": "eip,routing,resequence", - "javaType": "org.apache.camel.model.config.StreamResequencerConfig", - "input": false, - "output": false - }, - "properties": { - "capacity": { "kind": "attribute", "displayName": "Capacity", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "100", "description": "Sets the capacity of the resequencer's inbound queue." }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Sets minimum time to wait for missing elements (messages)." }, - "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery Attempt Interval", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Sets the interval in milli seconds the stream resequencer will at most wait while waiting for condition of being able to deliver." }, - "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" }, - "comparatorRef": { "kind": "attribute", "displayName": "Comparator Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom comparator" }, - "rejectOld": { "kind": "attribute", "displayName": "Reject Old", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true, throws an exception when messages older than the last delivered message are processed" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/contextScan.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/contextScan.json deleted file mode 100644 index 407493f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/contextScan.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "contextScan", - "title": "Context Scan", - "description": "Scans for Java org.apache.camel.builder.RouteBuilder instances in the context org.apache.camel.spi.Registry .", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.ContextScanDefinition", - "input": false, - "output": false - }, - "properties": { - "includeNonSingletons": { "kind": "attribute", "displayName": "Include Non Singletons", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to include non-singleton beans (prototypes) By default only singleton beans is included in the context scan" }, - "excludes": { "kind": "element", "displayName": "Excludes", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Exclude finding route builder from these java package names." }, - "includes": { "kind": "element", "displayName": "Includes", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Include finding route builder from these java package names." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/convertBodyTo.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/convertBodyTo.json deleted file mode 100644 index e1ad731..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/convertBodyTo.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "convertBodyTo", - "title": "Convert Body To", - "description": "Converts the message body to another type", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.ConvertBodyDefinition", - "input": true, - "output": false - }, - "properties": { - "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The java type to convert to" }, - "charset": { "kind": "attribute", "displayName": "Charset", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a specific charset when converting" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/any23.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/any23.json deleted file mode 100644 index eb7a1fc..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/any23.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "any23", - "title": "Any23", - "description": "Extract RDF data from HTML documents.", - "deprecated": false, - "firstVersion": "3.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.Any23DataFormat", - "input": false, - "output": false - }, - "properties": { - "outputFormat": { "kind": "attribute", "displayName": "Output Format", "required": false, "type": "enum", "javaType": "org.apache.camel.dataformat.any23.Any23OutputFormat", "enum": [ "JSONLD", "NQUADS", "NTRIPLES", "RDF4JMODEL", "RDFJSON", "RDFXML", "TURTLE" ], "deprecated": false, "secret": false, "defaultValue": "RDF4JMODEL", "description": "What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL." }, - "configuration": { "kind": "element", "displayName": "Configuration", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used." }, - "extractors": { "kind": "element", "displayName": "Extractors", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "List of Any23 extractors to be used in the unmarshal operation. A list of the available extractors can be found here here. If not provided, all the available extractors are used." }, - "baseURI": { "kind": "attribute", "displayName": "Base URI", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URI to use as base for building RDF entities if only relative paths are provided." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/asn1.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/asn1.json deleted file mode 100644 index 0a262d8..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/asn1.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "asn1", - "title": "ASN.1 File", - "description": "Encode and decode data structures using Abstract Syntax Notation One (ASN.1).", - "deprecated": false, - "firstVersion": "2.20.0", - "label": "dataformat,transformation,file", - "javaType": "org.apache.camel.model.dataformat.ASN1DataFormat", - "input": false, - "output": false - }, - "properties": { - "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the asn1 file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." }, - "clazzName": { "kind": "attribute", "displayName": "Clazz Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/avro.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/avro.json deleted file mode 100644 index 4b6ea63..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/avro.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "avro", - "title": "Avro", - "description": "Serialize and deserialize messages using Apache Avro binary data format.", - "deprecated": false, - "firstVersion": "2.14.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.AvroDataFormat", - "input": false, - "output": false - }, - "properties": { - "instanceClassName": { "kind": "attribute", "displayName": "Instance Class Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name to use for marshal and unmarshalling" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/barcode.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/barcode.json deleted file mode 100644 index 7d78566..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/barcode.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "barcode", - "title": "Barcode", - "description": "Transform strings to various 1D\/2D barcode bitmap formats and back.", - "deprecated": false, - "firstVersion": "2.14.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.BarcodeDataFormat", - "input": false, - "output": false - }, - "properties": { - "width": { "kind": "attribute", "displayName": "Width", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Width of the barcode" }, - "height": { "kind": "attribute", "displayName": "Height", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Height of the barcode" }, - "imageType": { "kind": "attribute", "displayName": "Image Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Image type of the barcode such as png" }, - "barcodeFormat": { "kind": "attribute", "displayName": "Barcode Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Barcode format such as QR-Code" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/base64.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/base64.json deleted file mode 100644 index 046bda3..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/base64.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "base64", - "title": "Base64", - "description": "Encode and decode data using Base64.", - "deprecated": false, - "firstVersion": "2.11.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.Base64DataFormat", - "input": false, - "output": false - }, - "properties": { - "lineLength": { "kind": "attribute", "displayName": "Line Length", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "76", "description": "To specific a maximum line length for the encoded data. By default 76 is used." }, - "lineSeparator": { "kind": "attribute", "displayName": "Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The line separators to use. Uses new line characters (CRLF) by default." }, - "urlSafe": { "kind": "attribute", "displayName": "Url Safe", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Instead of emitting '' and '\/' we emit '-' and '_' respectively. urlSafe is only applied to encode operations. Decoding seamlessly handles both modes. Is by default false." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/beanio.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/beanio.json deleted file mode 100644 index 721853e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/beanio.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "beanio", - "title": "BeanIO", - "description": "Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).", - "deprecated": false, - "firstVersion": "2.10.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.BeanioDataFormat", - "input": false, - "output": false - }, - "properties": { - "mapping": { "kind": "attribute", "displayName": "Mapping", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The BeanIO mapping file. Is by default loaded from the classpath. You can prefix with file:, http:, or classpath: to denote from where to load the mapping file." }, - "streamName": { "kind": "attribute", "displayName": "Stream Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the stream to use." }, - "ignoreUnidentifiedRecords": { "kind": "attribute", "displayName": "Ignore Unidentified Records", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore unidentified records." }, - "ignoreUnexpectedRecords": { "kind": "attribute", "displayName": "Ignore Unexpected Records", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore unexpected records." }, - "ignoreInvalidRecords": { "kind": "attribute", "displayName": "Ignore Invalid Records", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid records." }, - "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The charset to use. Is by default the JVM platform default charset." }, - "beanReaderErrorHandlerType": { "kind": "attribute", "displayName": "Bean Reader Error Handler Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.dataformat.beanio.BeanIOErrorHandler as error handler while parsing. Configure the fully qualified class name of the error handler. Notice the options ignoreUnidentifiedRecords, ignoreUnexpectedRecords, and ignoreInvalidRecords may not be in use when you use a custom error handler." }, - "unmarshalSingleObject": { "kind": "attribute", "displayName": "Unmarshal Single Object", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This options controls whether to unmarshal as a list of objects or as a single object only. The former is the default mode, and the latter is only intended in special use-cases where beanio maps the Camel message to a single POJO bean." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/bindy.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/bindy.json deleted file mode 100644 index 523458e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/bindy.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "bindy", - "title": "Bindy", - "description": "Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.BindyDataFormat", - "input": false, - "output": false - }, - "properties": { - "type": { "kind": "attribute", "displayName": "Type", "required": true, "type": "enum", "javaType": "org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed", "KeyValue" ], "deprecated": false, "secret": false, "description": "Whether to use Csv, Fixed, or KeyValue." }, - "classType": { "kind": "attribute", "displayName": "Class Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of model class to use." }, - "locale": { "kind": "attribute", "displayName": "Locale", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" }, - "unwrapSingleInstance": { "kind": "attribute", "displayName": "Unwrap Single Instance", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." }, - "allowEmptyStream": { "kind": "attribute", "displayName": "Allow Empty Stream", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/cbor.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/cbor.json deleted file mode 100644 index 9a273b8..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/cbor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "cbor", - "title": "CBOR", - "description": "Unmarshal a CBOR payload to POJO and back.", - "deprecated": false, - "firstVersion": "3.0.0", - "label": "dataformat,transformation,json", - "javaType": "org.apache.camel.model.dataformat.CBORDataFormat", - "input": false, - "output": false - }, - "properties": { - "objectMapper": { "kind": "attribute", "displayName": "Object Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing CBOR ObjectMapper with the given id when using Jackson." }, - "useDefaultObjectMapper": { "kind": "attribute", "displayName": "Use Default Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to lookup and use default Jackson CBOR ObjectMapper from the registry." }, - "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }, - "collectionTypeName": { "kind": "attribute", "displayName": "Collection Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default." }, - "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." }, - "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson CBOR is allowed to attempt to use the CamelCBORUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, - "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." }, - "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/crypto.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/crypto.json deleted file mode 100644 index 8062745..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/crypto.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "crypto", - "title": "Crypto (Java Cryptographic Extension)", - "description": "Encrypt and decrypt messages using Java Cryptography Extension (JCE).", - "deprecated": false, - "firstVersion": "2.3.0", - "label": "dataformat,transformation,security", - "javaType": "org.apache.camel.model.dataformat.CryptoDataFormat", - "input": false, - "output": false - }, - "properties": { - "algorithm": { "kind": "attribute", "displayName": "Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The JCE algorithm name indicating the cryptographic algorithm that will be used." }, - "cryptoProvider": { "kind": "attribute", "displayName": "Crypto Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the JCE Security Provider that should be used." }, - "keyRef": { "kind": "attribute", "displayName": "Key Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to the secret key to lookup from the register to use." }, - "initVectorRef": { "kind": "attribute", "displayName": "Init Vector Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a byte array containing the Initialization Vector that will be used to initialize the Cipher." }, - "algorithmParameterRef": { "kind": "attribute", "displayName": "Algorithm Parameter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type using the given name as a java.security.spec.AlgorithmParameterSpec type." }, - "buffersize": { "kind": "attribute", "displayName": "Buffersize", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "The size of the buffer used in the signature process." }, - "macAlgorithm": { "kind": "attribute", "displayName": "Mac Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "HmacSHA1", "description": "The JCE algorithm name indicating the Message Authentication algorithm." }, - "shouldAppendHMAC": { "kind": "attribute", "displayName": "Should Append HMAC", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data." }, - "inline": { "kind": "attribute", "displayName": "Inline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Flag indicating that the configured IV should be inlined into the encrypted data stream. Is by default false." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/csv.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/csv.json deleted file mode 100644 index 508b6c0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/csv.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "csv", - "title": "CSV", - "description": "Handle CSV (Comma Separated Values) payloads.", - "deprecated": false, - "firstVersion": "1.3.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.CsvDataFormat", - "input": false, - "output": false - }, - "properties": { - "formatRef": { "kind": "attribute", "displayName": "Format Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The reference format to use, it will be updated with the other format options, the default value is CSVFormat.DEFAULT" }, - "formatName": { "kind": "attribute", "displayName": "Format Name", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ], "deprecated": false, "secret": false, "description": "The name of the format to use, the default value is CSVFormat.DEFAULT" }, - "commentMarkerDisabled": { "kind": "attribute", "displayName": "Comment Marker Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Disables the comment marker of the reference format." }, - "commentMarker": { "kind": "attribute", "displayName": "Comment Marker", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the comment marker of the reference format." }, - "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the delimiter to use. The default value is , (comma)" }, - "escapeDisabled": { "kind": "attribute", "displayName": "Escape Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Use for disabling using escape character" }, - "escape": { "kind": "attribute", "displayName": "Escape", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the escape character to use" }, - "headerDisabled": { "kind": "attribute", "displayName": "Header Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Use for disabling headers" }, - "header": { "kind": "element", "displayName": "Header", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "To configure the CSV headers" }, - "allowMissingColumnNames": { "kind": "attribute", "displayName": "Allow Missing Column Names", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow missing column names." }, - "ignoreEmptyLines": { "kind": "attribute", "displayName": "Ignore Empty Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore empty lines." }, - "ignoreSurroundingSpaces": { "kind": "attribute", "displayName": "Ignore Surrounding Spaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore surrounding spaces" }, - "nullStringDisabled": { "kind": "attribute", "displayName": "Null String Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used to disable null strings" }, - "nullString": { "kind": "attribute", "displayName": "Null String", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the null string" }, - "quoteDisabled": { "kind": "attribute", "displayName": "Quote Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used to disable quotes" }, - "quote": { "kind": "attribute", "displayName": "Quote", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the quote which by default is" }, - "recordSeparatorDisabled": { "kind": "attribute", "displayName": "Record Separator Disabled", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Used for disabling record separator" }, - "recordSeparator": { "kind": "attribute", "displayName": "Record Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the record separator (aka new line) which by default is new line characters (CRLF)" }, - "skipHeaderRecord": { "kind": "attribute", "displayName": "Skip Header Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to skip the header record in the output" }, - "quoteMode": { "kind": "attribute", "displayName": "Quote Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the quote mode" }, - "ignoreHeaderCase": { "kind": "attribute", "displayName": "Ignore Header Case", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to ignore case when accessing header names." }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to trim leading and trailing blanks." }, - "trailingDelimiter": { "kind": "attribute", "displayName": "Trailing Delimiter", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to add a trailing delimiter." }, - "marshallerFactoryRef": { "kind": "attribute", "displayName": "Marshaller Factory Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the implementation of the CsvMarshallerFactory interface which is able to customize marshalling\/unmarshalling behavior by extending CsvMarshaller or creating it from scratch." }, - "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one." }, - "useMaps": { "kind": "attribute", "displayName": "Use Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps (HashMap)for the lines values instead of lists. It requires to have header (either defined or collected)." }, - "useOrderedMaps": { "kind": "attribute", "displayName": "Use Ordered Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the lines values instead of lists. It requires to have header (either defined or collected)." }, - "recordConverterRef": { "kind": "attribute", "displayName": "Record Converter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom CsvRecordConverter to lookup from the registry to use." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json deleted file mode 100644 index 6bbbf34..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "customDataFormat", - "title": "Custom", - "description": "Delegate to a custom org.apache.camel.spi.DataFormat implementation via Camel registry.", - "deprecated": false, - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.CustomDataFormat", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the custom org.apache.camel.spi.DataFormat to lookup from the Camel registry." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json deleted file mode 100644 index 2946196..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "dataFormats", - "title": "Data formats", - "description": "Configure data formats.", - "deprecated": false, - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.DataFormatsDefinition", - "input": false, - "output": false - }, - "properties": { - "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzip", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile", "thrift", "tidyMarkup", "univocity-csv", "univocity-fixed", "univocity-tsv", "xmlrpc", "xstream", "yaml", "zip", "zipfile" ], "deprecated": false, "secret": false, "description": "A list holding the configured data formats" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json deleted file mode 100644 index f4bda25..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirJson.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "fhirJson", - "title": "FHIR JSon", - "description": "Marshall and unmarshall FHIR objects to\/from JSON.", - "deprecated": false, - "firstVersion": "2.21.0", - "label": "dataformat,transformation,hl7,json", - "javaType": "org.apache.camel.model.dataformat.FhirJsonDataFormat", - "input": false, - "output": false - }, - "properties": { - "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_1", "DSTU2_HL7ORG", "DSTU3", "R4" ], "deprecated": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." }, - "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." }, - "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resources will still have local IDs but the outer\/containing ID will not have an ID." }, - "encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute", "displayName": "Encode Elements Applies To Child Resources Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), the values supplied to setEncodeElements(Set) will not be applied to the root resource (typically a Bundle), but will be applied to any sub-resources contained within it (i.e. search result resources in that bundle)" }, - "encodeElements": { "kind": "attribute", "displayName": "Encode Elements", "required": false, "type": "object", "javaType": "java.util.Set", "deprecated": false, "secret": false, "description": "If provided, specifies the elements which should be encoded, to the exclusion of all others. Valid values for this field would include: Patient - Encode patient and all its children Patient.name - Encode only the patient's name Patient.name.family - Encode only the patient's family name .text - Encode the text element on any resource (only the very first position may contain a wildcard) .(mandatory) - This is a special case which causes any mandatory fields (min 0) to be encoded" }, - "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode Elements", "required": false, "type": "object", "javaType": "java.util.Set", "deprecated": false, "secret": false, "description": "If provided, specifies the elements which should NOT be encoded. Valid values for this field would include: Patient - Don't encode patient and all its children Patient.name - Don't encode the patient's name Patient.name.family - Don't encode the patient's family name .text - Don't encode the text element on any resource (only the very first position may contain a wildcard) DSTU2 note: Note that values including meta, such as Patient.meta will work for DSTU2 parsers, but values with subelements on meta such as Patient.meta.lastUpdated will only work in DSTU3 mode." }, - "stripVersionsFromReferences": { "kind": "attribute", "displayName": "Strip Versions From References", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (which is the default), resource references containing a version will have the version removed when the resource is encoded. This is generally good behaviour because in most situations, references from one resource to another should be to the resource by ID, not by ID and version. In some cases though, it may be desirable to preserve the version in resource links. In that case, this value should be set to false. This method provides the ability to globally disable reference encoding. If finer-grained control is needed, use setDontStripVersionsFromReferencesAtPaths(List)" }, - "overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute", "displayName": "Override Resource Id With Bundle Entry Full Url", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (which is the default), the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id if the fullUrl is defined. This behavior happens when parsing the source data into a Bundle object. Set this to false if this is not the desired behavior (e.g. the client code wishes to perform additional validation checks between the fullUrl and the resource id)." }, - "summaryMode": { "kind": "attribute", "displayName": "Summary Mode", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included." }, - "suppressNarratives": { "kind": "attribute", "displayName": "Suppress Narratives", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), narratives will not be included in the encoded values." }, - "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute", "displayName": "Dont Strip Versions From References At Paths", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing process. This method provides a finer-grained level of control than setStripVersionsFromReferences(String) and any paths specified by this method will be encoded even if setStripVersionsFromReferences(String) has been set to true (which is the default)" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json deleted file mode 100644 index 08d5f83..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/fhirXml.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "fhirXml", - "title": "FHIR XML", - "description": "Marshall and unmarshall FHIR objects to\/from XML.", - "deprecated": false, - "firstVersion": "2.21.0", - "label": "dataformat,transformation,hl7,xml", - "javaType": "org.apache.camel.model.dataformat.FhirXmlDataFormat", - "input": false, - "output": false - }, - "properties": { - "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_1", "DSTU2_HL7ORG", "DSTU3", "R4" ], "deprecated": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." }, - "serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." }, - "omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resources will still have local IDs but the outer\/containing ID will not have an ID." }, - "encodeElementsAppliesToChildResourcesOnly": { "kind": "attribute", "displayName": "Encode Elements Applies To Child Resources Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), the values supplied to setEncodeElements(Set) will not be applied to the root resource (typically a Bundle), but will be applied to any sub-resources contained within it (i.e. search result resources in that bundle)" }, - "encodeElements": { "kind": "attribute", "displayName": "Encode Elements", "required": false, "type": "object", "javaType": "java.util.Set", "deprecated": false, "secret": false, "description": "If provided, specifies the elements which should be encoded, to the exclusion of all others. Valid values for this field would include: Patient - Encode patient and all its children Patient.name - Encode only the patient's name Patient.name.family - Encode only the patient's family name .text - Encode the text element on any resource (only the very first position may contain a wildcard) .(mandatory) - This is a special case which causes any mandatory fields (min 0) to be encoded" }, - "dontEncodeElements": { "kind": "attribute", "displayName": "Dont Encode Elements", "required": false, "type": "object", "javaType": "java.util.Set", "deprecated": false, "secret": false, "description": "If provided, specifies the elements which should NOT be encoded. Valid values for this field would include: Patient - Don't encode patient and all its children Patient.name - Don't encode the patient's name Patient.name.family - Don't encode the patient's family name .text - Don't encode the text element on any resource (only the very first position may contain a wildcard) DSTU2 note: Note that values including meta, such as Patient.meta will work for DSTU2 parsers, but values with subelements on meta such as Patient.meta.lastUpdated will only work in DSTU3 mode." }, - "stripVersionsFromReferences": { "kind": "attribute", "displayName": "Strip Versions From References", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (which is the default), resource references containing a version will have the version removed when the resource is encoded. This is generally good behaviour because in most situations, references from one resource to another should be to the resource by ID, not by ID and version. In some cases though, it may be desirable to preserve the version in resource links. In that case, this value should be set to false. This method provides the ability to globally disable reference encoding. If finer-grained control is needed, use setDontStripVersionsFromReferencesAtPaths(List)" }, - "overrideResourceIdWithBundleEntryFullUrl": { "kind": "attribute", "displayName": "Override Resource Id With Bundle Entry Full Url", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (which is the default), the Bundle.entry.fullUrl will override the Bundle.entry.resource's resource id if the fullUrl is defined. This behavior happens when parsing the source data into a Bundle object. Set this to false if this is not the desired behavior (e.g. the client code wishes to perform additional validation checks between the fullUrl and the resource id)." }, - "summaryMode": { "kind": "attribute", "displayName": "Summary Mode", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included." }, - "suppressNarratives": { "kind": "attribute", "displayName": "Suppress Narratives", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), narratives will not be included in the encoded values." }, - "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute", "displayName": "Dont Strip Versions From References At Paths", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing process. This method provides a finer-grained level of control than setStripVersionsFromReferences(String) and any paths specified by this method will be encoded even if setStripVersionsFromReferences(String) has been set to true (which is the default)" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json deleted file mode 100644 index 0dfe4fd..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "flatpack", - "title": "Flatpack", - "description": "Marshal and unmarshal Java lists and maps to\/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.", - "deprecated": false, - "firstVersion": "2.1.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.FlatpackDataFormat", - "input": false, - "output": false - }, - "properties": { - "definition": { "kind": "attribute", "displayName": "Definition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The flatpack pzmap configuration file. Can be omitted in simpler situations, but its preferred to use the pzmap." }, - "fixed": { "kind": "attribute", "displayName": "Fixed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Delimited or fixed. Is by default false = delimited" }, - "ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." }, - "textQualifier": { "kind": "attribute", "displayName": "Text Qualifier", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." }, - "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "The delimiter char (could be ; , or similar)" }, - "allowShortLines": { "kind": "attribute", "displayName": "Allow Short Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" }, - "ignoreExtraColumns": { "kind": "attribute", "displayName": "Ignore Extra Columns", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." }, - "parserFactoryRef": { "kind": "attribute", "displayName": "Parser Factory Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/grok.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/grok.json deleted file mode 100644 index 0d90491..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/grok.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "grok", - "title": "Grok", - "description": "Unmarshal unstructured data to objects using Logstash based Grok patterns.", - "deprecated": false, - "firstVersion": "3.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.GrokDataFormat", - "input": false, - "output": false - }, - "properties": { - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The grok pattern to match lines of input" }, - "flattened": { "kind": "attribute", "displayName": "Flattened", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key." }, - "allowMultipleMatchesPerLine": { "kind": "attribute", "displayName": "Allow Multiple Matches Per Line", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used." }, - "namedOnly": { "kind": "attribute", "displayName": "Named Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to capture named expressions only or not (i.e. %{IP:ip} but not ${IP})" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json deleted file mode 100644 index a721112..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "gzipdeflater", - "title": "GZip Deflater", - "description": "Compress and decompress messages using java.util.zip.GZIPStream.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.GzipDataFormat", - "input": false, - "output": false - }, - "properties": { - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/hl7.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/hl7.json deleted file mode 100644 index eeb8d11..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/hl7.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "hl7", - "title": "HL7", - "description": "Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation,hl7", - "javaType": "org.apache.camel.model.dataformat.HL7DataFormat", - "input": false, - "output": false - }, - "properties": { - "validate": { "kind": "attribute", "displayName": "Validate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/ical.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/ical.json deleted file mode 100644 index 3519651..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/ical.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "ical", - "title": "iCal", - "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects provided by the iCal4j library.", - "deprecated": false, - "firstVersion": "2.12.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.IcalDataFormat", - "input": false, - "output": false - }, - "properties": { - "validating": { "kind": "attribute", "displayName": "Validating", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to validate." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json deleted file mode 100644 index 0b2462a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "jacksonxml", - "title": "JacksonXML", - "description": "Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.", - "deprecated": false, - "firstVersion": "2.16.0", - "label": "dataformat,transformation,xml", - "javaType": "org.apache.camel.model.dataformat.JacksonXMLDataFormat", - "input": false, - "output": false - }, - "properties": { - "xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing XmlMapper with the given id." }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, - "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }, - "jsonView": { "kind": "attribute", "displayName": "Json View", "required": false, "type": "string", "javaType": "java.lang.Class", "deprecated": false, "secret": false, "description": "When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations" }, - "include": { "kind": "attribute", "displayName": "Include", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL" }, - "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." }, - "collectionTypeName": { "kind": "attribute", "displayName": "Collection Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default." }, - "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." }, - "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." }, - "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma." }, - "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." }, - "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index deleted file mode 100644 index 3c81a9c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -ASN1DataFormat -Any23DataFormat -Any23Type -AvroDataFormat -BarcodeDataFormat -Base64DataFormat -BeanioDataFormat -BindyDataFormat -BindyType -CBORDataFormat -CryptoDataFormat -CsvDataFormat -CustomDataFormat -DataFormatsDefinition -FhirJsonDataFormat -FhirXmlDataFormat -FlatpackDataFormat -GrokDataFormat -GzipDataFormat -HL7DataFormat -IcalDataFormat -JacksonXMLDataFormat -JaxbDataFormat -JsonApiDataFormat -JsonDataFormat -JsonLibrary -LZFDataFormat -MimeMultipartDataFormat -PGPDataFormat -ProtobufDataFormat -RssDataFormat -SoapJaxbDataFormat -SyslogDataFormat -TarFileDataFormat -ThriftDataFormat -TidyMarkupDataFormat -UniVocityCsvDataFormat -UniVocityFixedWidthDataFormat -UniVocityHeader -UniVocityTsvDataFormat -XMLSecurityDataFormat -XStreamDataFormat -XmlRpcDataFormat -YAMLDataFormat -YAMLLibrary -YAMLTypeFilterDefinition -YAMLTypeFilterType -ZipDeflaterDataFormat -ZipFileDataFormat diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json deleted file mode 100644 index 653ec01..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "jaxb", - "title": "JAXB", - "description": "Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.", - "deprecated": false, - "firstVersion": "1.0.0", - "label": "dataformat,transformation,xml", - "javaType": "org.apache.camel.model.dataformat.JaxbDataFormat", - "input": false, - "output": false - }, - "properties": { - "contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Package name where your JAXB classes are located." }, - "contextPathIsClassName": { "kind": "attribute", "displayName": "Context Path Is Class Name", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This can be set to true to mark that the contextPath is referring to a classname and not a package name." }, - "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." }, - "schemaSeverityLevel": { "kind": "attribute", "displayName": "Schema Severity Level", "required": false, "type": "enum", "javaType": "java.lang.Integer", "enum": [ "0", "1", "2" ], "deprecated": false, "secret": false, "defaultValue": "0", "description": "Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default value of 0 (warning) means that any error (warning, error or fatal error) will trigger JAXB to stop. There are the following three levels: 0=warning, 1=error, 2=fatal error." }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, - "objectFactory": { "kind": "attribute", "displayName": "Object Factory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files." }, - "ignoreJAXBElement": { "kind": "attribute", "displayName": "Ignore JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." }, - "mustBeJAXBElement": { "kind": "attribute", "displayName": "Must Be JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." }, - "filterNonXmlChars": { "kind": "attribute", "displayName": "Filter Non Xml Chars", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." }, - "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To overrule and use a specific encoding" }, - "fragment": { "kind": "attribute", "displayName": "Fragment", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does not have XmlRootElement annotation, sometimes you need unmarshall only part of tree. In that case you can use partial unmarshalling. To enable this behaviours you need set property partClass. Camel will pass this class to JAXB's unmarshaler." }, - "partClass": { "kind": "attribute", "displayName": "Part Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." }, - "partNamespace": { "kind": "attribute", "displayName": "Part Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." }, - "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." }, - "xmlStreamWriterWrapper": { "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom xml stream writer." }, - "schemaLocation": { "kind": "attribute", "displayName": "Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the location of the schema" }, - "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the location of the namespaceless schema" }, - "jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb Provider Properties", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom java.util.Map to lookup in the registry containing custom JAXB provider properties to be used with the JAXB marshaller." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/json.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/json.json deleted file mode 100644 index 17820b4..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/json.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "json", - "title": "JSon", - "description": "Marshal POJOs to JSON and back.", - "deprecated": false, - "label": "dataformat,transformation,json", - "javaType": "org.apache.camel.model.dataformat.JsonDataFormat", - "input": false, - "output": false - }, - "properties": { - "objectMapper": { "kind": "attribute", "displayName": "Object Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing ObjectMapper with the given id when using Jackson." }, - "useDefaultObjectMapper": { "kind": "attribute", "displayName": "Use Default Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to lookup and use default Jackson ObjectMapper from the registry." }, - "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." }, - "library": { "kind": "attribute", "displayName": "Library", "required": false, "type": "enum", "javaType": "org.apache.camel.model.dataformat.JsonLibrary", "enum": [ "Fastjson", "Gson", "Jackson", "Johnzon", "XStream" ], "deprecated": false, "secret": false, "defaultValue": "Jackson", "description": "Which json library to use." }, - "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }, - "jsonView": { "kind": "attribute", "displayName": "Json View", "required": false, "type": "string", "javaType": "java.lang.Class", "deprecated": false, "secret": false, "description": "When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations" }, - "include": { "kind": "attribute", "displayName": "Include", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL" }, - "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." }, - "collectionTypeName": { "kind": "attribute", "displayName": "Collection Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default." }, - "useList": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." }, - "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma." }, - "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." }, - "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma" }, - "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specfy com.foo.. Multiple permissions can be configured separated by comma, such as com.foo.,-com.foo.bar.MySecretBean. The following default permission is always included: -,java.lang.,java.util. unless its overridden by specifying a JVM system property with they key org.apache.camel.xstream.permissions." }, - "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." }, - "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." }, - "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" }, - "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSON output." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json deleted file mode 100644 index 8d32c0d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/jsonApi.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "jsonApi", - "title": "JSonApi", - "description": "Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.", - "deprecated": false, - "firstVersion": "3.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.JsonApiDataFormat", - "input": false, - "output": false - }, - "properties": { - "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class[]", "deprecated": false, "secret": false, "description": "The classes to take into account for the marshalling" }, - "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class", "deprecated": false, "secret": false, "description": "The classes to take into account while unmarshalling" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/lzf.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/lzf.json deleted file mode 100644 index 7d6bd03..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/lzf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "lzf", - "title": "LZF Deflate Compression", - "description": "Compress and decompress streams using LZF deflate algorithm.", - "deprecated": false, - "firstVersion": "2.17.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.LZFDataFormat", - "input": false, - "output": false - }, - "properties": { - "usingParallelCompression": { "kind": "attribute", "displayName": "Using Parallel Compression", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enable encoding (compress) using multiple processing cores." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json deleted file mode 100644 index b01c2d5..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/mime-multipart.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "mime-multipart", - "title": "MIME Multipart", - "description": "Marshal Camel messages with attachments into MIME-Multipart messages and back.", - "deprecated": false, - "firstVersion": "2.17.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.MimeMultipartDataFormat", - "input": false, - "output": false - }, - "properties": { - "multipartSubType": { "kind": "attribute", "displayName": "Multipart Sub Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "mixed", "description": "Specify the subtype of the MIME Multipart. Default is mixed." }, - "multipartWithoutAttachment": { "kind": "attribute", "displayName": "Multipart Without Attachment", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Defines whether a message without attachment is also marshaled into a MIME Multipart (with only one body part). Default is false." }, - "headersInline": { "kind": "attribute", "displayName": "Headers Inline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Defines whether the MIME-Multipart headers are part of the message body (true) or are set as Camel headers (false). Default is false." }, - "includeHeaders": { "kind": "attribute", "displayName": "Include Headers", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A regex that defines which Camel headers are also included as MIME headers into the MIME multipart. This will only work if headersInline is set to true. Default is to include no headers" }, - "binaryContent": { "kind": "attribute", "displayName": "Binary Content", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Defines whether the content of binary parts in the MIME multipart is binary (true) or Base-64 encoded (false) Default is false." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/pgp.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/pgp.json deleted file mode 100644 index b8e30e8..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/pgp.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "pgp", - "title": "PGP", - "description": "Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.", - "deprecated": false, - "firstVersion": "2.9.0", - "label": "dataformat,transformation,security", - "javaType": "org.apache.camel.model.dataformat.PGPDataFormat", - "input": false, - "output": false - }, - "properties": { - "keyUserid": { "kind": "attribute", "displayName": "Key Userid", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user ID of the key in the PGP keyring used during encryption. Can also be only a part of a user ID. For example, if the user ID is Test User then you can use the part Test User or to address the user ID." }, - "signatureKeyUserid": { "kind": "attribute", "displayName": "Signature Key Userid", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "User ID of the key in the PGP keyring used for signing (during encryption) or signature verification (during decryption). During the signature verification process the specified User ID restricts the public keys from the public keyring which can be used for the verification. If no User ID is specified for the signature verficiation then any public key in the public keyring can be used for the verification. Can also be only a part of a user ID. For example, if the user ID is Test User then you can use the part Test User or to address the User ID." }, - "password": { "kind": "attribute", "displayName": "Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Password used when opening the private key (not used for encryption)." }, - "signaturePassword": { "kind": "attribute", "displayName": "Signature Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Password used when opening the private key used for signing (during encryption)." }, - "keyFileName": { "kind": "attribute", "displayName": "Key File Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the file: prefix)." }, - "signatureKeyFileName": { "kind": "attribute", "displayName": "Signature Key File Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Filename of the keyring to use for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using the file: prefix)." }, - "signatureKeyRing": { "kind": "attribute", "displayName": "Signature Key Ring", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Keyring used for signing\/verifying as byte array. You can not set the signatureKeyFileName and signatureKeyRing at the same time." }, - "armored": { "kind": "attribute", "displayName": "Armored", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This option will cause PGP to base64 encode the encrypted text, making it available for copy\/paste, etc." }, - "integrity": { "kind": "attribute", "displayName": "Integrity", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Adds an integrity check\/sign into the encryption file. The default value is true." }, - "provider": { "kind": "attribute", "displayName": "Provider", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Java Cryptography Extension (JCE) provider, default is Bouncy Castle (BC). Alternatively you can use, for example, the IAIK JCE provider; in this case the provider must be registered beforehand and the Bouncy Castle provider must not be registered beforehand. The Sun JCE provider does not work." }, - "algorithm": { "kind": "attribute", "displayName": "Algorithm", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Symmetric key encryption algorithm; possible values are defined in org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encrypting." }, - "compressionAlgorithm": { "kind": "attribute", "displayName": "Compression Algorithm", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Compression algorithm; possible values are defined in org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting." }, - "hashAlgorithm": { "kind": "attribute", "displayName": "Hash Algorithm", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Signature hash algorithm; possible values are defined in org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing." }, - "signatureVerificationOption": { "kind": "attribute", "displayName": "Signature Verification Option", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Controls the behavior for verifying the signature during unmarshaling. There are 4 values possible: optional: The PGP message may or may not contain signatures; if it does contain signatures, then a signature verification is executed. required: The PGP message must contain at least one signature; if this is not the case an exception (PGPException) is thrown. A signature verification is executed. ignore: Contained signatures in the PGP message are ignored; no signature verification is executed. no_signature_allowed: The PGP message must not contain a signature; otherwise an exception (PGPException) is thrown." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json deleted file mode 100644 index 472794f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/protobuf.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "protobuf", - "title": "Protobuf", - "description": "Serialize and deserialize Java objects using Google's Protocol buffers.", - "deprecated": false, - "firstVersion": "2.2.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.ProtobufDataFormat", - "input": false, - "output": false - }, - "properties": { - "instanceClass": { "kind": "attribute", "displayName": "Instance Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" }, - "contentTypeFormat": { "kind": "attribute", "displayName": "Content Type Format", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "json", "native" ], "deprecated": false, "secret": false, "defaultValue": "native", "description": "Defines a content type format in which protobuf message will be serialized\/deserialized from(to) the Java been. The format can either be native or json for either native protobuf or json fields representation. The default value is native." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/rss.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/rss.json deleted file mode 100644 index 85ec7df..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/rss.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "rss", - "title": "RSS", - "description": "Transform from ROME SyndFeed Java Objects to XML and vice-versa.", - "deprecated": false, - "firstVersion": "2.1.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.RssDataFormat", - "input": false, - "output": false - }, - "properties": { - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json deleted file mode 100644 index 7bf4ec2..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "secureXML", - "title": "XML Security", - "description": "Encrypt and decrypt XML payloads using Apache Santuario.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation,xml,security", - "javaType": "org.apache.camel.model.dataformat.XMLSecurityDataFormat", - "input": false, - "output": false - }, - "properties": { - "xmlCipherAlgorithm": { "kind": "attribute", "displayName": "Xml Cipher Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "AES-256-GCM", "description": "The cipher algorithm to be used for encryption\/decryption of the XML message content. The available choices are: XMLCipher.TRIPLEDES XMLCipher.AES_128 XMLCipher.AES_128_GCM XMLCipher.AES_192 XMLCipher.AES_192_GCM XMLCipher.AES_256 XMLCipher.AES_256_GCM XMLCipher.SEED_128 XMLCipher.CAMELLIA_128 XMLCipher.CAMELLIA_192 XMLCipher.CAMELLIA_256 The default value is XMLCipher.AES_256_GCM" }, - "passPhrase": { "kind": "attribute", "displayName": "Pass Phrase", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A String used as passPhrase to encrypt\/decrypt content. The passPhrase has to be provided. The passPhrase needs to be put together in conjunction with the appropriate encryption algorithm. For example using TRIPLEDES the passPhase can be a Only another 24 Byte key" }, - "passPhraseByte": { "kind": "attribute", "displayName": "Pass Phrase Byte", "required": false, "type": "string", "javaType": "byte[]", "deprecated": false, "secret": false, "description": "A byte used as passPhrase to encrypt\/decrypt content. The passPhrase has to be provided. The passPhrase needs to be put together in conjunction with the appropriate encryption algorithm. For example using TRIPLEDES the passPhase can be a Only another 24 Byte key" }, - "secureTag": { "kind": "attribute", "displayName": "Secure Tag", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The XPath reference to the XML Element selected for encryption\/decryption. If no tag is specified, the entire payload is encrypted\/decrypted." }, - "secureTagContents": { "kind": "attribute", "displayName": "Secure Tag Contents", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "A boolean value to specify whether the XML Element is to be encrypted or the contents of the XML Element false = Element Level true = Element Content Level" }, - "keyCipherAlgorithm": { "kind": "attribute", "displayName": "Key Cipher Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "RSA_OAEP", "description": "The cipher algorithm to be used for encryption\/decryption of the asymmetric key. The available choices are: XMLCipher.RSA_v1dot5 XMLCipher.RSA_OAEP XMLCipher.RSA_OAEP_11 The default value is XMLCipher.RSA_OAEP" }, - "recipientKeyAlias": { "kind": "attribute", "displayName": "Recipient Key Alias", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The key alias to be used when retrieving the recipient's public or private key from a KeyStore when performing asymmetric key encryption or decryption." }, - "keyOrTrustStoreParametersRef": { "kind": "attribute", "displayName": "Key Or Trust Store Parameters Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a KeyStore instance to lookup in the registry, which is used for configuration options for creating and loading a KeyStore instance that represents the sender's trustStore or recipient's keyStore." }, - "keyPassword": { "kind": "attribute", "displayName": "Key Password", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password to be used for retrieving the private key from the KeyStore. This key is used for asymmetric decryption." }, - "digestAlgorithm": { "kind": "attribute", "displayName": "Digest Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "SHA1", "description": "The digest algorithm to use with the RSA OAEP algorithm. The available choices are: XMLCipher.SHA1 XMLCipher.SHA256 XMLCipher.SHA512 The default value is XMLCipher.SHA1" }, - "mgfAlgorithm": { "kind": "attribute", "displayName": "Mgf Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "MGF1_SHA1", "description": "The MGF Algorithm to use with the RSA OAEP algorithm. The available choices are: EncryptionConstants.MGF1_SHA1 EncryptionConstants.MGF1_SHA256 EncryptionConstants.MGF1_SHA512 The default value is EncryptionConstants.MGF1_SHA1" }, - "addKeyValueForEncryptedKey": { "kind": "attribute", "displayName": "Add Key Value For Encrypted Key", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to add the public key used to encrypt the session key as a KeyValue in the EncryptedKey structure or not." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json deleted file mode 100644 index 5cb95ba..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/soapjaxb.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "soapjaxb", - "title": "SOAP", - "description": "Marshal Java objects to SOAP messages and back.", - "deprecated": false, - "firstVersion": "2.3.0", - "label": "dataformat,transformation,xml", - "javaType": "org.apache.camel.model.dataformat.SoapJaxbDataFormat", - "input": false, - "output": false - }, - "properties": { - "contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Package name where your JAXB classes are located." }, - "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To overrule and use a specific encoding" }, - "elementNameStrategyRef": { "kind": "attribute", "displayName": "Element Name Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an element strategy to lookup from the registry. An element name strategy is used for two purposes. The first is to find a xml element name for a given object and soap action when marshaling the object into a SOAP message. The second is to find an Exception class for a given soap fault name. The following three element strategy class name is provided out of the box. QNameStrategy - Uses a fixed qName that is configured on instantiation. Exception lookup is not supported TypeNameStrategy - Uses the name and namespace from the XMLType annotation of the given type. If no namespace is set then package-info is used. Exception lookup is not supported ServiceInterfaceStrategy - Uses information from a webservice interface to determine the type name and to find the exception class for a SOAP fault All three classes is located in the package name org.apache.camel.dataformat.soap.name If you have generated the web service stub code with cxf-codegen or a similar tool then you probably will want to use the ServiceInterfaceStrategy. In the case you have no annotated service interface you should use QNameStrategy or TypeNameStrategy." }, - "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" }, - "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." }, - "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/syslog.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/syslog.json deleted file mode 100644 index 9b30fac..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/syslog.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "syslog", - "title": "Syslog", - "description": "Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.", - "deprecated": false, - "firstVersion": "2.6.0", - "label": "dataformat,transformation,monitoring", - "javaType": "org.apache.camel.model.dataformat.SyslogDataFormat", - "input": false, - "output": false - }, - "properties": { - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json deleted file mode 100644 index a5515d5..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tarfile.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "tarfile", - "title": "Tar File", - "description": "Archive files into tarballs or extract files from tarballs.", - "deprecated": false, - "firstVersion": "2.16.0", - "label": "dataformat,transformation,file", - "javaType": "org.apache.camel.model.dataformat.TarFileDataFormat", - "input": false, - "output": false - }, - "properties": { - "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the tar file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." }, - "allowEmptyDirectory": { "kind": "attribute", "displayName": "Allow Empty Directory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the tar file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty" }, - "preservePathElements": { "kind": "attribute", "displayName": "Preserve Path Elements", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the file name contains path elements, setting this option to true, allows the path to be maintained in the tar file." }, - "maxDecompressedSize": { "kind": "attribute", "displayName": "Max Decompressed Size", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Set the maximum decompressed size of a tar file (in bytes). An IOException will be thrown if the decompressed size exceeds this amount. Set to -1 to disable setting a maximum decompressed size. By default there is no maximum size enforced." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/thrift.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/thrift.json deleted file mode 100644 index ad08823..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/thrift.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "thrift", - "title": "Thrift", - "description": "Serialize and deserialize messages using Apache Thrift binary data format.", - "deprecated": false, - "firstVersion": "2.20.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.ThriftDataFormat", - "input": false, - "output": false - }, - "properties": { - "instanceClass": { "kind": "attribute", "displayName": "Instance Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" }, - "contentTypeFormat": { "kind": "attribute", "displayName": "Content Type Format", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "binary", "json", "sjson" ], "deprecated": false, "secret": false, "defaultValue": "binary", "description": "Defines a content type format in which thrift message will be serialized\/deserialized from(to) the Java been. The format can either be native or json for either native binary thrift, json or simple json fields representation. The default value is binary." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json deleted file mode 100644 index 17004e3..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/tidyMarkup.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "tidyMarkup", - "title": "TidyMarkup", - "description": "Parse (potentially invalid) HTML into valid HTML or DOM.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.TidyMarkupDataFormat", - "input": false, - "output": false - }, - "properties": { - "dataObjectType": { "kind": "attribute", "displayName": "Data Object Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "org.w3c.dom.Node", "description": "What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node" }, - "omitXmlDeclaration": { "kind": "attribute", "displayName": "Omit Xml Declaration", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When returning a String, do we omit the XML declaration in the top." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json deleted file mode 100644 index cb0bfea..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/typeFilter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "typeFilter", - "title": "YAML Type Filter", - "deprecated": false, - "label": "dataformat,transformation,yaml", - "javaType": "org.apache.camel.model.dataformat.YAMLTypeFilterDefinition", - "input": false, - "output": false - }, - "properties": { - "value": { "kind": "attribute", "displayName": "Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Value of type such as class name or regular expression" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "object", "javaType": "org.apache.camel.model.dataformat.YAMLTypeFilterType", "deprecated": false, "secret": false, "description": "Whether to filter by class type or regular expression" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json deleted file mode 100644 index de52bc0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "univocity-csv", - "title": "uniVocity CSV", - "description": "Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.", - "deprecated": false, - "firstVersion": "2.15.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.UniVocityCsvDataFormat", - "input": false, - "output": false - }, - "properties": { - "quoteAllFields": { "kind": "attribute", "displayName": "Quote All Fields", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not all values must be quoted when writing them." }, - "quote": { "kind": "attribute", "displayName": "Quote", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\"", "description": "The quote symbol." }, - "quoteEscape": { "kind": "attribute", "displayName": "Quote Escape", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\"", "description": "The quote escape symbol" }, - "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "The delimiter of values" }, - "nullValue": { "kind": "attribute", "displayName": "Null Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The string representation of a null value. The default value is null" }, - "skipEmptyLines": { "kind": "attribute", "displayName": "Skip Empty Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the empty lines must be ignored. The default value is true" }, - "ignoreTrailingWhitespaces": { "kind": "attribute", "displayName": "Ignore Trailing Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the trailing white spaces must ignored. The default value is true" }, - "ignoreLeadingWhitespaces": { "kind": "attribute", "displayName": "Ignore Leading Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the leading white spaces must be ignored. The default value is true" }, - "headersDisabled": { "kind": "attribute", "displayName": "Headers Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the headers are disabled. When defined, this option explicitly sets the headers as null which indicates that there is no header. The default value is false" }, - "headerExtractionEnabled": { "kind": "attribute", "displayName": "Header Extraction Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the header must be read in the first line of the test document The default value is false" }, - "numberOfRecordsToRead": { "kind": "attribute", "displayName": "Number Of Records To Read", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "The maximum number of record to read." }, - "emptyValue": { "kind": "attribute", "displayName": "Empty Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The String representation of an empty value" }, - "lineSeparator": { "kind": "attribute", "displayName": "Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The line separator of the files The default value is to use the JVM platform line separator" }, - "normalizedLineSeparator": { "kind": "attribute", "displayName": "Normalized Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\\n", "description": "The normalized line separator of the files The default value is a new line character." }, - "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" }, - "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" }, - "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json deleted file mode 100644 index a41bb1c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "univocity-fixed", - "title": "uniVocity Fixed Length", - "description": "Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.", - "deprecated": false, - "firstVersion": "2.15.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat", - "input": false, - "output": false - }, - "properties": { - "skipTrailingCharsUntilNewline": { "kind": "attribute", "displayName": "Skip Trailing Chars Until Newline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the trailing characters until new line must be ignored. The default value is false" }, - "recordEndsOnNewline": { "kind": "attribute", "displayName": "Record Ends On Newline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the record ends on new line. The default value is false" }, - "padding": { "kind": "attribute", "displayName": "Padding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The padding character. The default value is a space" }, - "nullValue": { "kind": "attribute", "displayName": "Null Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The string representation of a null value. The default value is null" }, - "skipEmptyLines": { "kind": "attribute", "displayName": "Skip Empty Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the empty lines must be ignored. The default value is true" }, - "ignoreTrailingWhitespaces": { "kind": "attribute", "displayName": "Ignore Trailing Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the trailing white spaces must ignored. The default value is true" }, - "ignoreLeadingWhitespaces": { "kind": "attribute", "displayName": "Ignore Leading Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the leading white spaces must be ignored. The default value is true" }, - "headersDisabled": { "kind": "attribute", "displayName": "Headers Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the headers are disabled. When defined, this option explicitly sets the headers as null which indicates that there is no header. The default value is false" }, - "headerExtractionEnabled": { "kind": "attribute", "displayName": "Header Extraction Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the header must be read in the first line of the test document The default value is false" }, - "numberOfRecordsToRead": { "kind": "attribute", "displayName": "Number Of Records To Read", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "The maximum number of record to read." }, - "emptyValue": { "kind": "attribute", "displayName": "Empty Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The String representation of an empty value" }, - "lineSeparator": { "kind": "attribute", "displayName": "Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The line separator of the files The default value is to use the JVM platform line separator" }, - "normalizedLineSeparator": { "kind": "attribute", "displayName": "Normalized Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\\n", "description": "The normalized line separator of the files The default value is a new line character." }, - "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" }, - "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" }, - "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json deleted file mode 100644 index 77b765a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-header.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "univocity-header", - "title": "uniVocity Header", - "description": "To configure headers for UniVocity data formats.", - "deprecated": false, - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.UniVocityHeader", - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "value", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Header name" }, - "length": { "kind": "attribute", "displayName": "Length", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Header length" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json deleted file mode 100644 index 0cdaafa..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/univocity-tsv.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "univocity-tsv", - "title": "uniVocity TSV", - "description": "Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.", - "deprecated": false, - "firstVersion": "2.15.0", - "label": "dataformat,transformation,csv", - "javaType": "org.apache.camel.model.dataformat.UniVocityTsvDataFormat", - "input": false, - "output": false - }, - "properties": { - "escapeChar": { "kind": "attribute", "displayName": "Escape Char", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\\", "description": "The escape character." }, - "nullValue": { "kind": "attribute", "displayName": "Null Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The string representation of a null value. The default value is null" }, - "skipEmptyLines": { "kind": "attribute", "displayName": "Skip Empty Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the empty lines must be ignored. The default value is true" }, - "ignoreTrailingWhitespaces": { "kind": "attribute", "displayName": "Ignore Trailing Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the trailing white spaces must ignored. The default value is true" }, - "ignoreLeadingWhitespaces": { "kind": "attribute", "displayName": "Ignore Leading Whitespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the leading white spaces must be ignored. The default value is true" }, - "headersDisabled": { "kind": "attribute", "displayName": "Headers Disabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the headers are disabled. When defined, this option explicitly sets the headers as null which indicates that there is no header. The default value is false" }, - "headerExtractionEnabled": { "kind": "attribute", "displayName": "Header Extraction Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the header must be read in the first line of the test document The default value is false" }, - "numberOfRecordsToRead": { "kind": "attribute", "displayName": "Number Of Records To Read", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "The maximum number of record to read." }, - "emptyValue": { "kind": "attribute", "displayName": "Empty Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The String representation of an empty value" }, - "lineSeparator": { "kind": "attribute", "displayName": "Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The line separator of the files The default value is to use the JVM platform line separator" }, - "normalizedLineSeparator": { "kind": "attribute", "displayName": "Normalized Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\\n", "description": "The normalized line separator of the files The default value is a new line character." }, - "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" }, - "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" }, - "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json deleted file mode 100644 index 4d3e08e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xmlrpc", - "title": "XML RPC", - "description": "Marshal and unmarshal XML RPC protocol requests or responses.", - "deprecated": false, - "firstVersion": "2.11.0", - "label": "dataformat,transformation,xml", - "javaType": "org.apache.camel.model.dataformat.XmlRpcDataFormat", - "input": false, - "output": false - }, - "properties": { - "request": { "kind": "attribute", "displayName": "Request", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to marshal\/unmarshal request or response Is by default false" }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xstream.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xstream.json deleted file mode 100644 index 833820d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/xstream.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xstream", - "title": "XStream", - "description": "Marshal and unmarshal POJOs to\/from XML using XStream library.", - "deprecated": false, - "firstVersion": "1.3.0", - "label": "dataformat,transformation,xml,json", - "javaType": "org.apache.camel.model.dataformat.XStreamDataFormat", - "input": false, - "output": false - }, - "properties": { - "permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus sign is allow, and minus sign is deny. Wildcards is supported by using . as prefix. For example to allow com.foo and all subpackages then specify com.foo.. Multiple permissions can be configured separated by comma, such as com.foo.,-com.foo.bar.MySecretBean. The following default permission is always included: -,java.lang.,java.util. unless its overridden by specifying a JVM system property with they key org.apache.camel.xstream.permissions." }, - "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the encoding to use" }, - "driver": { "kind": "attribute", "displayName": "Driver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom XStream driver. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" }, - "driverRef": { "kind": "attribute", "displayName": "Driver Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To refer to a custom XStream driver to lookup in the registry. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" }, - "mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Mode for dealing with duplicate references The possible values are: NO_REFERENCES ID_REFERENCES XPATH_RELATIVE_REFERENCES XPATH_ABSOLUTE_REFERENCES SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" }, - "converters": { "kind": "element", "displayName": "Converters", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter" }, - "aliases": { "kind": "element", "displayName": "Aliases", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Alias a Class to a shorter name to be used in XML elements." }, - "omitFields": { "kind": "element", "displayName": "Omit Fields", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma." }, - "implicitCollections": { "kind": "element", "displayName": "Implicit Collections", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/yaml.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/yaml.json deleted file mode 100644 index 8607448..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/yaml.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "yaml", - "title": "YAML", - "description": "Marshal and unmarshal Java objects to and from YAML.", - "deprecated": false, - "firstVersion": "2.17.0", - "label": "dataformat,transformation,yaml", - "javaType": "org.apache.camel.model.dataformat.YAMLDataFormat", - "input": false, - "output": false - }, - "properties": { - "library": { "kind": "attribute", "displayName": "Library", "required": false, "type": "enum", "javaType": "org.apache.camel.model.dataformat.YAMLLibrary", "enum": [ "SnakeYAML" ], "deprecated": false, "secret": false, "defaultValue": "SnakeYAML", "description": "Which yaml library to use. By default it is SnakeYAML" }, - "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }, - "constructor": { "kind": "attribute", "displayName": "Constructor", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "BaseConstructor to construct incoming documents." }, - "representer": { "kind": "attribute", "displayName": "Representer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Representer to emit outgoing objects." }, - "dumperOptions": { "kind": "attribute", "displayName": "Dumper Options", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "DumperOptions to configure outgoing objects." }, - "resolver": { "kind": "attribute", "displayName": "Resolver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Resolver to detect implicit type" }, - "useApplicationContextClassLoader": { "kind": "attribute", "displayName": "Use Application Context Class Loader", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Use ApplicationContextClassLoader as custom ClassLoader" }, - "prettyFlow": { "kind": "attribute", "displayName": "Pretty Flow", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Force the emitter to produce a pretty YAML document when using the flow style." }, - "allowAnyType": { "kind": "attribute", "displayName": "Allow Any Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allow any class to be un-marshaled" }, - "typeFilter": { "kind": "element", "displayName": "Type Filter", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Set the types SnakeYAML is allowed to un-marshall" }, - "maxAliasesForCollections": { "kind": "attribute", "displayName": "Max Aliases For Collections", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "50", "description": "Set the maximum amount of aliases allowed for collections." }, - "allowRecursiveKeys": { "kind": "attribute", "displayName": "Allow Recursive Keys", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Set whether recursive keys are allowed." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json deleted file mode 100644 index f2c92ae..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipdeflater.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "zipdeflater", - "title": "Zip Deflate Compression", - "description": "Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.", - "deprecated": false, - "firstVersion": "2.12.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.ZipDeflaterDataFormat", - "input": false, - "output": false - }, - "properties": { - "compressionLevel": { "kind": "attribute", "displayName": "Compression Level", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is best compression." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json deleted file mode 100644 index 033577e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "zipfile", - "title": "Zip File", - "description": "Compression and decompress streams using java.util.zip.ZipStream.", - "deprecated": false, - "firstVersion": "2.11.0", - "label": "dataformat,transformation,file", - "javaType": "org.apache.camel.model.dataformat.ZipFileDataFormat", - "input": false, - "output": false - }, - "properties": { - "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." }, - "allowEmptyDirectory": { "kind": "attribute", "displayName": "Allow Empty Directory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty" }, - "preservePathElements": { "kind": "attribute", "displayName": "Preserve Path Elements", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the file name contains path elements, setting this option to true, allows the path to be maintained in the zip file." }, - "maxDecompressedSize": { "kind": "attribute", "displayName": "Max Decompressed Size", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Set the maximum decompressed size of a zip file (in bytes). An IOException will be thrown if the decompressed size exceeds this amount. Set to -1 to disable setting a maximum decompressed size. By default there is no maximum size enforced." }, - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/delay.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/delay.json deleted file mode 100644 index ce12b2a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/delay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "delay", - "title": "Delay", - "description": "Delays processing for a specified length of time", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.DelayDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to define how long time to wait (in millis)" }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom Thread Pool if asyncDelay has been enabled." }, - "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Enables asynchronous delay which means the thread will not block while delaying." }, - "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller Runs When Rejected", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the caller should run the task when it was rejected by the thread pool. Is by default true" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/description.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/description.json deleted file mode 100644 index 516e8b4..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/description.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "description", - "title": "Description", - "description": "To provide comments about the node.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.DescriptionDefinition", - "input": false, - "output": false - }, - "properties": { - "lang": { "kind": "attribute", "displayName": "Lang", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Language, such as en for english." }, - "text": { "kind": "value", "displayName": "Text", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The description as human readable text" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doCatch.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doCatch.json deleted file mode 100644 index 6f3bc1b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doCatch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "doCatch", - "title": "Do Catch", - "description": "Catches exceptions as part of a try, catch, finally block", - "deprecated": false, - "label": "error", - "javaType": "org.apache.camel.model.CatchDefinition", - "input": true, - "output": false - }, - "properties": { - "exception": { "kind": "element", "displayName": "Exception", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "The exception(s) to catch." }, - "onWhen": { "kind": "element", "displayName": "On When", "required": false, "type": "object", "javaType": "org.apache.camel.model.WhenDefinition", "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets an additional predicate that should be true before the onCatch is triggered. To be used for fine grained controlling whether a thrown exception should be intercepted by this exception type or not." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doFinally.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doFinally.json deleted file mode 100644 index 304dc97..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doFinally.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "doFinally", - "title": "Do Finally", - "description": "Path traversed when a try, catch, finally block exits", - "deprecated": false, - "label": "error", - "javaType": "org.apache.camel.model.FinallyDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doTry.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doTry.json deleted file mode 100644 index 4862446..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/doTry.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "doTry", - "title": "Do Try", - "description": "Marks the beginning of a try, catch, finally block", - "deprecated": false, - "label": "error", - "javaType": "org.apache.camel.model.TryDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dynamicRouter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dynamicRouter.json deleted file mode 100644 index c0cbdac..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/dynamicRouter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "dynamicRouter", - "title": "Dynamic Router", - "description": "Routes messages based on dynamic rules", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.DynamicRouterDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to call that returns the endpoint(s) to route to in the dynamic routing. Important: The expression will be called in a while loop fashion, until the expression returns null which means the dynamic router is finished." }, - "uriDelimiter": { "kind": "attribute", "displayName": "Uri Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "Sets the uri delimiter to use" }, - "ignoreInvalidEndpoints": { "kind": "attribute", "displayName": "Ignore Invalid Endpoints", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producers when using this dynamic router, when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/enrich.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/enrich.json deleted file mode 100644 index 554b840..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/enrich.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "enrich", - "title": "Enrich", - "description": "Enriches a message with data from a secondary resource", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.EnrichDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression that computes the endpoint uri to use as the resource endpoint to enrich from" }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an AggregationStrategy to be used to merge the reply from the external service, into a single outgoing message. By default Camel will use the reply from the external service as outgoing message." }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If this option is false then the aggregate method is not used if there was no data to enrich. If this option is true then null values is used as the oldExchange (when no data to enrich), when using POJOs as the AggregationStrategy." }, - "aggregateOnException": { "kind": "attribute", "displayName": "Aggregate On Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was an exception thrown while trying to retrieve the data to enrich from the resource. Setting this option to true allows end users to control what to do if there was an exception in the aggregate method. For example to suppress the exception or set a custom message body etc." }, - "shareUnitOfWork": { "kind": "attribute", "displayName": "Share Unit Of Work", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Shares the org.apache.camel.spi.UnitOfWork with the parent and the resource exchange. Enrich will by default not share unit of work between the parent exchange and the resource exchange. This means the resource exchange has its own individual unit of work." }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producer when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore Invalid Endpoint", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json deleted file mode 100644 index 0a02ef7..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "faultToleranceConfiguration", - "title": "Fault Tolerance Configuration", - "description": "MicroProfile Fault Tolerance Circuit Breaker EIP configuration", - "deprecated": false, - "label": "eip,routing,circuitbreaker", - "javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition", - "input": false, - "output": false - }, - "properties": { - "circuitBreakerRef": { "kind": "attribute", "displayName": "Circuit Breaker Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an existing io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." }, - "delay": { "kind": "attribute", "displayName": "Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "5s", "description": "Control how long the circuit breaker stays open. The value are in seconds and the default is 5 seconds." }, - "successThreshold": { "kind": "attribute", "displayName": "Success Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1", "description": "Controls the number of trial calls which are allowed when the circuit breaker is half-open" }, - "requestVolumeThreshold": { "kind": "attribute", "displayName": "Request Volume Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "20", "description": "Controls the size of the rolling window used when the circuit breaker is closed" }, - "failureRatio": { "kind": "attribute", "displayName": "Failure Ratio", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "50", "description": "Configures the failure rate threshold in percentage. If the failure rate is equal or greater than the threshold the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not greater than 100. Default value is 50 percentage." }, - "timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether timeout is enabled or not on the circuit breaker. Default is false." }, - "timeoutDuration": { "kind": "attribute", "displayName": "Timeout Duration", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Configures the thread execution timeout. Default value is 1 second." }, - "timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the pool size of the thread pool when timeout is enabled. Default value is 10." }, - "timeoutScheduledExecutorServiceRef": { "kind": "attribute", "displayName": "Timeout Scheduled Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to a custom thread pool to use when timeout is enabled" }, - "bulkheadEnabled": { "kind": "attribute", "displayName": "Bulkhead Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether bulkhead is enabled or not on the circuit breaker. Default is false." }, - "bulkheadMaxConcurrentCalls": { "kind": "attribute", "displayName": "Bulkhead Max Concurrent Calls", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the max amount of concurrent calls the bulkhead will support." }, - "bulkheadWaitingTaskQueue": { "kind": "attribute", "displayName": "Bulkhead Waiting Task Queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the task queue size for holding waiting tasks to be processed by the bulkhead." }, - "bulkheadExecutorServiceRef": { "kind": "attribute", "displayName": "Bulkhead Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to a custom thread pool to use when bulkhead is enabled." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/filter.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/filter.json deleted file mode 100644 index 95f2c5e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/filter.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "filter", - "title": "Filter", - "description": "Filter out messages based using a predicate", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.FilterDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Expression to determine if the message should be filtered or not. If the expression returns an empty value or false then the message is filtered (dropped), otherwise the message is continued being routed." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/from.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/from.json deleted file mode 100644 index 3977986..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/from.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "from", - "title": "From", - "description": "Act as a message source as input to a route", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.FromDefinition", - "input": false, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the URI of the endpoint to use" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOption.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOption.json deleted file mode 100644 index 03fbde6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOption.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "globalOption", - "title": "Global Option", - "description": "Models a string key\/value pair for configuring some global options on a Camel context such as max debug log length.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.GlobalOptionDefinition", - "input": false, - "output": false - }, - "properties": { - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Global option key" }, - "value": { "kind": "attribute", "displayName": "Value", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Global option value" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOptions.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOptions.json deleted file mode 100644 index 46f5d61..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/globalOptions.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "globalOptions", - "title": "Global Options", - "description": "Models a series of string key\/value pairs for configuring some global options on a Camel context such as max debug log length.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.GlobalOptionsDefinition", - "input": false, - "output": false - }, - "properties": { - "globalOption": { "kind": "element", "displayName": "Global Option", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "A series of global options as key value pairs" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json deleted file mode 100644 index 2faaab6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "hystrixConfiguration", - "title": "Hystrix Configuration", - "description": "Hystrix Circuit Breaker EIP configuration", - "deprecated": true, - "label": "eip,routing,circuitbreaker", - "javaType": "org.apache.camel.model.HystrixConfigurationDefinition", - "input": false, - "output": false - }, - "properties": { - "groupKey": { "kind": "attribute", "displayName": "Group Key", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelHystrix", "description": "Sets the group key to use. The default value is CamelHystrix." }, - "threadPoolKey": { "kind": "attribute", "displayName": "Thread Pool Key", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelHystrix", "description": "Sets the thread pool key to use. Will by default use the same value as groupKey has been configured to use." }, - "circuitBreakerEnabled": { "kind": "attribute", "displayName": "Circuit Breaker Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open\/closed, this property results in not even instantiating a circuit-breaker." }, - "circuitBreakerErrorThresholdPercentage": { "kind": "attribute", "displayName": "Circuit Breaker Error Threshold Percentage", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "50", "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()." }, - "circuitBreakerForceClosed": { "kind": "attribute", "displayName": "Circuit Breaker Force Closed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing." }, - "circuitBreakerForceOpen": { "kind": "attribute", "displayName": "Circuit Breaker Force Open", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();" }, - "circuitBreakerRequestVolumeThreshold": { "kind": "attribute", "displayName": "Circuit Breaker Request Volume Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "20", "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage." }, - "circuitBreakerSleepWindowInMilliseconds": { "kind": "attribute", "displayName": "Circuit Breaker Sleep Window In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "5000", "description": "The time in milliseconds after a HystrixCircuitBreaker trips open that it should wait before trying requests again." }, - "executionIsolationSemaphoreMaxConcurrentRequests": { "kind": "attribute", "displayName": "Execution Isolation Semaphore Max Concurrent Requests", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "20", "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE." }, - "executionIsolationStrategy": { "kind": "attribute", "displayName": "Execution Isolation Strategy", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "SEMAPHORE", "THREAD" ], "deprecated": false, "secret": false, "defaultValue": "THREAD", "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count." }, - "executionIsolationThreadInterruptOnTimeout": { "kind": "attribute", "displayName": "Execution Isolation Thread Interrupt On Timeout", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD." }, - "executionTimeoutInMilliseconds": { "kind": "attribute", "displayName": "Execution Timeout In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed." }, - "executionTimeoutEnabled": { "kind": "attribute", "displayName": "Execution Timeout Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the timeout mechanism is enabled for this command" }, - "fallbackIsolationSemaphoreMaxConcurrentRequests": { "kind": "attribute", "displayName": "Fallback Isolation Semaphore Max Concurrent Requests", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Number of concurrent requests permitted to HystrixCommand.getFallback(). Requests beyond the concurrent limit will fail-fast and not attempt retrieving a fallback." }, - "fallbackEnabled": { "kind": "attribute", "displayName": "Fallback Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether HystrixCommand.getFallback() should be attempted when failure occurs." }, - "metricsHealthSnapshotIntervalInMilliseconds": { "kind": "attribute", "displayName": "Metrics Health Snapshot Interval In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "500", "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated." }, - "metricsRollingPercentileBucketSize": { "kind": "attribute", "displayName": "Metrics Rolling Percentile Bucket Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Maximum number of values stored in each bucket of the rolling percentile. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics." }, - "metricsRollingPercentileEnabled": { "kind": "attribute", "displayName": "Metrics Rolling Percentile Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether percentile metrics should be captured using HystrixRollingPercentile inside HystrixCommandMetrics." }, - "metricsRollingPercentileWindowInMilliseconds": { "kind": "attribute", "displayName": "Metrics Rolling Percentile Window In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10000", "description": "Duration of percentile rolling window in milliseconds. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics." }, - "metricsRollingPercentileWindowBuckets": { "kind": "attribute", "displayName": "Metrics Rolling Percentile Window Buckets", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "6", "description": "Number of buckets the rolling percentile window is broken into. This is passed into HystrixRollingPercentile inside HystrixCommandMetrics." }, - "metricsRollingStatisticalWindowInMilliseconds": { "kind": "attribute", "displayName": "Metrics Rolling Statistical Window In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10000", "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments." }, - "metricsRollingStatisticalWindowBuckets": { "kind": "attribute", "displayName": "Metrics Rolling Statistical Window Buckets", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside HystrixCommandMetrics." }, - "requestLogEnabled": { "kind": "attribute", "displayName": "Request Log Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether HystrixCommand execution and events should be logged to HystrixRequestLog." }, - "corePoolSize": { "kind": "attribute", "displayName": "Core Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)" }, - "maximumSize": { "kind": "attribute", "displayName": "Maximum Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize" }, - "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1", "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)" }, - "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()." }, - "queueSizeRejectionThreshold": { "kind": "attribute", "displayName": "Queue Size Rejection Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "5", "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution." }, - "threadPoolRollingNumberStatisticalWindowInMilliseconds": { "kind": "attribute", "displayName": "Thread Pool Rolling Number Statistical Window In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10000", "description": "Duration of statistical rolling window in milliseconds. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance." }, - "threadPoolRollingNumberStatisticalWindowBuckets": { "kind": "attribute", "displayName": "Thread Pool Rolling Number Statistical Window Buckets", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Number of buckets the rolling statistical window is broken into. This is passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance." }, - "allowMaximumSizeToDivergeFromCoreSize": { "kind": "attribute", "displayName": "Allow Maximum Size To Diverge From Core Size", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows the configuration for maximumSize to take effect. That value can then be equal to, or higher, than coreSize" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/idempotentConsumer.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/idempotentConsumer.json deleted file mode 100644 index c3c979f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/idempotentConsumer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "idempotentConsumer", - "title": "Idempotent Consumer", - "description": "Filters out duplicate messages", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.IdempotentConsumerDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression used to calculate the correlation key to use for duplicate check. The Exchange which has the same correlation key is regarded as a duplicate and will be rejected." }, - "messageIdRepositoryRef": { "kind": "attribute", "displayName": "Message Id Repository Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the reference name of the message id repository" }, - "eager": { "kind": "attribute", "displayName": "Eager", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets whether to eagerly add the key to the idempotent repository or wait until the exchange is complete. Eager is default enabled." }, - "completionEager": { "kind": "attribute", "displayName": "Completion Eager", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets whether to complete the idempotent consumer eager or when the exchange is done. If this option is true to complete eager, then the idempotent consumer will trigger its completion when the exchange reached the end of the block of the idempotent consumer pattern. So if the exchange is continued routed after the block ends, then whatever happens there does not affect the state. If this option is false (default) to not complete eager, then the idempotent consumer will complete when the exchange is done being routed. So if the exchange is continued routed after the block ends, then whatever happens there also affect the state. For example if the exchange failed due to an exception, then the state of the idempotent consumer will be a rollback." }, - "skipDuplicate": { "kind": "attribute", "displayName": "Skip Duplicate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets whether to skip duplicates or not. The default behavior is to skip duplicates. A duplicate message would have the Exchange property org.apache.camel.Exchange#DUPLICATE_MESSAGE set to a Boolean#TRUE value. A none duplicate message will not have this property set." }, - "removeOnFailure": { "kind": "attribute", "displayName": "Remove On Failure", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets whether to remove or keep the key on failure. The default behavior is to remove the key on failure." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOnly.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOnly.json deleted file mode 100644 index fbf5926..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOnly.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "inOnly", - "title": "In Only", - "description": "Marks the exchange pattern for the route to one way", - "deprecated": true, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.InOnlyDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the uri of the endpoint to send to." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOut.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOut.json deleted file mode 100644 index 0282841..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inOut.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "inOut", - "title": "In Out", - "description": "Marks the exchange pattern for the route to request\/reply", - "deprecated": true, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.InOutDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the uri of the endpoint to send to." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inputType.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inputType.json deleted file mode 100644 index f4c797c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/inputType.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "inputType", - "title": "Input Type", - "description": "Set the expected data type of the input message. If the actual message type is different at runtime, camel look for a required Transformer and apply if exists. If validate attribute is true then camel applies Validator as well. Type name consists of two parts, 'scheme' and 'name' connected with ':'. For Java type 'name' is a fully qualified class name. For example {code java:java.lang.String} , {code json:ABCOrder} . It's also possible to specify only scheme part, so that it works like a wildcard. If only 'xml' is specified, all the XML message matches. It's handy to add only one transformer\/validator for all the transformation from\/to XML.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.InputTypeDefinition", - "input": false, - "output": false - }, - "properties": { - "urn": { "kind": "attribute", "displayName": "Urn", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set input type URN." }, - "validate": { "kind": "attribute", "displayName": "Validate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Set if validation is required for this input type." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/intercept.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/intercept.json deleted file mode 100644 index 6a3e69b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/intercept.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "intercept", - "title": "Intercept", - "description": "Intercepts a message at each step in the route", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.InterceptDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptFrom.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptFrom.json deleted file mode 100644 index 6516b5c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptFrom.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "interceptFrom", - "title": "Intercept From", - "description": "Intercepts incoming messages", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.InterceptFromDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Intercept incoming messages from the uri or uri pattern. If this option is not configured, then all incoming messages is intercepted." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json deleted file mode 100644 index a21ee78..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/interceptSendToEndpoint.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "interceptSendToEndpoint", - "title": "Intercept Send To Endpoint", - "description": "Intercepts messages being sent to an endpoint", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.InterceptSendToEndpointDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Intercept sending to the uri or uri pattern." }, - "skipSendToOriginalEndpoint": { "kind": "attribute", "displayName": "Skip Send To Original Endpoint", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set to true then the message is not sent to the original endpoint. By default (false) the message is both intercepted and then sent to the original endpoint." }, - "afterUri": { "kind": "attribute", "displayName": "After Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "After sending to the endpoint then send the message to this uri which allows to process its result." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index deleted file mode 100644 index d6c82d7..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/jaxb.index +++ /dev/null @@ -1,95 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -AggregateDefinition -BeanDefinition -CatchDefinition -ChoiceDefinition -CircuitBreakerDefinition -ClaimCheckDefinition -ClaimCheckOperation -ContextScanDefinition -ConvertBodyDefinition -DataFormatDefinition -DelayDefinition -DescriptionDefinition -DynamicRouterDefinition -EnrichDefinition -ExpressionSubElementDefinition -FaultToleranceConfigurationDefinition -FilterDefinition -FinallyDefinition -FromDefinition -GlobalOptionDefinition -GlobalOptionsDefinition -HystrixConfigurationDefinition -IdempotentConsumerDefinition -IdentifiedType -InOnlyDefinition -InOutDefinition -InputTypeDefinition -InterceptDefinition -InterceptFromDefinition -InterceptSendToEndpointDefinition -LoadBalanceDefinition -LoadBalancerDefinition -LogDefinition -LoopDefinition -MarshalDefinition -MulticastDefinition -OnCompletionDefinition -OnCompletionMode -OnExceptionDefinition -OnFallbackDefinition -OptimisticLockRetryPolicyDefinition -OptionalIdentifiedDefinition -OtherwiseDefinition -OutputDefinition -OutputTypeDefinition -PackageScanDefinition -PipelineDefinition -PolicyDefinition -PollEnrichDefinition -ProcessDefinition -PropertyDefinition -PropertyDefinitions -RecipientListDefinition -RedeliveryPolicyDefinition -RemoveHeaderDefinition -RemoveHeadersDefinition -RemovePropertiesDefinition -RemovePropertyDefinition -ResequenceDefinition -Resilience4jConfigurationDefinition -RestContextRefDefinition -RollbackDefinition -RouteBuilderDefinition -RouteContextRefDefinition -RouteDefinition -RoutesDefinition -RoutingSlipDefinition -SagaCompletionMode -SagaDefinition -SagaPropagation -SamplingDefinition -ScriptDefinition -SetBodyDefinition -SetExchangePatternDefinition -SetHeaderDefinition -SetPropertyDefinition -SortDefinition -SplitDefinition -StepDefinition -StopDefinition -ThreadPoolProfileDefinition -ThreadsDefinition -ThrottleDefinition -ThrowExceptionDefinition -ToDefinition -ToDynamicDefinition -TransactedDefinition -TransformDefinition -TryDefinition -UnmarshalDefinition -ValidateDefinition -WhenDefinition -WhenSkipSendToEndpointDefinition -WireTapDefinition diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/constant.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/constant.json deleted file mode 100644 index f8e3865..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/constant.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "constant", - "title": "Constant", - "description": "A fixed value set only once during the route startup.", - "deprecated": false, - "firstVersion": "1.5.0", - "label": "language,core", - "javaType": "org.apache.camel.model.language.ConstantExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json deleted file mode 100644 index 9258762..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "exchangeProperty", - "title": "ExchangeProperty", - "description": "Get the value of named Camel Exchange property.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "language,core", - "javaType": "org.apache.camel.model.language.ExchangePropertyExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/expression.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/expression.json deleted file mode 100644 index 5151f05..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/expression.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "expression", - "title": "Expression", - "description": "A useful base class for an expression", - "deprecated": false, - "label": "language", - "javaType": "org.apache.camel.model.language.ExpressionDefinition", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/groovy.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/groovy.json deleted file mode 100644 index 3014d1b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/groovy.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "groovy", - "title": "Groovy", - "description": "Evaluate a Groovy script.", - "deprecated": false, - "firstVersion": "1.3.0", - "label": "language,script", - "javaType": "org.apache.camel.model.language.GroovyExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/header.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/header.json deleted file mode 100644 index b2ad003..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/header.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "header", - "title": "Header", - "description": "Get the value of the named Camel Message header.", - "deprecated": false, - "firstVersion": "1.5.0", - "label": "language,core", - "javaType": "org.apache.camel.model.language.HeaderExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/hl7terser.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/hl7terser.json deleted file mode 100644 index b5f282c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/hl7terser.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "hl7terser", - "title": "HL7 Terser", - "description": "Get the value of an HL7 message field specified by terse location specification syntax.", - "deprecated": false, - "firstVersion": "2.11.0", - "label": "language,hl7", - "javaType": "org.apache.camel.model.language.Hl7TerserExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jaxb.index deleted file mode 100644 index d1d418b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jaxb.index +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -ConstantExpression -ExchangePropertyExpression -ExpressionDefinition -GroovyExpression -HeaderExpression -Hl7TerserExpression -JsonPathExpression -LanguageExpression -MethodCallExpression -MvelExpression -OgnlExpression -RefExpression -SimpleExpression -SpELExpression -TokenizerExpression -XMLTokenizerExpression -XPathExpression -XQueryExpression diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jsonpath.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jsonpath.json deleted file mode 100644 index 532aef0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/jsonpath.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "jsonpath", - "title": "JsonPath", - "description": "Evaluate a JsonPath expression against a JSON message body.", - "deprecated": false, - "firstVersion": "2.13.0", - "label": "language,json", - "javaType": "org.apache.camel.model.language.JsonPathExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name of the result type (type from output)" }, - "suppressExceptions": { "kind": "attribute", "displayName": "Suppress Exceptions", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to suppress exceptions such as PathNotFoundException." }, - "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined simple exceptions in the JsonPath expression" }, - "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, - "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/language.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/language.json deleted file mode 100644 index 109d495..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/language.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "language", - "title": "Language", - "description": "Evaluate the given expression using the specified language.", - "deprecated": false, - "label": "language,core", - "javaType": "org.apache.camel.model.language.LanguageExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "language": { "kind": "attribute", "displayName": "Language", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the language to use" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/method.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/method.json deleted file mode 100644 index 3140fae..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/method.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "method", - "title": "Bean method", - "description": "Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.", - "deprecated": false, - "firstVersion": "1.3.0", - "label": "language,core,java", - "javaType": "org.apache.camel.model.language.MethodCallExpression", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to bean to lookup in the registry" }, - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of method to call" }, - "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the bean to use" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/mvel.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/mvel.json deleted file mode 100644 index 0d72e60..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/mvel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "mvel", - "title": "MVEL", - "description": "Evaluate an MVEL template against the Camel Exchange.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "language,java", - "javaType": "org.apache.camel.model.language.MvelExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ognl.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ognl.json deleted file mode 100644 index d9ca033..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ognl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "ognl", - "title": "OGNL", - "description": "Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.", - "deprecated": false, - "firstVersion": "1.1.0", - "label": "language,java", - "javaType": "org.apache.camel.model.language.OgnlExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ref.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ref.json deleted file mode 100644 index b64cd1e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/ref.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "ref", - "title": "Ref", - "description": "Look up an expression in the Camel Registry and evaluate it.", - "deprecated": false, - "firstVersion": "2.8.0", - "label": "language,core", - "javaType": "org.apache.camel.model.language.RefExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/simple.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/simple.json deleted file mode 100644 index 0eca889..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/simple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "simple", - "title": "Simple", - "description": "Evaluate Camel's built-in Simple language expression against the Camel Exchange.", - "deprecated": false, - "firstVersion": "1.1.0", - "label": "language,core,java", - "javaType": "org.apache.camel.model.language.SimpleExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name of the result type (type from output)" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/spel.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/spel.json deleted file mode 100644 index f8aa562..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/spel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "spel", - "title": "SpEL", - "description": "Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.", - "deprecated": false, - "firstVersion": "2.7.0", - "label": "language,spring", - "javaType": "org.apache.camel.model.language.SpELExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/tokenize.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/tokenize.json deleted file mode 100644 index 5048794..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/tokenize.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "tokenize", - "title": "Tokenize", - "description": "Tokenize text payloads using the specified delimiter patterns.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "language,core", - "javaType": "org.apache.camel.model.language.TokenizerExpression", - "input": false, - "output": false - }, - "properties": { - "token": { "kind": "attribute", "displayName": "Token", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The (start) token to use as tokenizer, for example you can use the new line token. You can use simple language as the token to support dynamic tokens." }, - "endToken": { "kind": "attribute", "displayName": "End Token", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The end token to use as tokenizer if using start\/end token pairs. You can use simple language as the token to support dynamic tokens." }, - "inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit Namespace Tag Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To inherit namespaces from a root\/parent tag name when using XML You can use simple language as the tag name to support dynamic names." }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." }, - "regex": { "kind": "attribute", "displayName": "Regex", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the token is a regular expression pattern. The default value is false" }, - "xml": { "kind": "attribute", "displayName": "Xml", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the input is XML messages. This option must be set to true if working with XML payloads." }, - "includeTokens": { "kind": "attribute", "displayName": "Include Tokens", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to include the tokens in the parts when using pairs The default value is false" }, - "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes." }, - "groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter." }, - "skipFirst": { "kind": "attribute", "displayName": "Skip First", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To skip the very first element" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xpath.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xpath.json deleted file mode 100644 index 314a15d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xpath.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xpath", - "title": "XPath", - "description": "Evaluate an XPath expression against an XML payload.", - "deprecated": false, - "firstVersion": "1.1.0", - "label": "language,core,xml", - "javaType": "org.apache.camel.model.language.XPathExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "documentType": { "kind": "attribute", "displayName": "Document Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class for document type The default value is org.w3c.dom.Document" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "BOOLEAN", "NODE", "NODESET", "NUMBER", "STRING" ], "deprecated": false, "secret": false, "defaultValue": "NODESET", "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" }, - "saxon": { "kind": "attribute", "displayName": "Saxon", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to use Saxon." }, - "factoryRef": { "kind": "attribute", "displayName": "Factory Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to a custom XPathFactory to lookup in the registry" }, - "objectModel": { "kind": "attribute", "displayName": "Object Model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The XPath object model to use" }, - "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during trouble shooting" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, - "threadSafety": { "kind": "attribute", "displayName": "Thread Safety", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable thread-safety for the returned result of the xpath expression. This applies to when using NODESET as the result type, and the returned set has multiple elements. In this situation there can be thread-safety issues if you process the NODESET concurrently such as from a Camel Splitter EIP in parallel processing mode. This option prevents concurrency issues by doing defensive copies of the nodes. It is recommended to turn this option on if you are using camel-saxon or Saxon in your application. Saxon has thread-safety issues which can be prevented by turning this option on." }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xquery.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xquery.json deleted file mode 100644 index 81053d2..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xquery.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xquery", - "title": "XQuery", - "description": "Evaluate an XQuery expressions against an XML payload.", - "deprecated": false, - "firstVersion": "1.0.0", - "label": "language,xml", - "javaType": "org.apache.camel.model.language.XQueryExpression", - "input": false, - "output": false - }, - "properties": { - "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xtokenize.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xtokenize.json deleted file mode 100644 index 70f4785..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/language/xtokenize.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xtokenize", - "title": "XML Tokenize", - "description": "Tokenize XML payloads using the specified path expression.", - "deprecated": false, - "firstVersion": "2.14.0", - "label": "language,core,xml", - "javaType": "org.apache.camel.model.language.XMLTokenizerExpression", - "input": false, - "output": false - }, - "properties": { - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." }, - "mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its child content t - extracting the text content of the specified element" }, - "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "To group N parts together" }, - "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadBalance.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadBalance.json deleted file mode 100644 index bde4217..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadBalance.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "loadBalance", - "title": "Load Balance", - "description": "Balances message processing among a number of nodes", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.LoadBalanceDefinition", - "input": true, - "output": false - }, - "properties": { - "loadBalancerType": { "kind": "element", "displayName": "Load Balancer Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.LoadBalancerDefinition", "oneOf": [ "customLoadBalancer", "failover", "random", "roundRobin", "sticky", "topic", "weighted" ], "deprecated": false, "secret": false, "description": "The load balancer to be used" }, - "inheritErrorHandler": { "kind": "attribute", "displayName": "Inherit Error Handler", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether or not to inherit the configured error handler. The default value is true. You can use this to disable using the inherited error handler for a given DSL such as a load balancer where you want to use a custom error handler strategy." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json deleted file mode 100644 index 12aca2c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/customLoadBalancer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "customLoadBalancer", - "title": "Custom Load Balancer", - "description": "Custom load balancer", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to the custom load balancer to lookup from the registry" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json deleted file mode 100644 index e017813..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/failover.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "failover", - "title": "Failover", - "description": "Failover load balancer The failover load balancer is capable of trying the next processor in case an Exchange failed with an exception during processing. You can constrain the failover to activate only when one exception of a list you specify occurs. If you do not specify a list any exception will cause fail over to occur. This balancer uses the same strategy for matching exceptions as the Exception Clause does for the onException.", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "exception": { "kind": "element", "displayName": "Exception", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "A list of class names for specific exceptions to monitor. If no exceptions is configured then all exceptions is monitored" }, - "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether or not the failover load balancer should operate in round robin mode or not. If not, then it will always start from the first endpoint when a new message is to be processed. In other words it restart from the top for every message. If round robin is enabled, then it keeps state and will continue with the next endpoint in a round robin fashion. You can also enable sticky mode together with round robin, if so then it will pick the last known good endpoint to use when starting the load balancing (instead of using the next when starting)." }, - "sticky": { "kind": "attribute", "displayName": "Sticky", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether or not the failover load balancer should operate in sticky mode or not. If not, then it will always start from the first endpoint when a new message is to be processed. In other words it restart from the top for every message. If sticky is enabled, then it keeps state and will continue with the last known good endpoint. You can also enable sticky mode together with round robin, if so then it will pick the last known good endpoint to use when starting the load balancing (instead of using the next when starting)." }, - "maximumFailoverAttempts": { "kind": "attribute", "displayName": "Maximum Failover Attempts", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "A value to indicate after X failover attempts we should exhaust (give up). Use -1 to indicate never give up and continuously try to failover. Use 0 to never failover. And use e.g. 3 to failover at most 3 times before giving up. his option can be used whether or not roundRobin is enabled or not." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index deleted file mode 100644 index 237fb88..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/jaxb.index +++ /dev/null @@ -1,8 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -CustomLoadBalancerDefinition -FailoverLoadBalancerDefinition -RandomLoadBalancerDefinition -RoundRobinLoadBalancerDefinition -StickyLoadBalancerDefinition -TopicLoadBalancerDefinition -WeightedLoadBalancerDefinition diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/random.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/random.json deleted file mode 100644 index bb37d14..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/random.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "random", - "title": "Random", - "description": "Random load balancer The random load balancer selects a random endpoint for each exchange.", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json deleted file mode 100644 index 73940e4..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/roundRobin.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "roundRobin", - "title": "Round Robin", - "description": "Round robin load balancer The round robin load balancer will use the next endpoint for each message. This load balancer is not meant to work with failover, for that you should use the dedicated failover load balancer.", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json deleted file mode 100644 index 151d15c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/sticky.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "sticky", - "title": "Sticky", - "description": "Sticky load balancer Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; rather like jsessionid in the web or JMSXGroupID in JMS.", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "correlationExpression": { "kind": "expression", "displayName": "Correlation Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "The correlation expression to use to calculate the correlation key" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json deleted file mode 100644 index 78302cb..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/topic.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "topic", - "title": "Topic", - "description": "Topic load balancer The topic load balancer sends to all destinations (rather like JMS Topics)", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json deleted file mode 100644 index b7c1f9e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "weighted", - "title": "Weighted", - "description": "Weighted load balancer The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others. In addition to the weight, endpoint selection is then further refined using random distribution based on weight.", - "deprecated": false, - "label": "eip,routing,loadbalance", - "javaType": "org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition", - "input": false, - "output": false - }, - "properties": { - "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To enable round robin mode. By default the weighted distribution mode is used. The default value is false." }, - "distributionRatio": { "kind": "attribute", "displayName": "Distribution Ratio", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The distribution ratio is a delimited String consisting on integer weights separated by delimiters for example 2,3,5. The distributionRatio must match the number of endpoints and\/or processors specified in the load balancer list." }, - "distributionRatioDelimiter": { "kind": "attribute", "displayName": "Distribution Ratio Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "Delimiter used to specify the distribution ratio. The default value is ," }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/log.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/log.json deleted file mode 100644 index 928d249..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "log", - "title": "Log", - "description": "Logs the defined message to the logger", - "deprecated": false, - "label": "eip,configuration", - "javaType": "org.apache.camel.model.LogDefinition", - "input": true, - "output": false - }, - "properties": { - "message": { "kind": "attribute", "displayName": "Message", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the log message (uses simple language)" }, - "loggingLevel": { "kind": "attribute", "displayName": "Logging Level", "required": false, "type": "enum", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "DEBUG", "ERROR", "INFO", "OFF", "TRACE", "WARN" ], "deprecated": false, "secret": false, "defaultValue": "INFO", "description": "Sets the logging level. The default value is INFO" }, - "logName": { "kind": "attribute", "displayName": "Log Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the logger" }, - "marker": { "kind": "attribute", "displayName": "Marker", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use slf4j marker" }, - "loggerRef": { "kind": "attribute", "displayName": "Logger Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To refer to a custom logger instance to lookup from the registry." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loop.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loop.json deleted file mode 100644 index ad2efad..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/loop.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "loop", - "title": "Loop", - "description": "Processes a message multiple times", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.LoopDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to define how many times we should loop. Notice the expression is only evaluated once, and should return a number as how many times to loop. A value of zero or negative means no looping. The loop is like a for-loop fashion, if you want a while loop, then the dynamic router may be a better choice." }, - "copy": { "kind": "attribute", "displayName": "Copy", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the copy attribute is true, a copy of the input Exchange is used for each iteration. That means each iteration will start from a copy of the same message. By default loop will loop the same exchange all over, so each iteration may have different message content." }, - "doWhile": { "kind": "attribute", "displayName": "Do While", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables the while loop that loops until the predicate evaluates to false or null." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/marshal.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/marshal.json deleted file mode 100644 index 08e3007..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/marshal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "marshal", - "title": "Marshal", - "description": "Marshals data into a specified format for transmission over a transport or component", - "deprecated": false, - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.MarshalDefinition", - "input": true, - "output": false - }, - "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzip", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile", "thrift", "tidyMarkup", "univocity-csv", "univocity-fixed", "univocity-tsv", "xmlrpc", "xstream", "yaml", "zip", "zipfile" ], "deprecated": false, "secret": false, "description": "The data format to be used" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/multicast.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/multicast.json deleted file mode 100644 index e29d8cd..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/multicast.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "multicast", - "title": "Multicast", - "description": "Routes the same message to multiple paths either sequentially or in parallel.", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.MulticastDefinition", - "input": true, - "output": false - }, - "properties": { - "parallelProcessing": { "kind": "attribute", "displayName": "Parallel Processing", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then sending messages to the multicasts occurs concurrently. Note the caller thread will still wait until all messages has been fully processed, before it continues. Its only the sending and processing the replies from the multicasts which happens concurrently." }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an AggregationStrategy to be used to assemble the replies from the multicasts, into a single outgoing message from the Multicast. By default Camel will use the last reply as the outgoing message. You can also use a POJO as the AggregationStrategy" }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was no data to enrich. If this option is true then null values is used as the oldExchange (when no data to enrich), when using POJOs as the AggregationStrategy" }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom Thread Pool to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well." }, - "streaming": { "kind": "attribute", "displayName": "Streaming", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Camel will process replies out-of-order, eg in the order they come back. If disabled, Camel will process replies in the same order as defined by the multicast." }, - "stopOnException": { "kind": "attribute", "displayName": "Stop On Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will now stop further processing if an exception or failure occurred during processing of an org.apache.camel.Exchange and the caused exception will be thrown. Will also stop if processing the exchange failed (has a fault message) or an exception was thrown and handled by the error handler (such as using onException). In all situations the multicast will stop further processing. This is the same behavior as in pipeline, which is used by the routing engine. The default behavior is to not stop but continue processing till the end" }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Sets a total timeout specified in millis, when using parallel processing. If the Multicast hasn't been able to send and process all replies within the given timeframe, then the timeout triggers and the Multicast breaks out and continues. Notice if you provide a TimeoutAwareAggregationStrategy then the timeout method is invoked before breaking out. If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run. So use this option with a bit of care." }, - "onPrepareRef": { "kind": "attribute", "displayName": "On Prepare Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uses the Processor when preparing the org.apache.camel.Exchange to be send. This can be used to deep-clone messages that should be send, or any custom logic needed before the exchange is send." }, - "shareUnitOfWork": { "kind": "attribute", "displayName": "Share Unit Of Work", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Shares the org.apache.camel.spi.UnitOfWork with the parent and each of the sub messages. Multicast will by default not share unit of work between the parent exchange and each multicasted exchange. This means each sub exchange has its own individual unit of work." }, - "parallelAggregate": { "kind": "attribute", "displayName": "Parallel Aggregate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then the aggregate method on AggregationStrategy can be called concurrently. Notice that this would require the implementation of AggregationStrategy to be implemented as thread-safe. By default this is false meaning that Camel synchronizes the call to the aggregate method. Though in some use-cases this can be used to archive higher performance when the AggregationStrategy is implemented as thread-safe." }, - "stopOnAggregateException": { "kind": "attribute", "displayName": "Stop On Aggregate Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled, unwind exceptions occurring at aggregation time to the error handler when parallelProcessing is used. Currently, aggregation time exceptions do not stop the route processing when parallelProcessing is used. Enabling this option allows to work around this behavior. The default value is false for the sake of backward compatibility." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onCompletion.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onCompletion.json deleted file mode 100644 index 256decc..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onCompletion.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "onCompletion", - "title": "On Completion", - "description": "Route to be executed when normal route processing completes", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.OnCompletionDefinition", - "input": true, - "output": false - }, - "properties": { - "mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "enum", "javaType": "org.apache.camel.model.OnCompletionMode", "enum": [ "AfterConsumer", "BeforeConsumer" ], "deprecated": false, "secret": false, "defaultValue": "AfterConsumer", "description": "Sets the on completion mode. The default value is AfterConsumer" }, - "onCompleteOnly": { "kind": "attribute", "displayName": "On Complete Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will only synchronize when the org.apache.camel.Exchange completed successfully (no errors)." }, - "onFailureOnly": { "kind": "attribute", "displayName": "On Failure Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will only synchronize when the org.apache.camel.Exchange ended with failure (exception or FAULT message)." }, - "onWhen": { "kind": "element", "displayName": "On When", "required": false, "type": "object", "javaType": "org.apache.camel.model.WhenDefinition", "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets an additional predicate that should be true before the onCompletion is triggered. To be used for fine grained controlling whether a completion callback should be invoked or not" }, - "parallelProcessing": { "kind": "attribute", "displayName": "Parallel Processing", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If enabled then the on completion process will run asynchronously by a separate thread from a thread pool. By default this is false, meaning the on completion process will run synchronously using the same caller thread as from the route." }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Refers to a custom Thread Pool to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well." }, - "useOriginalMessage": { "kind": "attribute", "displayName": "Use Original Message", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will use the original input message body when an org.apache.camel.Exchange for this on completion. By default this feature is off." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onException.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onException.json deleted file mode 100644 index 2861c77..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onException.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "onException", - "title": "On Exception", - "description": "Route to be executed when an exception is thrown", - "deprecated": false, - "label": "error", - "javaType": "org.apache.camel.model.OnExceptionDefinition", - "input": true, - "output": false - }, - "properties": { - "exception": { "kind": "element", "displayName": "Exception", "required": true, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "A set of exceptions to react upon." }, - "onWhen": { "kind": "element", "displayName": "On When", "required": false, "type": "object", "javaType": "org.apache.camel.model.WhenDefinition", "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets an additional predicate that should be true before the onException is triggered. To be used for fine grained controlling whether a thrown exception should be intercepted by this exception type or not." }, - "retryWhile": { "kind": "expression", "displayName": "Retry While", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets the retry while predicate. Will continue retrying until predicate returns false." }, - "redeliveryPolicy": { "kind": "element", "displayName": "Redelivery Policy", "required": false, "type": "object", "javaType": "org.apache.camel.model.RedeliveryPolicyDefinition", "deprecated": false, "secret": false, "description": "Used for configuring redelivery options" }, - "redeliveryPolicyRef": { "kind": "attribute", "displayName": "Redelivery Policy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a RedeliveryPolicy to lookup in the org.apache.camel.spi.Registry to be used." }, - "handled": { "kind": "expression", "displayName": "Handled", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets whether the exchange should be marked as handled or not." }, - "continued": { "kind": "expression", "displayName": "Continued", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Sets whether the exchange should handle and continue routing from the point of failure. If this option is enabled then its considered handled as well." }, - "onRedeliveryRef": { "kind": "attribute", "displayName": "On Redelivery Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a processor that should be processed before a redelivery attempt. Can be used to change the org.apache.camel.Exchange before its being redelivered." }, - "onExceptionOccurredRef": { "kind": "attribute", "displayName": "On Exception Occurred Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to a processor that should be processed just after an exception occurred. Can be used to perform custom logging about the occurred exception at the exact time it happened. Important: Any exception thrown from this processor will be ignored." }, - "useOriginalMessage": { "kind": "attribute", "displayName": "Use Original Message", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will use the original input org.apache.camel.Message (original body and headers) when an org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only applies when all redeliveries attempt have failed and the org.apache.camel.Exchange is doomed for failure. Instead of using the current inprogress org.apache.camel.Exchange IN message we use the original IN message instead. This allows you to store the original input in the dead letter queue instead of the inprogress snapshot of the IN message. For instance if you route transform the IN body during routing and then failed. With the original exchange store in the dead letter queue it might be easier to manually re submit the org.apache.camel.Exchange again as the IN message is the same as when Camel received it. So you should be able to send the org.apache.camel.Exchange to the same input. The difference between useOriginalMessage and useOriginalBody is that the former includes both the original body and headers, where as the latter only includes the original body. You can use the latter to enrich the message with custom headers and include the original message body. The former wont let you do this, as its using the original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. Important: The original input means the input message that are bounded by the current org.apache.camel.spi.UnitOfWork . An unit of work typically spans one route, or multiple routes if they are connected using internal endpoints such as direct or seda. When messages is passed via external endpoints such as JMS or HTTP then the consumer will create a new unit of work, with the message it received as input as the original input. Also some EIP patterns such as splitter, multicast, will create a new unit of work boundary for the messages in their sub-route (eg the splitted message); however these EIPs have an option named shareUnitOfWork which allows to combine with the parent unit of work in regard to error handling and therefore use the parent original message. By default this feature is off." }, - "useOriginalBody": { "kind": "attribute", "displayName": "Use Original Body", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will use the original input org.apache.camel.Message body (original body only) when an org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only applies when all redeliveries attempt have failed and the org.apache.camel.Exchange is doomed for failure. Instead of using the current inprogress org.apache.camel.Exchange IN message we use the original IN message instead. This allows you to store the original input in the dead letter queue instead of the inprogress snapshot of the IN message. For instance if you route transform the IN body during routing and then failed. With the original exchange store in the dead letter queue it might be easier to manually re submit the org.apache.camel.Exchange again as the IN message is the same as when Camel received it. So you should be able to send the org.apache.camel.Exchange to the same input. The difference between useOriginalMessage and useOriginalBody is that the former includes both the original body and headers, where as the latter only includes the original body. You can use the latter to enrich the message with custom headers and include the original message body. The former wont let you do this, as its using the original message body and headers as they are. You cannot enable both useOriginalMessage and useOriginalBody. Important: The original input means the input message that are bounded by the current org.apache.camel.spi.UnitOfWork . An unit of work typically spans one route, or multiple routes if they are connected using internal endpoints such as direct or seda. When messages is passed via external endpoints such as JMS or HTTP then the consumer will create a new unit of work, with the message it received as input as the original input. Also some EIP patterns such as splitter, multicast, will create a new unit of work boundary for the messages in their sub-route (eg the splitted message); however these EIPs have an option named shareUnitOfWork which allows to combine with the parent unit of work in regard to error handling and therefore use the parent original message. By default this feature is off." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onFallback.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onFallback.json deleted file mode 100644 index 8d9016b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/onFallback.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "onFallback", - "title": "On Fallback", - "description": "Route to be executed when Hystrix EIP executes fallback", - "deprecated": false, - "label": "eip,routing,circuitbreaker", - "javaType": "org.apache.camel.model.OnFallbackDefinition", - "input": true, - "output": false - }, - "properties": { - "fallbackViaNetwork": { "kind": "attribute", "displayName": "Fallback Via Network", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the fallback goes over the network. If the fallback will go over the network it is another possible point of failure and so it also needs to be wrapped by a HystrixCommand. It is important to execute the fallback command on a separate thread-pool, otherwise if the main command were to become latent and fill the thread-pool this would prevent the fallback from running if the two commands share the same pool." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json deleted file mode 100644 index b3e4fd6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/optimisticLockRetryPolicy.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "optimisticLockRetryPolicy", - "title": "Optimistic Lock Retry Policy", - "description": "To configure optimistic locking", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.OptimisticLockRetryPolicyDefinition", - "input": false, - "output": false - }, - "properties": { - "maximumRetries": { "kind": "attribute", "displayName": "Maximum Retries", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum number of retries" }, - "retryDelay": { "kind": "attribute", "displayName": "Retry Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "50ms", "description": "Sets the delay in millis between retries" }, - "maximumRetryDelay": { "kind": "attribute", "displayName": "Maximum Retry Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Sets the upper value of retry in millis between retries, when using exponential or random backoff" }, - "exponentialBackOff": { "kind": "attribute", "displayName": "Exponential Back Off", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Enable exponential backoff" }, - "randomBackOff": { "kind": "attribute", "displayName": "Random Back Off", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables random backoff" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/otherwise.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/otherwise.json deleted file mode 100644 index 0d93c22..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/otherwise.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "otherwise", - "title": "Otherwise", - "description": "Route to be executed when all other choices evaluate to false", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.OtherwiseDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/outputType.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/outputType.json deleted file mode 100644 index b10c6f9..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/outputType.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "outputType", - "title": "Output Type", - "description": "Set the expected data type of the output message. If the actual message type is different at runtime, camel look for a required Transformer and apply if exists. If validate attribute is true then camel applies Validator as well. Type name consists of two parts, 'scheme' and 'name' connected with ':'. For Java type 'name' is a fully qualified class name. For example {code java:java.lang.String} , {code json:ABCOrder} . It's also possible to specify only scheme part, so that it works like a wildcard. If only 'xml' is specified, all the XML message matches. It's handy to add only one transformer\/validator for all the XML-Java transformation.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.OutputTypeDefinition", - "input": false, - "output": false - }, - "properties": { - "urn": { "kind": "attribute", "displayName": "Urn", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set output type URN." }, - "validate": { "kind": "attribute", "displayName": "Validate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Set if validation is required for this output type." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/packageScan.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/packageScan.json deleted file mode 100644 index ab2331b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/packageScan.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "packageScan", - "title": "Package Scan", - "description": "Scans for Java org.apache.camel.builder.RouteBuilder classes in java packages", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.PackageScanDefinition", - "input": false, - "output": false - }, - "properties": { - "package": { "kind": "element", "displayName": "Package", "required": true, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the java package names to use for scanning for route builder classes" }, - "excludes": { "kind": "element", "displayName": "Excludes", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Exclude finding route builder from these java package names." }, - "includes": { "kind": "element", "displayName": "Includes", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Include finding route builder from these java package names." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pipeline.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pipeline.json deleted file mode 100644 index f4f6d45..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pipeline.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "pipeline", - "title": "Pipeline", - "description": "Routes the message to a sequence of processors.", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.PipelineDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/policy.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/policy.json deleted file mode 100644 index 939cd8f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/policy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "policy", - "title": "Policy", - "description": "Defines a policy the route will use", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.PolicyDefinition", - "input": true, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to use for lookup the policy in the registry." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pollEnrich.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pollEnrich.json deleted file mode 100644 index 867b3e0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/pollEnrich.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "pollEnrich", - "title": "Poll Enrich", - "description": "Enriches messages with data polled from a secondary resource", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.PollEnrichDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression that computes the endpoint uri to use as the resource endpoint to enrich from" }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "Timeout in millis when polling from the external service. The timeout has influence about the poll enrich behavior. It basically operations in three different modes: negative value - Waits until a message is available and then returns it. Warning that this method could block indefinitely if no messages are available. 0 - Attempts to receive a message exchange immediately without waiting and returning null if a message exchange is not available yet. positive value - Attempts to receive a message exchange, waiting up to the given timeout to expire if a message is not yet available. Returns null if timed out The default value is -1 and therefore the method could block indefinitely, and therefore its recommended to use a timeout value" }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an AggregationStrategy to be used to merge the reply from the external service, into a single outgoing message. By default Camel will use the reply from the external service as outgoing message." }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was no data to enrich. If this option is true then null values is used as the oldExchange (when no data to enrich), when using POJOs as the AggregationStrategy." }, - "aggregateOnException": { "kind": "attribute", "displayName": "Aggregate On Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was an exception thrown while trying to retrieve the data to enrich from the resource. Setting this option to true allows end users to control what to do if there was an exception in the aggregate method. For example to suppress the exception or set a custom message body etc." }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ConsumerCache which is used to cache and reuse consumers when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore Invalid Endpoint", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/process.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/process.json deleted file mode 100644 index 54547e5..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/process.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "process", - "title": "Process", - "description": "Calls a Camel processor", - "deprecated": false, - "label": "eip,endpoint", - "javaType": "org.apache.camel.model.ProcessDefinition", - "input": true, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the Processor to lookup in the registry to use." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/property.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/property.json deleted file mode 100644 index cc8de30..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/property.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "property", - "title": "Property", - "description": "A key value pair", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.PropertyDefinition", - "input": false, - "output": false - }, - "properties": { - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Property key" }, - "value": { "kind": "attribute", "displayName": "Value", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Property value" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/recipientList.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/recipientList.json deleted file mode 100644 index ba4da08..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/recipientList.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "recipientList", - "title": "Recipient List", - "description": "Routes messages to a number of dynamically specified recipients (dynamic to)", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.RecipientListDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression that returns which endpoints (url) to send the message to (the recipients). If the expression return an empty value then the message is not sent to any recipients." }, - "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "Delimiter used if the Expression returned multiple endpoints. Can be turned off using the value false. The default value is ," }, - "parallelProcessing": { "kind": "attribute", "displayName": "Parallel Processing", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then sending messages to the recipients occurs concurrently. Note the caller thread will still wait until all messages has been fully processed, before it continues. Its only the sending and processing the replies from the recipients which happens concurrently." }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to the AggregationStrategy to be used to assemble the replies from the recipients, into a single outgoing message from the RecipientList. By default Camel will use the last reply as the outgoing message. You can also use a POJO as the AggregationStrategy" }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was no data to enrich. If this option is true then null values is used as the oldExchange (when no data to enrich), when using POJOs as the AggregationStrategy" }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom Thread Pool to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well." }, - "stopOnException": { "kind": "attribute", "displayName": "Stop On Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will now stop further processing if an exception or failure occurred during processing of an org.apache.camel.Exchange and the caused exception will be thrown. Will also stop if processing the exchange failed (has a fault message) or an exception was thrown and handled by the error handler (such as using onException). In all situations the recipient list will stop further processing. This is the same behavior as in pipeline, which is used by the routing engine. The default behavior is to not stop but continue processing till the end" }, - "ignoreInvalidEndpoints": { "kind": "attribute", "displayName": "Ignore Invalid Endpoints", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "streaming": { "kind": "attribute", "displayName": "Streaming", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Camel will process replies out-of-order, eg in the order they come back. If disabled, Camel will process replies in the same order as defined by the recipient list." }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Sets a total timeout specified in millis, when using parallel processing. If the Recipient List hasn't been able to send and process all replies within the given timeframe, then the timeout triggers and the Recipient List breaks out and continues. Notice if you provide a TimeoutAwareAggregationStrategy then the timeout method is invoked before breaking out. If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run. So use this option with a bit of care." }, - "onPrepareRef": { "kind": "attribute", "displayName": "On Prepare Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uses the Processor when preparing the org.apache.camel.Exchange to be send. This can be used to deep-clone messages that should be send, or any custom logic needed before the exchange is send." }, - "shareUnitOfWork": { "kind": "attribute", "displayName": "Share Unit Of Work", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Shares the org.apache.camel.spi.UnitOfWork with the parent and each of the sub messages. Recipient List will by default not share unit of work between the parent exchange and each recipient exchange. This means each sub exchange has its own individual unit of work." }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producers when using this recipient list, when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "parallelAggregate": { "kind": "attribute", "displayName": "Parallel Aggregate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then the aggregate method on AggregationStrategy can be called concurrently. Notice that this would require the implementation of AggregationStrategy to be implemented as thread-safe. By default this is false meaning that Camel synchronizes the call to the aggregate method. Though in some use-cases this can be used to archive higher performance when the AggregationStrategy is implemented as thread-safe." }, - "stopOnAggregateException": { "kind": "attribute", "displayName": "Stop On Aggregate Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled, unwind exceptions occurring at aggregation time to the error handler when parallelProcessing is used. Currently, aggregation time exceptions do not stop the route processing when parallelProcessing is used. Enabling this option allows to work around this behavior. The default value is false for the sake of backward compatibility." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json deleted file mode 100644 index 829774d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/redeliveryPolicy.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "redeliveryPolicy", - "title": "Redelivery Policy", - "description": "To configure re-delivery for error handling", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RedeliveryPolicyDefinition", - "input": false, - "output": false - }, - "properties": { - "maximumRedeliveries": { "kind": "attribute", "displayName": "Maximum Redeliveries", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum redeliveries x = redeliver at most x times 0 = no redeliveries -1 = redeliver forever" }, - "redeliveryDelay": { "kind": "attribute", "displayName": "Redelivery Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the initial redelivery delay" }, - "asyncDelayedRedelivery": { "kind": "attribute", "displayName": "Async Delayed Redelivery", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allow synchronous delayed redelivery. The route, in particular the consumer's component, must support the Asynchronous Routing Engine (e.g. seda)." }, - "backOffMultiplier": { "kind": "attribute", "displayName": "Back Off Multiplier", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "description": "Sets the back off multiplier" }, - "useExponentialBackOff": { "kind": "attribute", "displayName": "Use Exponential Back Off", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Turn on exponential backk off" }, - "collisionAvoidanceFactor": { "kind": "attribute", "displayName": "Collision Avoidance Factor", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "description": "Sets the collision avoidance factor" }, - "useCollisionAvoidance": { "kind": "attribute", "displayName": "Use Collision Avoidance", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Turn on collision avoidance." }, - "maximumRedeliveryDelay": { "kind": "attribute", "displayName": "Maximum Redelivery Delay", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the maximum delay between redelivery" }, - "retriesExhaustedLogLevel": { "kind": "attribute", "displayName": "Retries Exhausted Log Level", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "deprecated": false, "secret": false, "description": "Sets the logging level to use when retries has exhausted" }, - "retryAttemptedLogLevel": { "kind": "attribute", "displayName": "Retry Attempted Log Level", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "deprecated": false, "secret": false, "description": "Sets the logging level to use for logging retry attempts" }, - "retryAttemptedLogInterval": { "kind": "attribute", "displayName": "Retry Attempted Log Interval", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the interval to use for logging retry attempts" }, - "logRetryAttempted": { "kind": "attribute", "displayName": "Log Retry Attempted", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether retry attempts should be logged or not. Can be used to include or reduce verbose." }, - "logStackTrace": { "kind": "attribute", "displayName": "Log Stack Trace", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether stack traces should be logged. Can be used to include or reduce verbose." }, - "logRetryStackTrace": { "kind": "attribute", "displayName": "Log Retry Stack Trace", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether stack traces should be logged when an retry attempt failed. Can be used to include or reduce verbose." }, - "logHandled": { "kind": "attribute", "displayName": "Log Handled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether handled exceptions should be logged or not. Can be used to include or reduce verbose." }, - "logNewException": { "kind": "attribute", "displayName": "Log New Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether new exceptions should be logged or not. Can be used to include or reduce verbose. A new exception is an exception that was thrown while handling a previous exception." }, - "logContinued": { "kind": "attribute", "displayName": "Log Continued", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether continued exceptions should be logged or not. Can be used to include or reduce verbose." }, - "logExhausted": { "kind": "attribute", "displayName": "Log Exhausted", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether exhausted exceptions should be logged or not. Can be used to include or reduce verbose." }, - "logExhaustedMessageHistory": { "kind": "attribute", "displayName": "Log Exhausted Message History", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether exhausted exceptions should be logged including message history or not (supports property placeholders). Can be used to include or reduce verbose." }, - "logExhaustedMessageBody": { "kind": "attribute", "displayName": "Log Exhausted Message Body", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether exhausted message body should be logged including message history or not (supports property placeholders). Can be used to include or reduce verbose. Requires logExhaustedMessageHistory to be enabled." }, - "disableRedelivery": { "kind": "attribute", "displayName": "Disable Redelivery", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Disables redelivery (same as setting maximum redeliveries to 0)" }, - "delayPattern": { "kind": "attribute", "displayName": "Delay Pattern", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the delay pattern with delay intervals." }, - "allowRedeliveryWhileStopping": { "kind": "attribute", "displayName": "Allow Redelivery While Stopping", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Controls whether to allow redelivery while stopping\/shutting down a route that uses error handling." }, - "exchangeFormatterRef": { "kind": "attribute", "displayName": "Exchange Formatter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the reference of the instance of org.apache.camel.spi.ExchangeFormatter to generate the log message from exchange." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeader.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeader.json deleted file mode 100644 index 520afd6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeader.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "removeHeader", - "title": "Remove Header", - "description": "Removes a named header from the message", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.RemoveHeaderDefinition", - "input": true, - "output": false - }, - "properties": { - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of header to remove" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeaders.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeaders.json deleted file mode 100644 index 70a4d33..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeHeaders.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "removeHeaders", - "title": "Remove Headers", - "description": "Removes message headers whose name matches a specified pattern", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.RemoveHeadersDefinition", - "input": true, - "output": false - }, - "properties": { - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name or pattern of headers to remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive)." }, - "excludePattern": { "kind": "attribute", "displayName": "Exclude Pattern", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name or patter of headers to not remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive)." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperties.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperties.json deleted file mode 100644 index 0249ce0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperties.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "removeProperties", - "title": "Remove Properties", - "description": "Removes message exchange properties whose name matches a specified pattern", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.RemovePropertiesDefinition", - "input": true, - "output": false - }, - "properties": { - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name or pattern of properties to remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive)." }, - "excludePattern": { "kind": "attribute", "displayName": "Exclude Pattern", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name or pattern of properties to not remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive)." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperty.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperty.json deleted file mode 100644 index e150bb8..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/removeProperty.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "removeProperty", - "title": "Remove Property", - "description": "Removes a named property from the message exchange", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.RemovePropertyDefinition", - "input": true, - "output": false - }, - "properties": { - "propertyName": { "kind": "attribute", "displayName": "Property Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of property to remove" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resequence.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resequence.json deleted file mode 100644 index 30bf7ef..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resequence.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "resequence", - "title": "Resequence", - "description": "Resequences (re-order) messages based on an expression", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.ResequenceDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to use for re-ordering the messages, such as a header with a sequence number" }, - "resequencerConfig": { "kind": "element", "displayName": "Resequencer Config", "required": false, "type": "object", "javaType": "org.apache.camel.model.config.ResequencerConfig", "oneOf": [ "batch-config", "stream-config" ], "deprecated": false, "secret": false, "description": "To configure the resequencer in using either batch or stream configuration. Will by default use batch configuration." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json deleted file mode 100644 index c10f437..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "resilience4jConfiguration", - "title": "Resilience4j Configuration", - "description": "Resilience4j Circuit Breaker EIP configuration", - "deprecated": false, - "label": "eip,routing,circuitbreaker", - "javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition", - "input": false, - "output": false - }, - "properties": { - "circuitBreakerRef": { "kind": "attribute", "displayName": "Circuit Breaker Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in use." }, - "configRef": { "kind": "attribute", "displayName": "Config Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig instance to lookup and use from the registry." }, - "failureRateThreshold": { "kind": "attribute", "displayName": "Failure Rate Threshold", "required": false, "type": "number", "javaType": "java.lang.Float", "deprecated": false, "secret": false, "defaultValue": "50", "description": "Configures the failure rate threshold in percentage. If the failure rate is equal or greater than the threshold the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not greater than 100. Default value is 50 percentage." }, - "permittedNumberOfCallsInHalfOpenState": { "kind": "attribute", "displayName": "Permitted Number Of Calls In Half Open State", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Configures the number of permitted calls when the CircuitBreaker is half open. The size must be greater than 0. Default size is 10." }, - "slidingWindowSize": { "kind": "attribute", "displayName": "Sliding Window Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "100", "description": "Configures the size of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. slidingWindowSize configures the size of the sliding window. Sliding window can either be count-based or time-based. If slidingWindowType is COUNT_BASED, the last slidingWindowSize calls are recorded and aggregated. If slidingWindowType is TIME_BASED, the calls of the last slidingWindowSize seconds are recorded and aggregated. The slidingWindowSize must be greater than 0. The minimumNumberOfCalls must be greater than 0. If the slidingWindowType is COUNT_BASED, the minimumNumberOfCalls cannot be greater than slidingWindowSize . If the slidingWindowType is TIME_BASED, you can pick whatever you want. Default slidingWindowSize is 100." }, - "slidingWindowType": { "kind": "attribute", "displayName": "Sliding Window Type", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "COUNT_BASED", "TIME_BASED" ], "deprecated": false, "secret": false, "defaultValue": "COUNT_BASED", "description": "Configures the type of the sliding window which is used to record the outcome of calls when the CircuitBreaker is closed. Sliding window can either be count-based or time-based. If slidingWindowType is COUNT_BASED, the last slidingWindowSize calls are recorded and aggregated. If slidingWindowType is TIME_BASED, the calls of the last slidingWindowSize seconds are recorded and aggregated. Default slidingWindowType is COUNT_BASED." }, - "minimumNumberOfCalls": { "kind": "attribute", "displayName": "Minimum Number Of Calls", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "100", "description": "Configures configures the minimum number of calls which are required (per sliding window period) before the CircuitBreaker can calculate the error rate. For example, if minimumNumberOfCalls is 10, then at least 10 calls must be recorded, before the failure rate can be calculated. If only 9 calls have been recorded the CircuitBreaker will not transition to open even if all 9 calls have failed. Default minimumNumberOfCalls is 100" }, - "writableStackTraceEnabled": { "kind": "attribute", "displayName": "Writable Stack Trace Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Enables writable stack traces. When set to false, Exception.getStackTrace returns a zero length array. This may be used to reduce log spam when the circuit breaker is open as the cause of the exceptions is already known (the circuit breaker is short-circuiting calls)." }, - "waitDurationInOpenState": { "kind": "attribute", "displayName": "Wait Duration In Open State", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "60", "description": "Configures the wait duration (in seconds) which specifies how long the CircuitBreaker should stay open, before it switches to half open. Default value is 60 seconds." }, - "automaticTransitionFromOpenToHalfOpenEnabled": { "kind": "attribute", "displayName": "Automatic Transition From Open To Half Open Enabled", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables automatic transition from OPEN to HALF_OPEN state once the waitDurationInOpenState has passed." }, - "slowCallRateThreshold": { "kind": "attribute", "displayName": "Slow Call Rate Threshold", "required": false, "type": "number", "javaType": "java.lang.Float", "deprecated": false, "secret": false, "defaultValue": "100", "description": "Configures a threshold in percentage. The CircuitBreaker considers a call as slow when the call duration is greater than slowCallDurationThreshold(Duration. When the percentage of slow calls is equal or greater the threshold, the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 and not greater than 100. Default value is 100 percentage which means that all recorded calls must be slower than slowCallDurationThreshold." }, - "slowCallDurationThreshold": { "kind": "attribute", "displayName": "Slow Call Duration Threshold", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "60", "description": "Configures the duration threshold (seconds) above which calls are considered as slow and increase the slow calls percentage. Default value is 60 seconds." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/apiKey.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/apiKey.json deleted file mode 100644 index cddd7c3..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/apiKey.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "apiKey", - "title": "Api Key", - "description": "Rest security basic auth definition", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestSecurityApiKey", - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the header or query parameter to be used." }, - "inHeader": { "kind": "attribute", "displayName": "In Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To use header as the location of the API key." }, - "inQuery": { "kind": "attribute", "displayName": "In Query", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To use query parameter as the location of the API key." }, - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Key used to refer to this security definition" }, - "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A short description for security scheme." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/basicAuth.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/basicAuth.json deleted file mode 100644 index 03e61a1..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/basicAuth.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "basicAuth", - "title": "Basic Auth", - "description": "Rest security basic auth definition", - "deprecated": false, - "label": "rest,security", - "javaType": "org.apache.camel.model.rest.RestSecurityBasicAuth", - "input": false, - "output": false - }, - "properties": { - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Key used to refer to this security definition" }, - "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A short description for security scheme." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/delete.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/delete.json deleted file mode 100644 index 3801557..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/delete.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "delete", - "title": "Delete", - "description": "Rest DELETE command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.DeleteVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/get.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/get.json deleted file mode 100644 index e974ab9..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/get.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "get", - "title": "Get", - "description": "Rest GET command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.GetVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/head.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/head.json deleted file mode 100644 index eebe7de..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/head.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "head", - "title": "Head", - "description": "Rest HEAD command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.HeadVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/jaxb.index deleted file mode 100644 index 695418d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/jaxb.index +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -CollectionFormat -DeleteVerbDefinition -GetVerbDefinition -HeadVerbDefinition -PatchVerbDefinition -PostVerbDefinition -PutVerbDefinition -RestBindingDefinition -RestBindingMode -RestConfigurationDefinition -RestDefinition -RestHostNameResolver -RestOperationParamDefinition -RestOperationResponseHeaderDefinition -RestOperationResponseMsgDefinition -RestParamType -RestPropertyDefinition -RestSecuritiesDefinition -RestSecurityApiKey -RestSecurityBasicAuth -RestSecurityOAuth2 -RestsDefinition -SecurityDefinition -VerbDefinition diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/oauth2.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/oauth2.json deleted file mode 100644 index ccca37a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/oauth2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "oauth2", - "title": "Oauth2", - "description": "Rest security OAuth2 definition", - "deprecated": false, - "label": "rest,security", - "javaType": "org.apache.camel.model.rest.RestSecurityOAuth2", - "input": false, - "output": false - }, - "properties": { - "authorizationUrl": { "kind": "attribute", "displayName": "Authorization Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The authorization URL to be used for this flow. This SHOULD be in the form of a URL. Required for implicit and access code flows" }, - "tokenUrl": { "kind": "attribute", "displayName": "Token Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The token URL to be used for this flow. This SHOULD be in the form of a URL. Required for password, application, and access code flows." }, - "flow": { "kind": "attribute", "displayName": "Flow", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "accessCode", "application", "implicit", "password" ], "deprecated": false, "secret": false, "description": "The flow used by the OAuth2 security scheme. Valid values are implicit, password, application or accessCode." }, - "scopes": { "kind": "element", "displayName": "Scopes", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "The available scopes for an OAuth2 security scheme" }, - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Key used to refer to this security definition" }, - "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A short description for security scheme." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/param.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/param.json deleted file mode 100644 index 6bae5ca..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/param.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "param", - "title": "Param", - "description": "To specify the rest operation parameters using Swagger. This maps to the Swagger Parameter Message Object.", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestOperationParamDefinition", - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter name." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "enum", "javaType": "org.apache.camel.model.rest.RestParamType", "enum": [ "body", "formData", "header", "path", "query" ], "deprecated": false, "secret": false, "defaultValue": "path", "description": "Sets the Swagger Parameter type." }, - "defaultValue": { "kind": "attribute", "displayName": "Default Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter default value." }, - "required": { "kind": "attribute", "displayName": "Required", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets the Swagger Parameter required flag." }, - "collectionFormat": { "kind": "attribute", "displayName": "Collection Format", "required": false, "type": "enum", "javaType": "org.apache.camel.model.rest.CollectionFormat", "enum": [ "csv", "multi", "pipes", "ssv", "tsv" ], "deprecated": false, "secret": false, "defaultValue": "csv", "description": "Sets the Swagger Parameter collection format." }, - "arrayType": { "kind": "attribute", "displayName": "Array Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "string", "description": "Sets the Swagger Parameter array type. Required if data type is array. Describes the type of items in the array." }, - "dataType": { "kind": "attribute", "displayName": "Data Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "string", "description": "Sets the Swagger Parameter data type." }, - "dataFormat": { "kind": "attribute", "displayName": "Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter data format." }, - "value": { "kind": "element", "displayName": "Value", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter list of allowable values (enum)." }, - "examples": { "kind": "element", "displayName": "Examples", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter examples." }, - "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter description." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/patch.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/patch.json deleted file mode 100644 index 3273011..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/patch.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "patch", - "title": "Patch", - "description": "Rest PATCH command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.PatchVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/post.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/post.json deleted file mode 100644 index 08119b5..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/post.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "post", - "title": "Post", - "description": "Rest POST command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.PostVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/put.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/put.json deleted file mode 100644 index 15d370b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/put.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "put", - "title": "Put", - "description": "Rest PUT command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.PutVerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseHeader.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseHeader.json deleted file mode 100644 index 65003a1..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseHeader.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "responseHeader", - "title": "Response Header", - "description": "To specify the rest operation response headers using Swagger. This maps to the Swagger Response Header Object.", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestOperationResponseHeaderDefinition", - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the parameter. This option is mandatory." }, - "collectionFormat": { "kind": "attribute", "displayName": "Collection Format", "required": false, "type": "enum", "javaType": "org.apache.camel.model.rest.CollectionFormat", "enum": [ "csv", "multi", "pipes", "ssv", "tsv" ], "deprecated": false, "secret": false, "defaultValue": "csv", "description": "Sets the Swagger Parameter collection format." }, - "arrayType": { "kind": "attribute", "displayName": "Array Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "string", "description": "Sets the Swagger Parameter array type. Required if data type is array. Describes the type of items in the array." }, - "dataType": { "kind": "attribute", "displayName": "Data Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "string", "description": "Sets the Swagger header data type." }, - "dataFormat": { "kind": "attribute", "displayName": "Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter data format." }, - "value": { "kind": "element", "displayName": "Value", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Sets the Swagger Parameter list of allowable values." }, - "example": { "kind": "attribute", "displayName": "Example", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the Swagger example" }, - "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Description of the parameter." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseMessage.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseMessage.json deleted file mode 100644 index 2f32cce..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/responseMessage.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "responseMessage", - "title": "Response Message", - "description": "To specify the rest operation response messages using Swagger. This maps to the Swagger Response Message Object.", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestOperationResponseMsgDefinition", - "input": false, - "output": false - }, - "properties": { - "code": { "kind": "attribute", "displayName": "Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "200", "description": "The response code such as a HTTP status code" }, - "message": { "kind": "attribute", "displayName": "Message", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The response message (description)" }, - "responseModel": { "kind": "attribute", "displayName": "Response Model", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The response model" }, - "header": { "kind": "element", "displayName": "Header", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Adds a response header" }, - "examples": { "kind": "element", "displayName": "Examples", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Examples of response messages" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rest.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rest.json deleted file mode 100644 index 52503d0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rest.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "rest", - "title": "Rest", - "description": "Defines a rest service using the rest-dsl", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestDefinition", - "input": false, - "output": true - }, - "properties": { - "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path of the rest service, such as \/foo" }, - "tag": { "kind": "attribute", "displayName": "Tag", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To configure a special tag for the operations within this rest definition." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. This option will override what may be configured on a parent level The default value is true." }, - "securityDefinitions": { "kind": "element", "displayName": "Security Definitions", "required": false, "type": "object", "javaType": "org.apache.camel.model.rest.RestSecuritiesDefinition", "deprecated": false, "secret": false, "description": "Sets the security definitions such as Basic, OAuth2 etc." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restBinding.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restBinding.json deleted file mode 100644 index 72cd2f4..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restBinding.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "restBinding", - "title": "Rest Binding", - "description": "To configure rest binding", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestBindingDefinition", - "input": false, - "output": false - }, - "properties": { - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "off", "description": "Sets the binding mode to use. The default value is off" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do." }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. The default value is false." }, - "component": { "kind": "attribute", "displayName": "Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the component name that this definition will apply to" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json deleted file mode 100644 index 740e78c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "restConfiguration", - "title": "Rest Configuration", - "description": "To configure rest", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestConfigurationDefinition", - "input": false, - "output": false - }, - "properties": { - "component": { "kind": "attribute", "displayName": "Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The Camel Rest component to use for the REST transport (consumer), such as netty-http, jetty, servlet, undertow. If no component has been explicit configured, then Camel will lookup if there is a Camel component that integrates with the Rest DSL, or if a org.apache.camel.spi.RestConsumerFactory is registered in the registry. If either one is found, then that is being used." }, - "apiComponent": { "kind": "attribute", "displayName": "Api Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "swagger", "description": "The name of the Camel component to use as the REST API (such as swagger)" }, - "producerComponent": { "kind": "attribute", "displayName": "Producer Component", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the Camel component to use as the REST producer" }, - "scheme": { "kind": "attribute", "displayName": "Scheme", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The scheme to use for exposing the REST service. Usually http or https is supported. The default value is http" }, - "host": { "kind": "attribute", "displayName": "Host", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The hostname to use for exposing the REST service." }, - "apiHost": { "kind": "attribute", "displayName": "Api Host", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use an specific hostname for the API documentation (eg swagger) This can be used to override the generated host with this configured hostname" }, - "useXForwardHeaders": { "kind": "attribute", "displayName": "Use XForward Headers", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to use X-Forward headers for Host and related setting. The default value is true." }, - "port": { "kind": "attribute", "displayName": "Port", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The port number to use for exposing the REST service. Notice if you use servlet component then the port number configured here does not apply, as the port number in use is the actual port number the servlet component is using. eg if using Apache Tomcat its the tomcat http port, if using Apache Karaf its the HTTP service in Karaf that uses port 8181 by default etc. Though in those situations setting the port number here, allows tooling and JMX to know the port number, so its recommended to set the port number to the number that the servlet engine uses." }, - "producerApiDoc": { "kind": "attribute", "displayName": "Producer Api Doc", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources to load from file or http url." }, - "contextPath": { "kind": "attribute", "displayName": "Context Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty-http that includes a HTTP server." }, - "apiContextPath": { "kind": "attribute", "displayName": "Api Context Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a leading API context-path the REST API services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path." }, - "apiContextRouteId": { "kind": "attribute", "displayName": "Api Context Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the route id to use for the route that services the REST API. The route will by default use an auto assigned route id." }, - "apiContextIdPattern": { "kind": "attribute", "displayName": "Api Context Id Pattern", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets an CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from PatternHelper#matchPattern(String,String)" }, - "apiContextListing": { "kind": "attribute", "displayName": "Api Context Listing", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use." }, - "apiVendorExtension": { "kind": "attribute", "displayName": "Api Vendor Extension", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether vendor extension is enabled in the Rest APIs. If enabled then Camel will include additional information as vendor extension (eg keys starting with x-) such as route ids, class names etc. Not all 3rd party API gateways and tools supports vendor-extensions when importing your API docs." }, - "hostNameResolver": { "kind": "attribute", "displayName": "Host Name Resolver", "required": false, "type": "enum", "javaType": "org.apache.camel.model.rest.RestHostNameResolver", "enum": [ "allLocalIp", "localHostName", "localIp" ], "deprecated": false, "secret": false, "description": "If no hostname has been explicit configured, then this resolver is used to compute the hostname the REST service will be using." }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "enum", "javaType": "org.apache.camel.model.rest.RestBindingMode", "enum": [ "auto", "json", "json_xml", "off", "xml" ], "deprecated": false, "secret": false, "defaultValue": "off", "description": "Sets the binding mode to use. The default value is off" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do." }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to enable CORS headers in the HTTP response. The default value is false." }, - "jsonDataFormat": { "kind": "attribute", "displayName": "Json Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of specific json data format to use. By default json-jackson will be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance." }, - "xmlDataFormat": { "kind": "attribute", "displayName": "Xml Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of specific XML data format to use. By default jaxb will be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance." }, - "componentProperty": { "kind": "element", "displayName": "Component Property", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure as many additional properties for the rest component in use." }, - "endpointProperty": { "kind": "element", "displayName": "Endpoint Property", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure as many additional properties for the rest endpoint in use." }, - "consumerProperty": { "kind": "element", "displayName": "Consumer Property", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure as many additional properties for the rest consumer in use." }, - "dataFormatProperty": { "kind": "element", "displayName": "Data Format Property", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure as many additional properties for the data formats in use. For example set property prettyPrint to true to have json outputted in pretty mode. The properties can be prefixed to denote the option is only for either JSON or XML and for either the IN or the OUT. The prefixes are: json.in. json.out. xml.in. xml.out. For example a key with value xml.out.mustBeJAXBElement is only for the XML data format for the outgoing. A key without a prefix is a common key for all situations." }, - "apiProperty": { "kind": "element", "displayName": "Api Property", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure as many additional properties for the api documentation (swagger). For example set property api.title to my cool stuff" }, - "corsHeaders": { "kind": "element", "displayName": "Cors Headers", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to configure custom CORS headers." } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restProperty.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restProperty.json deleted file mode 100644 index 3488e5e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/restProperty.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "restProperty", - "title": "Rest Property", - "description": "A key value pair", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestPropertyDefinition", - "input": false, - "output": false - }, - "properties": { - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Property key" }, - "value": { "kind": "attribute", "displayName": "Value", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Property value" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rests.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rests.json deleted file mode 100644 index cfd57a2..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/rests.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "rests", - "title": "Rests", - "description": "A series of rest services defined using the rest-dsl", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.RestsDefinition", - "input": false, - "output": false - }, - "properties": { - "rests": { "kind": "element", "displayName": "Rests", "required": false, "type": "array", "javaType": "java.util.List", "oneOf": [ "rest" ], "deprecated": false, "secret": false, "description": "Contains the rest services defined using the rest-dsl" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/security.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/security.json deleted file mode 100644 index 5d840a0..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/security.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "security", - "title": "Security", - "description": "Rest security definition", - "deprecated": false, - "label": "rest,security", - "javaType": "org.apache.camel.model.rest.SecurityDefinition", - "input": false, - "output": false - }, - "properties": { - "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Key used to refer to this security definition" }, - "scopes": { "kind": "attribute", "displayName": "Scopes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The scopes to allow (separate multiple scopes by comma)" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json deleted file mode 100644 index e8f67d7..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/securityDefinitions.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "securityDefinitions", - "title": "Security Definitions", - "description": "To configure rest security definitions.", - "deprecated": false, - "label": "rest,security", - "javaType": "org.apache.camel.model.rest.RestSecuritiesDefinition", - "input": false, - "output": false - }, - "properties": { - "securityDefinitions": { "kind": "element", "displayName": "Security Definitions", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "apiKey", "basicAuth", "oauth2" ], "deprecated": false, "secret": false, "description": "Security definitions" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/verb.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/verb.json deleted file mode 100644 index 0515aea..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rest/verb.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "verb", - "title": "Verb", - "description": "Rest command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.VerbDefinition", - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a parent level" }, - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes\/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false." }, - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The canonical name of the class of the input data. Append a to the end of the canonical name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/restContextRef.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/restContextRef.json deleted file mode 100644 index 01fc94b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/restContextRef.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "restContextRef", - "title": "Rest Context Ref", - "description": "To refer to an XML file with rest services defined using the rest-dsl", - "deprecated": false, - "label": "configuration,rest", - "javaType": "org.apache.camel.model.RestContextRefDefinition", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the rest-dsl" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rollback.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rollback.json deleted file mode 100644 index cda0a06..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/rollback.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "rollback", - "title": "Rollback", - "description": "Forces a rollback by stopping routing the message", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.RollbackDefinition", - "input": true, - "output": false - }, - "properties": { - "markRollbackOnly": { "kind": "attribute", "displayName": "Mark Rollback Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Mark the transaction for rollback only (cannot be overruled to commit)" }, - "markRollbackOnlyLast": { "kind": "attribute", "displayName": "Mark Rollback Only Last", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Mark only last sub transaction for rollback only. When using sub transactions (if the transaction manager support this)" }, - "message": { "kind": "attribute", "displayName": "Message", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Message to use in rollback exception" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/route.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/route.json deleted file mode 100644 index 1eb91d1..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/route.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "route", - "title": "Route", - "description": "A Camel route", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RouteDefinition", - "input": true, - "output": true - }, - "properties": { - "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The group that this route belongs to; could be the name of the RouteBuilder class or be explicitly configured in the XML. May be null." }, - "streamCache": { "kind": "attribute", "displayName": "Stream Cache", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether stream caching is enabled on this route." }, - "trace": { "kind": "attribute", "displayName": "Trace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether tracing is enabled on this route." }, - "messageHistory": { "kind": "attribute", "displayName": "Message History", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether message history is enabled on this route." }, - "logMask": { "kind": "attribute", "displayName": "Log Mask", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether security mask for Logging is enabled on this route." }, - "delayer": { "kind": "attribute", "displayName": "Delayer", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whether to slow down processing messages by a given delay in msec." }, - "autoStartup": { "kind": "attribute", "displayName": "Auto Startup", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether to auto start this route" }, - "startupOrder": { "kind": "attribute", "displayName": "Startup Order", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "To configure the ordering of the routes being started" }, - "errorHandlerRef": { "kind": "attribute", "displayName": "Error Handler", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the bean ref name of the error handler builder to use on this route" }, - "routePolicyRef": { "kind": "attribute", "displayName": "Route Policy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to custom org.apache.camel.spi.RoutePolicy to use by the route. Multiple policies can be configured by separating values using comma." }, - "shutdownRoute": { "kind": "attribute", "displayName": "Shutdown Route", "required": false, "type": "enum", "javaType": "org.apache.camel.ShutdownRoute", "enum": [ "Default", "Defer" ], "deprecated": false, "secret": false, "description": "To control how to shutdown the route." }, - "shutdownRunningTask": { "kind": "attribute", "displayName": "Shutdown Running Task", "required": false, "type": "enum", "javaType": "org.apache.camel.ShutdownRunningTask", "enum": [ "CompleteCurrentTaskOnly", "CompleteAllTasks" ], "deprecated": false, "secret": false, "description": "To control how to shutdown the route." }, - "input": { "kind": "element", "displayName": "Input", "required": true, "type": "object", "javaType": "org.apache.camel.model.FromDefinition", "oneOf": [ "from" ], "deprecated": false, "secret": false, "description": "Input to the route." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeBuilder.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeBuilder.json deleted file mode 100644 index 772ba6f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeBuilder.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "routeBuilder", - "title": "Route Builder", - "description": "To refer to a Java org.apache.camel.builder.RouteBuilder instance to use.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RouteBuilderDefinition", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the route builder instance" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeContextRef.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeContextRef.json deleted file mode 100644 index 899fb5a..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routeContextRef.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "routeContextRef", - "title": "Route Context Ref", - "description": "To refer to an XML file with routes defined using the xml-dsl", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RouteContextRefDefinition", - "input": false, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the routes in the xml dsl" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routes.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routes.json deleted file mode 100644 index 1a95257..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routes.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "routes", - "title": "Routes", - "description": "A series of Camel routes", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RoutesDefinition", - "input": false, - "output": false - }, - "properties": { - "routes": { "kind": "element", "displayName": "Routes", "required": false, "type": "array", "javaType": "java.util.List", "oneOf": [ "route" ], "deprecated": false, "secret": false, "description": "Contains the Camel routes" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routingSlip.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routingSlip.json deleted file mode 100644 index f316ddc..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/routingSlip.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "routingSlip", - "title": "Routing Slip", - "description": "Routes a message through a series of steps that are pre-determined (the slip)", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.RoutingSlipDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to define the routing slip, which defines which endpoints to route the message in a pipeline style. Notice the expression is evaluated once, if you want a more dynamic style, then the dynamic router eip is a better choice." }, - "uriDelimiter": { "kind": "attribute", "displayName": "Uri Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": ",", "description": "Sets the uri delimiter to use" }, - "ignoreInvalidEndpoints": { "kind": "attribute", "displayName": "Ignore Invalid Endpoints", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producers when using this routing slip, when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/saga.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/saga.json deleted file mode 100644 index 860ba29..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/saga.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "saga", - "title": "Saga", - "description": "Enables sagas on the route", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.SagaDefinition", - "input": true, - "output": false - }, - "properties": { - "propagation": { "kind": "attribute", "displayName": "Propagation", "required": false, "type": "enum", "javaType": "org.apache.camel.model.SagaPropagation", "enum": [ "MANDATORY", "NEVER", "NOT_SUPPORTED", "REQUIRED", "REQUIRES_NEW", "SUPPORTS" ], "deprecated": false, "secret": false, "defaultValue": "REQUIRED", "description": "Set the Saga propagation mode (REQUIRED, REQUIRES_NEW, MANDATORY, SUPPORTS, NOT_SUPPORTED, NEVER)." }, - "completionMode": { "kind": "attribute", "displayName": "Completion Mode", "required": false, "type": "enum", "javaType": "org.apache.camel.model.SagaCompletionMode", "enum": [ "AUTO", "MANUAL" ], "deprecated": false, "secret": false, "defaultValue": "AUTO", "description": "Determine how the saga should be considered complete. When set to AUTO, the saga is completed when the exchange that initiates the saga is processed successfully, or compensated when it completes exceptionally. When set to MANUAL, the user must complete or compensate the saga using the saga:complete or saga:compensate endpoints." }, - "timeoutInMilliseconds": { "kind": "attribute", "displayName": "Timeout In Milliseconds", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": true, "deprecationNote": "Use timeout instead", "secret": false, "description": "Set the maximum amount of time for the Saga. After the timeout is expired, the saga will be compensated automatically (unless a different decision has been taken in the meantime)." }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set the maximum amount of time for the Saga. After the timeout is expired, the saga will be compensated automatically (unless a different decision has been taken in the meantime)." }, - "compensation": { "kind": "element", "displayName": "Compensation", "required": false, "type": "object", "javaType": "org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, "secret": false, "description": "The compensation endpoint URI that must be called to compensate all changes done in the route. The route corresponding to the compensation URI must perform compensation and complete without error. If errors occur during compensation, the saga service may call again the compensation URI to retry." }, - "completion": { "kind": "element", "displayName": "Completion", "required": false, "type": "object", "javaType": "org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, "secret": false, "description": "The completion endpoint URI that will be called when the Saga is completed successfully. The route corresponding to the completion URI must perform completion tasks and terminate without error. If errors occur during completion, the saga service may call again the completion URI to retry." }, - "option": { "kind": "element", "displayName": "Option", "required": false, "type": "array", "javaType": "java.util.List", "deprecated": false, "secret": false, "description": "Allows to save properties of the current exchange in order to re-use them in a compensation\/completion callback route. Options are usually helpful e.g. to store and retrieve identifiers of objects that should be deleted in compensating actions. Option values will be transformed into input headers of the compensation\/completion exchange." }, - "sagaServiceRef": { "kind": "attribute", "displayName": "Saga Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to the id to lookup in the registry for the specific CamelSagaService to use." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sample.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sample.json deleted file mode 100644 index 46de0e9..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sample.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "sample", - "title": "Sample", - "description": "Extract a sample of the messages passing through a route", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.SamplingDefinition", - "input": true, - "output": false - }, - "properties": { - "samplePeriod": { "kind": "attribute", "displayName": "Sample Period", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1s", "description": "Sets the sample period during which only a single Exchange will pass through." }, - "messageFrequency": { "kind": "attribute", "displayName": "Message Frequency", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Sets the sample message count which only a single Exchange will pass through after this many received." }, - "units": { "kind": "attribute", "displayName": "Units", "required": false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "DAYS", "HOURS", "MICROSECONDS", "MILLISECONDS", "MINUTES", "NANOSECONDS", "SECONDS" ], "deprecated": true, "deprecationNote": "Use samplePeriod extended syntax instead", "secret": false, "defaultValue": "SECONDS", "description": "Sets the time units for the sample period, defaulting to seconds." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/script.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/script.json deleted file mode 100644 index c8a051c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/script.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "script", - "title": "Script", - "description": "Executes a script from a language which does not change the message body.", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.ScriptDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to return the transformed message body (the new message body to use)" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setBody.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setBody.json deleted file mode 100644 index ebf7a8e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setBody.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "setBody", - "title": "Set Body", - "description": "Sets the contents of the message body", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.SetBodyDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression that returns the new body to use" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setExchangePattern.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setExchangePattern.json deleted file mode 100644 index cdcf520..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setExchangePattern.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "setExchangePattern", - "title": "Set Exchange Pattern", - "description": "Sets the exchange pattern on the message exchange", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.SetExchangePatternDefinition", - "input": true, - "output": false - }, - "properties": { - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": true, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the new exchange pattern of the Exchange to be used from this point forward" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setHeader.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setHeader.json deleted file mode 100644 index b570632..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setHeader.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "setHeader", - "title": "Set Header", - "description": "Sets the value of a message header", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.SetHeaderDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to return the value of the header" }, - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of message header to set a new value The simple language can be used to define a dynamic evaluated header name to be used. Otherwise a constant name will be used." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setProperty.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setProperty.json deleted file mode 100644 index 6b97595..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/setProperty.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "setProperty", - "title": "Set Property", - "description": "Sets a named property on the message exchange", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.SetPropertyDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to return the value of the message exchange property" }, - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of exchange property to set a new value. The simple language can be used to define a dynamic evaluated exchange property name to be used. Otherwise a constant name will be used." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sort.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sort.json deleted file mode 100644 index bcc7c87..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/sort.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "sort", - "title": "Sort", - "description": "Sorts the contents of the message", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.SortDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Optional expression to sort by something else than the message body" }, - "comparatorRef": { "kind": "attribute", "displayName": "Comparator Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to lookup for the comparator to use for sorting" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/split.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/split.json deleted file mode 100644 index 01e5a39..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/split.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "split", - "title": "Split", - "description": "Splits a single message into many sub-messages.", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.SplitDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression of how to split the message body, such as as-is, using a tokenizer, or using an xpath." }, - "parallelProcessing": { "kind": "attribute", "displayName": "Parallel Processing", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then processing each splitted messages occurs concurrently. Note the caller thread will still wait until all messages has been fully processed, before it continues. Its only processing the sub messages from the splitter which happens concurrently." }, - "strategyRef": { "kind": "attribute", "displayName": "Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to the AggregationStrategy to be used to assemble the replies from the splitted messages, into a single outgoing message from the Splitter. By default Camel will use the original incoming message to the splitter (leave it unchanged). You can also use a POJO as the AggregationStrategy" }, - "strategyMethodName": { "kind": "attribute", "displayName": "Strategy Method Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option can be used to explicit declare the method name to use, when using POJOs as the AggregationStrategy." }, - "strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy Method Allow Null", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is false then the aggregate method is not used if there was no data to enrich. If this option is true then null values is used as the oldExchange (when no data to enrich), when using POJOs as the AggregationStrategy" }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom Thread Pool to be used for parallel processing. Notice if you set this option, then parallel processing is automatic implied, and you do not have to enable that option as well." }, - "streaming": { "kind": "attribute", "displayName": "Streaming", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When in streaming mode, then the splitter splits the original message on-demand, and each splitted message is processed one by one. This reduces memory usage as the splitter do not split all the messages first, but then we do not know the total size, and therefore the org.apache.camel.Exchange#SPLIT_SIZE is empty. In non-streaming mode (default) the splitter will split each message first, to know the total size, and then process each message one by one. This requires to keep all the splitted messages in memory and therefore requires more memory. The total size is provided in the org.apache.camel.Exchange#SPLIT_SIZE header. The streaming mode also affects the aggregation behavior. If enabled then Camel will process replies out-of-order, eg in the order they come back. If disabled, Camel will process replies in the same order as the messages was splitted." }, - "stopOnException": { "kind": "attribute", "displayName": "Stop On Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Will now stop further processing if an exception or failure occurred during processing of an org.apache.camel.Exchange and the caused exception will be thrown. Will also stop if processing the exchange failed (has a fault message) or an exception was thrown and handled by the error handler (such as using onException). In all situations the splitter will stop further processing. This is the same behavior as in pipeline, which is used by the routing engine. The default behavior is to not stop but continue processing till the end" }, - "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Sets a total timeout specified in millis, when using parallel processing. If the Splitter hasn't been able to split and process all the sub messages within the given timeframe, then the timeout triggers and the Splitter breaks out and continues. Notice if you provide a TimeoutAwareAggregationStrategy then the timeout method is invoked before breaking out. If the timeout is reached with running tasks still remaining, certain tasks for which it is difficult for Camel to shut down in a graceful manner may continue to run. So use this option with a bit of care." }, - "onPrepareRef": { "kind": "attribute", "displayName": "On Prepare Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uses the Processor when preparing the org.apache.camel.Exchange to be send. This can be used to deep-clone messages that should be send, or any custom logic needed before the exchange is send." }, - "shareUnitOfWork": { "kind": "attribute", "displayName": "Share Unit Of Work", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Shares the org.apache.camel.spi.UnitOfWork with the parent and each of the sub messages. Splitter will by default not share unit of work between the parent exchange and each splitted exchange. This means each splitted exchange has its own individual unit of work." }, - "parallelAggregate": { "kind": "attribute", "displayName": "Parallel Aggregate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then the aggregate method on AggregationStrategy can be called concurrently. Notice that this would require the implementation of AggregationStrategy to be implemented as thread-safe. By default this is false meaning that Camel synchronizes the call to the aggregate method. Though in some use-cases this can be used to archive higher performance when the AggregationStrategy is implemented as thread-safe." }, - "stopOnAggregateException": { "kind": "attribute", "displayName": "Stop On Aggregate Exception", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled, unwind exceptions occurring at aggregation time to the error handler when parallelProcessing is used. Currently, aggregation time exceptions do not stop the route processing when parallelProcessing is used. Enabling this option allows to work around this behavior. The default value is false for the sake of backward compatibility." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/step.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/step.json deleted file mode 100644 index 337b1bf..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/step.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "step", - "title": "Step", - "description": "Routes the message to a sequence of processors which is grouped together as one logical name", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.StepDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/stop.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/stop.json deleted file mode 100644 index 8cebb56..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/stop.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "stop", - "title": "Stop", - "description": "Stops the processing of the current message", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.StopDefinition", - "input": true, - "output": false - }, - "properties": { - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threadPoolProfile.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threadPoolProfile.json deleted file mode 100644 index 2d6517f..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threadPoolProfile.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "threadPoolProfile", - "title": "Thread Pool Profile", - "description": "To configure thread pools", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.ThreadPoolProfileDefinition", - "input": false, - "output": false - }, - "properties": { - "defaultProfile": { "kind": "attribute", "displayName": "Default Profile", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether this profile is the default thread pool profile" }, - "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the core pool size" }, - "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum pool size" }, - "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Sets the keep alive time for idle threads in the pool" }, - "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "DAYS", "HOURS", "MICROSECONDS", "MILLISECONDS", "MINUTES", "NANOSECONDS", "SECONDS" ], "deprecated": false, "secret": false, "description": "Sets the time unit to use for keep alive time By default SECONDS is used." }, - "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for an unbounded queue" }, - "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow Core Thread Time Out", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether idle core threads is allowed to timeout and therefore can shrink the pool size below the core pool size Is by default true" }, - "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", "required": false, "type": "object", "javaType": "org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "deprecated": false, "secret": false, "description": "Sets the handler for tasks which cannot be executed by the thread pool." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threads.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threads.json deleted file mode 100644 index b853065..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/threads.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "threads", - "title": "Threads", - "description": "Specifies that all steps after this node are processed asynchronously", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.ThreadsDefinition", - "input": true, - "output": false - }, - "properties": { - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To refer to a custom thread pool or use a thread pool profile (as overlay)" }, - "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the core pool size" }, - "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum pool size" }, - "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "Sets the keep alive time for idle threads" }, - "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "DAYS", "HOURS", "MICROSECONDS", "MILLISECONDS", "MINUTES", "NANOSECONDS", "SECONDS" ], "deprecated": false, "secret": false, "description": "Sets the keep alive time unit. By default SECONDS is used." }, - "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for an unbounded queue" }, - "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow Core Thread Time Out", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether idle core threads is allowed to timeout and therefore can shrink the pool size below the core pool size Is by default false" }, - "threadName": { "kind": "attribute", "displayName": "Thread Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Threads", "description": "Sets the thread name to use." }, - "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", "required": false, "type": "enum", "javaType": "org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", "CallerRuns", "Discard", "DiscardOldest" ], "deprecated": false, "secret": false, "description": "Sets the handler for tasks which cannot be executed by the thread pool." }, - "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller Runs When Rejected", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether or not to use as caller runs as fallback when a task is rejected being added to the thread pool (when its full). This is only used as fallback if no rejectedPolicy has been configured, or the thread pool has no configured rejection handler. Is by default true" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throttle.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throttle.json deleted file mode 100644 index 629ae7b..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throttle.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "throttle", - "title": "Throttle", - "description": "Controls the rate at which messages are passed to the next node in the route", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.ThrottleDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to configure the maximum number of messages to throttle per request" }, - "correlationExpression": { "kind": "expression", "displayName": "Correlation Expression", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "The expression used to calculate the correlation key to use for throttle grouping. The Exchange which has the same correlation key is throttled together." }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom thread pool (ScheduledExecutorService) by the throttler." }, - "timePeriodMillis": { "kind": "attribute", "displayName": "Time Period Millis", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Sets the time period during which the maximum request count is valid for" }, - "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables asynchronous delay which means the thread will not block while delaying." }, - "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller Runs When Rejected", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether or not the caller should run the task when it was rejected by the thread pool. Is by default true" }, - "rejectExecution": { "kind": "attribute", "displayName": "Reject Execution", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not throttler throws the ThrottlerRejectedExecutionException when the exchange exceeds the request limit Is by default false" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throwException.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throwException.json deleted file mode 100644 index c140815..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/throwException.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "throwException", - "title": "Throw Exception", - "description": "Throws an exception", - "deprecated": false, - "label": "error", - "javaType": "org.apache.camel.model.ThrowExceptionDefinition", - "input": true, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to the exception instance to lookup from the registry to throw" }, - "message": { "kind": "attribute", "displayName": "Message", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To create a new exception instance and use the given message as caused message (supports simple language)" }, - "exceptionType": { "kind": "attribute", "displayName": "Exception Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The class of the exception to create using the message." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/to.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/to.json deleted file mode 100644 index e5d005c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/to.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "to", - "title": "To", - "description": "Sends the message to a static endpoint", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.ToDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the uri of the endpoint to send to." }, - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the optional ExchangePattern used to invoke this endpoint" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/toD.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/toD.json deleted file mode 100644 index c93b4bb..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/toD.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "toD", - "title": "To D", - "description": "Sends the message to a dynamic endpoint You can specify multiple languages in the uri separated by the plus sign, such as mock:language:xpath:\/order\/uri where mock: would be a prefix to a xpath expression. For more dynamic behavior use Recipient List or Dynamic Router EIP instead.", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.ToDynamicDefinition", - "input": true, - "output": false - }, - "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The uri of the endpoint to send to. The uri can be dynamic computed using the org.apache.camel.language.simple.SimpleLanguage expression." }, - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the optional ExchangePattern used to invoke this endpoint" }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producers when using this recipient list, when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore Invalid Endpoint", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow Optimised Components", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to allow components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." }, - "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start Components", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to auto startup components when toD is starting up." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transacted.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transacted.json deleted file mode 100644 index 071f3cf..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transacted.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "transacted", - "title": "Transacted", - "description": "Enables transaction on the route", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.TransactedDefinition", - "input": true, - "output": false - }, - "properties": { - "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets a reference to use for lookup the policy in the registry." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transform.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transform.json deleted file mode 100644 index 6344aef..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transform.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "transform", - "title": "Transform", - "description": "Transforms the message body based on an expression", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.TransformDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Expression to return the transformed message body (the new message body to use)" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/jaxb.index deleted file mode 100644 index af780ec..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/jaxb.index +++ /dev/null @@ -1,6 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -CustomTransformerDefinition -DataFormatTransformerDefinition -EndpointTransformerDefinition -TransformerDefinition -TransformersDefinition diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/transformers.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/transformers.json deleted file mode 100644 index 621a0e6..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/transformer/transformers.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "transformers", - "title": "Transformations", - "description": "To configure transformers.", - "deprecated": false, - "label": "transformation", - "javaType": "org.apache.camel.model.transformer.TransformersDefinition", - "input": false, - "output": false - }, - "properties": { - "transformers": { "kind": "element", "displayName": "Transformers", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "customTransformer", "dataFormatTransformer", "endpointTransformer" ], "deprecated": false, "secret": false, "description": "The configured transformers" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/unmarshal.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/unmarshal.json deleted file mode 100644 index 973be3c..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/unmarshal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "unmarshal", - "title": "Unmarshal", - "description": "Converts the message data received from the wire into a format that Apache Camel processors can consume", - "deprecated": false, - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.UnmarshalDefinition", - "input": true, - "output": false - }, - "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzip", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile", "thrift", "tidyMarkup", "univocity-csv", "univocity-fixed", "univocity-tsv", "xmlrpc", "xstream", "yaml", "zip", "zipfile" ], "deprecated": false, "secret": false, "description": "The data format to be used" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validate.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validate.json deleted file mode 100644 index 0bd1d25..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "validate", - "title": "Validate", - "description": "Validates a message based on an expression", - "deprecated": false, - "label": "eip,transformation", - "javaType": "org.apache.camel.model.ValidateDefinition", - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Expression to use for validation as a predicate. The expression should return either true or false. If returning false the message is invalid and an exception is thrown." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/jaxb.index b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/jaxb.index deleted file mode 100644 index d048c01..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/jaxb.index +++ /dev/null @@ -1,6 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -CustomValidatorDefinition -EndpointValidatorDefinition -PredicateValidatorDefinition -ValidatorDefinition -ValidatorsDefinition diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/validators.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/validators.json deleted file mode 100644 index 8bd1a45..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/validator/validators.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "validators", - "title": "Validations", - "description": "To configure validators.", - "deprecated": false, - "label": "validation", - "javaType": "org.apache.camel.model.validator.ValidatorsDefinition", - "input": false, - "output": false - }, - "properties": { - "validators": { "kind": "element", "displayName": "Validators", "required": true, "type": "array", "javaType": "java.util.List", "oneOf": [ "customValidator", "endpointValidator", "predicateValidator" ], "deprecated": false, "secret": false, "description": "The configured transformers" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/when.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/when.json deleted file mode 100644 index 78877f2..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/when.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "when", - "title": "When", - "description": "Triggers a route when an expression evaluates to true", - "deprecated": false, - "label": "eip,routing", - "javaType": "org.apache.camel.model.WhenDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Expression used as the predicate to evaluate whether this when should trigger and route the message or not." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json deleted file mode 100644 index 760bd5e..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/whenSkipSendToEndpoint.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "whenSkipSendToEndpoint", - "title": "When Skip Send To Endpoint", - "description": "Predicate to determine if the message should be sent or not to the endpoint, when using interceptSentToEndpoint.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.WhenSkipSendToEndpointDefinition", - "input": true, - "output": true - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "asPredicate": true, "description": "Expression used as the predicate to evaluate whether the message should be sent or not to the endpoint" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/wireTap.json b/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/wireTap.json deleted file mode 100644 index 5877373..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/generated/resources/org/apache/camel/model/wireTap.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "wireTap", - "title": "Wire Tap", - "description": "Routes a copy of a message (or creates a new message) to a secondary destination while continue routing the original message.", - "deprecated": false, - "label": "eip,endpoint,routing", - "javaType": "org.apache.camel.model.WireTapDefinition", - "input": true, - "output": false - }, - "properties": { - "processorRef": { "kind": "attribute", "displayName": "Processor Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Reference to a Processor to use for creating a new body as the message to use for wire tapping" }, - "body": { "kind": "expression", "displayName": "Body", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "exchangeProperty", "groovy", "header", "hl7terser", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Uses the expression for creating a new body as the message to use for wire tapping" }, - "executorServiceRef": { "kind": "attribute", "displayName": "Executor Service Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uses a custom thread pool" }, - "copy": { "kind": "attribute", "displayName": "Copy", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Uses a copy of the original exchange" }, - "dynamicUri": { "kind": "attribute", "displayName": "Dynamic Uri", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the uri is dynamic or static. If the uri is dynamic then the simple language is used to evaluate a dynamic uri to use as the wire-tap destination, for each incoming message. This works similar to how the toD EIP pattern works. If static then the uri is used as-is as the wire-tap destination." }, - "onPrepareRef": { "kind": "attribute", "displayName": "On Prepare Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Uses the Processor when preparing the org.apache.camel.Exchange to be send. This can be used to deep-clone messages that should be send, or any custom logic needed before the exchange is send." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The uri of the endpoint to send to. The uri can be dynamic computed using the org.apache.camel.language.simple.SimpleLanguage expression." }, - "pattern": { "kind": "attribute", "displayName": "Pattern", "required": false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOptionalOut", "InOut" ], "deprecated": false, "secret": false, "description": "Sets the optional ExchangePattern used to invoke this endpoint" }, - "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is used to cache and reuse producers when using this recipient list, when uris are reused. Beware that when using dynamic endpoints then it affects how well the cache can be utilized. If each dynamic endpoint is unique then its best to turn of caching by setting this to -1, which allows Camel to not cache both the producers and endpoints; they are regarded as prototype scoped and will be stopped and discarded after use. This reduces memory usage as otherwise producers\/endpoints are stored in memory in the caches. However if there are a high degree of dynamic endpoints that have been used before, then it can benefit to use the cache to reuse both producers and endpoints and therefore the cache size can be set accordingly or rely on the default size (1000). If there is a mix of unique and used before dynamic endpoints, then setting a reasonable cache size can help reduce memory usage to avoid storing too many non frequent used producers." }, - "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore Invalid Endpoint", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Ignore the invalidate endpoint exception when try to create a producer with that endpoint" }, - "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow Optimised Components", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to allow components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." }, - "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start Components", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to auto startup components when toD is starting up." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/antora.yml b/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/antora.yml deleted file mode 100644 index fd4706d..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/antora.yml +++ /dev/null @@ -1,23 +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. -# - -name: components -#title: Enterprise Integration Patterns -version: 3.4.x -#start_page: eips:enterprise-integration-patterns.adoc -#nav: -#- modules/eips/nav.adoc diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_20150622.zip b/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_20150622.zip deleted file mode 100644 index d2875f8..0000000 Binary files a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_20150622.zip and /dev/null differ diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_OpenOffice.zip b/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_OpenOffice.zip deleted file mode 100644 index 26357bd..0000000 Binary files a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/attachments/Hohpe_EIP_camel_OpenOffice.zip and /dev/null differ diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java b/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java deleted file mode 100644 index 28a6444..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java +++ /dev/null @@ -1,66 +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.spring; - -import org.apache.camel.ConsumerTemplate; -import org.apache.camel.EndpointInject; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * Unit test using the ConsumerTemplate - */ -// tag::e1[] -@ContextConfiguration -public class SpringConsumerTemplateTest extends SpringRunWithTestSupport { - - @Autowired - private ProducerTemplate producer; - - @Autowired - private ConsumerTemplate consumer; - - @EndpointInject("ref:result") - private MockEndpoint mock; - - @Test - public void testConsumeTemplate() throws Exception { - // we expect Hello World received in our mock endpoint - mock.expectedBodiesReceived("Hello World"); - - // we use the producer template to send a message to the seda:start endpoint - producer.sendBody("seda:start", "Hello World"); - - // we consume the body from seda:start - String body = consumer.receiveBody("seda:start", String.class); - assertEquals(body, "Hello World"); - - // and then we send the body again to seda:foo so it will be routed to the mock - // endpoint so our unit test can complete - producer.sendBody("seda:foo", body); - - // assert mock received the body - mock.assertIsSatisfied(); - } - -} -// end::e1[] diff --git a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml b/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml deleted file mode 100644 index 149b407..0000000 --- a/underlying/camel.entaxy/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringConsumerTemplateTest-context.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -