From dd896347a2c3d477f4fe88566ac53116872c8df3 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Wed, 3 Apr 2024 14:41:06 +0200 Subject: [PATCH] Fix newly detected violations from PMD 7 --- .../src/main/java/btools/codec/MicroCache2.java | 3 ++- .../src/main/java/btools/codec/TagValueCoder.java | 3 ++- .../src/main/java/btools/router/OsmNogoPolygon.java | 4 ++-- brouter-core/src/main/java/btools/router/OsmTrack.java | 4 ++-- .../src/main/java/btools/router/RoutingEngine.java | 10 +++++----- .../main/java/btools/router/RoutingParamCollector.java | 2 +- .../src/main/java/btools/expressions/BExpression.java | 6 +++--- .../java/btools/expressions/BExpressionContext.java | 5 +++-- .../btools/mapcreator/CreateElevationRasterImage.java | 8 ++++---- .../mapcreator/ElevationRasterTileConverter.java | 1 - .../src/main/java/btools/mapcreator/OsmNodeP.java | 10 ++++++---- .../java/btools/mapcreator/RelationStatistics.java | 3 ++- .../src/main/java/btools/mapcreator/WayLinker.java | 3 ++- .../src/main/java/btools/mapaccess/OsmFile.java | 5 ++--- .../src/main/java/btools/mapaccess/OsmNodePairSet.java | 2 +- .../java/btools/mapaccess/WaypointMatcherImpl.java | 2 +- .../src/main/java/btools/server/IpAccessMonitor.java | 2 +- .../src/main/java/btools/server/Polygon.java | 3 ++- .../src/main/java/btools/server/RouteServer.java | 7 ++++--- .../src/main/java/btools/server/SuspectManager.java | 3 ++- .../btools/server/request/ProfileUploadHandler.java | 2 +- .../test/java/btools/server/RequestHandlerTest.java | 3 ++- .../src/main/java/btools/util/LazyArrayOfLists.java | 1 + .../src/main/java/btools/util/StackSampler.java | 8 ++++---- .../src/test/java/btools/util/CompactMapTest.java | 3 ++- .../src/test/java/btools/util/CompactSetTest.java | 3 ++- .../src/test/java/btools/util/DenseLongMapTest.java | 6 ++++-- config/pmd/pmd-ruleset.xml | 10 ++-------- 28 files changed, 65 insertions(+), 57 deletions(-) diff --git a/brouter-codec/src/main/java/btools/codec/MicroCache2.java b/brouter-codec/src/main/java/btools/codec/MicroCache2.java index c7b6878..657aaa9 100644 --- a/brouter-codec/src/main/java/btools/codec/MicroCache2.java +++ b/brouter-codec/src/main/java/btools/codec/MicroCache2.java @@ -1,6 +1,7 @@ package btools.codec; import java.util.HashMap; +import java.util.Map; import btools.util.ByteDataReader; import btools.util.IByteArrayUnifier; @@ -287,7 +288,7 @@ public final class MicroCache2 extends MicroCache { @Override public int encodeMicroCache(byte[] buffer) { - HashMap idMap = new HashMap<>(); + Map idMap = new HashMap<>(); for (int n = 0; n < size; n++) { // loop over nodes idMap.put(expandId(faid[n]), n); } diff --git a/brouter-codec/src/main/java/btools/codec/TagValueCoder.java b/brouter-codec/src/main/java/btools/codec/TagValueCoder.java index 098ea06..f0a3a0f 100644 --- a/brouter-codec/src/main/java/btools/codec/TagValueCoder.java +++ b/brouter-codec/src/main/java/btools/codec/TagValueCoder.java @@ -4,6 +4,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; import java.util.PriorityQueue; +import java.util.Queue; import btools.util.BitCoderContext; @@ -58,7 +59,7 @@ public final class TagValueCoder { TagValueSet dummy = new TagValueSet(nextTagValueSetId++); identityMap.put(dummy, dummy); } - PriorityQueue queue = new PriorityQueue<>(2 * identityMap.size(), new TagValueSet.FrequencyComparator()); + Queue queue = new PriorityQueue<>(2 * identityMap.size(), new TagValueSet.FrequencyComparator()); queue.addAll(identityMap.values()); while (queue.size() > 1) { TagValueSet node = new TagValueSet(nextTagValueSetId++); diff --git a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java index ea828fe..2809f27 100644 --- a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java +++ b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java @@ -168,7 +168,7 @@ public class OsmNogoPolygon extends OsmNodeNamed { Point p1 = points.get(0); for (int i = 1; i <= i_last; i++) { final Point p2 = points.get(i); - if (OsmNogoPolygon.isOnLine(px, py, p1.x, p1.y, p2.x, p2.y)) { + if (isOnLine(px, py, p1.x, p1.y, p2.x, p2.y)) { return true; } p1 = p2; @@ -234,7 +234,7 @@ public class OsmNogoPolygon extends OsmNodeNamed { final long p1x = p1.x; final long p1y = p1.y; - if (OsmNogoPolygon.isOnLine(px, py, p0x, p0y, p1x, p1y)) { + if (isOnLine(px, py, p0x, p0y, p1x, p1y)) { return true; } diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 1c95880..c153f8f 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -166,7 +166,7 @@ public final class OsmTrack { } public List aggregateMessages() { - ArrayList res = new ArrayList<>(); + List res = new ArrayList<>(); MessageData current = null; for (OsmPathElement n : nodes) { if (n.message != null && n.message.wayKeyValues != null) { @@ -188,7 +188,7 @@ public final class OsmTrack { } public List aggregateSpeedProfile() { - ArrayList res = new ArrayList<>(); + List res = new ArrayList<>(); int vmax = -1; int vmaxe = -1; int vmin = -1; diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 4d706e3..2909e5a 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -187,7 +187,7 @@ public class RoutingEngine extends Thread { OsmTrack[] refTracks = new OsmTrack[nsections]; // used ways for alternatives OsmTrack[] lastTracks = new OsmTrack[nsections]; OsmTrack track = null; - ArrayList messageList = new ArrayList<>(); + List messageList = new ArrayList<>(); for (int i = 0; ; i++) { track = findTrack(refTracks, lastTracks); track.message = "track-length = " + track.distance + " filtered ascend = " + track.ascend @@ -690,9 +690,9 @@ public class RoutingEngine extends Thread { return false; } } - ArrayList removeBackList = new ArrayList<>(); - ArrayList removeForeList = new ArrayList<>(); - ArrayList removeVoiceHintList = new ArrayList<>(); + List removeBackList = new ArrayList<>(); + List removeForeList = new ArrayList<>(); + List removeVoiceHintList = new ArrayList<>(); OsmPathElement last = null; OsmPathElement lastJunction = null; CompactLongMap lastJunctions = new CompactLongMap<>(); @@ -1246,7 +1246,7 @@ public class RoutingEngine extends Thread { addToOpenset(startPath1); addToOpenset(startPath2); } - ArrayList openBorderList = new ArrayList<>(4096); + List openBorderList = new ArrayList<>(4096); boolean memoryPanicMode = false; boolean needNonPanicProcessing = false; diff --git a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java index 99f5b3b..b8d7f6b 100644 --- a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java +++ b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java @@ -101,7 +101,7 @@ public class RoutingParamCollector { * @throws UnsupportedEncodingException */ public Map getUrlParams(String url) throws UnsupportedEncodingException { - HashMap params = new HashMap<>(); + Map params = new HashMap<>(); String decoded = URLDecoder.decode(url, "UTF-8"); StringTokenizer tk = new StringTokenizer(decoded, "?&"); while (tk.hasMoreTokens()) { diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpression.java b/brouter-expressions/src/main/java/btools/expressions/BExpression.java index b083f58..d266780 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpression.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpression.java @@ -242,15 +242,15 @@ final class BExpression { } // parse operands if (nops > 0) { - exp.op1 = BExpression.parse(ctx, level + 1, exp.typ == ASSIGN_EXP ? "=" : null); + exp.op1 = parse(ctx, level + 1, exp.typ == ASSIGN_EXP ? "=" : null); } if (nops > 1) { if (ifThenElse) checkExpectedToken(ctx, "then"); - exp.op2 = BExpression.parse(ctx, level + 1, null); + exp.op2 = parse(ctx, level + 1, null); } if (nops > 2) { if (ifThenElse) checkExpectedToken(ctx, "else"); - exp.op3 = BExpression.parse(ctx, level + 1, null); + exp.op3 = parse(ctx, level + 1, null); } if (brackets) { checkExpectedToken(ctx, ")"); diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java index 786439a..349baa5 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.NavigableMap; import java.util.Random; import java.util.StringTokenizer; import java.util.TreeMap; @@ -227,7 +228,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier { } public List getKeyValueList(boolean inverseDirection, byte[] ab) { - ArrayList res = new ArrayList<>(); + List res = new ArrayList<>(); decode(lookupData, inverseDirection, ab); for (int inum = 0; inum < lookupValues.size(); inum++) { // loop over lookup names BExpressionLookupValue[] va = lookupValues.get(inum); @@ -433,7 +434,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier { public void dumpStatistics() { - TreeMap counts = new TreeMap<>(); + NavigableMap counts = new TreeMap<>(); // first count for (String name : lookupNumbers.keySet()) { int cnt = 0; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/CreateElevationRasterImage.java b/brouter-map-creator/src/main/java/btools/mapcreator/CreateElevationRasterImage.java index 935965f..4cbd3c5 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/CreateElevationRasterImage.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/CreateElevationRasterImage.java @@ -184,10 +184,10 @@ public class CreateElevationRasterImage { if (DEBUG) System.out.println(line); String[] sa = line.split(","); if (!line.startsWith("#") && sa.length == 4) { - short e = Short.valueOf(sa[0].trim()); - short r = Short.valueOf(sa[1].trim()); - short g = Short.valueOf(sa[2].trim()); - short b = Short.valueOf(sa[3].trim()); + short e = Short.parseShort(sa[0].trim()); + short r = Short.parseShort(sa[1].trim()); + short g = Short.parseShort(sa[2].trim()); + short b = Short.parseShort(sa[3].trim()); colorMap.put(e, new Color(r, g, b)); } // read next line diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/ElevationRasterTileConverter.java b/brouter-map-creator/src/main/java/btools/mapcreator/ElevationRasterTileConverter.java index 9b251fc..229dcfd 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/ElevationRasterTileConverter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/ElevationRasterTileConverter.java @@ -90,7 +90,6 @@ public class ElevationRasterTileConverter { } else { System.out.println("usage: java [arc seconds (1 or 3,default=3)] [hgt-fallback-data-dir]"); System.out.println("or java all [arc seconds (1 or 3, default=3)] [hgt-fallback-data-dir]"); - return; } } diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java index 572554e..b945582 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java @@ -8,6 +8,8 @@ package btools.mapcreator; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import btools.codec.MicroCache; import btools.codec.MicroCache2; @@ -105,7 +107,7 @@ public class OsmNodeP extends OsmLinkP { } public void checkDuplicateTargets() { - HashMap targets = new HashMap<>(); + Map targets = new HashMap<>(); for (OsmLinkP link0 = getFirstLink(); link0 != null; link0 = link0.getNext(this)) { OsmLinkP link = link0; @@ -165,14 +167,14 @@ public class OsmNodeP extends OsmLinkP { mc.writeVarBytes(getNodeDecsription()); // buffer internal reverse links - ArrayList internalReverse = new ArrayList<>(); + List internalReverse = new ArrayList<>(); for (OsmLinkP link0 = getFirstLink(); link0 != null; link0 = link0.getNext(this)) { OsmLinkP link = link0; OsmNodeP origin = this; OsmNodeP target = null; - ArrayList linkNodes = new ArrayList<>(); + List linkNodes = new ArrayList<>(); linkNodes.add(this); // first pass just to see if that link is consistent @@ -226,7 +228,7 @@ public class OsmNodeP extends OsmLinkP { origin = this; for (int i = 1; i < linkNodes.size() - 1; i++) { OsmNodeP tranferNode = linkNodes.get(i); - if ((tranferNode.bits & OsmNodeP.DP_SURVIVOR_BIT) != 0) { + if ((tranferNode.bits & DP_SURVIVOR_BIT) != 0) { mc.writeVarLengthSigned(tranferNode.ilon - origin.ilon); mc.writeVarLengthSigned(tranferNode.ilat - origin.ilat); mc.writeVarLengthSigned(tranferNode.getSElev() - origin.getSElev()); diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java b/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java index a6d5e04..e239d89 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java @@ -4,6 +4,7 @@ import java.io.DataInputStream; import java.io.EOFException; import java.io.File; import java.util.HashMap; +import java.util.Map; /** * WayCutter does 2 step in map-processing: @@ -25,7 +26,7 @@ public class RelationStatistics extends MapCreatorBase { } public void process(File relationFileIn) throws Exception { - HashMap relstats = new HashMap<>(); + Map relstats = new HashMap<>(); DataInputStream dis = createInStream(relationFileIn); try { diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java index 0a01b93..e0a3c31 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java @@ -9,6 +9,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.RandomAccessFile; import java.util.List; +import java.util.Map; import java.util.TreeMap; import btools.codec.DataBuffers; @@ -481,7 +482,7 @@ public class WayLinker extends MapCreatorBase implements Runnable { MicroCache mc = new MicroCache2(size, abBuf2, lonIdxDiv, latIdxDiv, divisor); // sort via treemap - TreeMap sortedList = new TreeMap<>(); + Map sortedList = new TreeMap<>(); for (OsmNodeP n : subList) { long longId = n.getIdFromPos(); int shrinkid = mc.shrinkId(longId); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java index 67eff29..9b5724b 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmFile.java @@ -31,7 +31,6 @@ final class OsmFile { private int divisor; private int cellsize; - private int ncaches; private int indexsize; protected byte elevationType = 3; @@ -47,7 +46,7 @@ final class OsmFile { elevationType = rafile.elevationType; cellsize = 1000000 / divisor; - ncaches = divisor * divisor; + int ncaches = divisor * divisor; indexsize = ncaches * 4; byte[] iobuffer = dataBuffers.iobuffer; @@ -143,7 +142,7 @@ final class OsmFile { new DirectWeaver(bc, dataBuffers, lonIdx, latIdx, divisor, wayValidator, waypointMatcher, hollowNodes); return MicroCache.emptyNonVirgin; } finally { - // crc check only if the buffer has not been fully read + // crc check only if the buffer has not been fully read int readBytes = (bc.getReadingBitPosition() + 7) >> 3; if (readBytes != asize - 4) { int crcData = Crc32.crc(ab, 0, asize - 4); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodePairSet.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodePairSet.java index 3fe874e..19aec72 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodePairSet.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodePairSet.java @@ -21,7 +21,7 @@ public class OsmNodePairSet { n2a = new long[maxTempNodes]; } - private static class OsmNodePair { + private static final class OsmNodePair { public long node2; public OsmNodePair next; } diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java index 85ab9b5..e70d3be 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java @@ -51,7 +51,7 @@ public final class WaypointMatcherImpl implements WaypointMatcher { } // sort result list - comparator = new Comparator() { + comparator = new Comparator<>() { @Override public int compare(MatchedWaypoint mw1, MatchedWaypoint mw2) { int cmpDist = Double.compare(mw1.radius, mw2.radius); diff --git a/brouter-server/src/main/java/btools/server/IpAccessMonitor.java b/brouter-server/src/main/java/btools/server/IpAccessMonitor.java index a9413e2..3484b0e 100644 --- a/brouter-server/src/main/java/btools/server/IpAccessMonitor.java +++ b/brouter-server/src/main/java/btools/server/IpAccessMonitor.java @@ -31,7 +31,7 @@ public class IpAccessMonitor { } private static void cleanup(long t) { - HashMap newMap = new HashMap<>(ipAccess.size()); + Map newMap = new HashMap<>(ipAccess.size()); for (Map.Entry e : ipAccess.entrySet()) { if (t - e.getValue().longValue() <= MAX_IDLE) { newMap.put(e.getKey(), e.getValue()); diff --git a/brouter-server/src/main/java/btools/server/Polygon.java b/brouter-server/src/main/java/btools/server/Polygon.java index 9115ef1..a711de5 100644 --- a/brouter-server/src/main/java/btools/server/Polygon.java +++ b/brouter-server/src/main/java/btools/server/Polygon.java @@ -3,6 +3,7 @@ package btools.server; import java.io.BufferedReader; import java.io.IOException; import java.util.ArrayList; +import java.util.List; import java.util.StringTokenizer; public class Polygon { @@ -15,7 +16,7 @@ public class Polygon { private int maxy = Integer.MIN_VALUE; public Polygon(BufferedReader br) throws IOException { - ArrayList lines = new ArrayList<>(); + List lines = new ArrayList<>(); for (; ; ) { String line = br.readLine(); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 0685eac..b1f9cc8 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.PriorityQueue; +import java.util.Queue; import java.util.StringTokenizer; import java.util.zip.GZIPOutputStream; @@ -299,7 +300,7 @@ public class RouteServer extends Thread implements Comparable { ProfileCache.setSize(2 * maxthreads); - PriorityQueue threadQueue = new PriorityQueue<>(); + Queue threadQueue = new PriorityQueue<>(); ServerSocket serverSocket = args.length > 5 ? new ServerSocket(Integer.parseInt(args[3]), 100, InetAddress.getByName(args[5])) : new ServerSocket(Integer.parseInt(args[3])); @@ -364,7 +365,7 @@ public class RouteServer extends Thread implements Comparable { private static Map getUrlParams(String url) throws UnsupportedEncodingException { - HashMap params = new HashMap<>(); + Map params = new HashMap<>(); String decoded = URLDecoder.decode(url, "UTF-8"); StringTokenizer tk = new StringTokenizer(decoded, "?&"); while (tk.hasMoreTokens()) { @@ -417,7 +418,7 @@ public class RouteServer extends Thread implements Comparable { bw.write("\n"); } - private static void cleanupThreadQueue(PriorityQueue threadQueue) { + private static void cleanupThreadQueue(Queue threadQueue) { for (; ; ) { boolean removedItem = false; for (RouteServer t : threadQueue) { diff --git a/brouter-server/src/main/java/btools/server/SuspectManager.java b/brouter-server/src/main/java/btools/server/SuspectManager.java index 303c699..8e67933 100644 --- a/brouter-server/src/main/java/btools/server/SuspectManager.java +++ b/brouter-server/src/main/java/btools/server/SuspectManager.java @@ -9,6 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; @@ -244,7 +245,7 @@ public class SuspectManager extends Thread { bw.write("\n"); File countryParent = new File("worldpolys" + country); File[] files = countryParent.listFiles(); - TreeSet names = new TreeSet<>(); + Set names = new TreeSet<>(); for (File f : files) { String name = f.getName(); if (name.endsWith(".poly")) { diff --git a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java index 78a39cf..81d52b0 100644 --- a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java +++ b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java @@ -37,7 +37,7 @@ public class ProfileUploadHandler { String id; if (profileId != null) { // update existing file when id appended - id = profileId.substring(ProfileUploadHandler.CUSTOM_PREFIX.length()); + id = profileId.substring(CUSTOM_PREFIX.length()); } else { id = "" + System.currentTimeMillis(); } diff --git a/brouter-server/src/test/java/btools/server/RequestHandlerTest.java b/brouter-server/src/test/java/btools/server/RequestHandlerTest.java index 2d5f698..81d03cb 100644 --- a/brouter-server/src/test/java/btools/server/RequestHandlerTest.java +++ b/brouter-server/src/test/java/btools/server/RequestHandlerTest.java @@ -5,6 +5,7 @@ import org.junit.Ignore; import org.junit.Test; import java.util.HashMap; +import java.util.Map; import btools.router.RoutingContext; import btools.server.request.ServerHandler; @@ -13,7 +14,7 @@ public class RequestHandlerTest { @Test @Ignore("Parameters are currently handled by RouteServer, not RequestHandler") public void parseParameters() { - HashMap params = new HashMap<>(); + Map params = new HashMap<>(); params.put("lonlats", "8.799297,49.565883|8.811764,49.563606"); params.put("profile", "trekking"); params.put("alternativeidx", "0"); diff --git a/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java b/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java index d8b05a5..b9f6d0c 100644 --- a/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java +++ b/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java @@ -9,6 +9,7 @@ import java.util.List; * * @author ab */ +@SuppressWarnings("PMD.LooseCoupling") public class LazyArrayOfLists { private List> lists; diff --git a/brouter-util/src/main/java/btools/util/StackSampler.java b/brouter-util/src/main/java/btools/util/StackSampler.java index 6b2e304..753fec4 100644 --- a/brouter-util/src/main/java/btools/util/StackSampler.java +++ b/brouter-util/src/main/java/btools/util/StackSampler.java @@ -51,12 +51,12 @@ public class StackSampler extends Thread { try { int wait1 = rand.nextInt(interval); int wait2 = interval - wait1; - Thread.sleep(wait1); + sleep(wait1); StringBuilder sb = new StringBuilder(df.format(new Date()) + " THREADDUMP\n"); - Map allThreads = Thread.getAllStackTraces(); + Map allThreads = getAllStackTraces(); for (Map.Entry e : allThreads.entrySet()) { Thread t = e.getKey(); - if (t == Thread.currentThread()) { + if (t == currentThread()) { continue; // not me } @@ -76,7 +76,7 @@ public class StackSampler extends Thread { flushCnt = 0; bw.flush(); } - Thread.sleep(wait2); + sleep(wait2); } catch (Exception e) { // ignore } diff --git a/brouter-util/src/test/java/btools/util/CompactMapTest.java b/brouter-util/src/test/java/btools/util/CompactMapTest.java index 1217497..b2dc0af 100644 --- a/brouter-util/src/test/java/btools/util/CompactMapTest.java +++ b/brouter-util/src/test/java/btools/util/CompactMapTest.java @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; import java.util.HashMap; +import java.util.Map; import java.util.Random; public class CompactMapTest { @@ -22,7 +23,7 @@ public class CompactMapTest { private void hashMapComparison(int mapsize, int trycount) { Random rand = new Random(12345); - HashMap hmap = new HashMap<>(); + Map hmap = new HashMap<>(); CompactLongMap cmap_slow = new CompactLongMap<>(); CompactLongMap cmap_fast = new CompactLongMap<>(); diff --git a/brouter-util/src/test/java/btools/util/CompactSetTest.java b/brouter-util/src/test/java/btools/util/CompactSetTest.java index e0f5340..1a4f130 100644 --- a/brouter-util/src/test/java/btools/util/CompactSetTest.java +++ b/brouter-util/src/test/java/btools/util/CompactSetTest.java @@ -5,6 +5,7 @@ import org.junit.Test; import java.util.HashSet; import java.util.Random; +import java.util.Set; public class CompactSetTest { @Test @@ -22,7 +23,7 @@ public class CompactSetTest { private void hashSetComparison(int setsize, int trycount) { Random rand = new Random(12345); - HashSet hset = new HashSet<>(); + Set hset = new HashSet<>(); CompactLongSet cset_slow = new CompactLongSet(); CompactLongSet cset_fast = new CompactLongSet(); diff --git a/brouter-util/src/test/java/btools/util/DenseLongMapTest.java b/brouter-util/src/test/java/btools/util/DenseLongMapTest.java index 57e867a..a40ba83 100644 --- a/brouter-util/src/test/java/btools/util/DenseLongMapTest.java +++ b/brouter-util/src/test/java/btools/util/DenseLongMapTest.java @@ -5,7 +5,9 @@ import org.junit.Test; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Random; +import java.util.Set; public class DenseLongMapTest { @Test @@ -16,7 +18,7 @@ public class DenseLongMapTest { private void hashMapComparison(int mapsize, int trycount, long keyrange) { Random rand = new Random(12345); - HashMap hmap = new HashMap<>(); + Map hmap = new HashMap<>(); DenseLongMap dmap = new DenseLongMap(512); for (int i = 0; i < mapsize; i++) { @@ -48,7 +50,7 @@ public class DenseLongMapTest { int trycount = 100000; Random rand = new Random(12345); - HashSet hset = new HashSet<>(); + Set hset = new HashSet<>(); DenseLongMap dmap = new DenseLongMap(512); for (int i = 0; i < mapputs; i++) { diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml index dc7ae3e..dc25d1b 100644 --- a/config/pmd/pmd-ruleset.xml +++ b/config/pmd/pmd-ruleset.xml @@ -29,6 +29,7 @@ + @@ -45,18 +46,11 @@ - - - - - - - - +