svn commit: r1753955 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: DocumentMK.java DocumentNodeState.java

[mreutegg]

Author: mreutegg
Date: Mon Jul 25 07:36:39 2016
New Revision: 1753955

URL: http://svn.apache.org/viewvc?rev=1753955&view=rev
Log:
OAK-4594: Remove DocumentNodeState.copyTo()

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1753955&r1=1753954&r2=1753955&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
 Mon Jul 25 07:36:39 2016
@@ -44,6 +44,7 @@ import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.mongodb.DB;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheLIRS.EvictionCallback;
 import org.apache.jackrabbit.oak.cache.CacheStats;
@@ -505,7 +506,9 @@ public class DocumentMK {
                                 Commit commit) {
         RevisionVector destRevision = 
commit.getBaseRevision().update(commit.getRevision());
         DocumentNodeState newNode = new DocumentNodeState(nodeStore, 
targetPath, destRevision);
-        source.copyTo(newNode);
+        for (PropertyState p : source.getProperties()) {
+            newNode.setProperty(p);
+        }
 
         commit.addNode(newNode);
         if (move) {

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1753955&r1=1753954&r2=1753955&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 Mon Jul 25 07:36:39 2016
@@ -342,10 +342,6 @@ public class DocumentNodeState extends A
         return properties.keySet();
     }
 
-    void copyTo(DocumentNodeState newNode) {
-        newNode.properties.putAll(properties);
-    }
-
     @Override
     public boolean hasNoChildren() {
         return !hasChildren;