diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java index 23b3aff13..bb7f51ea5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java @@ -33,21 +33,21 @@ public class BeanCascadeInfo { return; } attr = attr.toLowerCase(); - delete = (attr.indexOf("delete")>-1); + delete = (attr.contains("delete")); if (!delete){ // same as EJB3 remove - delete = (attr.indexOf("remove")>-1); + delete = (attr.contains("remove")); } - save = (attr.indexOf("save")>-1); + save = (attr.contains("save")); if (!save){ // same as EJB3 persist - save = (attr.indexOf("persist")>-1); + save = (attr.contains("persist")); } - if (attr.indexOf("validate")>-1){ + if (attr.contains("validate")){ validate = true; } - if (attr.indexOf("all")>-1){ + if (attr.contains("all")){ delete = true; save = true; validate = true; diff --git a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java index 83a6f547e..420b93785 100644 --- a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java @@ -43,8 +43,8 @@ public class TestLimitQuery extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - boolean hasLimit = sql.indexOf("limit 0") > -1; - boolean hasOffset = sql.indexOf("offset 3") > -1; + boolean hasLimit = sql.contains("limit 0"); + boolean hasOffset = sql.contains("offset 3"); if (h2Db) { Assert.assertTrue(hasLimit); @@ -69,8 +69,8 @@ public class TestLimitQuery extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - boolean hasLimit = sql.indexOf("limit 3") > -1; - boolean hasOffset = sql.indexOf("offset") > -1; + boolean hasLimit = sql.contains("limit 3"); + boolean hasOffset = sql.contains("offset"); if (h2Db) { Assert.assertTrue(sql, hasLimit); @@ -94,8 +94,8 @@ public class TestLimitQuery extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - boolean hasLimit = sql.indexOf("limit") > -1; - boolean hasOffset = sql.indexOf("offset") > -1; + boolean hasLimit = sql.contains("limit"); + boolean hasOffset = sql.contains("offset"); if (h2Db) { Assert.assertFalse(hasLimit); @@ -121,10 +121,10 @@ public class TestLimitQuery extends BaseTestCase { Assert.assertTrue("sz > 0", list.size() > 0); String sql = query.getGeneratedSql(); - boolean hasDetailsJoin = sql.indexOf("join o_order_detail") > -1; - boolean hasLimit = sql.indexOf("limit 10") > -1; - boolean hasSelectedDetails = sql.indexOf("od.id,") > -1; - boolean hasDistinct = sql.indexOf("select distinct") > -1; + boolean hasDetailsJoin = sql.contains("join o_order_detail"); + boolean hasLimit = sql.contains("limit 10"); + boolean hasSelectedDetails = sql.contains("od.id,"); + boolean hasDistinct = sql.contains("select distinct"); Assert.assertTrue(hasDetailsJoin); Assert.assertFalse(hasSelectedDetails); @@ -141,10 +141,10 @@ public class TestLimitQuery extends BaseTestCase { query.findList(); sql = query.getGeneratedSql(); - hasDetailsJoin = sql.indexOf("left outer join o_order_detail") > -1; - hasLimit = sql.indexOf("limit 10") > -1; - hasSelectedDetails = sql.indexOf("od.id") > -1; - hasDistinct = sql.indexOf("select distinct") > -1; + hasDetailsJoin = sql.contains("left outer join o_order_detail"); + hasLimit = sql.contains("limit 10"); + hasSelectedDetails = sql.contains("od.id"); + hasDistinct = sql.contains("select distinct"); Assert.assertFalse("no join with maxRows",hasDetailsJoin); Assert.assertFalse(hasSelectedDetails); diff --git a/src/test/java/com/avaje/tests/basic/TestQuery.java b/src/test/java/com/avaje/tests/basic/TestQuery.java index 23c1437c2..26ce50d41 100644 --- a/src/test/java/com/avaje/tests/basic/TestQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestQuery.java @@ -36,13 +36,13 @@ public class TestQuery extends BaseTestCase { int rc = query.findList().size(); Assert.assertTrue(rc > 0); - Assert.assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") < 0); + Assert.assertTrue(!query.getGeneratedSql().toLowerCase().contains("for update")); query = Ebean.find(Order.class).setAutofetch(false).setForUpdate(true).setMaxRows(1).order() .asc("orderDate").order().desc("id"); rc = query.findList().size(); Assert.assertTrue(rc > 0); - Assert.assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") > -1); + Assert.assertTrue(query.getGeneratedSql().toLowerCase().contains("for update")); } } diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java index ad66550d6..872d687d3 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java @@ -26,6 +26,6 @@ public class TestQueryWhereBetween extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.indexOf("between t0.cretime and t0.updtime") > -1); + Assert.assertTrue(sql.contains("between t0.cretime and t0.updtime")); } } diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java index 577eea068..4854e5dce 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java +++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java @@ -34,9 +34,9 @@ public class TestManyWhereJoin extends BaseTestCase { // join o_order u1 on u1.kcustomer_id = t0.id // where u1.status = ? ; --bind(NEW) - Assert.assertTrue(sql.indexOf("select distinct ") > -1); - Assert.assertTrue(sql.indexOf("join o_order ") > -1); - Assert.assertTrue(sql.indexOf(".status = ?") > -1); + Assert.assertTrue(sql.contains("select distinct ")); + Assert.assertTrue(sql.contains("join o_order ")); + Assert.assertTrue(sql.contains(".status = ?")); Assert.assertTrue(sql.contains("select distinct t0.id c0, t0.status c1 from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id where u1.status = ?")); } @@ -66,10 +66,10 @@ public class TestManyWhereJoin extends BaseTestCase { // where t1.order_date is not null and u1.status = ? // order by t0.id; --bind(NEW) - Assert.assertTrue(sql.indexOf("select distinct t0.id c0, t0.status c1, t1.id c2, t1.status c3,") > -1); - Assert.assertTrue(sql.indexOf("left outer join o_order t1 on ") > -1); - Assert.assertTrue(sql.indexOf("join o_order u1 on ") > -1); - Assert.assertTrue(sql.indexOf(" u1.status = ?") > -1); + Assert.assertTrue(sql.contains("select distinct t0.id c0, t0.status c1, t1.id c2, t1.status c3,")); + Assert.assertTrue(sql.contains("left outer join o_order t1 on ")); + Assert.assertTrue(sql.contains("join o_order u1 on ")); + Assert.assertTrue(sql.contains(" u1.status = ?")); } @Test @@ -93,9 +93,9 @@ public class TestManyWhereJoin extends BaseTestCase { // where u1.product_id = ? // order by t0.cretime; --bind(1) - Assert.assertTrue(sql.indexOf("select distinct t0.id c0, t0.status c1,") > -1); - Assert.assertTrue(sql.indexOf(" join o_order_detail u1 on u1.order_id = t0.id") > -1); - Assert.assertTrue(sql.indexOf(" where u1.product_id = ?") > -1); + Assert.assertTrue(sql.contains("select distinct t0.id c0, t0.status c1,")); + Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); + Assert.assertTrue(sql.contains(" where u1.product_id = ?")); } /** @@ -123,9 +123,9 @@ public class TestManyWhereJoin extends BaseTestCase { // where u1.product_id = ? // order by t0.cretime - Assert.assertTrue(sql.indexOf("select distinct t0.id c0, t0.status c1,") > -1); - Assert.assertTrue(sql.indexOf(" join o_order_detail u1 on u1.order_id = t0.id") > -1); - Assert.assertTrue(sql.indexOf(" where u1.product_id = ?") > -1); + Assert.assertTrue(sql.contains("select distinct t0.id c0, t0.status c1,")); + Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); + Assert.assertTrue(sql.contains(" where u1.product_id = ?")); } /** @@ -155,11 +155,11 @@ public class TestManyWhereJoin extends BaseTestCase { // where t1.id > 0 and u1.product_id = ? // order by t0.cretime, t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind(1) - Assert.assertTrue(sql.indexOf("select distinct t0.id c0, t0.status c1,") > -1); - Assert.assertTrue(sql.indexOf(" join o_order_detail u1 on u1.order_id = t0.id") > -1); - Assert.assertTrue(sql.indexOf(" u1.product_id = ?") > -1); + Assert.assertTrue(sql.contains("select distinct t0.id c0, t0.status c1,")); + Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); + Assert.assertTrue(sql.contains(" u1.product_id = ?")); // additional join for fetching the many details - Assert.assertTrue(sql.indexOf(" left outer join o_order_detail t1 on t1.order_id = t0.id") > -1); + Assert.assertTrue(sql.contains(" left outer join o_order_detail t1 on t1.order_id = t0.id")); } } diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java index e8d7ae969..e2c78c586 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java +++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java @@ -55,10 +55,10 @@ public class TestManyWhereJoinM2M extends BaseTestCase { System.out.println(list); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.indexOf("select distinct") > -1); - Assert.assertTrue(sql.indexOf("left outer join mrole ") > -1); - Assert.assertTrue(sql.indexOf("join mrole ") > -1); - Assert.assertTrue(sql.indexOf(".role_name = ?") > -1); + Assert.assertTrue(sql.contains("select distinct")); + Assert.assertTrue(sql.contains("left outer join mrole ")); + Assert.assertTrue(sql.contains("join mrole ")); + Assert.assertTrue(sql.contains(".role_name = ?")); } } diff --git a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java b/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java index 69cf32d41..85e2cfa3d 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java +++ b/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java @@ -26,8 +26,8 @@ public class TestQueryInAssocOne extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql, sql.indexOf("join o_customer t1 on t1.id = t0.kcustomer_id") > -1); - Assert.assertTrue(sql, sql.indexOf("t0.kcustomer_id in (?") > -1); + Assert.assertTrue(sql, sql.contains("join o_customer t1 on t1.id = t0.kcustomer_id")); + Assert.assertTrue(sql, sql.contains("t0.kcustomer_id in (?")); } } diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/com/avaje/tests/query/TestSubQuery.java index 80a2f0cc8..9658f6d91 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/com/avaje/tests/query/TestSubQuery.java @@ -59,7 +59,7 @@ public class TestSubQuery extends BaseTestCase { String golden = "(t0.one_key) in (select t0.one_key from ckey_parent t0) "; - if (sql.indexOf(golden) < 0) { + if (!sql.contains(golden)) { System.out.println("failed sql:" + sql); Assert.fail("golden string not found"); } @@ -108,7 +108,7 @@ public class TestSubQuery extends BaseTestCase { // know now, in our case, it is not necessary if not // using it in the where clause String golden = "(t0.id) in (select t0.vehicle_id from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )"; - if (sql.indexOf(golden) < 0) { + if (!sql.contains(golden)) { System.out.println("failed sql:" + sql); Assert.fail("golden string not found"); } @@ -134,7 +134,7 @@ public class TestSubQuery extends BaseTestCase { System.err.println(sql); String golden = "(t0.id) in (select t0.vehicle_id from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id where t1.license_number = ? )"; - if (sql.indexOf(golden) < 0) { + if (!sql.contains(golden)) { System.out.println("failed sql:" + sql); Assert.fail("golden string not found"); } @@ -163,7 +163,7 @@ public class TestSubQuery extends BaseTestCase { // OR without join // String golden = // "(t0.id) in (select t0.vehicle_id from vehicle_driver t0)"; - if (sql.indexOf(golden) < 0) { + if (!sql.contains(golden)) { System.out.println("failed sql:" + sql); Assert.fail("golden string not found"); } diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java index 797c71051..0496a10fc 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -56,9 +56,9 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { System.out.println(list); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.indexOf("select distinct") > -1); - Assert.assertTrue(sql.indexOf("outer join mrole ") > -1); - Assert.assertTrue(sql.indexOf(".role_name = ?") > -1); + Assert.assertTrue(sql.contains("select distinct")); + Assert.assertTrue(sql.contains("outer join mrole ")); + Assert.assertTrue(sql.contains(".role_name = ?")); } finally { Ebean.rollbackTransaction(); diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java index d749bab2a..c02b673e6 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java @@ -21,13 +21,13 @@ public class TestOrderByWithFunction extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.indexOf("order by length(t0.name)") > -1); + Assert.assertTrue(sql.contains("order by length(t0.name)")); String oq = "find customer ORDER BY LENGTH(name),name"; query = Ebean.createQuery(Customer.class, oq); query.findList(); sql = query.getGeneratedSql(); - Assert.assertTrue(sql.indexOf("order by LENGTH(t0.name)") > -1); + Assert.assertTrue(sql.contains("order by LENGTH(t0.name)")); } }