2
0
Fork 0

added interface override annotations.

This commit is contained in:
Willem Cazander 2014-08-24 12:22:32 +02:00
parent fc4c568b18
commit 5bbd8e4ef3
189 changed files with 1458 additions and 319 deletions

View file

@ -170,13 +170,15 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
logger.finer("FOUND Query: "+out);
}
}
@Override
public Query getQuery(String name) {
Query q = queries.get(name);
return q;
}
@SuppressWarnings("unchecked")
@Override
public List<Object> execute(EntityManager entityManager,Query query) {
String sql = query.toPreparedSQL(query);
logger.finer("Executing: "+query.getName()+" sql: "+sql);
@ -212,6 +214,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
return q2.getResultList();
}
@Override
public Object executeObject(EntityManager entityManager,Query query) {
String sql = query.toPreparedSQL(query);
logger.finer("Executing: "+query.getName()+" sql: "+sql);
@ -261,6 +264,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
}
}
@Override
public List<Object> execute(EntityManager entityManager,String name,Map<String,Object> parameters) {
Query query = getQuery(name);
if (parameters!=null) {
@ -272,6 +276,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
return execute(entityManager,query);
}
@Override
public Object executeObject(EntityManager entityManager,String name,Map<String,Object> parameters) {
Query query = getQuery(name);
if (parameters!=null) {
@ -282,7 +287,8 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
}
return executeObject(entityManager,query);
}
@Override
public Integer executeUpdate(EntityManager entityManager,Query query) {
String sql = query.toPreparedSQL(query);
logger.fine("Executing: "+query.getName()+" sql: "+sql);
@ -330,7 +336,8 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa
}
throw new IllegalStateException("unknow query type");
}
@Override
public Integer executeUpdate(EntityManager entityManager,String name,Map<String, Object> parameters) {
Query query = getQuery(name);
for (String key:parameters.keySet()) {

View file

@ -53,52 +53,63 @@ public class XpqlVascJndiQueriesElement extends AbstractElement {
this.xpqlManager=xpqlManager;
}
public void clear() {
@Override
public void clear() {
}
@Override
public boolean containsKey(Object key) {
return true;
}
@Override
public boolean containsValue(Object value) {
return true;
}
@Override
public Set<Map.Entry<String, Query>> entrySet() {
return null;
}
@Override
public Query get(Object key) {
return xpqlManager.getQuery((String)key);
}
@Override
public boolean isEmpty() {
return false;
}
@Override
public Set<String> keySet() {
return null;
}
@Override
public Query put(String key, Query value) {
return null;
}
@SuppressWarnings("unchecked")
@Override
public void putAll(Map m) {
}
@Override
public Query remove(Object key) {
return null;
}
@Override
public int size() {
return 0;
}
@Override
public Collection<Query> values() {
return null;
}
}
}

View file

@ -123,6 +123,7 @@ public class DefaultQuery extends AbstractQuery {
return queryBuffer.toString();
}
@Override
public Query clone() throws CloneNotSupportedException {
Query query = new DefaultQuery();
//query.setTemplateStore(getTemplateStore());

View file

@ -32,6 +32,7 @@ import net.forwardfire.vasc.xpql.query.QueryParameterValue;
*/
public class DefaultQueryParameterValue extends AbstractQueryParameterValue {
@Override
public QueryParameterValue clone() throws CloneNotSupportedException {
QueryParameterValue p = new DefaultQueryParameterValue();
p.setDefaultValue(getDefaultValue());
@ -41,5 +42,4 @@ public class DefaultQueryParameterValue extends AbstractQueryParameterValue {
p.setValueType(getValueType());
return p;
}
}

View file

@ -88,6 +88,7 @@ public class QueryInclude extends AbstractQueryPart {
return query.getQueryStore().getQuery(getName()).toSQL(query);
}
@Override
public String toPreparedSQL(Query query) {
if (query.getQueryStore().getQuery(getName())==null) {
if (resource!=null) {
@ -104,6 +105,7 @@ public class QueryInclude extends AbstractQueryPart {
return query.getQueryStore().getQuery(getName()).toPreparedSQL(query);
}
@Override
public String toXML(Query query) {
if (resource==null) {
return "<include name=\""+name+"\"/>";
@ -111,6 +113,7 @@ public class QueryInclude extends AbstractQueryPart {
return "<include name=\""+name+"\" resource=\""+resource+"\"/>";
}
@Override
public String toEdit(Query query) {
if (resource==null) {
return "@inc:"+name;
@ -118,6 +121,7 @@ public class QueryInclude extends AbstractQueryPart {
return "@inc:"+name+"@"+resource;
}
@Override
public QueryPart clone() throws CloneNotSupportedException {
QueryInclude include = new QueryInclude();
include.setName(getName());

View file

@ -56,8 +56,9 @@ public class QueryParameter extends AbstractQueryPart {
public void setName(String name) {
this.name = name;
}
@SuppressWarnings("unchecked")
@Override
public String toSQL(Query query) {
QueryParameterValue value = query.getQueryParameterValue(getName());
if ( value == null ) {
@ -105,6 +106,7 @@ public class QueryParameter extends AbstractQueryPart {
}
@SuppressWarnings("unchecked")
@Override
public String toPreparedSQL(Query query) {
QueryParameterValue value = query.getQueryParameterValue(getName());
@ -197,14 +199,17 @@ public class QueryParameter extends AbstractQueryPart {
return result;
}
@Override
public String toXML(Query query) {
return "<parameter name=\"" + getName() + "\"/>";
}
@Override
public String toEdit(Query query) {
return "@"+getName();
}
@Override
public QueryPart clone() throws CloneNotSupportedException {
QueryParameter p = new QueryParameter();
p.setName(getName());

View file

@ -41,19 +41,20 @@ public class QueryText extends AbstractQueryPart {
public String getText() {
return text;
}
/**
* @param text the text to set
*/
public void setText(String text) {
this.text = text;
}
@Override
public String toSQL(Query query) {
return text;
}
@Override
public QueryPart clone() throws CloneNotSupportedException {
QueryText text = new QueryText();
text.setText(getText());

View file

@ -40,15 +40,18 @@ import org.x4o.xml.conv.ObjectConverterException;
public class ParameterTypeObjectConverter extends AbstractStringObjectConverter {
private static final long serialVersionUID = 40849496158706355L;
@Override
public Class<?> getObjectClassTo() {
return QueryParameterType.class;
}
@Override
public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException {
return ((QueryParameterType)obj).name();
}
@Override
public Object convertStringTo(String str, Locale locale) throws ObjectConverterException {
try {
return QueryParameterType.valueOf(""+str);

View file

@ -49,6 +49,7 @@ public class QueryBindingHandler extends AbstractElementBindingHandler<Query> {
/**
* @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass()
*/
@Override
public Class<?> getBindParentClass() {
return Query.class;
}
@ -56,6 +57,7 @@ public class QueryBindingHandler extends AbstractElementBindingHandler<Query> {
/**
* @see org.x4o.xml.element.ElementBindingHandler#getBindChildClasses()
*/
@Override
public Class<?>[] getBindChildClasses() {
return CLASSES_CHILD;
}

View file

@ -42,14 +42,17 @@ public class QueryTypeObjectConverter extends AbstractStringObjectConverter {
private static final long serialVersionUID = 2383122486722789617L;
@Override
public Class<?> getObjectClassTo() {
return QueryType.class;
}
@Override
public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException {
return ((QueryType)obj).name();
}
@Override
public Object convertStringTo(String str, Locale locale) throws ObjectConverterException {
try {
return QueryType.valueOf(""+str);

View file

@ -66,6 +66,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getName()
*/
@Override
public String getName() {
return name;
}
@ -73,6 +74,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#setName(java.lang.String)
*/
@Override
public void setName(String name) {
this.name=name;
}
@ -80,6 +82,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#addQueryComment(java.lang.String)
*/
@Override
public void addQueryComment(String comment) {
queryComments.add(comment);
}
@ -87,6 +90,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#addQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
@Override
public void addQueryParameterValue(QueryParameterValue value) {
queryParameterValues.put(value.getName(), value);
}
@ -94,6 +98,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#addLocalQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
@Override
public void addLocalQueryParameterValue(QueryParameterValue value) {
localQueryParameterValues.put(value.getName(), value);
}
@ -101,6 +106,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#addOrderQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue)
*/
@Override
public void addOrderQueryParameterValue(QueryParameterValue value) {
orderQueryParameterValues.add(value);
}
@ -108,6 +114,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#addQueryPart(net.forwardfire.vasc.xpql.query.QueryPart)
*/
@Override
public void addQueryPart(QueryPart queryPart) {
queryParts.add(queryPart);
}
@ -115,6 +122,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getProperty(java.lang.String)
*/
@Override
public Object getProperty(String name) {
return properties.get(name);
}
@ -122,6 +130,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getPropertyString(java.lang.String)
*/
@Override
public String getPropertyString(String name) {
return getProperty(name).toString();
}
@ -129,6 +138,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryComments()
*/
@Override
public List<String> getQueryComments() {
return queryComments;
}
@ -136,6 +146,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String)
*/
@Override
public QueryParameterValue getQueryParameterValue(String name) {
return queryParameterValues.get(name);
}
@ -143,6 +154,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParts()
*/
@Override
public List<QueryPart> getQueryParts() {
return queryParts;
}
@ -150,6 +162,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object)
*/
@Override
public void setProperty(String name, Object value) {
properties.put(name,value);
}
@ -157,6 +170,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getPropertyKeys()
*/
@Override
public Collection<String> getPropertyKeys() {
return properties.keySet();
}
@ -164,6 +178,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameters()
*/
@Override
public List<String> getQueryParameters() {
return null;
}
@ -171,6 +186,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValues()
*/
@Override
public Collection<QueryParameterValue> getQueryParameterValues() {
return queryParameterValues.values();
}
@ -178,6 +194,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getLocalQueryParameterValues()
*/
@Override
public Collection<QueryParameterValue> getLocalQueryParameterValues() {
return localQueryParameterValues.values();
}
@ -185,6 +202,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getOrderQueryParameterValues()
*/
@Override
public List<QueryParameterValue> getOrderQueryParameterValues() {
return orderQueryParameterValues;
}
@ -192,6 +210,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object)
*/
@Override
public void setQueryParameter(String name, Object value) {
if (name==null) {
throw new NullPointerException("name can't be null.");
@ -219,6 +238,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
parameter.setValue(value);
}
@Override
public void setQueryParameters(Map<String,Object> parameters) {
for (String key:parameters.keySet()) {
setQueryParameter(key,parameters.get(key));
@ -228,6 +248,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getType()
*/
@Override
public QueryType getType() {
return type;
}
@ -235,6 +256,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#setType(net.forwardfire.vasc.xpql.query.Query.QueryType)
*/
@Override
public void setType(QueryType type) {
this.type=type;
}
@ -242,6 +264,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#getQueryStore()
*/
@Override
public QueryStore getQueryStore() {
return queryStore;
}
@ -249,9 +272,11 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query {
/**
* @see net.forwardfire.vasc.xpql.query.Query#setQueryStore(net.forwardfire.vasc.xpql.query.QueryStore)
*/
@Override
public void setQueryStore(QueryStore store) {
this.queryStore=store;
}
@Override
abstract public Query clone() throws CloneNotSupportedException;
}

View file

@ -38,6 +38,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getName()
*/
@Override
public String getName() {
return name;
}
@ -45,6 +46,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setName(java.lang.String)
*/
@Override
public void setName(String name) {
this.name=name;
}
@ -52,6 +54,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getDefaultValue()
*/
@Override
public Object getDefaultValue() {
return defaultValue;
}
@ -59,6 +62,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object)
*/
@Override
public void setDefaultValue(Object defaultValue) {
this.defaultValue=defaultValue;
}
@ -66,6 +70,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getValue()
*/
@Override
public Object getValue() {
return value;
}
@ -73,6 +78,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setType(net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType)
*/
@Override
public void setType(QueryParameterType type) {
this.type=type;
}
@ -80,6 +86,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getType()
*/
@Override
public QueryParameterType getType() {
return type;
}
@ -87,6 +94,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object)
*/
@Override
public void setValue(Object value) {
this.value=value;
}
@ -94,6 +102,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @return the valueType
*/
@Override
public Class<?> getValueType() {
return valueType;
}
@ -101,9 +110,11 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue
/**
* @param valueType the valueType to set
*/
@Override
public void setValueType(Class<?> valueType) {
this.valueType = valueType;
}
@Override
abstract public QueryParameterValue clone() throws CloneNotSupportedException;
}

View file

@ -32,12 +32,14 @@ abstract public class AbstractQueryPart implements QueryPart {
/**
* @see net.forwardfire.vasc.xpql.query.QueryPart#toSQL()
*/
@Override
abstract public String toSQL(Query query);
/**
* Returns the toSQL() retult.
* @see net.forwardfire.vasc.xpql.query.QueryPart#toPreparedSQL()
*/
@Override
public String toPreparedSQL(Query query) {
return toSQL(query);
}
@ -46,6 +48,7 @@ abstract public class AbstractQueryPart implements QueryPart {
* XML escapes the toSQL() return String.
* @see net.forwardfire.vasc.xpql.query.QueryPart#toXML()
*/
@Override
public String toXML(Query query) {
return escapeXML(toSQL(query));
}
@ -54,6 +57,7 @@ abstract public class AbstractQueryPart implements QueryPart {
* Returns the toSQL() retult.
* @see net.forwardfire.vasc.xpql.query.QueryPart#toEdit()
*/
@Override
public String toEdit(Query query) {
return toSQL(query);
}
@ -83,5 +87,6 @@ abstract public class AbstractQueryPart implements QueryPart {
return filtered.toString();
}
@Override
abstract public QueryPart clone() throws CloneNotSupportedException;
}

View file

@ -79,5 +79,6 @@ public interface Query extends QueryPart {
* @return
* @throws CloneNotSupportedException
*/
@Override
public Query clone() throws CloneNotSupportedException;
}