From 250e50f142701b8b2e23111eb7abf122f0a63e8f Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Fri, 24 Jun 2016 10:02:57 -0400
Subject: [PATCH] Move InMemoryInserter out of notedb package

Change-Id: I23f8938ef188374a43c0ad6e08134a7ea2f89373
---
 .../java/com/google/gerrit/server/git/BatchUpdate.java |  1 -
 .../server/{notedb => git}/InMemoryInserter.java       | 10 +++++-----
 .../gerrit/server/{notedb => git}/InsertedObject.java  |  2 +-
 .../google/gerrit/server/notedb/ChangeNotesCommit.java |  2 ++
 .../gerrit/server/notedb/NoteDbUpdateManager.java      |  2 ++
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename gerrit-server/src/main/java/com/google/gerrit/server/{notedb => git}/InMemoryInserter.java (94%)
 rename gerrit-server/src/main/java/com/google/gerrit/server/{notedb => git}/InsertedObject.java (97%)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
index fe3712f28e..15ca859177 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
@@ -43,7 +43,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.index.change.ChangeIndexer;
 import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.notedb.InsertedObject;
 import com.google.gerrit.server.notedb.NoteDbUpdateManager;
 import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gerrit.server.project.ChangeControl;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/InMemoryInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java
similarity index 94%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/InMemoryInserter.java
rename to gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java
index c9d9d2d221..1b551f2b18 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/InMemoryInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.notedb;
+package com.google.gerrit.server.git;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -35,17 +35,17 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-class InMemoryInserter extends ObjectInserter {
+public class InMemoryInserter extends ObjectInserter {
   private final ObjectReader reader;
   private final Map<ObjectId, InsertedObject> inserted = new LinkedHashMap<>();
   private final boolean closeReader;
 
-  InMemoryInserter(ObjectReader reader) {
+  public InMemoryInserter(ObjectReader reader) {
     this.reader = checkNotNull(reader);
     closeReader = false;
   }
 
-  InMemoryInserter(Repository repo) {
+  public InMemoryInserter(Repository repo) {
     this.reader = repo.newObjectReader();
     closeReader = true;
   }
@@ -66,7 +66,7 @@ class InMemoryInserter extends ObjectInserter {
     return insert(InsertedObject.create(type, data, off, len));
   }
 
-  ObjectId insert(InsertedObject obj) {
+  public ObjectId insert(InsertedObject obj) {
     inserted.put(obj.id(), obj);
     return obj.id();
   }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/InsertedObject.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java
similarity index 97%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/InsertedObject.java
rename to gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java
index bb4bbc5cb7..1aee14f6ec 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/InsertedObject.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.notedb;
+package com.google.gerrit.server.git;
 
 import com.google.auto.value.AutoValue;
 import com.google.protobuf.ByteString;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
index 9bd3dfa94d..272f3a609b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
@@ -18,6 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
+import com.google.gerrit.server.git.InMemoryInserter;
+import com.google.gerrit.server.git.InsertedObject;
 
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
index 12e577daea..1f34998708 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
@@ -36,6 +36,8 @@ import com.google.gerrit.reviewdb.client.RefNames;
 import com.google.gerrit.server.config.AllUsersName;
 import com.google.gerrit.server.git.ChainedReceiveCommands;
 import com.google.gerrit.server.git.GitRepositoryManager;
+import com.google.gerrit.server.git.InMemoryInserter;
+import com.google.gerrit.server.git.InsertedObject;
 import com.google.gwtorm.server.OrmConcurrencyException;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.assistedinject.Assisted;