Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3665 from ByteHamster/checkstyle-limit-nesting

Browse Source 
Avoid too much nesting
This commit is contained in:
H. Lehmann 2019-12-02 13:05:37 +01:00 committed by GitHub
commit 9818692db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 214 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
View File

@ -98,7 +98,7 @@ public class HTTPBin extends NanoHTTPD {
if (func.equalsIgnoreCase("status")) {
try {
int code = Integer.parseInt(param);
return getStatus(code);
return new Response(getStatus(code), MIME_HTML, "");
} catch (NumberFormatException e) {
e.printStackTrace();
return getInternalError();
@ -284,19 +284,34 @@ public class HTTPBin extends NanoHTTPD {
return response;
}
private Response getStatus(final int code) {
Response.IStatus status = (code == 200) ? Response.Status.OK :
(code == 201) ? Response.Status.CREATED :
(code == 206) ? Response.Status.PARTIAL_CONTENT :
(code == 301) ? Response.Status.REDIRECT :
(code == 304) ? Response.Status.NOT_MODIFIED :
(code == 400) ? Response.Status.BAD_REQUEST :
(code == 401) ? Response.Status.UNAUTHORIZED :
(code == 403) ? Response.Status.FORBIDDEN :
(code == 404) ? Response.Status.NOT_FOUND :
(code == 405) ? Response.Status.METHOD_NOT_ALLOWED :
(code == 416) ? Response.Status.RANGE_NOT_SATISFIABLE :
(code == 500) ? Response.Status.INTERNAL_ERROR : new Response.IStatus() {
private Response.IStatus getStatus(final int code) {
switch (code) {
case 200:
return Response.Status.OK;
case 201:
return Response.Status.CREATED;
case 206:
return Response.Status.PARTIAL_CONTENT;
case 301:
return Response.Status.REDIRECT;
case 304:
return Response.Status.NOT_MODIFIED;
case 400:
return Response.Status.BAD_REQUEST;
case 401:
return Response.Status.UNAUTHORIZED;
case 403:
return Response.Status.FORBIDDEN;
case 404:
return Response.Status.NOT_FOUND;
case 405:
return Response.Status.METHOD_NOT_ALLOWED;
case 416:
return Response.Status.RANGE_NOT_SATISFIABLE;
case 500:
return Response.Status.INTERNAL_ERROR;
default:
return new Response.IStatus() {
@Override
public int getRequestStatus() {
return code;
@ -307,8 +322,7 @@ public class HTTPBin extends NanoHTTPD {
return "Unknown";
}
};
return new Response(status, MIME_HTML, "");
}
}
private Response getRedirectResponse(int times) {

9
config/checkstyle/checkstyle-best-practice.xml
View File

@ -244,5 +244,14 @@
<property name="exceptionVariableName" value="expected"/>
</module>
<module name="CommentsIndentation"/>
<module name="NestedIfDepth">
<property name="max" value="4"/>
</module>
<module name="NestedTryDepth">
<property name="max" value="2"/>
</module>
<module name="NestedForDepth">
<property name="max" value="2"/>
</module>
</module>
</module>

9
config/checkstyle/checkstyle.xml
View File

@ -91,5 +91,14 @@
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="NestedIfDepth">
<property name="max" value="4"/>
</module>
<module name="NestedTryDepth">
<property name="max" value="2"/>
</module>
<module name="NestedForDepth">
<property name="max" value="2"/>
</module>
</module>
</module>

4
core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
View File

@ -97,12 +97,10 @@ public class NSAtom extends Namespace {
type = SyndTypeUtils.getMimeTypeFromUrl(href);
}
if(SyndTypeUtils.enclosureTypeValid(type)) {
FeedItem currItem = state.getCurrentItem();
if(currItem != null && !currItem.hasMedia()) {
if (SyndTypeUtils.enclosureTypeValid(type) && currItem != null && !currItem.hasMedia()) {
currItem.setMedia(new FeedMedia(currItem, href, size, type));
}
}
} else if (LINK_REL_PAYMENT.equals(rel)) {
state.getCurrentItem().setPaymentLink(href);
}

13
core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
View File

@ -47,23 +47,18 @@ public class ID3Reader {
onEndTag();
} else {
while (readerPosition < tagHeader.getSize()) {
FrameHeader frameHeader = createFrameHeader(readBytes(
input, HEADER_LENGTH));
FrameHeader frameHeader = createFrameHeader(readBytes(input, HEADER_LENGTH));
if (checkForNullString(frameHeader.getId())) {
break;
} else {
}
rc = onStartFrameHeader(frameHeader, input);
if (rc == ACTION_SKIP) {
if (frameHeader.getSize() + readerPosition > tagHeader
.getSize()) {
if (frameHeader.getSize() + readerPosition > tagHeader.getSize()) {
break;
} else {
}
skipBytes(input, frameHeader.getSize());
}
}
}
}
onEndTag();
}
}