Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapting partial code(file name start with F) to the sonar cloud rule #2045

Merged
merged 5 commits into from
Mar 10, 2020
Merged

Adapting partial code(file name start with F) to the sonar cloud rule #2045

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d5cfc3
Adapting partial code(file name start with F) to the sonar cloud rule
gabrywu Mar 1, 2020
2671f07
add more unit test
gabrywu Mar 2, 2020
b9d8973
add License
gabrywu Mar 2, 2020
4cb1712
add includes configuration to maven-surefire-plugin
gabrywu Mar 2, 2020
8cf4e0d
fix getResourceFilesList incorrect logic
gabrywu Mar 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class FuncUtils {

static public String mkString(Iterable<String> list, String split) {
public static String mkString(Iterable<String> list, String split) {

if (null == list || StringUtils.isEmpty(split)){
return null;
Expand Down
2 changes: 1 addition & 1 deletion ...nscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void testMKString() {
logger.info(result);

//Expected result string
assertEquals(result, "user1|user2|user3");
assertEquals("user1|user2|user3", result);

//Null list expected return null
result = FuncUtils.mkString(null, split);
Expand Down
3 changes: 2 additions & 1 deletion ...r-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters;

import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -212,7 +213,7 @@ public List<String> getResourceFilesList() {
return resourceList.stream()
.map(p -> p.getRes()).collect(Collectors.toList());
}
return null;
return Collections.emptyList();
}


Expand Down
6 changes: 2 additions & 4 deletions ...hinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static String suffix(String filename) {

String fileSuffix = "";
if (StringUtils.isNotEmpty(filename)) {
int lastIndex = filename.lastIndexOf(".");
int lastIndex = filename.lastIndexOf('.');
if (lastIndex > 0) {
fileSuffix = filename.substring(lastIndex + 1);
}
Expand Down Expand Up @@ -325,10 +325,8 @@ public static FileOutputStream openOutputStream(File file, boolean append) throw
}
} else {
File parent = file.getParentFile();
if (parent != null) {
if (!parent.mkdirs() && !parent.isDirectory()) {
if (parent != null && !parent.mkdirs() && !parent.isDirectory()) {
throw new IOException("Directory '" + parent + "' could not be created");
}
}
}
return new FileOutputStream(file, append);
Expand Down
14 changes: 7 additions & 7 deletions ...cheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/FileUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@ public class FileUtilsTest {

@Test
public void suffix() {
Assert.assertEquals(FileUtils.suffix("ninfor.java"),"java");
Assert.assertEquals("java", FileUtils.suffix("ninfor.java"));
}

@Test
public void testGetDownloadFilename() {
PowerMockito.mockStatic(DateUtils.class);
PowerMockito.when(DateUtils.getCurrentTime(YYYYMMDDHHMMSS)).thenReturn("20190101101059");
Assert.assertEquals(FileUtils.getDownloadFilename("test"),
"/tmp/dolphinscheduler/download/20190101101059/test");
Assert.assertEquals("/tmp/dolphinscheduler/download/20190101101059/test",
FileUtils.getDownloadFilename("test"));
}

@Test
public void testGetUploadFilename() {
Assert.assertEquals(FileUtils.getUploadFilename("aaa","bbb"),
"/tmp/dolphinscheduler/aaa/resources/bbb");
Assert.assertEquals("/tmp/dolphinscheduler/aaa/resources/bbb",
FileUtils.getUploadFilename("aaa","bbb"));
}

@Test
public void testGetProcessExecDir() {
String dir = FileUtils.getProcessExecDir(1,2,3, 4);
Assert.assertEquals(dir, "/tmp/dolphinscheduler/exec/process/1/2/3/4");
Assert.assertEquals("/tmp/dolphinscheduler/exec/process/1/2/3/4", dir);
dir = FileUtils.getProcessExecDir(1,2,3);
Assert.assertEquals(dir, "/tmp/dolphinscheduler/exec/process/1/2/3");
Assert.assertEquals("/tmp/dolphinscheduler/exec/process/1/2/3", dir);
}

@Test
Expand Down
16 changes: 5 additions & 11 deletions ...heduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
package org.apache.dolphinscheduler.server.utils;


import org.apache.commons.lang.StringUtils;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ProgramType;
import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
import org.apache.commons.lang.StringUtils;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -32,12 +31,7 @@
* spark args utils
*/
public class FlinkArgsUtils {

/**
* logger of FlinkArgsUtils
*/
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(FlinkArgsUtils.class);

private static final String LOCAL_DEPLOY_MODE = "local";
/**
* build args
* @param param flink parameters
Expand All @@ -52,7 +46,7 @@ public static List<String> buildArgs(FlinkParameters param) {
deployMode = tmpDeployMode;

}
if (!"local".equals(deployMode)) {
if (!LOCAL_DEPLOY_MODE.equals(deployMode)) {
args.add(Constants.FLINK_RUN_MODE); //-m

args.add(Constants.FLINK_YARN_CLUSTER); //yarn-cluster
Expand Down Expand Up @@ -113,12 +107,12 @@ public static List<String> buildArgs(FlinkParameters param) {
String queue = param.getQueue();
if (StringUtils.isNotEmpty(others)) {

if (!others.contains(Constants.FLINK_QUEUE) && StringUtils.isNotEmpty(queue) && !deployMode.equals("local")) {
if (!others.contains(Constants.FLINK_QUEUE) && StringUtils.isNotEmpty(queue) && !deployMode.equals(LOCAL_DEPLOY_MODE)) {
args.add(Constants.FLINK_QUEUE);
args.add(param.getQueue());
}
args.add(others);
} else if (StringUtils.isNotEmpty(queue) && !deployMode.equals("local")) {
} else if (StringUtils.isNotEmpty(queue) && !deployMode.equals(LOCAL_DEPLOY_MODE)) {
args.add(Constants.FLINK_QUEUE);
args.add(param.getQueue());
}
Expand Down
4 changes: 1 addition & 3 deletions ...er/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,7 @@ private List<String> createProjectResFiles(TaskNode taskNode) throws Exception{

if (baseParam != null) {
List<String> projectResourceFiles = baseParam.getResourceFilesList();
if (projectResourceFiles != null) {
projectFiles.addAll(projectResourceFiles);
}
projectFiles.addAll(projectResourceFiles);
}

return new ArrayList<>(projectFiles);
Expand Down
24 changes: 12 additions & 12 deletions ...ler-server/src/test/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,35 +87,35 @@ public void testBuildArgs() {
}

//Expected values and order
assertEquals(result.size(),20);
assertEquals(20, result.size());

assertEquals(result.get(0),"-m");
assertEquals(result.get(1),"yarn-cluster");
assertEquals("-m", result.get(0));
assertEquals("yarn-cluster", result.get(1));

assertEquals(result.get(2),"-ys");
assertEquals("-ys", result.get(2));
assertSame(Integer.valueOf(result.get(3)),slot);

assertEquals(result.get(4),"-ynm");
assertEquals("-ynm",result.get(4));
assertEquals(result.get(5),appName);

assertEquals(result.get(6),"-yn");
assertEquals("-yn", result.get(6));
assertSame(Integer.valueOf(result.get(7)),taskManager);

assertEquals(result.get(8),"-yjm");
assertEquals("-yjm", result.get(8));
assertEquals(result.get(9),jobManagerMemory);

assertEquals(result.get(10),"-ytm");
assertEquals("-ytm", result.get(10));
assertEquals(result.get(11),taskManagerMemory);

assertEquals(result.get(12),"-d");
assertEquals("-d", result.get(12));

assertEquals(result.get(13),"-c");
assertEquals("-c", result.get(13));
assertEquals(result.get(14),mainClass);

assertEquals(result.get(15),mainJar.getRes());
assertEquals(result.get(16),mainArgs);

assertEquals(result.get(17),"--qu");
assertEquals("--qu", result.get(17));
assertEquals(result.get(18),queue);

assertEquals(result.get(19),others);
Expand All @@ -125,7 +125,7 @@ public void testBuildArgs() {
param1.setQueue(queue);
param1.setDeployMode(mode);
result = FlinkArgsUtils.buildArgs(param1);
assertEquals(result.size(),5);
assertEquals(5, result.size());

}
}