Browse Source

[Feature][Style] Enable spotless to manage imports (#11458)

3.1.0-release
Eric Gao 2 years ago committed by GitHub
parent
commit
896fef6c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java
  2. 55
      pom.xml
  3. 23
      style/eclipse.importorder

11
dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java

@ -17,23 +17,26 @@
package org.apache.dolphinscheduler.plugin.task.zeppelin; package org.apache.dolphinscheduler.plugin.task.zeppelin;
import com.fasterxml.jackson.databind.ObjectMapper;
import kong.unirest.Unirest;
import org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor; import org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor;
import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.spi.utils.DateUtils; import org.apache.dolphinscheduler.spi.utils.DateUtils;
import org.apache.dolphinscheduler.spi.utils.JSONUtils; import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.zeppelin.client.ClientConfig; import org.apache.zeppelin.client.ClientConfig;
import org.apache.zeppelin.client.NoteResult; import org.apache.zeppelin.client.NoteResult;
import org.apache.zeppelin.client.ParagraphResult; import org.apache.zeppelin.client.ParagraphResult;
import org.apache.zeppelin.client.Status; import org.apache.zeppelin.client.Status;
import org.apache.zeppelin.client.ZeppelinClient; import org.apache.zeppelin.client.ZeppelinClient;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import kong.unirest.Unirest;
import com.fasterxml.jackson.databind.ObjectMapper;
public class ZeppelinTask extends AbstractTaskExecutor { public class ZeppelinTask extends AbstractTaskExecutor {
@ -52,7 +55,6 @@ public class ZeppelinTask extends AbstractTaskExecutor {
*/ */
private ZeppelinClient zClient; private ZeppelinClient zClient;
/** /**
* constructor * constructor
* *
@ -121,7 +123,8 @@ public class ZeppelinTask extends AbstractTaskExecutor {
resultContent = resultContentBuilder.toString(); resultContent = resultContentBuilder.toString();
} else { } else {
final ParagraphResult paragraphResult = this.zClient.executeParagraph(noteId, paragraphId, zeppelinParamsMap); final ParagraphResult paragraphResult =
this.zClient.executeParagraph(noteId, paragraphId, zeppelinParamsMap);
resultContent = paragraphResult.getResultInText(); resultContent = paragraphResult.getResultInText();
status = paragraphResult.getStatus(); status = paragraphResult.getStatus();
} }

55
pom.xml

@ -31,7 +31,7 @@
<description>Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated <description>Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated
to solving the complex dependencies in data processing, making the scheduling system out of the box for data to solving the complex dependencies in data processing, making the scheduling system out of the box for data
processing.</description> processing.</description>
<modules> <modules>
<module>dolphinscheduler-bom</module> <module>dolphinscheduler-bom</module>
<module>dolphinscheduler-alert</module> <module>dolphinscheduler-alert</module>
@ -58,7 +58,7 @@
<module>dolphinscheduler-ui</module> <module>dolphinscheduler-ui</module>
<module>dolphinscheduler-scheduler-plugin</module> <module>dolphinscheduler-scheduler-plugin</module>
</modules> </modules>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@ -91,11 +91,11 @@
<docker.tag>${project.version}</docker.tag> <docker.tag>${project.version}</docker.tag>
<docker.build.skip>true</docker.build.skip> <docker.build.skip>true</docker.build.skip>
<docker.push.skip>true</docker.push.skip> <docker.push.skip>true</docker.push.skip>
<python.sign.skip>true</python.sign.skip> <python.sign.skip>true</python.sign.skip>
<skipDepCheck>true</skipDepCheck> <skipDepCheck>true</skipDepCheck>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -173,13 +173,13 @@
<artifactId>dolphinscheduler-spi</artifactId> <artifactId>dolphinscheduler-spi</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-data-quality</artifactId> <artifactId>dolphinscheduler-data-quality</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-python</artifactId> <artifactId>dolphinscheduler-python</artifactId>
@ -260,7 +260,7 @@
<artifactId>dolphinscheduler-registry-mysql</artifactId> <artifactId>dolphinscheduler-registry-mysql</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-scheduler-api</artifactId> <artifactId>dolphinscheduler-scheduler-api</artifactId>
@ -271,7 +271,7 @@
<artifactId>dolphinscheduler-scheduler-quartz</artifactId> <artifactId>dolphinscheduler-scheduler-quartz</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-datasource-all</artifactId> <artifactId>dolphinscheduler-datasource-all</artifactId>
@ -282,7 +282,7 @@
<artifactId>dolphinscheduler-datasource-api</artifactId> <artifactId>dolphinscheduler-datasource-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-task-api</artifactId> <artifactId>dolphinscheduler-task-api</artifactId>
@ -298,7 +298,7 @@
<artifactId>dolphinscheduler-task-all</artifactId> <artifactId>dolphinscheduler-task-all</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-ui</artifactId> <artifactId>dolphinscheduler-ui</artifactId>
@ -310,9 +310,9 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<!-- <!--
NOTE: only development / test phase dependencies (scope = test / provided) NOTE: only development / test phase dependencies (scope = test / provided)
@ -370,7 +370,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@ -380,7 +380,7 @@
<version>${rpm-maven-plugion.version}</version> <version>${rpm-maven-plugion.version}</version>
<inherited>false</inherited> <inherited>false</inherited>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -392,7 +392,7 @@
<testTarget>${java.version}</testTarget> <testTarget>${java.version}</testTarget>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
@ -401,13 +401,13 @@
<tagNameFormat>@{project.version}</tagNameFormat> <tagNameFormat>@{project.version}</tagNameFormat>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version> <version>${maven-assembly-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
@ -417,7 +417,7 @@
<failOnError>false</failOnError> <failOnError>false</failOnError>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@ -512,7 +512,7 @@
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.owasp</groupId> <groupId>org.owasp</groupId>
@ -554,7 +554,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -584,7 +584,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<!-- jenkins plugin jacoco report--> <!-- jenkins plugin jacoco report-->
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
@ -648,13 +648,22 @@
<eclipse> <eclipse>
<file>style/spotless_dolphinscheduler_formatter.xml</file> <file>style/spotless_dolphinscheduler_formatter.xml</file>
</eclipse> </eclipse>
<removeUnusedImports />
<importOrder>
<file>style/eclipse.importorder</file>
</importOrder>
<replaceRegex>
<name>Remove wildcard imports</name>
<searchRegex>import\s+[^\*\s]+\*;(\r\n|\r|\n)</searchRegex>
<replacement>$1</replacement>
</replaceRegex>
</java> </java>
<pom> <pom>
<sortPom> <sortPom>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<nrOfIndentSpace>4</nrOfIndentSpace> <nrOfIndentSpace>4</nrOfIndentSpace>
<keepBlankLines>true</keepBlankLines> <keepBlankLines>true</keepBlankLines>
<indentBlankLines>true</indentBlankLines> <indentBlankLines>false</indentBlankLines>
<indentSchemaLocation>true</indentSchemaLocation> <indentSchemaLocation>true</indentSchemaLocation>
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
<sortModules>false</sortModules> <sortModules>false</sortModules>
@ -747,7 +756,7 @@
<url>https://github.com/apache/dolphinscheduler</url> <url>https://github.com/apache/dolphinscheduler</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<profiles> <profiles>
<profile> <profile>
<id>docker</id> <id>docker</id>

23
style/eclipse.importorder

@ -0,0 +1,23 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#Organize Import Order
0=org.apache.dolphinscheduler
1=org.apache
2=java
3=javax
4=org
5=com
Loading…
Cancel
Save