GROOVY-11308: Restore compatibility of Collection#unique

The documentation for this method states that when `mutate` is false, a new collection is _always_ returned. The previous code only did so when self.size() was greater than 1, and otherwise returned null.

Author: octylFractal

Diff for: src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java

@@ -1304,19 +1304,19 @@ public static <T> List<T> unique(List<T> self) {
      * </pre>
      *
      * @param self a collection
-     * @param mutate false will cause a new list containing unique items from the collection to be created, true will mutate collections in place
-     * @return the now modified collection
+     * @param mutate false will return a new collection containing the unique items from the collection, true will mutate collections in place and return the original collection
+     * @return a collection with unique elements
      * @since 1.8.1
      */
     public static <T> Collection<T> unique(Collection<T> self, boolean mutate) {
-        Collection<T> answer = null;
-        if (mutate || (self != null && self.size() > 1)) {
-            answer = uniqueItems(self);
+        Objects.requireNonNull(self);
+        if (mutate && self.size() <= 1) {
+            return self;
         }
+        Collection<T> answer = uniqueItems(self);
         if (mutate) {
             self.clear();
             self.addAll(answer);
-
             return self;
         } else {
             return answer;

Diff for: src/test/groovy/UniqueOnCollectionTest.groovy

@@ -112,4 +112,22 @@ class UniqueOnCollectionTest extends GroovyTestCase {
         assert orig == [1, 3, 2, 3]
         assert uniq == [1, 3, 2]
     }
+
+    /** GROOVY-11308 */
+    void testNonMutatingEmpty() {
+        def it = []
+        def uniq = it.unique( false )
+        assert uniq !== it : "Must be a different instance to preserve documented behavior"
+        assert uniq == []
+        assert it == []
+    }
+
+    /** GROOVY-11308 */
+    void testNonMutatingSingleElement() {
+        def it = [1]
+        def uniq = it.unique( false )
+        assert uniq !== it : "Must be a different instance to preserve documented behavior"
+        assert uniq == [1]
+        assert it == [1]
+    }
 }