[OLINGO-891] Fixed tests and checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/2538dcc7 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/2538dcc7 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/2538dcc7 Branch: refs/heads/OLINGO-882_EnableContainerManagedPersistence Commit: 2538dcc7eaf5161ae282c08e0596a36a428fe3fb Parents: 8c0d152 Author: Michael Bolz <[email protected]> Authored: Wed Feb 24 10:42:58 2016 +0100 Committer: Michael Bolz <[email protected]> Committed: Wed Feb 24 10:42:58 2016 +0100 ---------------------------------------------------------------------- .../odata2/jpa/processor/core/ODataExpressionParser.java | 7 ++++--- .../processor/core/ODataFilterExpressionParserTest.java | 11 ++++++----- .../core/access/data/JPAExpandCallBackTest.java | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2538dcc7/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java index 1479b10..a6f7c9b 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java @@ -210,10 +210,11 @@ public class ODataExpressionParser { case SUBSTRINGOF: if (methodFlag.get() != null && methodFlag.get() == 1) { methodFlag.set(null); - return String.format("(CASE WHEN (%s LIKE CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END)", second, first); + return String.format("(CASE WHEN (%s LIKE CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END)", + second, first); } else { - return String.format("(CASE WHEN (%s LIKE CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END) = true", second, - first); + return String.format("(CASE WHEN (%s LIKE CONCAT('%%',CONCAT(%s,'%%'))) THEN TRUE ELSE FALSE END) = true", + second, first); } case TOLOWER: return String.format("LOWER(%s)", first); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2538dcc7/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java index 8d1d38e..24062a2 100644 --- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java +++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataFilterExpressionParserTest.java @@ -49,7 +49,7 @@ public class ODataFilterExpressionParserTest { private static final String[] EXPRESSION_BINARY_AND = { "id le '123' and soId eq 123L and not (substringof(id,'123') eq false) eq true", - "(((E1.id <= '123') AND (E1.soId = 123L)) AND (NOT(((CASE WHEN ('123' LIKE CONCAT('%',E1.id,'%')) " + "(((E1.id <= '123') AND (E1.soId = 123L)) AND (NOT(((CASE WHEN ('123' LIKE CONCAT('%',CONCAT(E1.id,'%'))) " + "THEN TRUE ELSE FALSE END) = false)) = true))" }; private static final String[] EXPRESSION_BINARY_OR = { "id ge '123' or soId gt 123L", "((E1.id >= '123') OR (E1.soId > 123L))" }; @@ -68,22 +68,23 @@ public class ODataFilterExpressionParserTest { "(SUBSTRING(E1.oValue.Currency, 2 + 1 ) NOT LIKE CONCAT('%','INR') )" }; private static final String[] EXPRESSION_SUBSTRING_OF = { "substringof(id,'123') ne true", - "((CASE WHEN ('123' LIKE CONCAT('%',E1.id,'%')) THEN TRUE ELSE FALSE END) <> true)" }; + "((CASE WHEN ('123' LIKE CONCAT('%',CONCAT(E1.id,'%'))) THEN TRUE ELSE FALSE END) <> true)" }; private static final String[] EXPRESSION_STARTS_WITH_WRONG_OP = { "startswith(oValue/Currency,'INR') lt true", "" }; private static final String[] EXPRESSION_SUBSTRING_ALL_OP = { "substring(oValue/Currency,1,3) eq 'INR'", "(SUBSTRING(E1.oValue.Currency, 1 + 1 , 3) = 'INR')" }; private static final String[] EXPRESSION_SUBSTRINGOF_INJECTION1 = { "substringof('a'' OR 1=1 OR E1.id LIKE ''b',id) eq true", - "((CASE WHEN (E1.id LIKE CONCAT('%','a'' OR 1=1 OR E1.id LIKE ''b','%')) THEN TRUE ELSE FALSE END) = true)" }; + "((CASE WHEN (E1.id LIKE CONCAT('%',CONCAT('a'' OR 1=1 OR E1.id LIKE ''b','%'))) " + + "THEN TRUE ELSE FALSE END) = true)" }; private static final String[] EXPRESSION_SUBSTRINGOF_INJECTION2 = { "substringof('substringof(''a'' OR 1=1 OR E1.id LIKE ''b'',id)',id) eq true", - "((CASE WHEN (E1.id LIKE CONCAT('%','substringof(''a'' OR 1=1 OR E1.id LIKE ''b'',id)','%')) " + "((CASE WHEN (E1.id LIKE CONCAT('%',CONCAT('substringof(''a'' OR 1=1 OR E1.id LIKE ''b'',id)','%'))) " + "THEN TRUE ELSE FALSE END) = true)" }; private static final String[] EXPRESSION_SUBSTRINGOF_INJECTION3 = { "substringof( substring(' ) OR execute_my_sql OR '' LIKE ',3),'de''') eq true", - "((CASE WHEN ('de''' LIKE CONCAT('%',SUBSTRING(' ) OR execute_my_sql OR '' LIKE ', 3 + 1 ),'%')) " + "((CASE WHEN ('de''' LIKE CONCAT('%',CONCAT(SUBSTRING(' ) OR execute_my_sql OR '' LIKE ', 3 + 1 ),'%'))) " + "THEN TRUE ELSE FALSE END) = true)" }; private static final String[] EXPRESSION_ENDSWITH_INJECTION1 = { "endswith(id,'Str''eet') eq true", "(E1.id LIKE CONCAT('%','Str''eet') )" }; http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2538dcc7/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBackTest.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBackTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBackTest.java index 29a2a7a..ae59cfd 100644 --- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBackTest.java +++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBackTest.java @@ -44,7 +44,6 @@ import org.apache.olingo.odata2.api.uri.NavigationPropertySegment; import org.apache.olingo.odata2.jpa.processor.core.callback.JPAExpandCallBack; import org.apache.olingo.odata2.jpa.processor.core.common.ODataJPATestConstants; import org.apache.olingo.odata2.jpa.processor.core.mock.data.EdmMockUtil; -import org.easymock.EasyMock; import org.junit.Test; public class JPAExpandCallBackTest {
