Revert "Fix eclipse-vertx#550: Fixed merging array-type attributes when only one of the two User objects has the attribute"

This reverts commit 3ea6603.

Author: dmironowicz

vertx-auth-common/src/main/java/io/vertx/ext/auth/impl/UserImpl.java

@@ -128,7 +128,7 @@ public User merge(User other) {
           Object rhsValue = otherAttrs.getValue(key);
           // accumulate
           if (lhsValue == null) {
-            attrs.put(key, rhsValue instanceof JsonArray ? new JsonArray().addAll((JsonArray) rhsValue) : rhsValue);
+            attrs.put(key, rhsValue instanceof JsonArray ? new JsonArray().add(rhsValue) : rhsValue);
           } else if (lhsValue instanceof JsonArray) {
             if (rhsValue instanceof JsonArray) {
               ((JsonArray) lhsValue).addAll((JsonArray) rhsValue);

vertx-auth-common/src/test/java/io/vertx/ext/auth/UserTest.java

@@ -159,27 +159,5 @@ public void testMerge() {
     // expectation
     assertEquals("B", userA.principal().getString("access_token"));
     assertEquals(new JsonArray().add("read").add("write"), userA.attributes().getJsonArray("roles"));
-
-    // or 1st is array and 2nd is null
-
-    userA = User.create(new JsonObject().put("access_token", "A"), new JsonObject().put("roles", new JsonArray().add("read")));
-    userB = User.create(new JsonObject().put("access_token", "B"));
-
-    userA.merge(userB);
-
-    // expectation
-    assertEquals("B", userA.principal().getString("access_token"));
-    assertEquals(new JsonArray().add("read"), userA.attributes().getJsonArray("roles"));
-
-    // or 1st is null and 2nd is array
-
-    userA = User.create(new JsonObject().put("access_token", "A"));
-    userB = User.create(new JsonObject().put("access_token", "B"), new JsonObject().put("roles", new JsonArray().add("write")));
-
-    userA.merge(userB);
-
-    // expectation
-    assertEquals("B", userA.principal().getString("access_token"));
-    assertEquals(new JsonArray().add("write"), userA.attributes().getJsonArray("roles"));
   }
 }