Repository: ambari Updated Branches: refs/heads/branch-2.5 6adc8bb9c -> e6b4f39a9 refs/heads/trunk a7280dd89 -> 159e5beeb
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/159e5bee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/159e5bee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/159e5bee Branch: refs/heads/trunk Commit: 159e5beeba85f7a068999fe9ecde25b0e9bf0608 Parents: a7280dd Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Jan 12 20:00:47 2017 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Jan 12 20:00:47 2017 +0200 ---------------------------------------------------------------------- .../server/orm/entities/ArtifactEntity.java | 6 ++--- .../UpgradeUserKerberosDescriptorTest.java | 26 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/159e5bee/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..190f29d 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,9 +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/159e5bee/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..5a78c81 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,19 @@ */ 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 java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; + import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.agent.ExecutionCommand; @@ -37,19 +50,6 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import java.lang.reflect.Field; -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 */
