diff --git a/src/test/java/io/ebean/common/BeanListTest.java b/src/test/java/io/ebean/common/BeanListTest.java index ba0d9c86a..11a7429d7 100644 --- a/src/test/java/io/ebean/common/BeanListTest.java +++ b/src/test/java/io/ebean/common/BeanListTest.java @@ -1,7 +1,6 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.ArrayList; @@ -18,7 +17,6 @@ public class BeanListTest { private Object object2 = new Object(); private Object object3 = new Object(); - @NotNull private List all() { List all = new ArrayList<>(); all.add(object1); @@ -27,7 +25,6 @@ public class BeanListTest { return all; } - @NotNull private List some() { List some = new ArrayList<>(); some.add(object2); diff --git a/src/test/java/io/ebean/common/BeanMapTest.java b/src/test/java/io/ebean/common/BeanMapTest.java index cd890988d..08a57e05a 100644 --- a/src/test/java/io/ebean/common/BeanMapTest.java +++ b/src/test/java/io/ebean/common/BeanMapTest.java @@ -1,7 +1,6 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.LinkedHashMap; @@ -16,7 +15,6 @@ public class BeanMapTest { Object object2 = new Object(); Object object3 = new Object(); - @NotNull private Map all() { Map all = new LinkedHashMap<>(); all.put("1", object1); @@ -25,7 +23,6 @@ public class BeanMapTest { return all; } - @NotNull private Map some() { Map all = new LinkedHashMap<>(); all.put("2", object2); diff --git a/src/test/java/io/ebean/common/BeanSetTest.java b/src/test/java/io/ebean/common/BeanSetTest.java index 2a775dac7..c274d34d7 100644 --- a/src/test/java/io/ebean/common/BeanSetTest.java +++ b/src/test/java/io/ebean/common/BeanSetTest.java @@ -1,7 +1,6 @@ package io.ebean.common; import io.ebean.bean.BeanCollection; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.LinkedHashSet; @@ -16,7 +15,6 @@ public class BeanSetTest { Object object2 = new Object(); Object object3 = new Object(); - @NotNull private Set all() { Set all = new LinkedHashSet<>(); all.add(object1); @@ -25,7 +23,6 @@ public class BeanSetTest { return all; } - @NotNull private Set some() { Set some = new LinkedHashSet<>(); some.add(object2); diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java index 5bb28386c..680ea207f 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.dbmigration.model; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.DropColumn; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -139,7 +139,6 @@ public class EntryTest { return drop; } - @NotNull static PendingDrops.Entry createEntry(ChangeSet... pending) { PendingDrops.Entry entry = new PendingDrops.Entry(MigrationVersion.parse("1.1")); diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java index 45c27f590..4cbd63cfa 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.dbmigration.model; import io.ebeaninternal.dbmigration.migration.AlterColumn; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -309,7 +308,6 @@ public class MColumnTest { assertThat(getAlterColumn(diff).isHistoryExclude()).isEqualTo(false); } - @NotNull private AlterColumn getAlterColumn(ModelDiff diff) { return (AlterColumn) diff.getApplyChanges().get(0); } diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java index ec361ba6f..aa988b187 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java @@ -3,7 +3,6 @@ package io.ebeaninternal.dbmigration.model; import io.ebeaninternal.dbmigration.migration.Migration; import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.List; @@ -67,7 +66,6 @@ public class ModelContainerTest { assertThat(normalColumns).doesNotContain("zing", "zong", "boom", "baz", "bar"); } - @NotNull private ModelContainer container_2_1() { ModelContainer container = new ModelContainer(); container.apply(mig("2.0.model.xml"), ver("2.0")); @@ -75,7 +73,6 @@ public class ModelContainerTest { return container; } - @NotNull private ModelContainer container_1_1() { ModelContainer container = new ModelContainer(); container.apply(mig("1.0.model.xml"), ver("1.0")); diff --git a/src/test/java/io/ebeaninternal/server/changelog/Helper.java b/src/test/java/io/ebeaninternal/server/changelog/Helper.java index 356e4774f..4661b21c1 100644 --- a/src/test/java/io/ebeaninternal/server/changelog/Helper.java +++ b/src/test/java/io/ebeaninternal/server/changelog/Helper.java @@ -4,7 +4,6 @@ import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebean.event.changelog.ChangeType; import io.ebean.event.changelog.TxnState; -import org.jetbrains.annotations.NotNull; import java.sql.Timestamp; import java.util.LinkedHashMap; @@ -33,7 +32,6 @@ public class Helper { return cs; } - @NotNull private BeanChange createInsert(long startId) { Map values = new LinkedHashMap<>(); @@ -47,7 +45,6 @@ public class Helper { return new BeanChange("mytable", null, startId + 1, ChangeType.INSERT, "");//values, oldValues); } - @NotNull private BeanChange createUpdate(long startId) { Map values = new LinkedHashMap<>(); values.put("name", "jim"); @@ -66,7 +63,6 @@ public class Helper { return new BeanChange("mytable", null, startId + 2, ChangeType.UPDATE, "");//values, oldValues); } - @NotNull private BeanChange createDelete(long startId) { return new BeanChange("mytable", null, startId + 3, ChangeType.DELETE, null); } diff --git a/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index 316edb569..d8c8c8d55 100644 --- a/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.LinkedHashMap; @@ -88,8 +87,6 @@ public class AllEqualsExpressionTest extends BaseExpressionTest { assertThat(exp("a", null).isSameByBind(exp("a", 10))).isFalse(); } - - @NotNull private AllEqualsExpression exp(Map propMap) { return new AllEqualsExpression(propMap); } diff --git a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java index f23d4b126..b4de23798 100644 --- a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java @@ -1,13 +1,11 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; public class BetweenPropertyExpressionTest extends BaseExpressionTest { - @NotNull private BetweenPropertyExpression exp(String lowProperty, String highProperty, Object value) { return new BetweenPropertyExpression(lowProperty, highProperty, value); } diff --git a/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index f3989a141..970ac45a5 100644 --- a/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -1,7 +1,5 @@ package io.ebeaninternal.server.expression; - -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.Arrays; @@ -11,7 +9,6 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class ExistsQueryExpressionTest extends BaseExpressionTest { - @NotNull private ExistsQueryExpression exp(boolean not, String sql, Object... bindValues) { return new ExistsQueryExpression(not, sql, Arrays.asList(bindValues)); } diff --git a/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java index b3babb490..45ab71780 100644 --- a/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -9,7 +8,6 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class IdExpressionTest extends BaseExpressionTest { - @NotNull private IdExpression exp(Object value) { return new IdExpression(value); } diff --git a/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java index 44aa34dff..207ca6500 100644 --- a/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.Arrays; @@ -10,7 +9,6 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class IdInExpressionTest extends BaseExpressionTest { - @NotNull private IdInExpression exp(Object... values) { return new IdInExpression(Arrays.asList(values)); } diff --git a/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java index d137cdbc1..7b88ef37f 100644 --- a/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.Arrays; @@ -10,7 +9,6 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class InQueryExpressionTest extends BaseExpressionTest { - @NotNull private InQueryExpression exp(String propertyName, boolean not, String sql, Object... bindValues) { return new InQueryExpression(propertyName, not, sql, Arrays.asList(bindValues)); } diff --git a/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java index 4dd27e9b1..05ed59c7d 100644 --- a/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java @@ -1,13 +1,11 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; public class JsonPathExpressionTest extends BaseExpressionTest { - @NotNull private JsonPathExpression exp(String propertyName, String path, Op operator, Object value) { return new JsonPathExpression(propertyName, path, operator, value); } diff --git a/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java index cbf8e76c3..945d8aa7d 100644 --- a/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.expression; import io.ebean.LikeType; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -9,7 +8,6 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class LikeExpressionTest extends BaseExpressionTest { - @NotNull private LikeExpression exp(String propertyName, String value, boolean caseInsensitive, LikeType type) { return new LikeExpression(propertyName, value, caseInsensitive, type); } diff --git a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index e6ec2b038..c34e9c037 100644 --- a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,13 +1,11 @@ package io.ebeaninternal.server.expression; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; public class RawExpressionTest extends BaseExpressionTest { - @NotNull private RawExpression exp(String sql, Object... values) { return new RawExpression(sql, values); } diff --git a/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java index 88dc9a99f..433c3e532 100644 --- a/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java +++ b/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java @@ -1,7 +1,5 @@ package io.ebeaninternal.server.query; - -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -53,7 +51,6 @@ public class RawSqlQueryPlanKeyTest { assertThat(key("select foo", true, true, "").hashCode()).isNotEqualTo(key("select foo", true, true, "a").hashCode()); } - @NotNull private RawSqlQueryPlanKey key(String sql, boolean rawSql, boolean rowNumberIncluded, String logWhereSql) { return new RawSqlQueryPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql); } diff --git a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index cb8fda162..c204076c7 100644 --- a/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -11,7 +11,6 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.expression.BaseExpressionTest; import org.tests.model.basic.Customer; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -73,7 +72,6 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { assertSame(key1, key2); } - @NotNull private TableJoin tableJoin(String table, String col1, String col2) { DeployTableJoin deploy = new DeployTableJoin(); deploy.setTable(table); diff --git a/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java index ab22bc4f0..81334e523 100644 --- a/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java +++ b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java @@ -14,7 +14,6 @@ import io.ebeaninternal.server.querydefn.OrmQueryDetail; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; @@ -96,7 +95,6 @@ public class TunedQueryInfoTest extends BaseTestCase { Assert.assertTrue(trimSql(loggedSql.get(1), 1).contains("select t0.id, t0.status,")); } - @NotNull private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) { Origin origin = new Origin(); origin.setDetail(tunedDetail.asString()); diff --git a/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 2f6f40be4..3e00c2d74 100644 --- a/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -9,13 +9,11 @@ import io.ebeaninternal.server.autotune.model.Origin; import io.ebeaninternal.server.autotune.service.TunedQueryInfo; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import org.tests.model.basic.FeatureDescription; -import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; public class TestL2CacheWithSharedBean extends BaseTestCase { - @NotNull private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) { Origin origin = new Origin(); origin.setDetail(tunedDetail.toString()); diff --git a/src/test/java/org/tests/draftable/OrganisationTest.java b/src/test/java/org/tests/draftable/OrganisationTest.java index 8146b943a..4a3e20d7a 100644 --- a/src/test/java/org/tests/draftable/OrganisationTest.java +++ b/src/test/java/org/tests/draftable/OrganisationTest.java @@ -6,7 +6,6 @@ import org.tests.model.draftable.Document; import org.tests.model.draftable.DocumentMedia; import org.tests.model.draftable.Organisation; import org.assertj.core.api.StrictAssertions; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.List; @@ -106,7 +105,6 @@ public class OrganisationTest { } - @NotNull private DocumentMedia createMedia(String name) { DocumentMedia media = new DocumentMedia(); media.setName(name); diff --git a/src/test/java/org/tests/model/basic/finder/CustomerFinder.java b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java index 485650ff7..7a7cb0352 100644 --- a/src/test/java/org/tests/model/basic/finder/CustomerFinder.java +++ b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java @@ -1,7 +1,6 @@ package org.tests.model.basic.finder; import io.ebean.Finder; -import org.jetbrains.annotations.Nullable; import org.tests.model.basic.Customer; import java.util.List; @@ -35,7 +34,6 @@ public class CustomerFinder extends Finder { /** * Find customer by unique name. */ - @Nullable public Customer byName(String name) { return query().where().eq("name", name).findOne(); diff --git a/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/src/test/java/org/tests/model/survey/TestOrderByFetch.java index 9244448d8..b401696f0 100644 --- a/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -2,7 +2,6 @@ package org.tests.model.survey; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.ArrayList; @@ -55,14 +54,12 @@ public class TestOrderByFetch extends BaseTestCase { assertEquals(2, groups2.size()); } - @NotNull private Group group(int number) { Group group1 = new Group("g" + number); group1.setSequenceNumber(number); return group1; } - @NotNull private Question question(int sequence) { Question q2 = new Question("q" + sequence); q2.setSequenceNumber(sequence);