From 46315f99162a26f390a5f6513483e07fa68fede5 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 9 Nov 2010 11:44:12 -0500 Subject: [PATCH] Remove override annotation for building on Java 5 --- .../org/springframework/data/support/HashMapChangeSet.java | 5 ----- .../ChangeSetBackedTransactionSynchronization.java | 7 ------- .../transaction/NaiveDoubleTransactionManager.java | 3 --- 3 files changed, 15 deletions(-) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/support/HashMapChangeSet.java b/spring-data-commons-core/src/main/java/org/springframework/data/support/HashMapChangeSet.java index a1a034bf3..236cd9ace 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/support/HashMapChangeSet.java +++ b/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()); } - @Override public void set(String key, Object o) { values.put(key, o); } - @Override public String toString() { return "HashMapChangeSet: values=[" + values + "]"; } - @Override public Map getValues() { return Collections.unmodifiableMap(values); } - @Override public Object removeProperty(String k) { return this.values.remove(k); } - @Override public T get(String key, Class requiredClass, ConversionService conversionService) { return conversionService.convert(values.get(key), requiredClass); } diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java b/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java index 92f513a96..e2e53ec2b 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java +++ b/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; } - @Override public void afterCommit() { log.debug("After Commit called for " + entity); changeSetPersister.persistState(entity.getClass(), entity.getChangeSet()); changeSetTxStatus = 0; } - @Override public void afterCompletion(int status) { log.debug("After Completion called with status = " + status); if (changeSetTxStatus == 0) { @@ -44,24 +42,19 @@ public class ChangeSetBackedTransactionSynchronization implements TransactionSyn } } - @Override public void beforeCommit(boolean readOnly) { } - @Override public void beforeCompletion() { } - @Override public void flush() { } - @Override public void resume() { throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently."); } - @Override public void suspend() { throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently."); } diff --git a/spring-data-commons-core/src/main/java/org/springframework/persistence/transaction/NaiveDoubleTransactionManager.java b/spring-data-commons-core/src/main/java/org/springframework/persistence/transaction/NaiveDoubleTransactionManager.java index b4e11742f..60bd3c254 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/persistence/transaction/NaiveDoubleTransactionManager.java +++ b/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; } - @Override public void commit(TransactionStatus ts) throws TransactionException { try { 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); } - @Override public TransactionStatus getTransaction(TransactionDefinition td) throws TransactionException { TransactionStatus atx = a.getTransaction(td); @@ -57,7 +55,6 @@ public class NaiveDoubleTransactionManager implements PlatformTransactionManager return atx; } - @Override public void rollback(TransactionStatus ts) throws TransactionException { final TransactionStatus tsb = copyTransactionStatus(status.remove(ts)); try {