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

This commit is contained in:
Eric Gao 2022-08-13 10:05:03 +08:00 committed by GitHub
parent 7ff34c3947
commit 896fef6c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 62 additions and 27 deletions

View File

@ -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();
} }

11
pom.xml
View File

@ -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>

23
style/eclipse.importorder Normal file
View File

@ -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