This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch upgrade/jdk-spring-dependencies
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to
refs/heads/upgrade/jdk-spring-dependencies by this push:
new 6166e179f6 AMBARI-26212: Fix checkstyle error (#3862)
6166e179f6 is described below
commit 6166e179f634ab369a72e9f8e1d7a08776112b31
Author: coldless177 <[email protected]>
AuthorDate: Tue Oct 29 14:52:59 2024 +0800
AMBARI-26212: Fix checkstyle error (#3862)
---
.../main/java/org/apache/ambari/annotations/ClusterScale.java | 2 +-
.../org/apache/ambari/annotations/ConfigurationMarkdown.java | 2 +-
.../org/apache/ambari/server/configuration/Configuration.java | 8 ++------
.../ambari/server/checks/HostsMasterMaintenanceCheckTest.java | 1 -
.../java/org/apache/ambari/server/checks/LZOCheckTest.java | 1 -
.../server/checks/RequiredServicesInRepositoryCheckTest.java | 1 -
.../ambari/server/checks/ServicesMaintenanceModeCheckTest.java | 1 -
.../apache/ambari/server/configuration/ConfigurationTest.java | 3 +--
.../server/controller/AmbariManagementControllerImplTest.java | 1 -
.../internal/RecommendationResourceProviderTest.java | 10 +++++-----
10 files changed, 10 insertions(+), 20 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/annotations/ClusterScale.java
b/ambari-server/src/main/java/org/apache/ambari/annotations/ClusterScale.java
index 85457f7eb9..65996e282f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/annotations/ClusterScale.java
+++
b/ambari-server/src/main/java/org/apache/ambari/annotations/ClusterScale.java
@@ -17,12 +17,12 @@
*/
package org.apache.ambari.annotations;
-import org.apache.ambari.server.configuration.Configuration;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.ambari.server.configuration.Configuration;
/**
* The {@link ClusterScale} class is a representation of the size of the
* cluster combined with a value. It's used to represent different
diff --git
a/ambari-server/src/main/java/org/apache/ambari/annotations/ConfigurationMarkdown.java
b/ambari-server/src/main/java/org/apache/ambari/annotations/ConfigurationMarkdown.java
index f03b807854..0561386692 100644
---
a/ambari-server/src/main/java/org/apache/ambari/annotations/ConfigurationMarkdown.java
+++
b/ambari-server/src/main/java/org/apache/ambari/annotations/ConfigurationMarkdown.java
@@ -17,12 +17,12 @@
*/
package org.apache.ambari.annotations;
-import org.apache.ambari.server.configuration.Configuration;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.ambari.server.configuration.Configuration;
/**
* The {@link ConfigurationMarkdown} is used to represent more complex
* Markdown for {@link Configuration.ConfigurationProperty} fields. It wraps
the traditional
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index a6e5bcc1e7..02bd1b5151 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -28,10 +28,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -52,11 +48,11 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
+import org.apache.ambari.annotations.ClusterScale;
+import org.apache.ambari.annotations.ConfigurationMarkdown;
import org.apache.ambari.annotations.Experimental;
import org.apache.ambari.annotations.ExperimentalFeature;
import org.apache.ambari.annotations.Markdown;
-import org.apache.ambari.annotations.ConfigurationMarkdown;
-import org.apache.ambari.annotations.ClusterScale;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.actionmanager.CommandExecutionType;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
index 2333e11fa6..dbd3b9711f 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
@@ -31,7 +31,6 @@ import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.repository.ClusterVersionSummary;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.spi.ClusterInformation;
-import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.RepositoryVersion;
import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
index 907d12fce2..d9f6ed27ac 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
@@ -27,7 +27,6 @@ import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.spi.ClusterInformation;
-import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.RepositoryVersion;
import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
index e6e39be418..02271185bb 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
@@ -28,7 +28,6 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.spi.ClusterInformation;
-import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.RepositoryVersion;
import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
index 6f98ea8f2d..5242cd8ef5 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheckTest.java
@@ -30,7 +30,6 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.repository.ClusterVersionSummary;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.spi.ClusterInformation;
-import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.RepositoryVersion;
import org.apache.ambari.spi.upgrade.UpgradeCheckRequest;
import org.apache.ambari.spi.upgrade.UpgradeCheckResult;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
index 91c158e2fa..f863d920d3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
@@ -28,7 +28,6 @@ import static org.powermock.api.easymock.PowerMock.verifyAll;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.nio.charset.Charset;
@@ -36,8 +35,8 @@ import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
-import org.apache.ambari.annotations.Markdown;
import org.apache.ambari.annotations.ConfigurationMarkdown;
+import org.apache.ambari.annotations.Markdown;
import org.apache.ambari.server.AmbariException;
import
org.apache.ambari.server.configuration.Configuration.ConfigurationProperty;
import org.apache.ambari.server.configuration.Configuration.ConnectionPoolType;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
index 64a0025576..c1ac73241a 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
@@ -48,7 +48,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RecommendationResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RecommendationResourceProviderTest.java
index 8d55dbd874..a2bd1fb7c6 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RecommendationResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RecommendationResourceProviderTest.java
@@ -23,16 +23,17 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorHelper;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
@@ -43,13 +44,12 @@ import
org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.RequestStatus;
import org.apache.ambari.server.controller.spi.Resource;
-
import org.apache.ambari.server.state.Clusters;
+import org.junit.Before;
import org.junit.Test;
-
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.junit.Before;
+
public class RecommendationResourceProviderTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
