git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
support
/
general
/
src
/
main
/
java
/
org
/
wamblee
/
persistence
/
JpaMergeSupport.java
diff --git
a/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
b/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
index 6230656f0f3933a37a879849ded6418c62c83d46..5105d767b9772753ccdea1b0e328608b2cccf49d 100644
(file)
--- a/
support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
+++ b/
support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
@@
-24,12
+24,10
@@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wamblee.persistence.PersistentFactory.EntityAccessor;
import org.wamblee.reflection.ReflectionUtils;
/**
import org.wamblee.reflection.ReflectionUtils;
/**
@@
-55,7
+53,7
@@
import org.wamblee.reflection.ReflectionUtils;
* @author Erik Brakkee
*/
public class JpaMergeSupport {
* @author Erik Brakkee
*/
public class JpaMergeSupport {
- private static final Log
LOG = LogFactory.getLog(JpaMergeSupport.class
);
+ private static final Log
ger LOG = Logger.getLogger(JpaMergeSupport.class.getName()
);
/**
* Constructs the object.
/**
* Constructs the object.
@@
-113,7
+111,7
@@
public class JpaMergeSupport {
aProcessed.add(elem);
aProcessed.add(elem);
- LOG.
debug
("Setting pk/version on " + aPersistent + " from " + aMerged);
+ LOG.
fine
("Setting pk/version on " + aPersistent + " from " + aMerged);
Persistent persistentWrapper = PersistentFactory.create(aPersistent);
Persistent mergedWrapper = PersistentFactory.create(aMerged);
Persistent persistentWrapper = PersistentFactory.create(aPersistent);
Persistent mergedWrapper = PersistentFactory.create(aMerged);
@@
-140,11
+138,10
@@
public class JpaMergeSupport {
throw new IllegalArgumentException(
"Mismatch between primary key values: " + aPersistent + " " +
aMerged);
throw new IllegalArgumentException(
"Mismatch between primary key values: " + aPersistent + " " +
aMerged);
- } else {
- persistentWrapper.setPersistedVersion(mergedWrapper
- .getPersistedVersion());
- persistentWrapper.setPrimaryKey(mergedWrapper.getPrimaryKey());
}
}
+ persistentWrapper.setPersistedVersion(mergedWrapper
+ .getPersistedVersion());
+ persistentWrapper.setPrimaryKey(mergedWrapper.getPrimaryKey());
List<Method> methods = ReflectionUtils.getAllMethods(aPersistent
.getClass(), Object.class);
List<Method> methods = ReflectionUtils.getAllMethods(aPersistent
.getClass(), Object.class);