You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/06/14 12:07:43 UTC
[camel] 02/02: (chores) camel-core-languages: cleanup duplicated code extracting date from exchanges
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
commit 53db9590c06a04987fddceb8899ca859e15a9a11
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 14 08:42:26 2023 +0200
(chores) camel-core-languages: cleanup duplicated code extracting date from exchanges
---
.../camel/language/csimple/CSimpleHelper.java | 59 +++-----------------
.../language/simple/SimpleExpressionBuilder.java | 63 +++-------------------
.../org/apache/camel/support/LanguageHelper.java | 55 +++++++++++++++++++
3 files changed, 70 insertions(+), 107 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index c7af5e75a75..950e970905f 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -317,67 +317,22 @@ public final class CSimpleHelper {
if ("now".equals(command)) {
date = new Date();
} else if ("exchangeCreated".equals(command)) {
- date = dateFromExchangeCreated(exchange);
+ date = LanguageHelper.dateFromExchangeCreated(exchange);
} else if (command.startsWith("header.")) {
- date = dateFromHeader(exchange, command);
+ date = LanguageHelper.dateFromHeader(exchange, command, (e, o) -> failDueToMissingObjectAtCommand(command));
} else if (command.startsWith("exchangeProperty.")) {
- date = dateFromExchangeProperty(exchange, command);
+ date = LanguageHelper.dateFromExchangeProperty(exchange, command,
+ (e, o) -> failDueToMissingObjectAtCommand(command));
} else if ("file".equals(command)) {
- date = dateFromFileLastModified(exchange, command);
+ date = LanguageHelper.dateFromFileLastModified(exchange, command);
} else {
throw new IllegalArgumentException("Command not supported for dateExpression: " + command);
}
return date;
}
- private static Date dateFromFileLastModified(Exchange exchange, String command) {
- Date date;
- Long num = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Long.class);
- if (num != null && num > 0) {
- date = new Date(num);
- } else {
- date = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Date.class);
- if (date == null) {
- throw new IllegalArgumentException(
- "Cannot find " + Exchange.FILE_LAST_MODIFIED + " header at command: " + command);
- }
- }
- return date;
- }
-
- private static Date dateFromExchangeProperty(Exchange exchange, String command) {
- Date date;
- String key = command.substring(command.lastIndexOf('.') + 1);
- Object obj = exchange.getProperty(key);
- if (obj instanceof Date) {
- date = (Date) obj;
- } else if (obj instanceof Long) {
- date = new Date((Long) obj);
- } else {
- throw new IllegalArgumentException("Cannot find Date/long object at command: " + command);
- }
- return date;
- }
-
- private static Date dateFromHeader(Exchange exchange, String command) {
- Date date;
- String key = command.substring(command.lastIndexOf('.') + 1);
- Object obj = exchange.getMessage().getHeader(key);
- if (obj instanceof Date) {
- date = (Date) obj;
- } else if (obj instanceof Long) {
- date = new Date((Long) obj);
- } else {
- throw new IllegalArgumentException("Cannot find Date/long object at command: " + command);
- }
- return date;
- }
-
- private static Date dateFromExchangeCreated(Exchange exchange) {
- Date date;
- long num = exchange.getCreated();
- date = new Date(num);
- return date;
+ private static Date failDueToMissingObjectAtCommand(String command) {
+ throw new IllegalArgumentException("Cannot find Date/long object at command:" + command);
}
public static String property(Exchange exchange, String key, String defaultValue) {
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index f29fd681f0f..8b98fa8684a 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -583,72 +583,25 @@ public final class SimpleExpressionBuilder {
if ("now".equals(command)) {
date = new Date();
} else if ("exchangeCreated".equals(command)) {
- date = dateFromExchangeCreated(exchange);
+ date = LanguageHelper.dateFromExchangeCreated(exchange);
} else if (command.startsWith("header.")) {
- date = dateFromHeader(exchange, command);
+ date = LanguageHelper.dateFromHeader(exchange, command, (e, o) -> tryConvertingAsDate(e, o, command));
} else if (command.startsWith("exchangeProperty.")) {
- date = dateFromExchangeProperty(exchange, command);
+ date = LanguageHelper.dateFromExchangeProperty(exchange, command, (e, o) -> tryConvertingAsDate(e, o, command));
} else if ("file".equals(command)) {
- date = dateFromFileLastModified(exchange, command);
+ date = LanguageHelper.dateFromFileLastModified(exchange, command);
} else {
throw new IllegalArgumentException("Command not supported for dateExpression: " + command);
}
return date;
}
- private static Date dateFromFileLastModified(Exchange exchange, String command) {
- Date date;
- Long num = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Long.class);
- if (num != null && num > 0) {
- date = new Date(num);
- } else {
- date = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Date.class);
- if (date == null) {
- throw new IllegalArgumentException(
- "Cannot find " + Exchange.FILE_LAST_MODIFIED + " header at command: " + command);
- }
- }
- return date;
- }
-
- private static Date dateFromExchangeProperty(Exchange exchange, String command) {
- Date date;
- String key = command.substring(command.lastIndexOf('.') + 1);
- Object obj = exchange.getProperty(key);
- if (obj instanceof Date) {
- date = (Date) obj;
- } else if (obj instanceof Long) {
- date = new Date((Long) obj);
- } else {
- date = exchange.getContext().getTypeConverter().tryConvertTo(Date.class, exchange, obj);
- if (date == null) {
- throw new IllegalArgumentException("Cannot find Date/long object at command: " + command);
- }
+ private static Date tryConvertingAsDate(Exchange exchange, Object obj, String command) {
+ final Date date = exchange.getContext().getTypeConverter().tryConvertTo(Date.class, exchange, obj);
+ if (date == null) {
+ throw new IllegalArgumentException("Cannot find Date/long object at command: " + command);
}
- return date;
- }
-
- private static Date dateFromHeader(Exchange exchange, String command) {
- Date date;
- String key = command.substring(command.lastIndexOf('.') + 1);
- Object obj = exchange.getMessage().getHeader(key);
- if (obj instanceof Date) {
- date = (Date) obj;
- } else if (obj instanceof Long) {
- date = new Date((Long) obj);
- } else {
- date = exchange.getContext().getTypeConverter().tryConvertTo(Date.class, exchange, obj);
- if (date == null) {
- throw new IllegalArgumentException("Cannot find Date/long object at command: " + command);
- }
- }
- return date;
- }
- private static Date dateFromExchangeCreated(Exchange exchange) {
- Date date;
- long num = exchange.getCreated();
- date = new Date(num);
return date;
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/LanguageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/LanguageHelper.java
index 3e7e627c195..f1c3b7586b6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/LanguageHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/LanguageHelper.java
@@ -19,6 +19,8 @@ package org.apache.camel.support;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.Date;
+import java.util.function.BiFunction;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -200,4 +202,57 @@ public final class LanguageHelper {
}
return sb.toString();
}
+
+ public static Date dateFromFileLastModified(Exchange exchange, String command) {
+ Date date;
+ Long num = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Long.class);
+ if (num != null && num > 0) {
+ date = new Date(num);
+ } else {
+ date = exchange.getIn().getHeader(Exchange.FILE_LAST_MODIFIED, Date.class);
+ if (date == null) {
+ throw new IllegalArgumentException(
+ "Cannot find " + Exchange.FILE_LAST_MODIFIED + " header at command: " + command);
+ }
+ }
+ return date;
+ }
+
+ public static Date dateFromExchangeProperty(
+ Exchange exchange, String command, BiFunction<Exchange, Object, Date> orElseFunction) {
+ final String key = command.substring(command.lastIndexOf('.') + 1);
+ final Object obj = exchange.getProperty(key);
+ if (obj instanceof Date) {
+ return (Date) obj;
+ } else if (obj instanceof Long) {
+ return new Date((Long) obj);
+ } else {
+ if (orElseFunction != null) {
+ return orElseFunction.apply(exchange, obj);
+ }
+ }
+ return null;
+ }
+
+ public static Date dateFromHeader(Exchange exchange, String command, BiFunction<Exchange, Object, Date> orElseFunction) {
+ final String key = command.substring(command.lastIndexOf('.') + 1);
+ final Object obj = exchange.getMessage().getHeader(key);
+ if (obj instanceof Date) {
+ return (Date) obj;
+ } else if (obj instanceof Long) {
+ return new Date((Long) obj);
+ } else {
+ if (orElseFunction != null) {
+ return orElseFunction.apply(exchange, obj);
+ }
+ }
+ return null;
+ }
+
+ public static Date dateFromExchangeCreated(Exchange exchange) {
+ Date date;
+ long num = exchange.getCreated();
+ date = new Date(num);
+ return date;
+ }
}