Author: aadamchik
Date: Thu Mar 13 10:10:30 2014
New Revision: 1577081
URL: http://svn.apache.org/r1577081
Log:
java 6 annotations
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java?rev=1577081&r1=1577080&r2=1577081&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
Thu Mar 13 10:10:30 2014
@@ -93,50 +93,62 @@ public class AutoAdapter implements DbAd
return adapterProvider.get();
}
+ @Override
public String getBatchTerminator() {
return getAdapter().getBatchTerminator();
}
+ @Override
public QualifierTranslator getQualifierTranslator(QueryAssembler
queryAssembler) {
return getAdapter().getQualifierTranslator(queryAssembler);
}
+ @Override
public SQLAction getAction(Query query, DataNode node) {
return getAdapter().getAction(query, node);
}
+ @Override
public boolean supportsUniqueConstraints() {
return getAdapter().supportsUniqueConstraints();
}
+ @Override
public boolean supportsGeneratedKeys() {
return getAdapter().supportsGeneratedKeys();
}
+ @Override
public boolean supportsBatchUpdates() {
return getAdapter().supportsBatchUpdates();
}
+ @Override
public Collection<String> dropTableStatements(DbEntity table) {
return getAdapter().dropTableStatements(table);
}
+ @Override
public String createTable(DbEntity entity) {
return getAdapter().createTable(entity);
}
+ @Override
public String createUniqueConstraint(DbEntity source,
Collection<DbAttribute> columns) {
return getAdapter().createUniqueConstraint(source, columns);
}
+ @Override
public String createFkConstraint(DbRelationship rel) {
return getAdapter().createFkConstraint(rel);
}
+ @Override
public String[] externalTypesForJdbcType(int type) {
return getAdapter().externalTypesForJdbcType(type);
}
+ @Override
public ExtendedTypeMap getExtendedTypes() {
return getAdapter().getExtendedTypes();
}
@@ -144,6 +156,7 @@ public class AutoAdapter implements DbAd
/**
* Returns a primary key generator.
*/
+ @Override
public PkGenerator getPkGenerator() {
return (pkGenerator != null) ? pkGenerator :
getAdapter().getPkGenerator();
}
@@ -156,6 +169,7 @@ public class AutoAdapter implements DbAd
this.pkGenerator = pkGenerator;
}
+ @Override
public DbAttribute buildAttribute(
String name,
String typeName,
@@ -173,6 +187,7 @@ public class AutoAdapter implements DbAd
allowNulls);
}
+ @Override
public void bindParameter(
PreparedStatement statement,
Object object,
@@ -182,18 +197,22 @@ public class AutoAdapter implements DbAd
getAdapter().bindParameter(statement, object, pos, sqlType, precision);
}
+ @Override
public String tableTypeForTable() {
return getAdapter().tableTypeForTable();
}
+ @Override
public String tableTypeForView() {
return getAdapter().tableTypeForView();
}
+ @Override
public MergerFactory mergerFactory() {
return getAdapter().mergerFactory();
}
+ @Override
public void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute
column) {
getAdapter().createTableAppendColumn(sqlBuffer, column);
}
@@ -202,6 +221,7 @@ public class AutoAdapter implements DbAd
* @deprecated since 3.2
*/
@Deprecated
+ @Override
public QuotingStrategy getQuotingStrategy(boolean isQuoteStrategy) {
return getAdapter().getQuotingStrategy(isQuoteStrategy);
}
@@ -209,6 +229,7 @@ public class AutoAdapter implements DbAd
/**
* @since 3.2
*/
+ @Override
public QuotingStrategy getQuotingStrategy() {
return getAdapter().getQuotingStrategy();
}
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java?rev=1577081&r1=1577080&r2=1577081&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
Thu Mar 13 10:10:30 2014
@@ -40,38 +40,46 @@ public class DefaultQuotingStrategy impl
/**
* @deprecated since 3.2
*/
+ @Override
@Deprecated
public String quoteString(String name) {
return quotedIdentifier((DataMap) null, name);
}
+ @Override
@Deprecated
public String quoteFullyQualifiedName(DbEntity entity) {
return quotedFullyQualifiedName(entity);
}
+ @Override
public String quotedFullyQualifiedName(DbEntity entity) {
return quotedIdentifier(entity.getDataMap(), entity.getCatalog(),
entity.getSchema(), entity.getName());
}
+ @Override
public String quotedName(DbAttribute attribute) {
return quotedIdentifier(attribute.getEntity().getDataMap(),
attribute.getName());
}
+ @Override
public String quotedSourceName(DbJoin join) {
DataMap dataMap = join.getSource().getEntity().getDataMap();
return quotedIdentifier(dataMap, join.getSourceName());
}
+ @Override
public String quotedTargetName(DbJoin join) {
DataMap dataMap = join.getTarget().getEntity().getDataMap();
return quotedIdentifier(dataMap, join.getTargetName());
}
+ @Override
public String quotedIdentifier(Entity entity, String... identifierParts) {
return quotedIdentifier(entity.getDataMap(), identifierParts);
}
+ @Override
public String quotedIdentifier(DataMap dataMap, String... identifierParts)
{
String startQuote, endQuote;
