Merge branch 'pmd/new-rule3' into 'master'
Ref: add more PMD rule: bestpractices.xml/OneDeclarationPerLine See merge request sheepitrenderfarm/client!316
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
<rule ref="category/java/bestpractices.xml/AbstractClassWithoutAbstractMethod" />
|
||||
<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" />
|
||||
<rule ref="category/java/bestpractices.xml/CheckResultSet" />
|
||||
<rule ref="category/java/bestpractices.xml/OneDeclarationPerLine" />
|
||||
<rule ref="category/java/bestpractices.xml/PrimitiveWrapperInstantiation" />
|
||||
<rule ref="category/java/bestpractices.xml/UnusedFormalParameter" />
|
||||
<rule ref="category/java/bestpractices.xml/UnusedLocalVariable" />
|
||||
|
||||
@@ -122,7 +122,8 @@ import lombok.Data;
|
||||
* @return string formatted with SheepIt Admin Log Viewer in mind
|
||||
*/
|
||||
public String toString() {
|
||||
String c = " CFG: ", n ="\n";
|
||||
String c = " CFG: ";
|
||||
String n ="\n";
|
||||
return
|
||||
c + "version: " + getJarVersion() + n +
|
||||
c + "configFilePath: " + configFilePath + n +
|
||||
|
||||
@@ -100,10 +100,9 @@ public class Speedtest {
|
||||
* @throws Exception
|
||||
*/
|
||||
private <T> Pair<Long, T> runTimed(Callable<T> task) throws Exception {
|
||||
long start, end;
|
||||
start = System.nanoTime();
|
||||
long start = System.nanoTime();
|
||||
T callValue = task.call();
|
||||
end = System.nanoTime();
|
||||
long end = System.nanoTime();
|
||||
return new Pair<>(Duration.ofNanos(end - start).toMillis(), callValue);
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,8 @@ public class Mac extends OS {
|
||||
|
||||
@Override public boolean isSupported() {
|
||||
String[] ver = operatingSystem.getVersionInfo().getVersion().split("\\.");
|
||||
int majorVer = Integer.parseInt(ver[0]), minorVer = Integer.parseInt(ver[1]);
|
||||
int majorVer = Integer.parseInt(ver[0]);
|
||||
int minorVer = Integer.parseInt(ver[1]);
|
||||
return super.isSupported() && ((majorVer == 10 && minorVer >= 13) || majorVer >= 11);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user