Merge "Move ReceiveCommits.Message to CommitValidationMessage"

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -64,6 +64,7 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.MultiProgressMonitor.Task;
 import com.google.gerrit.server.git.validators.CommitValidationResult;
 import com.google.gerrit.server.git.validators.CommitValidationListener;
+import com.google.gerrit.server.git.validators.CommitValidationMessage;
 import com.google.gerrit.server.mail.CreateChangeSender;
 import com.google.gerrit.server.mail.MergedSender;
 import com.google.gerrit.server.mail.ReplacePatchSetSender;
@@ -218,16 +219,6 @@ public class ReceiveCommits {
     }
   }
 
-  private static class Message {
-    private final String message;
-    private final boolean isError;
-
-    private Message(final String message, final boolean isError) {
-      this.message = message;
-      this.isError = isError;
-    }
-  }
-
   private static final Function<Exception, OrmException> ORM_EXCEPTION =
       new Function<Exception, OrmException>() {
         @Override
@@ -286,7 +277,7 @@ public class ReceiveCommits {
 
   private final SubmoduleOp.Factory subOpFactory;
 
-  private final List<Message> messages = new ArrayList<Message>();
+  private final List<CommitValidationMessage> messages = new ArrayList<CommitValidationMessage>();
   private ListMultimap<Error, String> errors = LinkedListMultimap.create();
   private Task newProgress;
   private Task replaceProgress;
@@ -489,19 +480,19 @@ public class ReceiveCommits {
   }
 
   private void addMessage(String message) {
-    messages.add(new Message(message, false));
+    messages.add(new CommitValidationMessage(message, false));
   }
 
   void addError(String error) {
-    messages.add(new Message(error, true));
+    messages.add(new CommitValidationMessage(error, true));
   }
 
   void sendMessages() {
-    for (Message m : messages) {
+    for (CommitValidationMessage m : messages) {
-      if (m.isError) {
+      if (m.isError()) {
-        messageSender.sendError(m.message);
+        messageSender.sendError(m.getMessage());
       } else {
-        messageSender.sendMessage(m.message);
+        messageSender.sendMessage(m.getMessage());
       }
     }
   }

gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationMessage.java

@@ -0,0 +1,33 @@
+// Copyright (C) 2012 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.git.validators;
+
+public class CommitValidationMessage {
+  private final String message;
+  private final boolean isError;
+
+  public CommitValidationMessage(final String message, final boolean isError) {
+    this.message = message;
+    this.isError = isError;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public boolean isError() {
+    return isError;
+  }
+}