This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a760f36f567a6497814c202520461ec98051ec6 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Aug 10 14:16:04 2021 +0200 Polish and cleanup documentation --- docs/user-manual/modules/ROOT/nav.adoc | 1 - .../modules/ROOT/pages/dependency-injection.adoc | 15 --------- .../modules/ROOT/pages/dozer-type-conversion.adoc | 36 ++++------------------ docs/user-manual/modules/ROOT/pages/index.adoc | 1 - 4 files changed, 6 insertions(+), 47 deletions(-) diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc index 7bf5e51..59e5e63 100644 --- a/docs/user-manual/modules/ROOT/nav.adoc +++ b/docs/user-manual/modules/ROOT/nav.adoc @@ -44,7 +44,6 @@ ** xref:data-format.adoc[Data Format] ** xref:debugger.adoc[Debugger] ** xref:delay-interceptor.adoc[Delayer] -** xref:dependency-injection.adoc[Dependency Injection] ** xref:dozer-type-conversion.adoc[Dozer Type Conversion] ** xref:endpoint.adoc[Endpoints] ** xref:endpoint-annotations.adoc[Endpoint Annotations] diff --git a/docs/user-manual/modules/ROOT/pages/dependency-injection.adoc b/docs/user-manual/modules/ROOT/pages/dependency-injection.adoc deleted file mode 100644 index 95ae2d9..0000000 --- a/docs/user-manual/modules/ROOT/pages/dependency-injection.adoc +++ /dev/null @@ -1,15 +0,0 @@ -[[DependencyInjection-DependencyInjection]] -= Dependency Injection - -_Dependency Injection_ or _Inversion of Control_ is a pattern where -dependencies of an object are injected into the object without the -object being too aware of how the injection is performed. The two most -popular Dependency Injection libraries available at the time of writing -are - -* Spring -* CDI - -Camel is developed such that any Dependency Injection framework can be -used easily - though we've tried hard to optimise Camel for both -Spring and CDI. diff --git a/docs/user-manual/modules/ROOT/pages/dozer-type-conversion.adoc b/docs/user-manual/modules/ROOT/pages/dozer-type-conversion.adoc index 971f4f9..a32ab6a 100644 --- a/docs/user-manual/modules/ROOT/pages/dozer-type-conversion.adoc +++ b/docs/user-manual/modules/ROOT/pages/dozer-type-conversion.adoc @@ -132,10 +132,11 @@ For our simple example, the configuration looks like the following. == Support for Dozer in Camel Camel provides a simple mechanism to integrate Dozer Mappers with it's -own powerful http://camel.apache.org/type-converter.html[Type -Conversion] framework. Its configured by creating an instance of -`DozerTypeConverterLoader` providing it the camel context and an -optional Dozer mapper. If no mapper is supplied, Camel's registry will +own powerful xref:type-converter.adoc[Type Conversion] framework. +Its configured by creating an instance of `DozerTypeConverterLoader` +providing it the camel context and an optional Dozer mapper. + +If no mapper is supplied, Camel's registry will be searched for suitable instances. The loader will query the Dozer Mapper for the types it converts and register them with Camel's type conversion framework to be handled by the mapper. @@ -159,7 +160,7 @@ Mapper mapper = DozerBeanMapperBuilder.create() new DozerTypeConverterLoader(camelContext, mapper); ----------------------------------------------------------------------------------------- -Or in Spring: +Or in Spring XML: [source,xml] -------------------------------------------------------------------------------------------------- @@ -181,31 +182,6 @@ Or in Spring: </camelContext> -------------------------------------------------------------------------------------------------- -Or in OSGi Blueprints: - -[source,xml] --------------------------------------------------------------------------------------------------- -<bean id="dozerConverterLoader" class="org.apache.camel.converter.dozer.DozerTypeConverterLoader"> - <argument index="0" ref="myCamel"/> - <argument index="1" ref="mapperConfiguration"/> -</bean> - -<bean id="mapperConfiguration" class="org.apache.camel.converter.dozer.DozerBeanMapperConfiguration"> - <property name="mappingFiles"> - <list> - <value>mapping.xml</value> - </list> - </property> -</bean> - -<camelContext id="myCamel" xmlns="http://camel.apache.org/schema/blueprint";> - ... -</camelContext> --------------------------------------------------------------------------------------------------- - -You should have noticed that the configuration for Spring or OSGi Blueprints -is the same, except for the 'xmlns' for the 'camelContext'. - Now, where necessary, Camel will use Dozer to do conversions; in our case between the new domain and legacy Customer types e.g. diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 555de59..f290d8e 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -83,7 +83,6 @@ camel routes without them knowing * xref:data-format.adoc[Data Format] * xref:debugger.adoc[Debugger] * xref:delay-interceptor.adoc[Delayer] -* xref:dependency-injection.adoc[Dependency Injection] * xref:dozer-type-conversion.adoc[Dozer Type Conversion] * xref:dsl.adoc[DSL] * xref:endpoint.adoc[Endpoint]
