Skip to content

Commit a4c9cc8

Browse files
Fix Java issues and warnings
Change-Id: I43272649f8a4c260ffb59a88d09644d372cfd0d8
1 parent 5d73e8a commit a4c9cc8

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/DateTimeValue.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ public class DateTimeValue implements Value {
1616
private static final TimeZone UTC_TZ = TimeZone.getTimeZone("UTC");
1717
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
1818

19+
static {
20+
DATE_FORMAT.setTimeZone(UTC_TZ);
21+
}
22+
1923
private long timestamp;
2024

2125
public DateTimeValue(long timestamp) {
2226
this.timestamp = timestamp;
23-
DATE_FORMAT.setTimeZone(UTC_TZ);
2427
}
2528

2629
public DateTimeValue(String dt) {

cf-java-logging-support-log4j2/src/test/java/com/sap/hcp/cf/logging/common/AbstractTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ protected String getField(String fieldName) {
5050
}
5151
}
5252

53+
@SuppressWarnings("unchecked")
5354
protected List<String> getList(String fieldName) {
5455
try {
5556
return (List<String>) JSON.std.mapFrom(getLastLine()).get(fieldName);

cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/converter/CategoriesConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ private void getMarkers(Marker marker, StringBuilder appendTo) {
4646
private void getMarkersRecursively(Marker marker, ArrayComposer<JSONComposer<String>> ac) throws IOException {
4747
if (marker != null) {
4848
ac.add(marker.getName());
49-
Iterator it = marker.iterator();
49+
Iterator<Marker> it = marker.iterator();
5050
while (it.hasNext()) {
51-
getMarkersRecursively((Marker) it.next(), ac);
51+
getMarkersRecursively(it.next(), ac);
5252
}
5353
}
5454
}

cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logging/common/AbstractTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ protected String getField(String fieldName) {
4646
}
4747
}
4848

49+
@SuppressWarnings("unchecked")
4950
protected List<String> getList(String fieldName) {
5051
try {
5152
return (List<String>) JSON.std.mapFrom(lastLine()).get(fieldName);

cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logging/common/TestAppLog.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public void testMDC() {
6363
logMsg = "Running testMDC()";
6464
long beforeTS = System.nanoTime();
6565
LOGGER.info(logMsg);
66-
long afterTS = System.nanoTime();
6766
assertThat(getMessage(), is(logMsg));
6867
assertThat(getField(Fields.COMPONENT_ID), is("-"));
6968
assertThat(getField(Fields.COMPONENT_NAME), is("-"));

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/ContentLengthTrackingRequestWrapper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
public class ContentLengthTrackingRequestWrapper extends HttpServletRequestWrapper {
1414

15-
private final HttpServletRequest request;
1615
private WrappedInputReader wrappedReader = null;
1716
private WrappedInputStream wrappedStream = null;
1817

@@ -25,7 +24,6 @@ public class ContentLengthTrackingRequestWrapper extends HttpServletRequestWrapp
2524
*/
2625
public ContentLengthTrackingRequestWrapper(HttpServletRequest request) {
2726
super(request);
28-
this.request = request;
2927
}
3028

3129
@Override

sample/src/main/java/com/iamjambay/cloudfoundry/stickysession/MainServlet.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.math.BigInteger;
77
import java.util.Enumeration;
88
import java.util.Map.Entry;
9-
import java.util.Random;
109

1110
import javax.servlet.ServletException;
1211
import javax.servlet.http.Cookie;
@@ -24,7 +23,6 @@ public class MainServlet extends HttpServlet {
2423
private static final long serialVersionUID = 1L;
2524
private static final String CF_INSTANCE_INDEX = "CF_INSTANCE_INDEX";
2625
private final Logger logger = LoggerFactory.getLogger(MainServlet.class);
27-
private final Random random = new Random();
2826
private static final String STACKTRACE = "/stacktrace";
2927

3028
public MainServlet() {
@@ -105,10 +103,6 @@ private void printFibonacci(PrintWriter writer, String qs) {
105103
}
106104
}
107105

108-
private void logRequest(HttpServletRequest request) {
109-
logger.info("Done processing request " + request.getRequestURI() + " from " + request.getRemoteHost());
110-
}
111-
112106
@Override
113107
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
114108
IOException {

0 commit comments

Comments
 (0)