add missing @override (#975)

* no effective code change: add missing @override in "io.ebean.*" package
* no effective code change: add missing @override in "io.ebeaninternal.api.*" package
* no effective code change: add missing @override in "io.ebeaninternal.server.*" package
* no effective code change: add missing @override in "io.ebeaninternal.util.*" package
* no effective code change: add missing @override in "io.ebeanservice.*" package
* no effective code change: add missing @override in "src/test/java/"
This commit is contained in:
Roland Praml authored and Rob Bygrave committed 2017-02-24 00:01:25 +13:00
1 parent 43c978e41a
commit 40f5596837
300 files changed
+1492 -12

No files matched your search

@@ -39,12 +39,14 @@ public final class IdBinderEmbedded implements IdBinder {
this.embIdProperty = embIdProperty;
}
@Override
public void initialise() {
this.idDesc = embIdProperty.getTargetDescriptor();
this.props = embIdProperty.getProperties();
this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
}
@Override
public boolean isIdInExpandedForm() {
return idInExpandedForm;
}
@@ -86,6 +88,7 @@ public final class IdBinderEmbedded implements IdBinder {
return embIdProperty;
}
@Override
public String getOrderBy(String pathPrefix, boolean ascending) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < props.length; i++) {
@@ -109,10 +112,12 @@ public final class IdBinderEmbedded implements IdBinder {
return idDesc;
}
@Override
public String getIdProperty() {
return embIdProperty.getName();
}
@Override
public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
prefix = SplitName.add(prefix, embIdProperty.getName());
@@ -122,6 +127,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public BeanProperty findBeanProperty(String dbColumnName) {
for (BeanProperty prop : props) {
if (dbColumnName.equalsIgnoreCase(prop.getDbColumn())) {
@@ -131,10 +137,12 @@ public final class IdBinderEmbedded implements IdBinder {
return null;
}
@Override
public boolean isComplexId() {
return true;
}
@Override
public String getDefaultOrderBy() {
StringBuilder sb = new StringBuilder();
@@ -155,12 +163,14 @@ public final class IdBinderEmbedded implements IdBinder {
return props;
}
@Override
public void addIdInBindValue(SpiExpressionRequest request, Object value) {
for (BeanProperty prop : props) {
request.addBindValue(prop.getValue((EntityBean) value));
}
}
@Override
public String getIdInValueExprDelete(int size) {
if (!idInExpandedForm) {
return getIdInValueExpr(size);
@@ -187,6 +197,7 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public String getIdInValueExpr(int size) {
StringBuilder sb = new StringBuilder();
@@ -209,6 +220,7 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public Object[] getIdValues(EntityBean bean) {
Object val = embIdProperty.getValue(bean);
Object[] bindvalues = new Object[props.length];
@@ -218,6 +230,7 @@ public final class IdBinderEmbedded implements IdBinder {
return bindvalues;
}
@Override
public Object[] getBindValues(Object value) {
Object[] bindvalues = new Object[props.length];
@@ -244,6 +257,7 @@ public final class IdBinderEmbedded implements IdBinder {
/**
* Convert back from a Map to embedded bean.
*/
@Override
@SuppressWarnings("unchecked")
public Object convertIdFromJson(Object value) {
@@ -258,6 +272,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
@Override
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
for (BeanProperty prop : props) {
Object embFieldValue = prop.getValue((EntityBean) value);
@@ -265,6 +280,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public void bindId(DataBind dataBind, Object value) throws SQLException {
for (BeanProperty prop : props) {
@@ -273,6 +289,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public Object readData(DataInput dataInput) throws IOException {
EntityBean embId = idDesc.createEntityBean();
@@ -293,6 +310,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
for (BeanProperty prop : props) {
Object embFieldValue = prop.getValue((EntityBean) idValue);
@@ -300,12 +318,14 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public void loadIgnore(DbReadContext ctx) {
for (BeanProperty prop : props) {
prop.loadIgnore(ctx);
}
}
@Override
public Object read(DbReadContext ctx) throws SQLException {
EntityBean embId = idDesc.createEntityBean();
@@ -325,6 +345,7 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
Object embId = read(ctx);
@@ -336,12 +357,14 @@ public final class IdBinderEmbedded implements IdBinder {
}
}
@Override
public void appendSelect(DbSqlContext ctx, boolean subQuery) {
for (BeanProperty prop : props) {
prop.appendSelect(ctx, subQuery);
}
}
@Override
public String getAssocIdInExpr(String prefix) {
StringBuilder sb = new StringBuilder();
@@ -360,6 +383,7 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public String getAssocOneIdExpr(String prefix, String operator) {
StringBuilder sb = new StringBuilder();
@@ -380,6 +404,7 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public String getBindIdSql(String baseTableAlias) {
StringBuilder sb = new StringBuilder();
@@ -397,6 +422,7 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public String getBindIdInSql(String baseTableAlias) {
if (idInExpandedForm) {
@@ -425,6 +451,7 @@ public final class IdBinderEmbedded implements IdBinder {
return idValue;
}
@Override
public Object convertSetId(Object idValue, EntityBean bean) {
// can not cast/convert if it is embedded
@@ -25,18 +25,22 @@ public final class IdBinderEmpty implements IdBinder {
}
@Override
public void initialise() {
}
@Override
public boolean isIdInExpandedForm() {
return false;
}
@Override
public String getOrderBy(String pathPrefix, boolean ascending) {
return pathPrefix;
}
@Override
public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
}
@@ -45,55 +49,68 @@ public final class IdBinderEmpty implements IdBinder {
return null;
}
@Override
public String getIdProperty() {
return null;
}
@Override
public BeanProperty findBeanProperty(String dbColumnName) {
return null;
}
@Override
public boolean isComplexId() {
return true;
}
@Override
public String getDefaultOrderBy() {
// this should never happen?
return "";
}
@Override
public String getBindIdSql(String baseTableAlias) {
return bindIdSql;
}
@Override
public String getAssocOneIdExpr(String prefix, String operator) {
return null;
}
@Override
public String getAssocIdInExpr(String prefix) {
return null;
}
@Override
public void addIdInBindValue(SpiExpressionRequest request, Object value) {
}
@Override
public String getIdInValueExprDelete(int size) {
return getIdInValueExpr(size);
}
@Override
public String getIdInValueExpr(int size) {
return "";
}
@Override
public String getBindIdInSql(String baseTableAlias) {
return null;
}
@Override
public Object[] getIdValues(EntityBean bean) {
return null;
}
@Override
public Object[] getBindValues(Object idValue) {
return new Object[]{idValue};
}
@@ -108,28 +125,35 @@ public final class IdBinderEmpty implements IdBinder {
return value;
}
@Override
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
}
@Override
public void bindId(DataBind dataBind, Object value) throws SQLException {
}
@Override
public void loadIgnore(DbReadContext ctx) {
}
@Override
public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
return null;
}
@Override
public Object read(DbReadContext ctx) throws SQLException {
return null;
}
@Override
public void appendSelect(DbSqlContext ctx, boolean subQuery) {
}
@Override
public Object convertSetId(Object idValue, EntityBean bean) {
return idValue;
}
@@ -139,10 +163,12 @@ public final class IdBinderEmpty implements IdBinder {
return idValue;
}
@Override
public Object readData(DataInput dataOutput) throws IOException {
return null;
}
@Override
public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
}
@@ -37,14 +37,17 @@ public final class IdBinderSimple implements IdBinder {
bindIdSql = InternString.intern(idProperty.getDbColumn() + " = ? ");
}
@Override
public void initialise() {
// do nothing
}
@Override
public boolean isIdInExpandedForm() {
return false;
}
@Override
public String getOrderBy(String pathPrefix, boolean ascending) {
StringBuilder sb = new StringBuilder();
@@ -58,6 +61,7 @@ public final class IdBinderSimple implements IdBinder {
return sb.toString();
}
@Override
public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
idProperty.buildRawSqlSelectChain(prefix, selectChain);
@@ -68,10 +72,12 @@ public final class IdBinderSimple implements IdBinder {
return idProperty;
}
@Override
public String getIdProperty() {
return idProperty.getName();
}
@Override
public BeanProperty findBeanProperty(String dbColumnName) {
if (dbColumnName.equalsIgnoreCase(idProperty.getDbColumn())) {
return idProperty;
@@ -79,14 +85,17 @@ public final class IdBinderSimple implements IdBinder {
return null;
}
@Override
public boolean isComplexId() {
return false;
}
@Override
public String getDefaultOrderBy() {
return idProperty.getName();
}
@Override
public String getBindIdInSql(String baseTableAlias) {
if (baseTableAlias == null) {
return idProperty.getDbColumn();
@@ -95,6 +104,7 @@ public final class IdBinderSimple implements IdBinder {
}
}
@Override
public String getBindIdSql(String baseTableAlias) {
if (baseTableAlias == null) {
return bindIdSql;
@@ -103,18 +113,22 @@ public final class IdBinderSimple implements IdBinder {
}
}
@Override
public Object[] getIdValues(EntityBean bean) {
return new Object[]{idProperty.getValue(bean)};
}
@Override
public Object[] getBindValues(Object idValue) {
return new Object[]{idValue};
}
@Override
public String getIdInValueExprDelete(int size) {
return getIdInValueExpr(size);
}
@Override
public String getIdInValueExpr(int size) {
StringBuilder sb = new StringBuilder(2 * size + 10);
sb.append(" in");
@@ -126,6 +140,7 @@ public final class IdBinderSimple implements IdBinder {
return sb.toString();
}
@Override
public void addIdInBindValue(SpiExpressionRequest request, Object value) {
value = convertSetId(value, null);
request.addBindValue(value);
@@ -142,10 +157,12 @@ public final class IdBinderSimple implements IdBinder {
return convertId(value);
}
@Override
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
sqlUpdate.addParameter(value);
}
@Override
public void bindId(DataBind dataBind, Object value) throws SQLException {
if (!value.getClass().equals(expectedType)) {
value = scalarType.toBeanType(value);
@@ -153,18 +170,22 @@ public final class IdBinderSimple implements IdBinder {
idProperty.bind(dataBind, value);
}
@Override
public void writeData(DataOutput os, Object value) throws IOException {
idProperty.writeData(os, value);
}
@Override
public Object readData(DataInput is) throws IOException {
return idProperty.readData(is);
}
@Override
public void loadIgnore(DbReadContext ctx) {
idProperty.loadIgnore(ctx);
}
@Override
public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
Object id = idProperty.read(ctx);
if (id != null) {
@@ -173,14 +194,17 @@ public final class IdBinderSimple implements IdBinder {
return id;
}
@Override
public Object read(DbReadContext ctx) throws SQLException {
return idProperty.read(ctx);
}
@Override
public void appendSelect(DbSqlContext ctx, boolean subQuery) {
idProperty.appendSelect(ctx, subQuery);
}
@Override
public String getAssocOneIdExpr(String prefix, String operator) {
StringBuilder sb = new StringBuilder();
@@ -193,6 +217,7 @@ public final class IdBinderSimple implements IdBinder {
return sb.toString();
}
@Override
public String getAssocIdInExpr(String prefix) {
StringBuilder sb = new StringBuilder();
@@ -204,6 +229,7 @@ public final class IdBinderSimple implements IdBinder {
return sb.toString();
}
@Override
public Object convertId(Object idValue) {
if (!idValue.getClass().equals(expectedType)) {
@@ -212,6 +238,7 @@ public final class IdBinderSimple implements IdBinder {
return idValue;
}
@Override
public Object convertSetId(Object idValue, EntityBean bean) {
if (!idValue.getClass().equals(expectedType)) {
@@ -32,6 +32,7 @@ public class ImportedIdEmbedded implements ImportedId {
this.imported = imported;
}
@Override
public void addFkeys(String name) {
BeanProperty[] embeddedProps = foreignAssocOne.getProperties();
@@ -43,20 +44,24 @@ public class ImportedIdEmbedded implements ImportedId {
}
}
@Override
public boolean isScalar() {
return false;
}
@Override
public String getDbColumn() {
return null;
}
@Override
public void sqlAppend(DbSqlContext ctx) {
for (ImportedIdSimple anImported : imported) {
ctx.appendColumn(anImported.localDbColumn);
}
}
@Override
public void dmlAppend(GenerateDmlRequest request) {
for (ImportedIdSimple anImported : imported) {
@@ -92,6 +97,7 @@ public class ImportedIdEmbedded implements ImportedId {
return pos;
}
@Override
public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
Object embeddedId = null;
@@ -120,6 +126,7 @@ public class ImportedIdEmbedded implements ImportedId {
return null;
}
@Override
public void buildImport(IntersectionRow row, EntityBean other) {
EntityBean embeddedId = (EntityBean) foreignAssocOne.getValue(other);
@@ -138,6 +145,7 @@ public class ImportedIdEmbedded implements ImportedId {
/**
* Not supported for embedded id.
*/
@Override
public BeanProperty findMatchImport(String matchDbColumn) {
for (ImportedIdSimple anImported : imported) {
@@ -27,6 +27,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
* Helper class to sort ImportedIdSimple.
*/
private final static class EntryComparator implements Comparator<ImportedIdSimple> {
@Override
public int compare(ImportedIdSimple o1, ImportedIdSimple o2) {
return o1.compareTo(o2);
}
@@ -73,19 +74,23 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
return obj == this;
}
@Override
public int compareTo(ImportedIdSimple other) {
return (position < other.position ? -1 : (position == other.position ? 0 : 1));
}
@Override
public void addFkeys(String name) {
BeanFkeyProperty fkey = new BeanFkeyProperty(name + "." + foreignProperty.getName(), localDbColumn, owner.getDeployOrder());
owner.getBeanDescriptor().add(fkey);
}
@Override
public boolean isScalar() {
return true;
}
@Override
public String getDbColumn() {
return localDbColumn;
}
@@ -94,6 +99,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
return foreignProperty.getValue(bean);
}
@Override
public void buildImport(IntersectionRow row, EntityBean other) {
Object value = getIdValue(other);
@@ -105,6 +111,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
row.put(localDbColumn, value);
}
@Override
public void sqlAppend(DbSqlContext ctx) {
if (localSqlFormula != null) {
ctx.appendFormulaSelect(localSqlFormula);
@@ -114,6 +121,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
}
@Override
public void dmlAppend(GenerateDmlRequest request) {
request.appendColumn(localDbColumn);
}
@@ -130,6 +138,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
return ++position;
}
@Override
public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
Object value = null;
@@ -140,6 +149,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
return value;
}
@Override
public BeanProperty findMatchImport(String matchDbColumn) {
if (matchDbColumn.equals(localDbColumn)) {