#2626 - Add final modifier to methods - For readOnly disableLazyLoad using Collections.EMPTY_LIST etc

This commit is contained in:
Rob Bygrave committed 2022-05-03 12:23:22 +12:00
1 parent 84042397b6
commit 1d4f2ad856
6 files changed
+29 -46

No files matched your search

@@ -29,6 +29,7 @@ public final class TenantAwareCache implements ServerCache {
/** /**
* Return the underlying ServerCache that is being delegated to. * Return the underlying ServerCache that is being delegated to.
*/ */
@SuppressWarnings("unchecked")
@Override @Override
public <T> T unwrap(Class<T> cls) { public <T> T unwrap(Class<T> cls) {
return (T) delegate; return (T) delegate;
@@ -28,7 +28,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
} }
@Override @Override
public void setLoader(BeanCollectionLoader loader) { public final void setLoader(BeanCollectionLoader loader) {
this.loader = loader; this.loader = loader;
} }
@@ -43,7 +43,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
public Collection underlying(Object value) { public final Collection underlying(Object value) {
if (value instanceof BeanCollection) { if (value instanceof BeanCollection) {
return ((BeanCollection)value).getActualDetails(); return ((BeanCollection)value).getActualDetails();
} else { } else {
@@ -51,7 +51,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
} }
} }
void jsonWriteCollection(SpiJsonWriter ctx, String name, Collection<?> list) throws IOException { final void jsonWriteCollection(SpiJsonWriter ctx, String name, Collection<?> list) throws IOException {
if (!list.isEmpty() || ctx.isIncludeEmpty()) { if (!list.isEmpty() || ctx.isIncludeEmpty()) {
ctx.beginAssocMany(name); ctx.beginAssocMany(name);
for (Object bean : list) { for (Object bean : list) {
@@ -28,8 +28,7 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) { public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
if (bc instanceof BeanList<?>) { if (bc instanceof BeanList<?>) {
BeanList<?> bl = (BeanList<?>) bc; BeanList<?> bl = (BeanList<?>) bc;
if (bl.getActualList() == null) { if (bl.getActualList() == null) {
@@ -43,17 +42,17 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public Object createEmptyReference() { public final Object createEmptyReference() {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@Override @Override
public BeanCollection<T> createEmptyNoParent() { public final BeanCollection<T> createEmptyNoParent() {
return new BeanList<>(); return new BeanList<>();
} }
@Override @Override
public BeanCollection<T> createEmpty(EntityBean parentBean) { public final BeanCollection<T> createEmpty(EntityBean parentBean) {
BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName); BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName);
if (many != null) { if (many != null) {
beanList.setModifyListening(many.modifyListenMode()); beanList.setModifyListening(many.modifyListenMode());
@@ -62,29 +61,23 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public BeanCollection<T> createReference(EntityBean parentBean) { public final BeanCollection<T> createReference(EntityBean parentBean) {
BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName); BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName);
beanList.setModifyListening(many.modifyListenMode()); beanList.setModifyListening(many.modifyListenMode());
return beanList; return beanList;
} }
@Override @Override
public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) { public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
BeanList<?> newBeanList = (BeanList<?>) server.findList(query, t); BeanList<?> newBeanList = (BeanList<?>) server.findList(query, t);
refresh(newBeanList, parentBean); refresh(newBeanList, parentBean);
} }
@Override @Override
public void refresh(BeanCollection<?> bc, EntityBean parentBean) { public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
BeanList<?> newBeanList = (BeanList<?>) bc; BeanList<?> newBeanList = (BeanList<?>) bc;
List<?> currentList = (List<?>) many.getValue(parentBean); List<?> currentList = (List<?>) many.getValue(parentBean);
newBeanList.setModifyListening(many.modifyListenMode()); newBeanList.setModifyListening(many.modifyListenMode());
if (currentList == null) { if (currentList == null) {
// the currentList is null? Not really expecting this... // the currentList is null? Not really expecting this...
many.setValue(parentBean, newBeanList); many.setValue(parentBean, newBeanList);
@@ -102,8 +95,7 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException { public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
List<?> list; List<?> list;
if (collection instanceof BeanCollection<?>) { if (collection instanceof BeanCollection<?>) {
BeanList<?> beanList = (BeanList<?>) collection; BeanList<?> beanList = (BeanList<?>) collection;
@@ -120,7 +112,6 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
} else { } else {
list = (List<?>) collection; list = (List<?>) collection;
} }
jsonWriteCollection(ctx, name, list); jsonWriteCollection(ctx, name, list);
} }
@@ -37,13 +37,11 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) { public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
if (mapKey == null) { if (mapKey == null) {
mapKey = many.mapKey(); mapKey = many.mapKey();
} }
BeanProperty beanProp = targetDescriptor.beanProperty(mapKey); BeanProperty beanProp = targetDescriptor.beanProperty(mapKey);
if (bc instanceof BeanMap<?, ?>) { if (bc instanceof BeanMap<?, ?>) {
BeanMap<Object, Object> bm = (BeanMap<Object, Object>) bc; BeanMap<Object, Object> bm = (BeanMap<Object, Object>) bc;
Map<Object, Object> actualMap = bm.getActualMap(); Map<Object, Object> actualMap = bm.getActualMap();
@@ -58,10 +56,9 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
} }
} }
static class Adder implements BeanCollectionAdd { static final class Adder implements BeanCollectionAdd {
private final BeanProperty beanProperty; private final BeanProperty beanProperty;
private final Map<Object, Object> map; private final Map<Object, Object> map;
Adder(BeanProperty beanProperty, Map<Object, Object> map) { Adder(BeanProperty beanProperty, Map<Object, Object> map) {
@@ -77,18 +74,17 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public Object createEmptyReference() { public final Object createEmptyReference() {
return Collections.EMPTY_MAP; return Collections.EMPTY_MAP;
} }
@Override @Override
public BeanCollection<T> createEmptyNoParent() { public final BeanCollection<T> createEmptyNoParent() {
return new BeanMap<>(); return new BeanMap<>();
} }
@Override @Override
public BeanCollection<T> createEmpty(EntityBean ownerBean) { public final BeanCollection<T> createEmpty(EntityBean ownerBean) {
BeanMap<?, T> beanMap = new BeanMap<>(loader, ownerBean, propertyName); BeanMap<?, T> beanMap = new BeanMap<>(loader, ownerBean, propertyName);
if (many != null) { if (many != null) {
beanMap.setModifyListening(many.modifyListenMode()); beanMap.setModifyListening(many.modifyListenMode());
@@ -98,7 +94,6 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
@Override @Override
public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) { public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
if (bean == null) { if (bean == null) {
((BeanMap<?, ?>) collection).internalPutNull(); ((BeanMap<?, ?>) collection).internalPutNull();
} else { } else {
@@ -110,8 +105,7 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
@Override @Override
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
public BeanCollection<T> createReference(EntityBean parentBean) { public final BeanCollection<T> createReference(EntityBean parentBean) {
BeanMap beanMap = new BeanMap(loader, parentBean, propertyName); BeanMap beanMap = new BeanMap(loader, parentBean, propertyName);
if (many != null) { if (many != null) {
beanMap.setModifyListening(many.modifyListenMode()); beanMap.setModifyListening(many.modifyListenMode());
@@ -120,14 +114,13 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) { public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) server.findMap(query, t); BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) server.findMap(query, t);
refresh(newBeanMap, parentBean); refresh(newBeanMap, parentBean);
} }
@Override @Override
public void refresh(BeanCollection<?> bc, EntityBean parentBean) { public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) bc; BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) bc;
Map<?, ?> current = (Map<?, ?>) many.getValue(parentBean); Map<?, ?> current = (Map<?, ?>) many.getValue(parentBean);
@@ -149,8 +142,7 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException { public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
Map<?, ?> map; Map<?, ?> map;
if (collection instanceof BeanCollection<?>) { if (collection instanceof BeanCollection<?>) {
BeanMap<?, ?> bc = (BeanMap<?, ?>) collection; BeanMap<?, ?> bc = (BeanMap<?, ?>) collection;
@@ -15,7 +15,6 @@ public final class BeanMapHelpElement<T> extends BeanMapHelp<T> {
public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) { public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
Object key = bean._ebean_getField(0); Object key = bean._ebean_getField(0);
Object val = bean._ebean_getField(1); Object val = bean._ebean_getField(1);
BeanMap<?, ?> map = ((BeanMap<?, ?>) collection); BeanMap<?, ?> map = ((BeanMap<?, ?>) collection);
if (withCheck) { if (withCheck) {
map.internalPutWithCheck(key, val); map.internalPutWithCheck(key, val);
@@ -34,7 +34,7 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) { public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
if (bc instanceof BeanSet<?>) { if (bc instanceof BeanSet<?>) {
BeanSet<?> beanSet = (BeanSet<?>) bc; BeanSet<?> beanSet = (BeanSet<?>) bc;
if (beanSet.getActualSet() == null) { if (beanSet.getActualSet() == null) {
@@ -47,17 +47,17 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public Object createEmptyReference() { public final Object createEmptyReference() {
return Collections.EMPTY_SET; return Collections.EMPTY_SET;
} }
@Override @Override
public BeanCollection<T> createEmptyNoParent() { public final BeanCollection<T> createEmptyNoParent() {
return new BeanSet<>(); return new BeanSet<>();
} }
@Override @Override
public BeanCollection<T> createEmpty(EntityBean ownerBean) { public final BeanCollection<T> createEmpty(EntityBean ownerBean) {
BeanSet<T> beanSet = new BeanSet<>(loader, ownerBean, propertyName); BeanSet<T> beanSet = new BeanSet<>(loader, ownerBean, propertyName);
if (many != null) { if (many != null) {
beanSet.setModifyListening(many.modifyListenMode()); beanSet.setModifyListening(many.modifyListenMode());
@@ -66,20 +66,20 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public BeanCollection<T> createReference(EntityBean parentBean) { public final BeanCollection<T> createReference(EntityBean parentBean) {
BeanSet<T> beanSet = new BeanSet<>(loader, parentBean, propertyName); BeanSet<T> beanSet = new BeanSet<>(loader, parentBean, propertyName);
beanSet.setModifyListening(many.modifyListenMode()); beanSet.setModifyListening(many.modifyListenMode());
return beanSet; return beanSet;
} }
@Override @Override
public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) { public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
BeanSet<?> newBeanSet = (BeanSet<?>) server.findSet(query, t); BeanSet<?> newBeanSet = (BeanSet<?>) server.findSet(query, t);
refresh(newBeanSet, parentBean); refresh(newBeanSet, parentBean);
} }
@Override @Override
public void refresh(BeanCollection<?> bc, EntityBean parentBean) { public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
BeanSet<?> newBeanSet = (BeanSet<?>) bc; BeanSet<?> newBeanSet = (BeanSet<?>) bc;
Set<?> current = (Set<?>) many.getValue(parentBean); Set<?> current = (Set<?>) many.getValue(parentBean);
newBeanSet.setModifyListening(many.modifyListenMode()); newBeanSet.setModifyListening(many.modifyListenMode());
@@ -100,7 +100,7 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
} }
@Override @Override
public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException { public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
Set<?> set; Set<?> set;
if (collection instanceof BeanCollection<?>) { if (collection instanceof BeanCollection<?>) {
BeanSet<?> bc = (BeanSet<?>) collection; BeanSet<?> bc = (BeanSet<?>) collection;