From 2be19d7c48d8b66c44115072200226e273227862 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 2 Jul 2019 15:43:54 -0400 Subject: [PATCH 01/16] Upversion to 1.5.1 Issue-ID: AAI-2485 Signed-off-by: Jimmy Forsyth Change-Id: Ibae5c8e6ea23c44d21bf1e409c7943ccc0e9fcf2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19b377f..1c5d0cb 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.onap.aai.router-core router-core bundle - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT aai-router-core google_checks.xml -- 2.16.6 From 8bb78722943797bbf8b89a4f562064c6a9de0b96 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 2 Jul 2019 16:44:24 -0400 Subject: [PATCH 02/16] Remove staging deploy plugin Issue-ID: AAI-2485 Signed-off-by: Jimmy Forsyth Change-Id: I98b4cf4c599c9e0da767d583cf916c7583a23a0b --- pom.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 1c5d0cb..d376121 100644 --- a/pom.xml +++ b/pom.xml @@ -255,15 +255,8 @@ limitations under the License. 3.6 - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - + org.apache.maven.plugins + maven-deploy-plugin org.codehaus.mojo -- 2.16.6 From 79a3b1eb2177c892687f51c5b23db4c0c2395a52 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 14 Aug 2019 15:46:05 -0400 Subject: [PATCH 03/16] Upversion rest-client in master Issue-ID: AAI-2579 Signed-off-by: Jimmy Forsyth Change-Id: Id841eb07cc84fa18c5a65d22368ea1d3810759c9 --- pom.xml | 2 +- version.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d376121..84dcd3c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.onap.aai.router-core router-core bundle - 1.5.1-SNAPSHOT + 1.6.0-SNAPSHOT aai-router-core google_checks.xml diff --git a/version.properties b/version.properties index 99af342..a0756ad 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=5 +minor=6 patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6 From 9c71d7c8f7875b551dfb1bb53b98e1a081336a51 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Thu, 31 Oct 2019 15:49:41 -0400 Subject: [PATCH 04/16] Switch to v 1.6.0 of schema-service Issue-ID: AAI-2607 Signed-off-by: Jimmy Forsyth Change-Id: I0a290c913e3568323c97a5325714c97a93bbf5a6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84dcd3c..9d63ed5 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ limitations under the License. org.onap.aai.schema-service aai-schema - 1.0.5 + 1.6.0 org.onap.aai.aai-common -- 2.16.6 From f94ea25a8a70681b6de2bbd21a0632ce4b60328e Mon Sep 17 00:00:00 2001 From: jimmy Date: Tue, 18 Feb 2020 12:13:04 -0500 Subject: [PATCH 05/16] Fix sonar settings Issue-ID: AAI-2793 Change-Id: Ie2756804e6a15e42d46d42b01ab86d31425f53fe Signed-off-by: Jimmy Forsyth --- pom.xml | 99 ++++-------------------------------------------------- version.properties | 2 +- 2 files changed, 7 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index 9d63ed5..7aa8701 100644 --- a/pom.xml +++ b/pom.xml @@ -22,72 +22,24 @@ limitations under the License. 4.0.0 - org.onap.oparent - oparent - 2.0.0 + org.onap.aai.aai-common + aai-parent + 1.6.6-SNAPSHOT org.onap.aai.router-core router-core bundle - 1.6.0-SNAPSHOT + 1.6.4-SNAPSHOT aai-router-core google_checks.xml 1.5.0 - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/code-coverage/jacoco-ut.exec - false - ${project.version} - 2.22.1 0.70 - 4.3.18.RELEASE + 2.22.1 - - - - ch.qos.logback - logback-classic - 1.1.3 - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-expression - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-test - ${springframework.version} - test - - - - org.apache.camel @@ -132,13 +84,12 @@ limitations under the License. org.apache.httpcomponents httpclient - 4.5.5 org.onap.aai.schema-service aai-schema - 1.6.0 + 1.6.3 org.onap.aai.aai-common @@ -157,7 +108,6 @@ limitations under the License. org.eclipse.jetty jetty-security - 9.3.24.v20180605 @@ -176,18 +126,15 @@ limitations under the License. org.mockito mockito-all - 1.10.19 test org.springframework spring-context - 4.3.18.RELEASE org.springframework spring-test - 4.3.18.RELEASE test @@ -263,40 +210,6 @@ limitations under the License. sonar-maven-plugin 3.2 - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - - - - default-check - - check - - - ${sonar.jacoco.reportPath} - - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco.line.coverage.limit} - - - - - - - - - diff --git a/version.properties b/version.properties index a0756ad..fe64195 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=6 -patch=0 +patch=4 base_version=${major}.${minor}.${patch} -- 2.16.6 From 78fb50df15b98a694ffa26d7e5d2b33533cdd260 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 18 Mar 2020 15:14:01 -0400 Subject: [PATCH 06/16] Use aai-parent:1.6.8 and schema-service:1.6.5 Issue-ID: AAI-2834 Signed-off-by: Jimmy Forsyth Change-Id: I46d376213ea9234eb401c07170855a378e4ddec3 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7aa8701..fc7fc09 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.6.6-SNAPSHOT + 1.6.8 org.onap.aai.router-core @@ -34,6 +34,7 @@ limitations under the License. aai-router-core google_checks.xml + 1.6.8 1.5.0 0.70 @@ -89,7 +90,7 @@ limitations under the License. org.onap.aai.schema-service aai-schema - 1.6.3 + 1.6.5 org.onap.aai.aai-common -- 2.16.6 From d937570dbc783ba6e0e5a845be619ca011023dc3 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 18 Mar 2020 15:33:51 -0400 Subject: [PATCH 07/16] Release aai-router-core:1.6.4 Issue-ID: AAI-2834 Change-Id: I39dcee22c99f5af79349902b57e6087d20f151c9 Signed-off-by: Jimmy Forsyth --- releases/1.6.4-maven-release.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/1.6.4-maven-release.yaml diff --git a/releases/1.6.4-maven-release.yaml b/releases/1.6.4-maven-release.yaml new file mode 100644 index 0000000..4d421aa --- /dev/null +++ b/releases/1.6.4-maven-release.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '1.6.4' +project: 'aai-router-core' +log_dir: 'aai-router-core-maven-stage-master/264' -- 2.16.6 From 72f4a83f0c6e14fd7ef0fe35cafd3337d56ca3d3 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Fri, 20 Mar 2020 15:57:40 -0400 Subject: [PATCH 08/16] Updated to use event-client:1.6.4 Issue-ID: AAI-2834 Change-Id: I56770c515324c97c30645d3006ac95cc02203f74 Signed-off-by: Jimmy Forsyth --- pom.xml | 4 ++-- version.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fc7fc09..e0ff239 100644 --- a/pom.xml +++ b/pom.xml @@ -30,12 +30,12 @@ limitations under the License. org.onap.aai.router-core router-core bundle - 1.6.4-SNAPSHOT + 1.6.5-SNAPSHOT aai-router-core google_checks.xml 1.6.8 - 1.5.0 + 1.6.4 0.70 2.22.1 diff --git a/version.properties b/version.properties index fe64195..98eaf26 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=6 -patch=4 +patch=5 base_version=${major}.${minor}.${patch} -- 2.16.6 From 65d4fc3343280914ddcf915a750b897c3e29cec8 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Mon, 23 Mar 2020 19:24:59 -0400 Subject: [PATCH 09/16] Release artifacts for 1.6.5 Issue-ID: AAI-2839 Change-Id: Ib315a96c26b7f07c8d89fd0d5e3c8cc9bbd4030e Signed-off-by: Jimmy Forsyth --- releases/1.6.5-maven-release.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/1.6.5-maven-release.yaml diff --git a/releases/1.6.5-maven-release.yaml b/releases/1.6.5-maven-release.yaml new file mode 100644 index 0000000..2b64a90 --- /dev/null +++ b/releases/1.6.5-maven-release.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '1.6.5' +project: 'aai-router-core' +log_dir: 'aai-router-core-maven-stage-master/270/' -- 2.16.6 From 9fdfb866a2f44a10d6224b4fae560083222afe8e Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 8 Apr 2020 12:07:47 -0400 Subject: [PATCH 10/16] Upversion to 1.7.0 Issue-ID: AAI-2860 Signed-off-by: Jimmy Forsyth Change-Id: Icc989a3bdaff76d7d532754364fcb182c434864e --- pom.xml | 4 ++-- version.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e0ff239..c9fadce 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.onap.aai.router-core router-core bundle - 1.6.5-SNAPSHOT + 1.7.0-SNAPSHOT aai-router-core google_checks.xml @@ -90,7 +90,7 @@ limitations under the License. org.onap.aai.schema-service aai-schema - 1.6.5 + 1.6.6 org.onap.aai.aai-common diff --git a/version.properties b/version.properties index 98eaf26..e377fcf 100644 --- a/version.properties +++ b/version.properties @@ -3,8 +3,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=6 -patch=5 +minor=7 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6 From 04acc5c1831faecf2732d38e30c4b81e36eba8bf Mon Sep 17 00:00:00 2001 From: wr148d Date: Mon, 11 May 2020 10:36:58 -0400 Subject: [PATCH 11/16] Remove Tian Lee from committers and update TSC section Issue-ID: AAI-2898 Change-Id: I3d6c303b9f6881f58e37235eee5abf05bda916ef Signed-off-by: wr148d --- INFO.yaml | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 277b80f..d04cdef 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -28,38 +28,7 @@ meetings: repeats: 'weekly' time: '14:00 UTC' repositories: - - 'aai-aai-common' - - 'aai-aai-config' - - 'aai-aai-data' - - 'aai-aai-service' - - 'aai-babel' - - 'aai-cacher' - - 'aai-chameleon' - - 'aai-champ' - - 'aai-data-router' - - 'aai-eis' - - 'aai-enricher' - - 'aai-event-client' - - 'aai-gallifrey' - - 'aai-gap' - - 'aai-gizmo' - - 'aai-graphadmin' - - 'aai-graphgraph' - - 'aai-logging-service' - - 'aai-model-loader' - - 'aai-oom' - - 'aai-resources' - - 'aai-rest-client' - - 'aai-router-core' - - 'aai-schema-service' - - 'aai-search-data-service' - - 'aai-sparky-be' - - 'aai-sparky-fe' - - 'aai-spike' - - 'aai-tabular-data-service' - - 'aai-test-config' - - 'aai-traversal' - - 'aai-validation' + - 'aai/router-core' committers: - <<: *onap_aai_ptl - name: 'Manisha Aggarwal' @@ -72,19 +41,17 @@ committers: company: 'Amdocs' id: 'sblimkie' timezone: 'America/Toronto' - - name: 'Tian Lee' - email: 'TianL@amdocs.com' - company: 'Amdocs' - id: 'TianL' - timezone: 'Europe/London' - name: 'Venkata Harish Kajur' email: 'vk250x@att.com' company: 'ATT' id: 'vk250x' timezone: 'America/New_York' tsc: - approval: 'https://lists.onap.org/pipermail/onap-tsc' + approval: 'https://lists.onap.org/g/onap-tsc' changes: - type: 'removal' name: 'Steve Smokowski' - link: 'https://lists.onap.org/pipermail/onap-tsc/2018-February/004361.html' + link: 'https://lists.onap.org/g/onap-tsc/message/2506' + - type: 'removal' + name: 'Tian Lee' + link: 'https://lists.onap.org/g/onap-tsc/message/6227' -- 2.16.6 From fb8a8d8c3264701b3d937b1bd6229c1a16d6d6be Mon Sep 17 00:00:00 2001 From: wr148d Date: Fri, 12 Jun 2020 09:28:27 -0400 Subject: [PATCH 12/16] Added William Reehil as committer Issue-ID: AAI-2928 Signed-off-by: wr148d Change-Id: Ic57fa57a94849cc197131c73584029243daec224 --- INFO.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/INFO.yaml b/INFO.yaml index d04cdef..1109efb 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -46,6 +46,11 @@ committers: company: 'ATT' id: 'vk250x' timezone: 'America/New_York' + - name: 'William Reehil' + email: 'william.reehil@att.com' + company: 'ATT' + id: 'wreehil' + timezone: 'America/New_York' tsc: approval: 'https://lists.onap.org/g/onap-tsc' changes: @@ -55,3 +60,6 @@ tsc: - type: 'removal' name: 'Tian Lee' link: 'https://lists.onap.org/g/onap-tsc/message/6227' + - type: 'Addition' + name: 'William Reehil' + link: 'https://lists.onap.org/g/onap-tsc/message/6506' -- 2.16.6 From 03db846178d7f7649d08ac779786ade3a354c808 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Thu, 2 Jul 2020 16:06:00 -0400 Subject: [PATCH 13/16] Promote Bill Reehil as AAI PTL Issue-ID: AAI-2967 Signed-off-by: Jimmy Forsyth Change-Id: I790b88146a90cd0abeca3a895a366d149836a61c --- INFO.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 1109efb..f3a08a9 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -4,11 +4,11 @@ project_creation_date: '2017-05-03' project_category: '' lifecycle_state: 'Incubation' project_lead: &onap_aai_ptl - name: 'James Forsyth' - email: 'jf2512@att.com' - id: 'jimmydot' + name: 'William Reehil' + email: 'william.reehil@att.com' company: 'ATT' - timezone: 'America/Detroit' + id: 'wreehil' + timezone: 'America/New_York' primary_contact: *onap_aai_ptl issue_tracking: type: 'jira' @@ -46,11 +46,11 @@ committers: company: 'ATT' id: 'vk250x' timezone: 'America/New_York' - - name: 'William Reehil' - email: 'william.reehil@att.com' + - name: 'James Forsyth' + email: 'jf2512@att.com' + id: 'jimmydot' company: 'ATT' - id: 'wreehil' - timezone: 'America/New_York' + timezone: 'America/Detroit' tsc: approval: 'https://lists.onap.org/g/onap-tsc' changes: -- 2.16.6 From b38b0235584b7d033ecb6628dc9d4ad0fb6f93bb Mon Sep 17 00:00:00 2001 From: wr148d Date: Thu, 30 Jul 2020 15:07:23 -0400 Subject: [PATCH 14/16] Update Lifecycle state to mature Issue-ID: AAI-3101 Signed-off-by: wr148d Change-Id: Ifd021bdaa78831090d67064d99dd536b77008d22 --- INFO.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INFO.yaml b/INFO.yaml index d04cdef..8812790 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -2,7 +2,7 @@ project: 'aai-router-core' project_creation_date: '2017-05-03' project_category: '' -lifecycle_state: 'Incubation' +lifecycle_state: 'Mature' project_lead: &onap_aai_ptl name: 'James Forsyth' email: 'jf2512@att.com' -- 2.16.6 From f05013b8e6fa64998a68547a6a7bac003ea2add3 Mon Sep 17 00:00:00 2001 From: Rodrigo Lima Date: Fri, 21 Aug 2020 15:45:31 -0400 Subject: [PATCH 15/16] Update apache camel from 2.x to 3.x - Update apache camel lib - Remove camel apt and add camel package plugin Issue-ID: AAI-3119 Signed-off-by: Rodrigo Lima Change-Id: Ib62e8d0807017895183eafce0a7e52018c9a1f3a --- .gitignore | 1 + README.md | 2 +- pom.xml | 55 +- .../onap/aai/event/AbstractEventBusEndpoint.java | 4 +- .../java/org/onap/aai/event/EventBusComponent.java | 4 +- .../java/org/onap/aai/event/EventBusConsumer.java | 6 +- .../java/org/onap/aai/event/EventBusEndPoint.java | 36 +- .../java/org/onap/aai/event/EventBusProducer.java | 2 +- .../org/onap/aai/rest/RestClientComponent.java | 10 +- .../java/org/onap/aai/rest/RestClientConsumer.java | 2 +- .../java/org/onap/aai/rest/RestClientEndpoint.java | 29 +- .../java/org/onap/aai/rest/RestClientProducer.java | 3 +- .../services/org/apache/camel/component/event-bus | 1 - .../org/apache/camel/component/rest-client | 1 - src/test/java/org/onap/aai/event/EventBusTest.java | 19 +- .../java/org/onap/aai/event/TestCamelContext.java | 1170 +++++--------------- .../java/org/onap/aai/rest/RestClientTest.java | 17 +- 17 files changed, 372 insertions(+), 990 deletions(-) delete mode 100644 src/main/resources/META-INF/services/org/apache/camel/component/event-bus delete mode 100644 src/main/resources/META-INF/services/org/apache/camel/component/rest-client diff --git a/.gitignore b/.gitignore index af81fcf..c0bcb0c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ logs/ debug-logs/ .idea *.iml +src/generated diff --git a/README.md b/README.md index 97fe808..e773a2f 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ console as the content body for the REST request. - + diff --git a/pom.xml b/pom.xml index c9fadce..b02fc5e 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ limitations under the License. 1.6.4 0.70 - 2.22.1 + 3.4.0 @@ -48,11 +48,6 @@ limitations under the License. ${camel-spring-boot.version} - - org.apache.camel - apt - ${camel-spring-boot.version} - org.onap.aai.logging-service @@ -142,10 +137,56 @@ limitations under the License. install + + org.jacoco + jacoco-maven-plugin + + + **/*Configurer.class + + + + + org.apache.camel + camel-package-maven-plugin + ${camel-spring-boot.version} + + + generate + + generate-component + + process-classes + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + initialize + + add-source + add-resource + + + + src/generated/java + + + + src/generated/resources + + + + + + org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.8.1 1.8 1.8 diff --git a/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java b/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java index 9a5abee..7295a9a 100644 --- a/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java +++ b/src/main/java/org/onap/aai/event/AbstractEventBusEndpoint.java @@ -21,7 +21,7 @@ package org.onap.aai.event; import org.apache.camel.Component; -import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.support.DefaultEndpoint; public abstract class AbstractEventBusEndpoint extends DefaultEndpoint { @@ -29,7 +29,7 @@ public abstract class AbstractEventBusEndpoint extends DefaultEndpoint { super(endpointUri, component); } - abstract void close() throws Exception; + abstract void end() throws Exception; abstract int getPollingDelay(); abstract int getPoolSize(); abstract String getEventTopic(); diff --git a/src/main/java/org/onap/aai/event/EventBusComponent.java b/src/main/java/org/onap/aai/event/EventBusComponent.java index 766382b..cbe4605 100644 --- a/src/main/java/org/onap/aai/event/EventBusComponent.java +++ b/src/main/java/org/onap/aai/event/EventBusComponent.java @@ -24,8 +24,10 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.support.DefaultComponent; +import org.apache.camel.spi.annotations.Component; +@Component("event-bus") public class EventBusComponent extends DefaultComponent { public EventBusComponent() { super(); diff --git a/src/main/java/org/onap/aai/event/EventBusConsumer.java b/src/main/java/org/onap/aai/event/EventBusConsumer.java index b189cfd..bc698df 100644 --- a/src/main/java/org/onap/aai/event/EventBusConsumer.java +++ b/src/main/java/org/onap/aai/event/EventBusConsumer.java @@ -25,7 +25,7 @@ import org.onap.aai.event.api.EventConsumer; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; -import org.apache.camel.impl.ScheduledPollConsumer; +import org.apache.camel.support.ScheduledPollConsumer; import org.onap.aai.logging.RouterCoreMsgs; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; @@ -96,14 +96,14 @@ public class EventBusConsumer extends ScheduledPollConsumer { protected void doStop() throws Exception { super.doStop(); if (endpoint != null) { - endpoint.close(); + endpoint.end(); } } @Override protected void doShutdown() throws Exception { super.doShutdown(); if (endpoint != null) { - endpoint.close(); + endpoint.end(); } } diff --git a/src/main/java/org/onap/aai/event/EventBusEndPoint.java b/src/main/java/org/onap/aai/event/EventBusEndPoint.java index 621b30f..5ea6a67 100644 --- a/src/main/java/org/onap/aai/event/EventBusEndPoint.java +++ b/src/main/java/org/onap/aai/event/EventBusEndPoint.java @@ -20,34 +20,40 @@ */ package org.onap.aai.event; +import org.apache.camel.Category; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriPath; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.event.api.EventConsumer; import org.onap.aai.event.api.EventPublisher; @UriEndpoint(scheme = "event-bus", syntax = "event-bus:name", -consumerClass = EventBusConsumer.class, title = "event-bus") +consumerClass = EventBusConsumer.class, title = "event-bus", +firstVersion = "1.0.0", category = {Category.CORE}) public class EventBusEndPoint extends AbstractEventBusEndpoint { - @UriParam(label = "eventTopic") - @Metadata(required = "true") + + @UriPath(description = "client name") + private String name; + @UriParam(label = "eventTopic", description = "event topic") + @Metadata(required = true) private String eventTopic; - @UriParam(label = "poolSize") - @Metadata(required = "true", defaultValue="20") + @UriParam(label = "poolSize", description = "pool size") + @Metadata(required = true, defaultValue="20") private int poolSize = 20; - @UriParam(label = "pollingDelay") - @Metadata(required = "true", defaultValue="30000") + @UriParam(label = "pollingDelay", description = "polling delay") + @Metadata(required = true, defaultValue="30000") private int pollingDelay = 30000; - + EventConsumer consumer; //This would be injected via bean through camel route when passed with # - + EventPublisher publisher; //This would be injected via bean through camel route when passed with # - + private Logger logger = LoggerFactory.getInstance().getLogger(EventBusEndPoint.class); public EventBusEndPoint(String uri, EventBusComponent component) { @@ -69,7 +75,7 @@ public class EventBusEndPoint extends AbstractEventBusEndpoint { return false; } - void close() throws Exception { + void end() throws Exception { if(consumer != null) consumer.close(); if(publisher != null) @@ -94,6 +100,14 @@ public class EventBusEndPoint extends AbstractEventBusEndpoint { return eventTopic; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public void setEventTopic(String eventTopic) { this.eventTopic = eventTopic; } diff --git a/src/main/java/org/onap/aai/event/EventBusProducer.java b/src/main/java/org/onap/aai/event/EventBusProducer.java index dfd1bfe..86118ce 100644 --- a/src/main/java/org/onap/aai/event/EventBusProducer.java +++ b/src/main/java/org/onap/aai/event/EventBusProducer.java @@ -21,7 +21,7 @@ package org.onap.aai.event; import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.support.DefaultProducer; import org.onap.aai.event.api.EventPublisher; /** diff --git a/src/main/java/org/onap/aai/rest/RestClientComponent.java b/src/main/java/org/onap/aai/rest/RestClientComponent.java index ec39829..13023fe 100644 --- a/src/main/java/org/onap/aai/rest/RestClientComponent.java +++ b/src/main/java/org/onap/aai/rest/RestClientComponent.java @@ -22,7 +22,8 @@ package org.onap.aai.rest; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.annotations.Component; +import org.apache.camel.support.DefaultComponent; import java.util.Map; @@ -30,14 +31,15 @@ import java.util.Map; /** * Represents the component that manages {@link RestClientEndpoint}. */ -public class RestClientComponent extends UriEndpointComponent { +@Component("ecomp-rest") +public class RestClientComponent extends DefaultComponent { public RestClientComponent() { - super(RestClientEndpoint.class); + super(); } public RestClientComponent(CamelContext context) { - super(context, RestClientEndpoint.class); + super(context); } @Override diff --git a/src/main/java/org/onap/aai/rest/RestClientConsumer.java b/src/main/java/org/onap/aai/rest/RestClientConsumer.java index 0c733a6..41373e2 100644 --- a/src/main/java/org/onap/aai/rest/RestClientConsumer.java +++ b/src/main/java/org/onap/aai/rest/RestClientConsumer.java @@ -21,7 +21,7 @@ package org.onap.aai.rest; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultConsumer; +import org.apache.camel.support.DefaultConsumer; /** diff --git a/src/main/java/org/onap/aai/rest/RestClientEndpoint.java b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java index 06c9e0b..e39a9ca 100644 --- a/src/main/java/org/onap/aai/rest/RestClientEndpoint.java +++ b/src/main/java/org/onap/aai/rest/RestClientEndpoint.java @@ -20,10 +20,11 @@ */ package org.onap.aai.rest; +import org.apache.camel.Category; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; @@ -32,11 +33,9 @@ import org.apache.camel.spi.UriPath; import java.util.Map; -/** - * Represents a RestClient endpoint. - */ @UriEndpoint(scheme = "ecomp-rest", syntax = "ecomp-rest:op", - consumerClass = RestClientConsumer.class, label = "RestClient2", title = "") + consumerClass = RestClientConsumer.class, label = "RestClient2", title = "ecomp-rest", + firstVersion = "1.0.0", category = {Category.CORE}) public class RestClientEndpoint extends DefaultEndpoint { public static final String CONTEXT_PARAM_CLIENT_CERT = "ecomp-client-cert"; @@ -48,32 +47,24 @@ public class RestClientEndpoint extends DefaultEndpoint { public static final String OUT_HEADER_RESPONSE_CODE = "ecomp-response-code"; public static final String OUT_HEADER_RESPONSE_MSG = "ecomp-response-message"; - @UriPath - @Metadata(required = "true") + @UriPath(description = "op") + @Metadata(required = true) private String op; - - @UriParam + @UriParam(description = "ecomp client cert") private String ecompClientCert; - - @UriParam + @UriParam(description = "ecomp key store") private String ecompKeystore; - - @UriParam + @UriParam(description = "ecomp key store passwd") private String ecompKeystorePassword; - public RestClientEndpoint() {} public RestClientEndpoint(String uri, RestClientComponent component) { super(uri, component); } - public RestClientEndpoint(String endpointUri) { - super(endpointUri); - } - @Override - protected void setProperties(Object bean, Map parameters) throws Exception { + public void setProperties(Object bean, Map parameters) { super.setProperties(bean, parameters); } diff --git a/src/main/java/org/onap/aai/rest/RestClientProducer.java b/src/main/java/org/onap/aai/rest/RestClientProducer.java index 5062018..ccb8b89 100644 --- a/src/main/java/org/onap/aai/rest/RestClientProducer.java +++ b/src/main/java/org/onap/aai/rest/RestClientProducer.java @@ -21,9 +21,8 @@ package org.onap.aai.rest; import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.support.DefaultProducer; import org.eclipse.jetty.util.security.Password; -import org.onap.aai.event.EventBusConsumer; import org.onap.aai.restclient.client.Headers; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.restclient.client.RestClient; diff --git a/src/main/resources/META-INF/services/org/apache/camel/component/event-bus b/src/main/resources/META-INF/services/org/apache/camel/component/event-bus deleted file mode 100644 index f795067..0000000 --- a/src/main/resources/META-INF/services/org/apache/camel/component/event-bus +++ /dev/null @@ -1 +0,0 @@ -class=org.onap.aai.event.EventBusComponent diff --git a/src/main/resources/META-INF/services/org/apache/camel/component/rest-client b/src/main/resources/META-INF/services/org/apache/camel/component/rest-client deleted file mode 100644 index 375dcd7..0000000 --- a/src/main/resources/META-INF/services/org/apache/camel/component/rest-client +++ /dev/null @@ -1 +0,0 @@ -class=org.onap.aai.rest.RestClientComponent diff --git a/src/test/java/org/onap/aai/event/EventBusTest.java b/src/test/java/org/onap/aai/event/EventBusTest.java index e535bf3..4fa9e91 100644 --- a/src/test/java/org/onap/aai/event/EventBusTest.java +++ b/src/test/java/org/onap/aai/event/EventBusTest.java @@ -20,6 +20,7 @@ */ package org.onap.aai.event; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,13 +28,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; +import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultMessage; -import org.apache.camel.impl.MessageSupport; -import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.camel.support.DefaultMessage; +import org.apache.camel.support.MessageSupport; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ public class EventBusTest { public EventPublisher publisher; @Mock - public CamelContext context; + public ExtendedCamelContext context; @Mock public Processor processor; @@ -74,20 +74,23 @@ public class EventBusTest { @Test public void validateProducer() throws Exception { - EventBusComponent rc = new EventBusComponent(); + String clientName = "client name"; + EventBusComponent rc = new EventBusComponent(); EventBusEndPoint endpoint = new EventBusEndPoint("http://host.com:8443/endpoint", rc); + endpoint.setName(clientName); endpoint.setEventTopic("eventTopic"); endpoint.setPublisher(publisher); endpoint.setPoolSize(45); endpoint.setPollingDelay(10); - + + assertEquals(clientName, endpoint.getName()); assertTrue(endpoint.getEventTopic().compareTo("eventTopic") == 0); assertTrue(endpoint.getPoolSize() == 45); assertTrue(endpoint.getPollingDelay() == 10); assertFalse(endpoint.isSingleton()); EventBusProducer producer = (EventBusProducer)endpoint.createProducer(); assertTrue(producer.getEndpoint() != null); - endpoint.close(); + endpoint.end(); } @Test diff --git a/src/test/java/org/onap/aai/event/TestCamelContext.java b/src/test/java/org/onap/aai/event/TestCamelContext.java index 1315bd9..718e599 100644 --- a/src/test/java/org/onap/aai/event/TestCamelContext.java +++ b/src/test/java/org/onap/aai/event/TestCamelContext.java @@ -21,26 +21,20 @@ package org.onap.aai.event; -import java.io.IOException; -import java.io.InputStream; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Endpoint; -import org.apache.camel.ErrorHandlerFactory; import org.apache.camel.FluentProducerTemplate; -import org.apache.camel.NoFactoryAvailableException; -import org.apache.camel.PollingConsumer; +import org.apache.camel.GlobalEndpointConfiguration; +import org.apache.camel.NoSuchLanguageException; import org.apache.camel.Processor; -import org.apache.camel.Producer; import org.apache.camel.ProducerTemplate; import org.apache.camel.Route; import org.apache.camel.RoutesBuilder; @@ -49,1602 +43,932 @@ import org.apache.camel.ShutdownRoute; import org.apache.camel.ShutdownRunningTask; import org.apache.camel.StartupListener; import org.apache.camel.TypeConverter; -import org.apache.camel.api.management.mbean.ManagedCamelContextMBean; -import org.apache.camel.api.management.mbean.ManagedProcessorMBean; -import org.apache.camel.api.management.mbean.ManagedRouteMBean; -import org.apache.camel.builder.ErrorHandlerBuilder; -import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.DefaultHeadersMapFactory; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.HystrixConfigurationDefinition; -import org.apache.camel.model.ProcessorDefinition; -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.model.RoutesDefinition; -import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.model.rest.RestDefinition; -import org.apache.camel.model.rest.RestsDefinition; -import org.apache.camel.model.transformer.TransformerDefinition; -import org.apache.camel.model.validator.ValidatorDefinition; -import org.apache.camel.runtimecatalog.RuntimeCamelCatalog; -import org.apache.camel.spi.AsyncProcessorAwaitManager; +import org.apache.camel.ValueHolder; import org.apache.camel.spi.CamelContextNameStrategy; import org.apache.camel.spi.ClassResolver; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.DataFormatResolver; import org.apache.camel.spi.DataType; import org.apache.camel.spi.Debugger; import org.apache.camel.spi.EndpointRegistry; -import org.apache.camel.spi.EndpointStrategy; import org.apache.camel.spi.ExecutorServiceManager; -import org.apache.camel.spi.ExecutorServiceStrategy; -import org.apache.camel.spi.FactoryFinder; -import org.apache.camel.spi.FactoryFinderResolver; -import org.apache.camel.spi.HeadersMapFactory; import org.apache.camel.spi.InflightRepository; import org.apache.camel.spi.Injector; -import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spi.Language; import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.LogListener; -import org.apache.camel.spi.ManagementMBeanAssembler; import org.apache.camel.spi.ManagementNameStrategy; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.spi.MessageHistoryFactory; -import org.apache.camel.spi.ModelJAXBContextFactory; -import org.apache.camel.spi.NodeIdFactory; -import org.apache.camel.spi.PackageScanClassResolver; -import org.apache.camel.spi.ProcessorFactory; +import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.Registry; -import org.apache.camel.spi.ReloadStrategy; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestRegistry; import org.apache.camel.spi.RouteController; import org.apache.camel.spi.RoutePolicyFactory; -import org.apache.camel.spi.RouteStartupOrder; + import org.apache.camel.spi.RuntimeEndpointRegistry; -import org.apache.camel.spi.ServicePool; + import org.apache.camel.spi.ShutdownStrategy; import org.apache.camel.spi.StreamCachingStrategy; +import org.apache.camel.spi.Tracer; import org.apache.camel.spi.Transformer; import org.apache.camel.spi.TransformerRegistry; import org.apache.camel.spi.TypeConverterRegistry; -import org.apache.camel.spi.UnitOfWorkFactory; import org.apache.camel.spi.UuidGenerator; import org.apache.camel.spi.Validator; import org.apache.camel.spi.ValidatorRegistry; -import org.apache.camel.util.LoadPropertiesException; -import org.apache.camel.util.jsse.SSLContextParameters; +import org.apache.camel.support.jsse.SSLContextParameters; -public class TestCamelContext implements CamelContext { - @Override - public void suspend() throws Exception { - // TODO Auto-generated method stub +public class TestCamelContext implements CamelContext { - } @Override - public void resume() throws Exception { + public T adapt(Class type) { // TODO Auto-generated method stub - + return null; } @Override - public boolean isSuspended() { + public T getExtension(Class type) { // TODO Auto-generated method stub - return false; + return null; } @Override - public void setStreamCaching(Boolean cache) { + public void setExtension(Class type, T module) { // TODO Auto-generated method stub - } @Override - public Boolean isStreamCaching() { + public boolean isVetoStarted() { // TODO Auto-generated method stub - return null; + return false; } @Override - public void setTracing(Boolean tracing) { + public String getName() { // TODO Auto-generated method stub - + return null; } @Override - public Boolean isTracing() { + public CamelContextNameStrategy getNameStrategy() { // TODO Auto-generated method stub return null; } @Override - public void setMessageHistory(Boolean messageHistory) { + public void setNameStrategy(CamelContextNameStrategy nameStrategy) { // TODO Auto-generated method stub - } @Override - public Boolean isMessageHistory() { + public ManagementNameStrategy getManagementNameStrategy() { // TODO Auto-generated method stub return null; } @Override - public void setHandleFault(Boolean handleFault) { + public void setManagementNameStrategy(ManagementNameStrategy nameStrategy) { // TODO Auto-generated method stub - } @Override - public Boolean isHandleFault() { + public String getManagementName() { // TODO Auto-generated method stub return null; } @Override - public void setDelayer(Long delay) { + public void setManagementName(String name) { // TODO Auto-generated method stub - } @Override - public Long getDelayer() { + public String getVersion() { // TODO Auto-generated method stub return null; } @Override - public void setAutoStartup(Boolean autoStartup) { - // TODO Auto-generated method stub - - } - - @Override - public Boolean isAutoStartup() { + public String getUptime() { // TODO Auto-generated method stub return null; } @Override - public void setShutdownRoute(ShutdownRoute shutdownRoute) { + public long getUptimeMillis() { // TODO Auto-generated method stub - + return 0; } @Override - public ShutdownRoute getShutdownRoute() { + public Date getStartDate() { // TODO Auto-generated method stub return null; } @Override - public void setShutdownRunningTask(ShutdownRunningTask shutdownRunningTask) { + public void addService(Object object) throws Exception { // TODO Auto-generated method stub - } @Override - public ShutdownRunningTask getShutdownRunningTask() { + public void addService(Object object, boolean stopOnShutdown) throws Exception { // TODO Auto-generated method stub - return null; } @Override - public void setAllowUseOriginalMessage(Boolean allowUseOriginalMessage) { + public void addService(Object object, boolean stopOnShutdown, boolean forceStart) throws Exception { // TODO Auto-generated method stub - } @Override - public Boolean isAllowUseOriginalMessage() { + public void addPrototypeService(Object object) throws Exception { // TODO Auto-generated method stub - return null; } @Override - public T adapt(Class type) { + public boolean removeService(Object object) throws Exception { // TODO Auto-generated method stub - return null; + return false; } @Override - public void start() throws Exception { + public boolean hasService(Object object) { // TODO Auto-generated method stub - + return false; } @Override - public void stop() throws Exception { + public T hasService(Class type) { // TODO Auto-generated method stub - + return null; } @Override - public String getName() { + public Set hasServices(Class type) { // TODO Auto-generated method stub return null; } @Override - public CamelContextNameStrategy getNameStrategy() { + public void deferStartService(Object object, boolean stopOnShutdown) throws Exception { // TODO Auto-generated method stub - return null; } @Override - public void setNameStrategy(CamelContextNameStrategy nameStrategy) { + public void addStartupListener(StartupListener listener) throws Exception { // TODO Auto-generated method stub - } @Override - public ManagementNameStrategy getManagementNameStrategy() { + public void addComponent(String componentName, Component component) { // TODO Auto-generated method stub - return null; } @Override - public void setManagementNameStrategy(ManagementNameStrategy nameStrategy) { + public Component hasComponent(String componentName) { // TODO Auto-generated method stub - + return null; } @Override - public String getManagementName() { + public Component getComponent(String componentName) { // TODO Auto-generated method stub return null; } @Override - public String getVersion() { + public Component getComponent(String name, boolean autoCreateComponents) { // TODO Auto-generated method stub return null; } @Override - public ServiceStatus getStatus() { + public Component getComponent(String name, boolean autoCreateComponents, boolean autoStart) { // TODO Auto-generated method stub return null; } @Override - public String getUptime() { + public T getComponent(String name, Class componentType) { // TODO Auto-generated method stub return null; } @Override - public void addService(Object object) throws Exception { + public List getComponentNames() { // TODO Auto-generated method stub - + return null; } @Override - public void addService(Object object, boolean closeOnShutdown) throws Exception { + public Component removeComponent(String componentName) { // TODO Auto-generated method stub - + return null; } @Override - public boolean removeService(Object object) throws Exception { + public EndpointRegistry> getEndpointRegistry() { // TODO Auto-generated method stub - return false; + return null; } @Override - public boolean hasService(Object object) { + public Endpoint getEndpoint(String uri) { // TODO Auto-generated method stub - return false; + return null; } @Override - public T hasService(Class type) { + public Endpoint getEndpoint(String uri, Map parameters) { // TODO Auto-generated method stub return null; } @Override - public void addStartupListener(StartupListener listener) throws Exception { + public T getEndpoint(String name, Class endpointType) { // TODO Auto-generated method stub - + return null; } @Override - public void addComponent(String componentName, Component component) { + public Collection getEndpoints() { // TODO Auto-generated method stub - + return null; } @Override - public Component hasComponent(String componentName) { + public Map getEndpointMap() { // TODO Auto-generated method stub return null; } @Override - public Component getComponent(String componentName) { + public Endpoint hasEndpoint(String uri) { // TODO Auto-generated method stub return null; } @Override - public Component getComponent(String name, boolean autoCreateComponents) { + public Endpoint addEndpoint(String uri, Endpoint endpoint) throws Exception { // TODO Auto-generated method stub return null; } @Override - public T getComponent(String name, Class componentType) { + public void removeEndpoint(Endpoint endpoint) throws Exception { // TODO Auto-generated method stub - return null; } @Override - public List getComponentNames() { - // TODO Auto-generated method stub + public Collection removeEndpoints(String pattern) throws Exception { return null; } @Override - public Component removeComponent(String componentName) { - // TODO Auto-generated method stub + public GlobalEndpointConfiguration getGlobalEndpointConfiguration() { return null; } @Override - public EndpointRegistry getEndpointRegistry() { - // TODO Auto-generated method stub - return null; + public void setRouteController(RouteController routeController) { + } @Override - public Endpoint getEndpoint(String uri) { - // TODO Auto-generated method stub + public RouteController getRouteController() { return null; } @Override - public T getEndpoint(String name, Class endpointType) { - // TODO Auto-generated method stub + public List getRoutes() { return null; } @Override - public Collection getEndpoints() { - // TODO Auto-generated method stub - return null; + public int getRoutesSize() { + return 0; } @Override - public Map getEndpointMap() { - // TODO Auto-generated method stub + public Route getRoute(String id) { return null; } @Override - public Endpoint hasEndpoint(String uri) { - // TODO Auto-generated method stub + public Processor getProcessor(String id) { return null; } @Override - public Endpoint addEndpoint(String uri, Endpoint endpoint) throws Exception { - // TODO Auto-generated method stub + public T getProcessor(String id, Class type) { return null; } @Override - public void removeEndpoint(Endpoint endpoint) throws Exception { - // TODO Auto-generated method stub + public void addRoutes(RoutesBuilder builder) throws Exception { } @Override - public Collection removeEndpoints(String pattern) throws Exception { - // TODO Auto-generated method stub - return null; + public boolean removeRoute(String routeId) throws Exception { + return false; } @Override - public void addRegisterEndpointCallback(EndpointStrategy strategy) { - // TODO Auto-generated method stub + public void addRoutePolicyFactory(RoutePolicyFactory routePolicyFactory) { } @Override - public void setupRoutes(boolean done) { - // TODO Auto-generated method stub - + public List getRoutePolicyFactories() { + return null; } @Override - public List getRouteDefinitions() { - // TODO Auto-generated method stub - return null; + public void setRestConfiguration(RestConfiguration restConfiguration) { + } @Override - public RouteDefinition getRouteDefinition(String id) { - // TODO Auto-generated method stub + public RestConfiguration getRestConfiguration() { return null; } @Override - public List getRestDefinitions() { - // TODO Auto-generated method stub + public RestRegistry getRestRegistry() { return null; } @Override - public void addRestDefinitions(Collection restDefinitions) throws Exception { - // TODO Auto-generated method stub + public void setRestRegistry(RestRegistry restRegistry) { } @Override - public void setRestConfiguration(RestConfiguration restConfiguration) { - // TODO Auto-generated method stub - + public TypeConverter getTypeConverter() { + return null; } @Override - public RestConfiguration getRestConfiguration() { - // TODO Auto-generated method stub + public TypeConverterRegistry getTypeConverterRegistry() { return null; } @Override - public List getRouteStartupOrder() { - // TODO Auto-generated method stub + public void setTypeConverterRegistry(TypeConverterRegistry typeConverterRegistry) { + + } + + @Override + public Registry getRegistry() { return null; } @Override - public List getRoutes() { - // TODO Auto-generated method stub + public T getRegistry(Class type) { return null; } @Override - public Route getRoute(String id) { - // TODO Auto-generated method stub + public Injector getInjector() { return null; } @Override - public void addRoutes(RoutesBuilder builder) throws Exception { - // TODO Auto-generated method stub + public void setInjector(Injector injector) { } @Override - public RoutesDefinition loadRoutesDefinition(InputStream is) throws Exception { - // TODO Auto-generated method stub + public List getLifecycleStrategies() { return null; } @Override - public void addRouteDefinitions(Collection routeDefinitions) throws Exception { - // TODO Auto-generated method stub + public void addLifecycleStrategy(LifecycleStrategy lifecycleStrategy) { } @Override - public void addRouteDefinition(RouteDefinition routeDefinition) throws Exception { - // TODO Auto-generated method stub - + public Language resolveLanguage(String language) throws NoSuchLanguageException { + return null; } @Override - public void removeRouteDefinitions(Collection routeDefinitions) throws Exception { - // TODO Auto-generated method stub - + public String resolvePropertyPlaceholders(String text) { + return null; } @Override - public void removeRouteDefinition(RouteDefinition routeDefinition) throws Exception { - // TODO Auto-generated method stub - + public PropertiesComponent getPropertiesComponent() { + return null; } @Override - public void startRoute(RouteDefinition route) throws Exception { - // TODO Auto-generated method stub + public void setPropertiesComponent(PropertiesComponent propertiesComponent) { } @Override - public void startAllRoutes() throws Exception { - // TODO Auto-generated method stub - + public List getLanguageNames() { + return null; } @Override - public void startRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - + public ProducerTemplate createProducerTemplate() { + return null; } @Override - public void stopRoute(RouteDefinition route) throws Exception { - // TODO Auto-generated method stub - + public ProducerTemplate createProducerTemplate(int maximumCacheSize) { + return null; } @Override - public void stopRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - + public FluentProducerTemplate createFluentProducerTemplate() { + return null; } @Override - public void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - // TODO Auto-generated method stub - + public FluentProducerTemplate createFluentProducerTemplate(int maximumCacheSize) { + return null; } @Override - public boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) - throws Exception { - // TODO Auto-generated method stub - return false; + public ConsumerTemplate createConsumerTemplate() { + return null; } @Override - public void shutdownRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - + public ConsumerTemplate createConsumerTemplate(int maximumCacheSize) { + return null; } @Override - public void shutdownRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - // TODO Auto-generated method stub - + public DataFormat resolveDataFormat(String name) { + return null; } @Override - public boolean removeRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - return false; + public DataFormat createDataFormat(String name) { + return null; } @Override - public void resumeRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - + public Transformer resolveTransformer(String model) { + return null; } @Override - public void suspendRoute(String routeId) throws Exception { - // TODO Auto-generated method stub - + public Transformer resolveTransformer(DataType from, DataType to) { + return null; } @Override - public void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception { - // TODO Auto-generated method stub - + public TransformerRegistry getTransformerRegistry() { + return null; } @Override - public ServiceStatus getRouteStatus(String routeId) { - // TODO Auto-generated method stub + public Validator resolveValidator(DataType type) { return null; } @Override - public boolean isStartingRoutes() { - // TODO Auto-generated method stub - return false; + public ValidatorRegistry getValidatorRegistry() { + return null; } @Override - public boolean isSetupRoutes() { - // TODO Auto-generated method stub - return false; - } + public void setGlobalOptions(Map globalOptions) { - @Override - public TypeConverter getTypeConverter() { - // TODO Auto-generated method stub - return null; } @Override - public TypeConverterRegistry getTypeConverterRegistry() { - // TODO Auto-generated method stub + public Map getGlobalOptions() { return null; } @Override - public Registry getRegistry() { - // TODO Auto-generated method stub + public String getGlobalOption(String key) { return null; } @Override - public T getRegistry(Class type) { - // TODO Auto-generated method stub + public ClassResolver getClassResolver() { return null; } @Override - public Injector getInjector() { - // TODO Auto-generated method stub - return null; - } + public void setClassResolver(ClassResolver resolver) { - @Override - public ManagementMBeanAssembler getManagementMBeanAssembler() { - // TODO Auto-generated method stub - return null; } @Override - public List getLifecycleStrategies() { - // TODO Auto-generated method stub + public ManagementStrategy getManagementStrategy() { return null; } @Override - public void addLifecycleStrategy(LifecycleStrategy lifecycleStrategy) { - // TODO Auto-generated method stub + public void setManagementStrategy(ManagementStrategy strategy) { } @Override - public Language resolveLanguage(String language) { - // TODO Auto-generated method stub - return null; - } + public void disableJMX() throws IllegalStateException { - @Override - public String resolvePropertyPlaceholders(String text) throws Exception { - // TODO Auto-generated method stub - return null; } @Override - public String getPropertyPrefixToken() { - // TODO Auto-generated method stub + public InflightRepository getInflightRepository() { return null; } @Override - public String getPropertySuffixToken() { - // TODO Auto-generated method stub - return null; - } + public void setInflightRepository(InflightRepository repository) { - @Override - public List getLanguageNames() { - // TODO Auto-generated method stub - return null; } @Override - public ProducerTemplate createProducerTemplate() { - // TODO Auto-generated method stub + public ClassLoader getApplicationContextClassLoader() { return null; } @Override - public ProducerTemplate createProducerTemplate(int maximumCacheSize) { - // TODO Auto-generated method stub - return null; - } + public void setApplicationContextClassLoader(ClassLoader classLoader) { - @Override - public ConsumerTemplate createConsumerTemplate() { - // TODO Auto-generated method stub - return null; } @Override - public ConsumerTemplate createConsumerTemplate(int maximumCacheSize) { - // TODO Auto-generated method stub + public ShutdownStrategy getShutdownStrategy() { return null; } @Override - public void addInterceptStrategy(InterceptStrategy interceptStrategy) { - // TODO Auto-generated method stub - - } + public void setShutdownStrategy(ShutdownStrategy shutdownStrategy) { - @Override - public List getInterceptStrategies() { - // TODO Auto-generated method stub - return null; } @Override - public ErrorHandlerBuilder getErrorHandlerBuilder() { - // TODO Auto-generated method stub + public ExecutorServiceManager getExecutorServiceManager() { return null; } @Override - public void setErrorHandlerBuilder(ErrorHandlerFactory errorHandlerBuilder) { - // TODO Auto-generated method stub + public void setExecutorServiceManager(ExecutorServiceManager executorServiceManager) { } @Override - public ScheduledExecutorService getErrorHandlerExecutorService() { - // TODO Auto-generated method stub + public MessageHistoryFactory getMessageHistoryFactory() { return null; } @Override - public void setDataFormats(Map dataFormats) { - // TODO Auto-generated method stub + public void setMessageHistoryFactory(MessageHistoryFactory messageHistoryFactory) { } @Override - public Map getDataFormats() { - // TODO Auto-generated method stub + public Debugger getDebugger() { return null; } @Override - public DataFormat resolveDataFormat(String name) { - // TODO Auto-generated method stub - return null; + public void setDebugger(Debugger debugger) { + } @Override - public DataFormatDefinition resolveDataFormatDefinition(String name) { - // TODO Auto-generated method stub + public Tracer getTracer() { return null; } @Override - public DataFormatResolver getDataFormatResolver() { - // TODO Auto-generated method stub - return null; + public void setTracer(Tracer tracer) { + } @Override - public void setDataFormatResolver(DataFormatResolver dataFormatResolver) { - // TODO Auto-generated method stub - + public UuidGenerator getUuidGenerator() { + return null; } @Override - public void setProperties(Map properties) { - // TODO Auto-generated method stub + public void setUuidGenerator(UuidGenerator uuidGenerator) { } @Override - public Map getProperties() { - // TODO Auto-generated method stub + public Boolean isLoadTypeConverters() { return null; } @Override - public String getProperty(String name) { - // TODO Auto-generated method stub - return null; + public void setLoadTypeConverters(Boolean loadTypeConverters) { + } @Override - public FactoryFinder getDefaultFactoryFinder() { - // TODO Auto-generated method stub + public Boolean isTypeConverterStatisticsEnabled() { return null; } @Override - public void setFactoryFinderResolver(FactoryFinderResolver resolver) { - // TODO Auto-generated method stub + public void setTypeConverterStatisticsEnabled(Boolean typeConverterStatisticsEnabled) { } @Override - public FactoryFinder getFactoryFinder(String path) throws NoFactoryAvailableException { - // TODO Auto-generated method stub + public Boolean isUseMDCLogging() { return null; } @Override - public ClassResolver getClassResolver() { - // TODO Auto-generated method stub - return null; + public void setUseMDCLogging(Boolean useMDCLogging) { + } @Override - public PackageScanClassResolver getPackageScanClassResolver() { - // TODO Auto-generated method stub + public String getMDCLoggingKeysPattern() { return null; } @Override - public void setClassResolver(ClassResolver resolver) { - // TODO Auto-generated method stub + public void setMDCLoggingKeysPattern(String pattern) { } @Override - public void setPackageScanClassResolver(PackageScanClassResolver resolver) { - // TODO Auto-generated method stub - + public Boolean isUseDataType() { + return null; } @Override - public void setProducerServicePool(ServicePool servicePool) { - // TODO Auto-generated method stub + public void setUseDataType(Boolean useDataType) { } @Override - public ServicePool getProducerServicePool() { - // TODO Auto-generated method stub + public Boolean isUseBreadcrumb() { return null; } @Override - public void setPollingConsumerServicePool(ServicePool servicePool) { - // TODO Auto-generated method stub + public void setUseBreadcrumb(Boolean useBreadcrumb) { } @Override - public ServicePool getPollingConsumerServicePool() { - // TODO Auto-generated method stub + public StreamCachingStrategy getStreamCachingStrategy() { return null; } @Override - public void setNodeIdFactory(NodeIdFactory factory) { - // TODO Auto-generated method stub + public void setStreamCachingStrategy(StreamCachingStrategy streamCachingStrategy) { } @Override - public NodeIdFactory getNodeIdFactory() { - // TODO Auto-generated method stub + public RuntimeEndpointRegistry getRuntimeEndpointRegistry() { return null; } @Override - public ManagementStrategy getManagementStrategy() { - // TODO Auto-generated method stub - return null; + public void setRuntimeEndpointRegistry(RuntimeEndpointRegistry runtimeEndpointRegistry) { + } @Override - public void setManagementStrategy(ManagementStrategy strategy) { - // TODO Auto-generated method stub + public void setSSLContextParameters(SSLContextParameters sslContextParameters) { } @Override - public InterceptStrategy getDefaultTracer() { - // TODO Auto-generated method stub + public SSLContextParameters getSSLContextParameters() { return null; } @Override - public void setDefaultTracer(InterceptStrategy tracer) { - // TODO Auto-generated method stub + public void start() { } @Override - public InterceptStrategy getDefaultBacklogTracer() { - // TODO Auto-generated method stub - return null; + public void stop() { + } @Override - public void setDefaultBacklogTracer(InterceptStrategy backlogTracer) { - // TODO Auto-generated method stub - + public boolean isStarted() { + return false; } @Override - public InterceptStrategy getDefaultBacklogDebugger() { - // TODO Auto-generated method stub - return null; + public boolean isStarting() { + return false; } @Override - public void setDefaultBacklogDebugger(InterceptStrategy backlogDebugger) { - // TODO Auto-generated method stub - + public boolean isStopping() { + return false; } @Override - public void disableJMX() throws IllegalStateException { - // TODO Auto-generated method stub - + public boolean isStopped() { + return false; } @Override - public InflightRepository getInflightRepository() { - // TODO Auto-generated method stub - return null; + public boolean isSuspending() { + return false; } @Override - public void setInflightRepository(InflightRepository repository) { - // TODO Auto-generated method stub - + public boolean isSuspended() { + return false; } @Override - public AsyncProcessorAwaitManager getAsyncProcessorAwaitManager() { - // TODO Auto-generated method stub - return null; + public boolean isRunAllowed() { + return false; } @Override - public void setAsyncProcessorAwaitManager(AsyncProcessorAwaitManager manager) { - // TODO Auto-generated method stub + public void build() { } @Override - public ClassLoader getApplicationContextClassLoader() { - // TODO Auto-generated method stub - return null; + public void init() { + } @Override - public void setApplicationContextClassLoader(ClassLoader classLoader) { - // TODO Auto-generated method stub + public void suspend() { } @Override - public ShutdownStrategy getShutdownStrategy() { - // TODO Auto-generated method stub - return null; + public void resume() { + } @Override - public void setShutdownStrategy(ShutdownStrategy shutdownStrategy) { - // TODO Auto-generated method stub + public void shutdown() { } @Override - public ExecutorServiceManager getExecutorServiceManager() { - // TODO Auto-generated method stub - return null; + public void close() throws Exception { + } @Override - public ExecutorServiceStrategy getExecutorServiceStrategy() { - // TODO Auto-generated method stub + public ServiceStatus getStatus() { return null; } @Override - public void setExecutorServiceManager(ExecutorServiceManager executorServiceManager) { - // TODO Auto-generated method stub + public void setStreamCaching(Boolean cache) { } @Override - public ProcessorFactory getProcessorFactory() { - // TODO Auto-generated method stub + public Boolean isStreamCaching() { return null; } @Override - public void setProcessorFactory(ProcessorFactory processorFactory) { - // TODO Auto-generated method stub + public void setTracing(Boolean tracing) { } @Override - public Debugger getDebugger() { - // TODO Auto-generated method stub + public Boolean isTracing() { return null; } @Override - public void setDebugger(Debugger debugger) { - // TODO Auto-generated method stub - + public String getTracingPattern() { + return null; } @Override - public UuidGenerator getUuidGenerator() { - // TODO Auto-generated method stub - return null; + public void setTracingPattern(String tracePattern) { + } @Override - public void setUuidGenerator(UuidGenerator uuidGenerator) { - // TODO Auto-generated method stub + public void setBacklogTracing(Boolean backlogTrace) { } @Override - public Boolean isLazyLoadTypeConverters() { - // TODO Auto-generated method stub + public Boolean isBacklogTracing() { return null; } @Override - public void setLazyLoadTypeConverters(Boolean lazyLoadTypeConverters) { - // TODO Auto-generated method stub + public void setDebugging(Boolean debugging) { } @Override - public Boolean isTypeConverterStatisticsEnabled() { - // TODO Auto-generated method stub + public Boolean isDebugging() { return null; } @Override - public void setTypeConverterStatisticsEnabled(Boolean typeConverterStatisticsEnabled) { - // TODO Auto-generated method stub + public void setMessageHistory(Boolean messageHistory) { } @Override - public Boolean isUseMDCLogging() { - // TODO Auto-generated method stub + public Boolean isMessageHistory() { return null; } @Override - public void setUseMDCLogging(Boolean useMDCLogging) { - // TODO Auto-generated method stub + public void setLogMask(Boolean logMask) { } @Override - public Boolean isUseBreadcrumb() { - // TODO Auto-generated method stub + public Boolean isLogMask() { return null; } @Override - public void setUseBreadcrumb(Boolean useBreadcrumb) { - // TODO Auto-generated method stub + public void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody) { } @Override - public String resolveComponentDefaultName(String javaType) { - // TODO Auto-generated method stub + public Boolean isLogExhaustedMessageBody() { return null; } @Override - public Map findComponents() throws LoadPropertiesException, IOException { - // TODO Auto-generated method stub - return null; - } + public void setDelayer(Long delay) { - @Override - public Map findEips() throws LoadPropertiesException, IOException { - // TODO Auto-generated method stub - return null; } @Override - public String getComponentDocumentation(String componentName) throws IOException { - // TODO Auto-generated method stub + public Long getDelayer() { return null; } @Override - public String getComponentParameterJsonSchema(String componentName) throws IOException { - // TODO Auto-generated method stub - return null; + public void setAutoStartup(Boolean autoStartup) { + } @Override - public String getDataFormatParameterJsonSchema(String dataFormatName) throws IOException { - // TODO Auto-generated method stub + public Boolean isAutoStartup() { return null; } @Override - public String getLanguageParameterJsonSchema(String languageName) throws IOException { - // TODO Auto-generated method stub - return null; + public void setShutdownRoute(ShutdownRoute shutdownRoute) { + } @Override - public String getEipParameterJsonSchema(String eipName) throws IOException { - // TODO Auto-generated method stub + public ShutdownRoute getShutdownRoute() { return null; } @Override - public String explainEipJson(String nameOrId, boolean includeAllOptions) { - // TODO Auto-generated method stub - return null; + public void setShutdownRunningTask(ShutdownRunningTask shutdownRunningTask) { + } @Override - public String explainComponentJson(String componentName, boolean includeAllOptions) { - // TODO Auto-generated method stub + public ShutdownRunningTask getShutdownRunningTask() { return null; } @Override - public String explainEndpointJson(String uri, boolean includeAllOptions) { - // TODO Auto-generated method stub - return null; + public void setAllowUseOriginalMessage(Boolean allowUseOriginalMessage) { + } @Override - public String createRouteStaticEndpointJson(String routeId) { - // TODO Auto-generated method stub + public Boolean isAllowUseOriginalMessage() { return null; } @Override - public String createRouteStaticEndpointJson(String routeId, boolean includeDynamic) { - // TODO Auto-generated method stub + public Boolean isCaseInsensitiveHeaders() { return null; } @Override - public StreamCachingStrategy getStreamCachingStrategy() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setStreamCachingStrategy(StreamCachingStrategy streamCachingStrategy) { - // TODO Auto-generated method stub - - } - - @Override - public UnitOfWorkFactory getUnitOfWorkFactory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setUnitOfWorkFactory(UnitOfWorkFactory unitOfWorkFactory) { - // TODO Auto-generated method stub - - } - - @Override - public RuntimeEndpointRegistry getRuntimeEndpointRegistry() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setRuntimeEndpointRegistry(RuntimeEndpointRegistry runtimeEndpointRegistry) { - // TODO Auto-generated method stub - - } - - @Override - public RestRegistry getRestRegistry() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setRestRegistry(RestRegistry restRegistry) { - // TODO Auto-generated method stub - - } - - @Override - public void addRoutePolicyFactory(RoutePolicyFactory routePolicyFactory) { - // TODO Auto-generated method stub - - } - - @Override - public List getRoutePolicyFactories() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ModelJAXBContextFactory getModelJAXBContextFactory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setModelJAXBContextFactory(ModelJAXBContextFactory modelJAXBContextFactory) { - // TODO Auto-generated method stub - - } + public void setCaseInsensitiveHeaders(Boolean caseInsensitiveHeaders) { - @Override - public Boolean isLogExhaustedMessageBody() { - // TODO Auto-generated method stub - return null; } - - @Override - public Boolean isLogMask() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setLogExhaustedMessageBody(Boolean arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setLogMask(Boolean arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void addHystrixConfiguration(String arg0, HystrixConfigurationDefinition arg1) { - // TODO Auto-generated method stub - - } - - @Override - public void addLogListener(LogListener arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void addRestConfiguration(RestConfiguration arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void addService(Object arg0, boolean arg1, boolean arg2) throws Exception { - // TODO Auto-generated method stub - - } - - @Override - public void addServiceCallConfiguration(String arg0, ServiceCallConfigurationDefinition arg1) { - // TODO Auto-generated method stub - - } - - @Override - public DataFormat createDataFormat(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public FluentProducerTemplate createFluentProducerTemplate() { - // TODO Auto-generated method stub - return null; - } - - @Override - public FluentProducerTemplate createFluentProducerTemplate(int arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void deferStartService(Object arg0, boolean arg1) throws Exception { - // TODO Auto-generated method stub - - } - - @Override - public String explainDataFormatJson(String arg0, DataFormat arg1, boolean arg2) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Component getComponent(String arg0, boolean arg1, boolean arg2) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getGlobalOption(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getGlobalOptions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HeadersMapFactory getHeadersMapFactory() { - return new DefaultHeadersMapFactory(); - } - - @Override - public HealthCheckRegistry getHealthCheckRegistry() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HystrixConfigurationDefinition getHystrixConfiguration(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set getLogListeners() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ManagedCamelContextMBean getManagedCamelContext() { - // TODO Auto-generated method stub - return null; - } - - @Override - public T getManagedProcessor(String arg0, Class arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public T getManagedRoute(String arg0, Class arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public MessageHistoryFactory getMessageHistoryFactory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Processor getProcessor(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public T getProcessor(String arg0, Class arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ProcessorDefinition getProcessorDefinition(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public T getProcessorDefinition(String arg0, Class arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ReloadStrategy getReloadStrategy() { - // TODO Auto-generated method stub - return null; - } - - @Override - public RestConfiguration getRestConfiguration(String arg0, boolean arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Collection getRestConfigurations() { - // TODO Auto-generated method stub - return null; - } - - @Override - public RouteController getRouteController() { - // TODO Auto-generated method stub - return null; - } - - @Override - public RuntimeCamelCatalog getRuntimeCamelCatalog() { - // TODO Auto-generated method stub - return null; - } - - @Override - public SSLContextParameters getSSLContextParameters() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServiceCallConfigurationDefinition getServiceCallConfiguration(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public TransformerRegistry getTransformerRegistry() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List getTransformers() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getUptimeMillis() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public ValidatorRegistry getValidatorRegistry() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List getValidators() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set hasServices(Class arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Boolean isLoadTypeConverters() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Boolean isUseDataType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isVetoStarted() { - // TODO Auto-generated method stub - return false; - } - - @Override - public RestsDefinition loadRestsDefinition(InputStream arg0) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public Transformer resolveTransformer(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Transformer resolveTransformer(DataType arg0, DataType arg1) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Validator resolveValidator(DataType arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setGlobalOptions(Map arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setHeadersMapFactory(HeadersMapFactory arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setHealthCheckRegistry(HealthCheckRegistry arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setHystrixConfiguration(HystrixConfigurationDefinition arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setHystrixConfigurations(List arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setLoadTypeConverters(Boolean arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setMessageHistoryFactory(MessageHistoryFactory arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setReloadStrategy(ReloadStrategy arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setRouteController(RouteController arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setSSLContextParameters(SSLContextParameters arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setServiceCallConfiguration(ServiceCallConfigurationDefinition arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setServiceCallConfigurations(List arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setTransformers(List arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setUseDataType(Boolean arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setValidators(List arg0) { - // TODO Auto-generated method stub - - } - } diff --git a/src/test/java/org/onap/aai/rest/RestClientTest.java b/src/test/java/org/onap/aai/rest/RestClientTest.java index 66e7365..6c176d6 100644 --- a/src/test/java/org/onap/aai/rest/RestClientTest.java +++ b/src/test/java/org/onap/aai/rest/RestClientTest.java @@ -29,16 +29,23 @@ import java.util.List; import java.util.Map; import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.impl.DefaultMessage; +import org.apache.camel.ExtendedCamelContext; +import org.apache.camel.support.DefaultMessage; import org.junit.Before; import org.junit.Test; -import org.onap.aai.event.TestCamelContext; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; import org.onap.aai.logging.RouterCoreMsgs; import org.onap.aai.restclient.client.Headers; +@RunWith(MockitoJUnitRunner.class) public class RestClientTest { + + @Mock + public ExtendedCamelContext context; + /** * Test case initialization * @@ -52,7 +59,7 @@ public class RestClientTest { public void validate() throws Exception { try { - RestClientComponent rc = new RestClientComponent(); + RestClientComponent rc = new RestClientComponent(context); RestClientEndpoint endpoint = new RestClientEndpoint("http://host.com:8443/endpoint", rc); endpoint.setEcompClientCert("client-cert"); @@ -60,6 +67,7 @@ public class RestClientTest { endpoint.setEcompKeystorePassword("OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10"); endpoint.setOp("GET"); + assertTrue(endpoint.getEcompClientCert().compareTo("client-cert") == 0); assertTrue(endpoint.getEcompKeystore().compareTo("keystore") == 0); assertTrue(endpoint.getEcompKeystorePassword().compareTo("OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10") == 0); @@ -75,7 +83,6 @@ public class RestClientTest { Exchange exchange = endpoint.createExchange(); exchange.setProperty(Exchange.TO_ENDPOINT, "mock://get"); DefaultMessage in = (DefaultMessage)exchange.getIn(); - in.setCamelContext(new TestCamelContext()); in.setHeader(RestClientEndpoint.IN_HEADER_URL, "svc/endpoint"); in.setHeader(Headers.FROM_APP_ID, "val1"); -- 2.16.6 From d1dcd3db0d453b8a92d1498271783fb6acdb9eed Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 17 Sep 2020 05:57:21 +0000 Subject: [PATCH 16/16] Release aai/router-core --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b02fc5e..783012b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.onap.aai.router-core router-core bundle - 1.7.0-SNAPSHOT + 1.7.0 aai-router-core google_checks.xml -- 2.16.6