You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/05/17 08:36:22 UTC
camel git commit: Fix ehcache starter build
Repository: camel
Updated Branches:
refs/heads/master 57f26a103 -> 4332c7e65
Fix ehcache starter build
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4332c7e6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4332c7e6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4332c7e6
Branch: refs/heads/master
Commit: 4332c7e65256be90e808c1eae3d3a8952b39c374
Parents: 57f26a1
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed May 17 10:35:44 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed May 17 10:35:52 2017 +0200
----------------------------------------------------------------------
components/camel-ehcache/src/main/docs/ehcache-component.adoc | 2 +-
.../org/apache/camel/component/ehcache/EhcacheComponent.java | 4 ++--
.../ehcache/springboot/EhcacheComponentConfiguration.java | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4332c7e6/components/camel-ehcache/src/main/docs/ehcache-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ehcache/src/main/docs/ehcache-component.adoc b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
index 78b5f9a..468aa15 100644
--- a/components/camel-ehcache/src/main/docs/ehcache-component.adoc
+++ b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
@@ -47,7 +47,7 @@ The Ehcache component supports 6 options which are listed below.
| **configuration** (advanced) | Sets the global component configuration | | EhcacheConfiguration
| **cacheManager** (common) | The cache manager | | CacheManager
| **cacheManager Configuration** (common) | The cache manager configuration | | Configuration
-| **cacheConfiguration** (common) | The default cache configuration to be used to create caches. | | CacheConfiguration<K, V>
+| **cacheConfiguration** (common) | The default cache configuration to be used to create caches. | | CacheConfiguration<?,?>
| **cacheConfigurationUri** (common) | URI pointing to the Ehcache XML configuration file's location | | String
| **resolveProperty Placeholders** (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/4332c7e6/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java
index a92fac5..614f6cb 100644
--- a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java
+++ b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheComponent.java
@@ -144,11 +144,11 @@ public class EhcacheComponent extends DefaultComponent {
/**
* The default cache configuration to be used to create caches.
*/
- public <K, V> void setCacheConfiguration(CacheConfiguration<K, V> cacheConfiguration) {
+ public void setCacheConfiguration(CacheConfiguration<?, ?> cacheConfiguration) {
this.configuration.setConfiguration(cacheConfiguration);
}
- public <K, V> CacheConfiguration<K, V> getCacheConfiguration() {
+ public CacheConfiguration<?, ?> getCacheConfiguration() {
return this.configuration.getConfiguration();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4332c7e6/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
index 66c9742..3415f72 100644
--- a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
@@ -56,7 +56,7 @@ public class EhcacheComponentConfiguration {
* The default cache configuration to be used to create caches.
*/
@NestedConfigurationProperty
- private CacheConfiguration<K, V> cacheConfiguration;
+ private CacheConfiguration<?, ?> cacheConfiguration;
/**
* URI pointing to the Ehcache XML configuration file's location
*/
@@ -94,12 +94,12 @@ public class EhcacheComponentConfiguration {
this.cacheManagerConfiguration = cacheManagerConfiguration;
}
- public CacheConfiguration<K, V> getCacheConfiguration() {
+ public CacheConfiguration<?, ?> getCacheConfiguration() {
return cacheConfiguration;
}
public void setCacheConfiguration(
- CacheConfiguration<K, V> cacheConfiguration) {
+ CacheConfiguration<?, ?> cacheConfiguration) {
this.cacheConfiguration = cacheConfiguration;
}