This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c2770f7a85a CAMEL-20093: cleaned up duplicated code in
DefaultCamelCatalog.java (#11955)
c2770f7a85a is described below
commit c2770f7a85afa773bd63691a4cc17970f435155f
Author: LostArtist <[email protected]>
AuthorDate: Thu Nov 9 16:29:16 2023 +0100
CAMEL-20093: cleaned up duplicated code in DefaultCamelCatalog.java (#11955)
Co-authored-by: Nikita Konovalov <[email protected]>
---
.../org/apache/camel/catalog/DefaultCamelCatalog.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 9238ff938b4..eb4d8e24048 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -543,6 +543,10 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
@SuppressWarnings("unchecked")
private <T> T cache(String key, String name, Function<String, T> loader) {
+ return doGetCache(key, name, loader);
+ }
+
+ private <T> T doGetCache(String key, String name, Function<String, T>
loader) {
if (caching) {
T t = (T) cache.get(key);
if (t == null) {
@@ -559,18 +563,7 @@ public class DefaultCamelCatalog extends
AbstractCamelCatalog implements CamelCa
@SuppressWarnings("unchecked")
private <T> T cache(String name, Function<String, T> loader) {
- if (caching) {
- T t = (T) cache.get(name);
- if (t == null) {
- t = loader.apply(name);
- if (t != null) {
- cache.put(name, t);
- }
- }
- return t;
- } else {
- return loader.apply(name);
- }
+ return doGetCache(name, name, loader);
}
private String loadResource(String file) {
