github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-14 06:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2423 Tidy up DefaultServer internals with Objects.requireNonNull()

Browse Source
This commit is contained in:
Rob Bygrave committed 2021-10-20 15:53:50 +13:00
1 parent cc272bb950
commit 30088f4de7
1 file changed
+7 -17
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+7 -17
View File
@@ -663,9 +663,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
@Override @Override
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
public <T> T reference(Class<T> type, Object id) { public <T> T reference(Class<T> type, Object id) {
if (id == null) { Objects.requireNonNull(id);
throw new NullPointerException("The id is null");
}
BeanDescriptor desc = descriptor(type); BeanDescriptor desc = descriptor(type);
id = desc.convertId(id); id = desc.convertId(id);
PersistenceContext pc = null; PersistenceContext pc = null;
@@ -835,12 +833,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> void sort(List<T> list, String sortByClause) { public <T> void sort(List<T> list, String sortByClause) {
if (list == null) { Objects.requireNonNull(list);
throw new NullPointerException("list is null"); Objects.requireNonNull(sortByClause);
}
if (sortByClause == null) {
throw new NullPointerException("sortByClause is null");
}
if (list.isEmpty()) { if (list.isEmpty()) {
// don't need to sort an empty list // don't need to sort an empty list
return; return;
@@ -1045,9 +1039,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
*/ */
@Override @Override
public <T> T find(Class<T> beanType, Object id, @Nullable Transaction t) { public <T> T find(Class<T> beanType, Object id, @Nullable Transaction t) {
if (id == null) { Objects.requireNonNull(id);
throw new NullPointerException("The id is null");
}
Query<T> query = createQuery(beanType).setId(id); Query<T> query = createQuery(beanType).setId(id);
return findId(query, t); return findId(query, t);
} }
@@ -1774,7 +1766,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
} }
@Override @Override
public <T> T publish(Class<T> beanType, Object id, Transaction transaction) { public <T> T publish(Class<T> beanType, Object id, @Nullable Transaction transaction) {
Query<T> query = find(beanType).setId(id); Query<T> query = find(beanType).setId(id);
List<T> liveBeans = publish(query, transaction); List<T> liveBeans = publish(query, transaction);
return (liveBeans.size() == 1) ? liveBeans.get(0) : null; return (liveBeans.size() == 1) ? liveBeans.get(0) : null;
@@ -1786,7 +1778,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
} }
@Override @Override
public <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction) { public <T> T draftRestore(Class<T> beanType, Object id, @Nullable Transaction transaction) {
Query<T> query = find(beanType).setId(id); Query<T> query = find(beanType).setId(id);
List<T> beans = draftRestore(query, transaction); List<T> beans = draftRestore(query, transaction);
return (beans.size() == 1) ? beans.get(0) : null; return (beans.size() == 1) ? beans.get(0) : null;
@@ -1803,9 +1795,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
} }
private EntityBean checkEntityBean(Object bean) { private EntityBean checkEntityBean(Object bean) {
if (bean == null) { Objects.requireNonNull(bean);
throw new IllegalArgumentException("The bean is null?");
}
if (!(bean instanceof EntityBean)) { if (!(bean instanceof EntityBean)) {
throw new IllegalArgumentException("Was expecting an EntityBean but got a " + bean.getClass()); throw new IllegalArgumentException("Was expecting an EntityBean but got a " + bean.getClass());
} }