Browse Source

Remove override annotation for building on Java 5

pull/2/head
Mark Pollack 15 years ago
parent
commit
46315f9916
  1. 5
      spring-data-commons-core/src/main/java/org/springframework/data/support/HashMapChangeSet.java
  2. 7
      spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
  3. 3
      spring-data-commons-core/src/main/java/org/springframework/persistence/transaction/NaiveDoubleTransactionManager.java

5
spring-data-commons-core/src/main/java/org/springframework/data/support/HashMapChangeSet.java

@ -23,27 +23,22 @@ public class HashMapChangeSet implements ChangeSet {
this(new HashMap<String, Object>()); this(new HashMap<String, Object>());
} }
@Override
public void set(String key, Object o) { public void set(String key, Object o) {
values.put(key, o); values.put(key, o);
} }
@Override
public String toString() { public String toString() {
return "HashMapChangeSet: values=[" + values + "]"; return "HashMapChangeSet: values=[" + values + "]";
} }
@Override
public Map<String, Object> getValues() { public Map<String, Object> getValues() {
return Collections.unmodifiableMap(values); return Collections.unmodifiableMap(values);
} }
@Override
public Object removeProperty(String k) { public Object removeProperty(String k) {
return this.values.remove(k); return this.values.remove(k);
} }
@Override
public <T> T get(String key, Class<T> requiredClass, ConversionService conversionService) { public <T> T get(String key, Class<T> requiredClass, ConversionService conversionService) {
return conversionService.convert(values.get(key), requiredClass); return conversionService.convert(values.get(key), requiredClass);
} }

7
spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java

@ -22,14 +22,12 @@ public class ChangeSetBackedTransactionSynchronization implements TransactionSyn
this.entity = entity; this.entity = entity;
} }
@Override
public void afterCommit() { public void afterCommit() {
log.debug("After Commit called for " + entity); log.debug("After Commit called for " + entity);
changeSetPersister.persistState(entity.getClass(), entity.getChangeSet()); changeSetPersister.persistState(entity.getClass(), entity.getChangeSet());
changeSetTxStatus = 0; changeSetTxStatus = 0;
} }
@Override
public void afterCompletion(int status) { public void afterCompletion(int status) {
log.debug("After Completion called with status = " + status); log.debug("After Completion called with status = " + status);
if (changeSetTxStatus == 0) { if (changeSetTxStatus == 0) {
@ -44,24 +42,19 @@ public class ChangeSetBackedTransactionSynchronization implements TransactionSyn
} }
} }
@Override
public void beforeCommit(boolean readOnly) { public void beforeCommit(boolean readOnly) {
} }
@Override
public void beforeCompletion() { public void beforeCompletion() {
} }
@Override
public void flush() { public void flush() {
} }
@Override
public void resume() { public void resume() {
throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently."); throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
} }
@Override
public void suspend() { public void suspend() {
throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently."); throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
} }

3
spring-data-commons-core/src/main/java/org/springframework/persistence/transaction/NaiveDoubleTransactionManager.java

@ -21,7 +21,6 @@ public class NaiveDoubleTransactionManager implements PlatformTransactionManager
this.b = b; this.b = b;
} }
@Override
public void commit(TransactionStatus ts) throws TransactionException { public void commit(TransactionStatus ts) throws TransactionException {
try { try {
final TransactionStatus tsb = copyTransactionStatus(status.get(ts)); final TransactionStatus tsb = copyTransactionStatus(status.get(ts));
@ -48,7 +47,6 @@ public class NaiveDoubleTransactionManager implements PlatformTransactionManager
return new DefaultTransactionStatus(t,ts.isNewTransaction(), false, false, false, null); return new DefaultTransactionStatus(t,ts.isNewTransaction(), false, false, false, null);
} }
@Override
public TransactionStatus getTransaction(TransactionDefinition td) public TransactionStatus getTransaction(TransactionDefinition td)
throws TransactionException { throws TransactionException {
TransactionStatus atx = a.getTransaction(td); TransactionStatus atx = a.getTransaction(td);
@ -57,7 +55,6 @@ public class NaiveDoubleTransactionManager implements PlatformTransactionManager
return atx; return atx;
} }
@Override
public void rollback(TransactionStatus ts) throws TransactionException { public void rollback(TransactionStatus ts) throws TransactionException {
final TransactionStatus tsb = copyTransactionStatus(status.remove(ts)); final TransactionStatus tsb = copyTransactionStatus(status.remove(ts));
try { try {

Loading…
Cancel
Save