Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87ba55d8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87ba55d8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87ba55d8 Branch: refs/heads/master Commit: 87ba55d89cd37dd51a593926b7a03b9552a5bf97 Parents: 629d63a Author: Claus Ibsen <[email protected]> Authored: Wed Aug 10 11:22:33 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Aug 10 19:08:13 2016 +0200 ---------------------------------------------------------------------- .../camel/spring/CamelContextFactoryBean.java | 91 ++++++++++---------- 1 file changed, 45 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87ba55d8/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java index a9da06b..42def32 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java @@ -95,64 +95,64 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr implements FactoryBean<SpringCamelContext>, InitializingBean, DisposableBean, ApplicationContextAware, ApplicationListener<ApplicationEvent> { private static final Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBean.class); - @XmlAttribute(name = "depends-on", required = false) + @XmlAttribute(name = "depends-on") private String dependsOn; - @XmlAttribute(required = false) + @XmlAttribute private String trace; - @XmlAttribute(required = false) + @XmlAttribute private String messageHistory; - @XmlAttribute(required = false) + @XmlAttribute private String logExhaustedMessageBody; - @XmlAttribute(required = false) + @XmlAttribute private String streamCache; - @XmlAttribute(required = false) + @XmlAttribute private String delayer; - @XmlAttribute(required = false) + @XmlAttribute private String handleFault; - @XmlAttribute(required = false) + @XmlAttribute private String errorHandlerRef; - @XmlAttribute(required = false) + @XmlAttribute private String autoStartup; - @XmlAttribute(required = false) + @XmlAttribute private String shutdownEager; - @XmlAttribute(required = false) + @XmlAttribute private String useMDCLogging; - @XmlAttribute(required = false) + @XmlAttribute private String useBreadcrumb; - @XmlAttribute(required = false) + @XmlAttribute private String allowUseOriginalMessage; - @XmlAttribute(required = false) + @XmlAttribute private String runtimeEndpointRegistryEnabled; - @XmlAttribute(required = false) + @XmlAttribute private String managementNamePattern; - @XmlAttribute(required = false) + @XmlAttribute private String threadNamePattern; - @XmlAttribute(required = false) + @XmlAttribute private ShutdownRoute shutdownRoute; - @XmlAttribute(required = false) + @XmlAttribute private ShutdownRunningTask shutdownRunningTask; - @XmlAttribute(required = false) + @XmlAttribute @Deprecated private Boolean lazyLoadTypeConverters; - @XmlAttribute(required = false) + @XmlAttribute private Boolean typeConverterStatisticsEnabled; - @XmlAttribute(required = false) + @XmlAttribute private TypeConverterExists typeConverterExists; - @XmlAttribute(required = false) + @XmlAttribute private LoggingLevel typeConverterExistsLoggingLevel; - @XmlElement(name = "properties", required = false) + @XmlElement(name = "properties") private PropertiesDefinition properties; - @XmlElement(name = "propertyPlaceholder", type = CamelPropertyPlaceholderDefinition.class, required = false) + @XmlElement(name = "propertyPlaceholder", type = CamelPropertyPlaceholderDefinition.class) private CamelPropertyPlaceholderDefinition camelPropertyPlaceholder; - @XmlElement(name = "package", required = false) + @XmlElement(name = "package") private String[] packages = {}; - @XmlElement(name = "packageScan", type = PackageScanDefinition.class, required = false) + @XmlElement(name = "packageScan", type = PackageScanDefinition.class) private PackageScanDefinition packageScan; - @XmlElement(name = "contextScan", type = ContextScanDefinition.class, required = false) + @XmlElement(name = "contextScan", type = ContextScanDefinition.class) private ContextScanDefinition contextScan; - @XmlElement(name = "streamCaching", type = CamelStreamCachingStrategyDefinition.class, required = false) + @XmlElement(name = "streamCaching", type = CamelStreamCachingStrategyDefinition.class) private CamelStreamCachingStrategyDefinition camelStreamCachingStrategy; - @XmlElement(name = "jmxAgent", type = CamelJMXAgentDefinition.class, required = false) + @XmlElement(name = "jmxAgent", type = CamelJMXAgentDefinition.class) private CamelJMXAgentDefinition camelJMXAgent; @XmlElements({ @XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class, required = false), @@ -167,37 +167,37 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr @XmlElement(name = "export", type = CamelServiceExporterDefinition.class, required = false), @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class, required = false)}) private List<?> beans; - @XmlElement(name = "routeBuilder", required = false) + @XmlElement(name = "routeBuilder") private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>(); - @XmlElement(name = "routeContextRef", required = false) + @XmlElement(name = "routeContextRef") private List<RouteContextRefDefinition> routeRefs = new ArrayList<RouteContextRefDefinition>(); - @XmlElement(name = "restContextRef", required = false) + @XmlElement(name = "restContextRef") private List<RestContextRefDefinition> restRefs = new ArrayList<RestContextRefDefinition>(); - @XmlElement(name = "threadPoolProfile", required = false) + @XmlElement(name = "threadPoolProfile") private List<ThreadPoolProfileDefinition> threadPoolProfiles; - @XmlElement(name = "threadPool", required = false) + @XmlElement(name = "threadPool") private List<CamelThreadPoolFactoryBean> threadPools; - @XmlElement(name = "endpoint", required = false) + @XmlElement(name = "endpoint") private List<CamelEndpointFactoryBean> endpoints; - @XmlElement(name = "dataFormats", required = false) + @XmlElement(name = "dataFormats") private DataFormatsDefinition dataFormats; - @XmlElement(name = "redeliveryPolicyProfile", required = false) + @XmlElement(name = "redeliveryPolicyProfile") private List<CamelRedeliveryPolicyFactoryBean> redeliveryPolicies; - @XmlElement(name = "onException", required = false) + @XmlElement(name = "onException") private List<OnExceptionDefinition> onExceptions = new ArrayList<OnExceptionDefinition>(); - @XmlElement(name = "onCompletion", required = false) + @XmlElement(name = "onCompletion") private List<OnCompletionDefinition> onCompletions = new ArrayList<OnCompletionDefinition>(); - @XmlElement(name = "intercept", required = false) + @XmlElement(name = "intercept") private List<InterceptDefinition> intercepts = new ArrayList<InterceptDefinition>(); - @XmlElement(name = "interceptFrom", required = false) + @XmlElement(name = "interceptFrom") private List<InterceptFromDefinition> interceptFroms = new ArrayList<InterceptFromDefinition>(); - @XmlElement(name = "interceptSendToEndpoint", required = false) + @XmlElement(name = "interceptSendToEndpoint") private List<InterceptSendToEndpointDefinition> interceptSendToEndpoints = new ArrayList<InterceptSendToEndpointDefinition>(); - @XmlElement(name = "restConfiguration", required = false) + @XmlElement(name = "restConfiguration") private RestConfigurationDefinition restConfiguration; - @XmlElement(name = "rest", required = false) + @XmlElement(name = "rest") private List<RestDefinition> rests = new ArrayList<RestDefinition>(); - @XmlElement(name = "route", required = false) + @XmlElement(name = "route") private List<RouteDefinition> routes = new ArrayList<RouteDefinition>(); @XmlTransient private SpringCamelContext context; @@ -209,7 +209,6 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr private BeanPostProcessor beanPostProcessor; @XmlTransient private boolean implicitId; - @Override public Class<SpringCamelContext> getObjectType() {
