diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java index 4fe0120e24..f46b7ce56c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java +++ b/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; -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.TaskConstants; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.spi.utils.DateUtils; import org.apache.dolphinscheduler.spi.utils.JSONUtils; + import org.apache.zeppelin.client.ClientConfig; import org.apache.zeppelin.client.NoteResult; import org.apache.zeppelin.client.ParagraphResult; import org.apache.zeppelin.client.Status; import org.apache.zeppelin.client.ZeppelinClient; + import java.util.HashMap; import java.util.List; import java.util.Map; +import kong.unirest.Unirest; + +import com.fasterxml.jackson.databind.ObjectMapper; public class ZeppelinTask extends AbstractTaskExecutor { @@ -52,7 +55,6 @@ public class ZeppelinTask extends AbstractTaskExecutor { */ private ZeppelinClient zClient; - /** * constructor * @@ -121,7 +123,8 @@ public class ZeppelinTask extends AbstractTaskExecutor { resultContent = resultContentBuilder.toString(); } else { - final ParagraphResult paragraphResult = this.zClient.executeParagraph(noteId, paragraphId, zeppelinParamsMap); + final ParagraphResult paragraphResult = + this.zClient.executeParagraph(noteId, paragraphId, zeppelinParamsMap); resultContent = paragraphResult.getResultInText(); status = paragraphResult.getStatus(); } diff --git a/pom.xml b/pom.xml index 76f697c4df..7c0bc2cbd5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 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 processing. - + dolphinscheduler-bom dolphinscheduler-alert @@ -58,7 +58,7 @@ dolphinscheduler-ui dolphinscheduler-scheduler-plugin - + UTF-8 UTF-8 @@ -91,11 +91,11 @@ ${project.version} true true - + true true - + @@ -173,13 +173,13 @@ dolphinscheduler-spi ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-data-quality ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-python @@ -260,7 +260,7 @@ dolphinscheduler-registry-mysql ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-scheduler-api @@ -271,7 +271,7 @@ dolphinscheduler-scheduler-quartz ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-datasource-all @@ -282,7 +282,7 @@ dolphinscheduler-datasource-api ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-task-api @@ -298,7 +298,7 @@ dolphinscheduler-task-all ${project.version} - + org.apache.dolphinscheduler dolphinscheduler-ui @@ -310,9 +310,9 @@ ${project.version} - + - + org.jacoco @@ -648,13 +648,22 @@ style/spotless_dolphinscheduler_formatter.xml + + + style/eclipse.importorder + + + Remove wildcard imports + import\s+[^\*\s]+\*;(\r\n|\r|\n) + $1 + UTF-8 4 true - true + false true true false @@ -747,7 +756,7 @@ https://github.com/apache/dolphinscheduler HEAD - + docker diff --git a/style/eclipse.importorder b/style/eclipse.importorder new file mode 100644 index 0000000000..2d3e2a9345 --- /dev/null +++ b/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 \ No newline at end of file