Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMD: Enable and obey AddEmptyString

Browse Source
This commit is contained in:
Daniel Martí 2016-04-23 16:14:05 +01:00
parent 5d3d8786e2
commit 857b0ea1c7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -572,7 +572,7 @@ public class AppProvider extends FDroidProvider {
public static Uri getSearchUri(Repo repo, String query) { public static Uri getSearchUri(Repo repo, String query) {
return getContentUri().buildUpon() return getContentUri().buildUpon()
.appendPath(PATH_SEARCH_REPO) .appendPath(PATH_SEARCH_REPO)
.appendPath(repo.id + "") .appendPath(String.valueOf(repo.id))
.appendPath(query) .appendPath(query)
.build(); .build();
} }

6
app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java
View File

@ -221,7 +221,7 @@ public class LocalHTTPD extends NanoHTTPD {
try { try {
// Calculate etag // Calculate etag
String etag = Integer String etag = Integer
.toHexString((file.getAbsolutePath() + file.lastModified() + "" + file.length()) .toHexString((file.getAbsolutePath() + file.lastModified() + String.valueOf(file.length()))
.hashCode()); .hashCode());
// Support (simple) skipping: // Support (simple) skipping:
@ -268,7 +268,7 @@ public class LocalHTTPD extends NanoHTTPD {
fis.skip(startFrom); fis.skip(startFrom);
res = createResponse(Response.Status.PARTIAL_CONTENT, mime, fis); res = createResponse(Response.Status.PARTIAL_CONTENT, mime, fis);
res.addHeader("Content-Length", "" + dataLen); res.addHeader("Content-Length", String.valueOf(dataLen));
res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/"
+ fileLen); + fileLen);
res.addHeader("ETag", etag); res.addHeader("ETag", etag);
@ -278,7 +278,7 @@ public class LocalHTTPD extends NanoHTTPD {
res = createResponse(Response.Status.NOT_MODIFIED, mime, ""); res = createResponse(Response.Status.NOT_MODIFIED, mime, "");
} else { } else {
res = createResponse(Response.Status.OK, mime, new FileInputStream(file)); res = createResponse(Response.Status.OK, mime, new FileInputStream(file));
res.addHeader("Content-Length", "" + fileLen); res.addHeader("Content-Length", String.valueOf(fileLen));
res.addHeader("ETag", etag); res.addHeader("ETag", etag);
} }
} }

6
app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
View File

@ -259,7 +259,7 @@ public class BluetoothServer extends Thread {
try { try {
// Calculate etag // Calculate etag
String etag = Integer String etag = Integer
.toHexString((file.getAbsolutePath() + file.lastModified() + "" + file.length()) .toHexString((file.getAbsolutePath() + file.lastModified() + String.valueOf(file.length()))
.hashCode()); .hashCode());
// Support (simple) skipping: // Support (simple) skipping:
@ -306,7 +306,7 @@ public class BluetoothServer extends Thread {
fis.skip(startFrom); fis.skip(startFrom);
res = createResponse(NanoHTTPD.Response.Status.PARTIAL_CONTENT, mime, fis); res = createResponse(NanoHTTPD.Response.Status.PARTIAL_CONTENT, mime, fis);
res.addHeader("Content-Length", "" + dataLen); res.addHeader("Content-Length", String.valueOf(dataLen));
res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/"
+ fileLen); + fileLen);
res.addHeader("ETag", etag); res.addHeader("ETag", etag);
@ -316,7 +316,7 @@ public class BluetoothServer extends Thread {
res = createResponse(NanoHTTPD.Response.Status.NOT_MODIFIED, mime, ""); res = createResponse(NanoHTTPD.Response.Status.NOT_MODIFIED, mime, "");
} else { } else {
res = createResponse(NanoHTTPD.Response.Status.OK, mime, new FileInputStream(file)); res = createResponse(NanoHTTPD.Response.Status.OK, mime, new FileInputStream(file));
res.addHeader("Content-Length", "" + fileLen); res.addHeader("Content-Length", String.valueOf(fileLen));
res.addHeader("ETag", etag); res.addHeader("ETag", etag);
} }
} }

1
config/pmd/rules.xml
View File

@ -16,4 +16,5 @@
<exclude name="UselessParentheses"/> <!--Too nitpicky--> <exclude name="UselessParentheses"/> <!--Too nitpicky-->
</rule> </rule>
<rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/> <rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/>
<rule ref="rulesets/java/optimizations.xml/AddEmptyString"/>
</ruleset> </ruleset>