AMBARI-19464. Stack Downgrading Potentially Corrupts Kerberos Descriptor. Fix imports (echekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6b4f39a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6b4f39a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6b4f39a Branch: refs/heads/branch-2.5 Commit: e6b4f39a9dd98b3d959fa8c0f7f5aa671e5cdf39 Parents: 6adc8bb Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Jan 12 20:01:24 2017 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Jan 12 20:01:24 2017 +0200 ---------------------------------------------------------------------- .../ambari/server/orm/entities/ArtifactEntity.java | 7 ++++--- .../upgrades/UpgradeUserKerberosDescriptorTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b4f39a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java index 4d5e2ac..6426f1e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ArtifactEntity.java @@ -18,7 +18,8 @@ package org.apache.ambari.server.orm.entities; -import com.google.gson.Gson; +import java.util.Collections; +import java.util.Map; import javax.persistence.Basic; import javax.persistence.Column; @@ -29,8 +30,8 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Collections; -import java.util.Map; + +import com.google.gson.Gson; /** * Entity representing an Artifact. http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b4f39a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java index cc6f0fa..6b80623 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeUserKerberosDescriptorTest.java @@ -17,6 +17,14 @@ */ package org.apache.ambari.server.serveraction.upgrades; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; + import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.agent.ExecutionCommand; @@ -42,14 +50,6 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; - /** * Tests OozieConfigCalculation logic */
