Fixed CharSequenceTranslatorEvaluator to meet style standard and added license text block
Signed-off-by: Matt Burgess <mattyb...@apache.org> This closes #833 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/098a35c9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/098a35c9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/098a35c9 Branch: refs/heads/master Commit: 098a35c915bbd809d7e8e99dac3371a90c0909e9 Parents: 28b5dbe Author: Devin Fisher <dev.fis...@gmail.com> Authored: Thu Aug 11 10:07:54 2016 -0600 Committer: Matt Burgess <mattyb...@apache.org> Committed: Fri Aug 12 11:31:50 2016 -0400 ---------------------------------------------------------------------- .../CharSequenceTranslatorEvaluator.java | 58 ++++++++++++-------- 1 file changed, 36 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/098a35c9/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java index 11a779e..9a671c1 100644 --- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java +++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.nifi.attribute.expression.language.evaluation.functions; import java.util.Map; @@ -9,49 +25,47 @@ import org.apache.nifi.attribute.expression.language.evaluation.QueryResult; import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult; -public class CharSequenceTranslatorEvaluator extends StringEvaluator -{ +public class CharSequenceTranslatorEvaluator extends StringEvaluator { public static StringEvaluator jsonEscapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_JSON); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_JSON); } - + public static StringEvaluator xmlEscapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_XML10); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_XML10); } - + public static StringEvaluator csvEscapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_CSV); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_CSV); } public static StringEvaluator html3EscapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_HTML3); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_HTML3); } - + public static StringEvaluator html4EscapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_HTML4); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.ESCAPE_HTML4); } - + public static StringEvaluator jsonUnescapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_JSON); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_JSON); } - + public static StringEvaluator xmlUnescapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_XML); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_XML); } - + public static StringEvaluator csvUnescapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_CSV); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_CSV); } public static StringEvaluator html3UnescapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_HTML3); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_HTML3); } - + public static StringEvaluator html4UnescapeEvaluator(final Evaluator<String> subject){ - return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_HTML4); + return new CharSequenceTranslatorEvaluator(subject, StringEscapeUtils.UNESCAPE_HTML4); } - - + private final Evaluator<String> subject; private final CharSequenceTranslator method; @@ -70,4 +84,4 @@ public class CharSequenceTranslatorEvaluator extends StringEvaluator public Evaluator<?> getSubjectEvaluator() { return subject; } -} \ No newline at end of file +}
