A Message should have only one source but as it is used in Errors, currently it can have multiple sources. The Message objects is returned from two public methods(Elements#getElements() and Errors#getMessages()) that make any changes in its method declarations difficult. As the first step, I am going to remove all calls to the Message constructor that receives multiple sources from []. So, the only calls will be from Errors that I will deal with separately.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=57979416

2 files changed, 8 insertions, 2 deletions

diff --git a/core/src/com/google/inject/ProvisionException.java b/core/src/com/google/inject/ProvisionException.java
index 4d6afcdb..e2394461 100644
--- a/core/src/com/google/inject/ProvisionException.java
+++ b/core/src/com/google/inject/ProvisionException.java
@@ -18,7 +18,6 @@ package com.google.inject;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.internal.Errors;
 import com.google.inject.spi.Message;
@@ -45,7 +44,7 @@ public final class ProvisionException extends RuntimeException {
 
   public ProvisionException(String message, Throwable cause) {
     super(cause);
-    this.messages = ImmutableSet.of(new Message(ImmutableList.of(), message, cause));
+    this.messages = ImmutableSet.of(new Message(message, cause));
   }
 
   public ProvisionException(String message) {
diff --git a/core/src/com/google/inject/spi/Message.java b/core/src/com/google/inject/spi/Message.java
index 14d3bcc8..59c40728 100644
--- a/core/src/com/google/inject/spi/Message.java
+++ b/core/src/com/google/inject/spi/Message.java
@@ -55,6 +55,13 @@ public final class Message implements Serializable, Element {
     this.cause = cause;
   }
 
+  /**
+   * @since 4.0
+   */
+  public Message(String message, Throwable cause) {
+    this(ImmutableList.of(), message, cause);
+  }
+
   public Message(Object source, String message) {
     this(ImmutableList.of(source), message, null);
   }