From 8d231c9bf568505c0dd41cef4376f62b825d3d18 Mon Sep 17 00:00:00 2001 From: glaplace Date: Tue, 11 May 2021 17:22:44 +0200 Subject: [PATCH] #24 Correct usage of VariableUnsupportedTypeException (report in 1.4.0-SNAPSHOT) --- .../incoming/variable/VariableDefinition.java | 18 +++++++++--------- .../incoming/variable/VariableImplBuilder.java | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableDefinition.java b/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableDefinition.java index a86cf3af..ff7627eb 100644 --- a/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableDefinition.java +++ b/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableDefinition.java @@ -1,16 +1,16 @@ /** * Copyright (c) 2019-2021 Linagora - * + * * This program/library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 2.1 of the License, or (at your * option) any later version. - * + * * This program/library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with this program/library; If not, see http://www.gnu.org/licenses/ * for the GNU Lesser General Public License version 2.1. @@ -41,14 +41,14 @@ /** * Variable definition used as an internal model of a variable. - * + * * @author Christophe DENEUX - Linagora * */ public class VariableDefinition { - + private final String name; - + private final XPathExpression xpathExprValue; private Templates preXmlTransformation; @@ -174,7 +174,7 @@ public void setPreXmlTranformationResultJson(final boolean isPreXmlTranformation /** * Return the Flowable variable value in the right format according to its type - * + * * @param stringValue * The Flowable varaible value as {@link String} to convert in the right type * @throws VariableException @@ -224,12 +224,12 @@ private Object convert(final String variableValueAsStr) throws VariableException } else if (this.type.equals("json")) { return Boolean.valueOf(variableValueAsStr); } else { - throw new VariableUnsupportedTypeException(this.type, this.name); + throw new VariableUnsupportedTypeException(this.name, this.type); } } /** - * + * * @param incomingPayload * @param emptyVariableValueLogger * A callback logger to log message about an empty value extracted diff --git a/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableImplBuilder.java b/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableImplBuilder.java index 61e6a70e..9d888a45 100644 --- a/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableImplBuilder.java +++ b/src/main/java/org/ow2/petals/flowable/incoming/variable/VariableImplBuilder.java @@ -1,16 +1,16 @@ /** * Copyright (c) 2019-2021 Linagora - * + * * This program/library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 2.1 of the License, or (at your * option) any later version. - * + * * This program/library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with this program/library; If not, see http://www.gnu.org/licenses/ * for the GNU Lesser General Public License version 2.1. @@ -28,7 +28,7 @@ /** * Abstract variable implementation. - * + * * @author Christophe DENEUX - Linagora * */ @@ -40,7 +40,7 @@ private VariableImplBuilder() { /** * Builds a {@link VariableImpl} from its {@link VariableDefinition}. - * + * * @param variable * The variable definition. Not {@code null}. * @return The variable implementation @@ -74,13 +74,13 @@ public static final VariableImpl build(final VariableDefinition variable, final variable.getNamespaceMappings(), jacksonObjectMapper, logger); } else { - throw new VariableUnsupportedTypeException(variable.getType(), variable.getName()); + throw new VariableUnsupportedTypeException(variable.getName(), variable.getType()); } } /** * Builds a list of {@link VariableImpl} from a list of {@link VariableDefinition}. - * + * * @param variables * The variable definitions. Not {@code null}. * @return The variable implementations