ambari git commit: AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos Gergely via oleewere)

2016-06-08 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 5754b6826 -> 6576c8460


AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos 
Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6576c846
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6576c846
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6576c846

Branch: refs/heads/trunk
Commit: 6576c8460239824e948c099856eaa53007489796
Parents: 5754b68
Author: Aravindan Vijayan 
Authored: Wed Jun 8 10:21:47 2016 -0700
Committer: Aravindan Vijayan 
Committed: Wed Jun 8 10:21:47 2016 -0700

--
 .../ChangeRepositoryVersionRequestAuditEvent.java|  5 +++--
 .../request/ClusterPrivilegeChangeRequestAuditEvent.java |  4 +++-
 .../eventcreator/RepositoryVersionEventCreator.java  | 10 ++
 .../eventcreator/RequestAuditEventCreatorHelper.java |  5 +++--
 .../audit/request/creator/PrivilegeEventCreatorTest.java |  6 +++---
 .../request/creator/ViewPrivilegeEventCreatorTest.java   |  6 +++---
 .../internal/ComponentResourceProviderTest.java  |  9 ++---
 .../security/ldap/AmbariLdapDataPopulatorTest.java   | 11 ++-
 8 files changed, 33 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6576c846/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
index 74e7267..702cd6f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.audit.event.request;
 
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -57,7 +58,7 @@ public class ChangeRepositoryVersionRequestAuditEvent extends 
RequestAuditEvent
  * Details of the repositories
  * os type -> list of repositories, where a repository is a key-value map 
of the properties (repo_id, repo_name, base_url)
  */
-private Map>> repos;
+private SortedMap>> repos;
 
 public ChangeRepositoryVersionAuditEventBuilder() {
   super.withOperation("Repository version change");
@@ -125,7 +126,7 @@ public class ChangeRepositoryVersionRequestAuditEvent 
extends RequestAuditEvent
   return this;
 }
 
-public ChangeRepositoryVersionAuditEventBuilder withRepos(Map>> repos) {
+public ChangeRepositoryVersionAuditEventBuilder 
withRepos(SortedMap>> repos) {
   this.repos = repos;
   return this;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/6576c846/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
index cc59038..b28bb2a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -67,7 +69,7 @@ public class ClusterPrivilegeChangeRequestAuditEvent extends 
RequestAuditEvent {
 protected void buildAuditMessage(StringBuilder builder) {
   super.buildAuditMessage(builder);
 
-  Set roleSet = new HashSet();
+  SortedSet roleSet = new TreeSet();
   roleSet.addAll(users.keySet());
   roleSet.addAll(groups.keySet());
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6576c846/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java

ambari git commit: AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos Gergely via oleewere)

2016-06-08 Thread oleewere 
Repository: ambari
Updated Branches:
  refs/heads/trunk d2cbcd3cf -> be36f4856


AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos 
Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be36f485
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be36f485
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be36f485

Branch: refs/heads/trunk
Commit: be36f4856f75d9d2e7de2a6c28e5c79bcea6add3
Parents: d2cbcd3
Author: Miklos Gergely 
Authored: Wed Jun 8 18:20:21 2016 +0200
Committer: oleewere 
Committed: Wed Jun 8 18:21:59 2016 +0200

--
 .../event/request/ViewPrivilegeChangeRequestAuditEvent.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be36f485/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
index c06eb7e..11c558c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -89,7 +91,7 @@ public class ViewPrivilegeChangeRequestAuditEvent extends 
RequestAuditEvent {
 .append(name)
 .append(")");
 
-  Set roleSet = new HashSet();
+  SortedSet roleSet = new TreeSet();
   roleSet.addAll(users.keySet());
   roleSet.addAll(groups.keySet());

ambari git commit: AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos Gergely via oleewere)

2016-06-08 Thread oleewere 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 0597d52bc -> f516c79e1


AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos 
Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f516c79e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f516c79e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f516c79e

Branch: refs/heads/branch-2.4
Commit: f516c79e1794001ec7fbfdab5ce1c30e894e4f5a
Parents: 0597d52
Author: Miklos Gergely 
Authored: Wed Jun 8 12:18:16 2016 +0200
Committer: oleewere 
Committed: Wed Jun 8 12:37:58 2016 +0200

--
 .../ChangeRepositoryVersionRequestAuditEvent.java|  5 +++--
 .../request/ClusterPrivilegeChangeRequestAuditEvent.java |  4 +++-
 .../eventcreator/RepositoryVersionEventCreator.java  | 10 ++
 .../eventcreator/RequestAuditEventCreatorHelper.java |  5 +++--
 .../audit/request/creator/PrivilegeEventCreatorTest.java |  6 +++---
 .../request/creator/ViewPrivilegeEventCreatorTest.java   |  6 +++---
 .../internal/ComponentResourceProviderTest.java  |  9 ++---
 .../security/ldap/AmbariLdapDataPopulatorTest.java   | 11 ++-
 8 files changed, 33 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f516c79e/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
index 74e7267..702cd6f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.audit.event.request;
 
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -57,7 +58,7 @@ public class ChangeRepositoryVersionRequestAuditEvent extends 
RequestAuditEvent
  * Details of the repositories
  * os type -> list of repositories, where a repository is a key-value map 
of the properties (repo_id, repo_name, base_url)
  */
-private Map>> repos;
+private SortedMap>> repos;
 
 public ChangeRepositoryVersionAuditEventBuilder() {
   super.withOperation("Repository version change");
@@ -125,7 +126,7 @@ public class ChangeRepositoryVersionRequestAuditEvent 
extends RequestAuditEvent
   return this;
 }
 
-public ChangeRepositoryVersionAuditEventBuilder withRepos(Map>> repos) {
+public ChangeRepositoryVersionAuditEventBuilder 
withRepos(SortedMap>> repos) {
   this.repos = repos;
   return this;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f516c79e/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
index cc59038..b28bb2a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -67,7 +69,7 @@ public class ClusterPrivilegeChangeRequestAuditEvent extends 
RequestAuditEvent {
 protected void buildAuditMessage(StringBuilder builder) {
   super.buildAuditMessage(builder);
 
-  Set roleSet = new HashSet();
+  SortedSet roleSet = new TreeSet();
   roleSet.addAll(users.keySet());
   roleSet.addAll(groups.keySet());
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f516c79e/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java

ambari git commit: AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos Gergely via oleewere)

2016-06-08 Thread oleewere 
Repository: ambari
Updated Branches:
  refs/heads/trunk 210238c4f -> 32890b554


AMBARI-17004. Unit tests failing because of the order of hash sets/maps (Miklos 
Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/32890b55
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/32890b55
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/32890b55

Branch: refs/heads/trunk
Commit: 32890b5542dee84de30d127896fe2426af1926ee
Parents: 210238c
Author: Miklos Gergely 
Authored: Wed Jun 8 12:18:16 2016 +0200
Committer: oleewere 
Committed: Wed Jun 8 12:32:28 2016 +0200

--
 .../ChangeRepositoryVersionRequestAuditEvent.java|  5 +++--
 .../request/ClusterPrivilegeChangeRequestAuditEvent.java |  4 +++-
 .../eventcreator/RepositoryVersionEventCreator.java  | 10 ++
 .../eventcreator/RequestAuditEventCreatorHelper.java |  5 +++--
 .../audit/request/creator/PrivilegeEventCreatorTest.java |  6 +++---
 .../request/creator/ViewPrivilegeEventCreatorTest.java   |  6 +++---
 .../internal/ComponentResourceProviderTest.java  |  9 ++---
 .../security/ldap/AmbariLdapDataPopulatorTest.java   | 11 ++-
 8 files changed, 33 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/32890b55/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
index 74e7267..702cd6f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.audit.event.request;
 
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -57,7 +58,7 @@ public class ChangeRepositoryVersionRequestAuditEvent extends 
RequestAuditEvent
  * Details of the repositories
  * os type -> list of repositories, where a repository is a key-value map 
of the properties (repo_id, repo_name, base_url)
  */
-private Map>> repos;
+private SortedMap>> repos;
 
 public ChangeRepositoryVersionAuditEventBuilder() {
   super.withOperation("Repository version change");
@@ -125,7 +126,7 @@ public class ChangeRepositoryVersionRequestAuditEvent 
extends RequestAuditEvent
   return this;
 }
 
-public ChangeRepositoryVersionAuditEventBuilder withRepos(Map>> repos) {
+public ChangeRepositoryVersionAuditEventBuilder 
withRepos(SortedMap>> repos) {
   this.repos = repos;
   return this;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/32890b55/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
index cc59038..b28bb2a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -67,7 +69,7 @@ public class ClusterPrivilegeChangeRequestAuditEvent extends 
RequestAuditEvent {
 protected void buildAuditMessage(StringBuilder builder) {
   super.buildAuditMessage(builder);
 
-  Set roleSet = new HashSet();
+  SortedSet roleSet = new TreeSet();
   roleSet.addAll(users.keySet());
   roleSet.addAll(groups.keySet());
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/32890b55/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java