diff --git a/brouter-codec/src/main/java/btools/codec/StatCoderContext.java b/brouter-codec/src/main/java/btools/codec/StatCoderContext.java index 772dcd22..29ec7868 100644 --- a/brouter-codec/src/main/java/btools/codec/StatCoderContext.java +++ b/brouter-codec/src/main/java/btools/codec/StatCoderContext.java @@ -1,11 +1,12 @@ package btools.codec; +import java.util.Map; import java.util.TreeMap; import btools.util.BitCoderContext; public final class StatCoderContext extends BitCoderContext { - private static TreeMap statsPerName; + private static Map statsPerName; private long lastbitpos = 0; diff --git a/brouter-codec/src/main/java/btools/codec/TagValueCoder.java b/brouter-codec/src/main/java/btools/codec/TagValueCoder.java index f307b2e3..e8e3235a 100644 --- a/brouter-codec/src/main/java/btools/codec/TagValueCoder.java +++ b/brouter-codec/src/main/java/btools/codec/TagValueCoder.java @@ -2,6 +2,7 @@ import java.util.Comparator; import java.util.HashMap; +import java.util.Map; import java.util.PriorityQueue; import btools.util.BitCoderContext; @@ -16,7 +17,7 @@ * but doesn't do anything at pass1 */ public final class TagValueCoder { - private HashMap identityMap; + private Map identityMap; private Object tree; private BitCoderContext bc; private int pass; diff --git a/brouter-codec/src/main/java/btools/codec/TagValueValidator.java b/brouter-codec/src/main/java/btools/codec/TagValueValidator.java index 4b88dfc1..70220d69 100644 --- a/brouter-codec/src/main/java/btools/codec/TagValueValidator.java +++ b/brouter-codec/src/main/java/btools/codec/TagValueValidator.java @@ -6,11 +6,11 @@ public interface TagValueValidator { * @param tagValueSet the way description to check * @return 0 = nothing, 1=no matching, 2=normal */ - public int accessType(byte[] tagValueSet); + int accessType(byte[] tagValueSet); - public byte[] unify(byte[] tagValueSet, int offset, int len); + byte[] unify(byte[] tagValueSet, int offset, int len); - public boolean isLookupIdxUsed(int idx); + boolean isLookupIdxUsed(int idx); - public void setDecodeForbidden(boolean decodeForbidden); + void setDecodeForbidden(boolean decodeForbidden); } diff --git a/brouter-codec/src/test/java/btools/codec/LinkedListContainerTest.java b/brouter-codec/src/test/java/btools/codec/LinkedListContainerTest.java index 1e221ea3..a39269eb 100644 --- a/brouter-codec/src/test/java/btools/codec/LinkedListContainerTest.java +++ b/brouter-codec/src/test/java/btools/codec/LinkedListContainerTest.java @@ -24,18 +24,14 @@ public void linkedListTest1() { for (int ln = 0; ln < nlists; ln++) { int cnt = llc.initList(ln); - Assert.assertTrue("list size test", cnt == 20); + Assert.assertEquals("list size test", 20, cnt); for (int i = 19; i >= 0; i--) { int data = llc.getDataElement(); - Assert.assertTrue("data value test", data == ln * (i % 10)); + Assert.assertEquals("data value test", ln * (i % 10), data); } } - try { - llc.getDataElement(); - Assert.fail("no more elements expected"); - } catch (IllegalArgumentException e) { - } + Assert.assertThrows("no more elements expected", IllegalArgumentException.class, () -> llc.getDataElement()); } } diff --git a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java index 3ebd0678..b033dbb3 100644 --- a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java +++ b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java @@ -132,7 +132,6 @@ public void calcBoundingCircle() { ilon = cx; ilat = cy; radius = rad * 1.001 + 1.0; // ensure the outside-of-enclosing-circle test in RoutingContext.calcDistance() is not passed by segments ending very close to the radius due to limited numerical precision - return; } /** diff --git a/brouter-core/src/main/java/btools/router/OsmPrePath.java b/brouter-core/src/main/java/btools/router/OsmPrePath.java index 4131d112..81de14dd 100644 --- a/brouter-core/src/main/java/btools/router/OsmPrePath.java +++ b/brouter-core/src/main/java/btools/router/OsmPrePath.java @@ -7,7 +7,6 @@ import btools.mapaccess.OsmLink; import btools.mapaccess.OsmNode; -import btools.mapaccess.OsmTransferNode; public abstract class OsmPrePath { protected OsmNode sourceNode; diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 0ac5e2e0..8f57d28b 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -53,7 +53,7 @@ private static class OsmPathElementHolder { public OsmPathElementHolder nextHolder; } - public ArrayList nodes = new ArrayList(); + public List nodes = new ArrayList(); private CompactLongMap nodesMap; @@ -62,7 +62,7 @@ private static class OsmPathElementHolder { private VoiceHintList voiceHints; public String message = null; - public ArrayList messageList = null; + public List messageList = null; public String name = "unset"; @@ -113,7 +113,7 @@ public void buildMap() { nodesMap = new FrozenLongMap(nodesMap); } - private ArrayList aggregateMessages() { + private List aggregateMessages() { ArrayList res = new ArrayList(); MessageData current = null; for (OsmPathElement n : nodes) { @@ -135,7 +135,7 @@ private ArrayList aggregateMessages() { return res; } - private ArrayList aggregateSpeedProfile() { + private List aggregateSpeedProfile() { ArrayList res = new ArrayList(); int vmax = -1; int vmaxe = -1; @@ -673,7 +673,7 @@ public String formatAsGeoJson() { } if (showSpeedProfile) // set in profile { - ArrayList sp = aggregateSpeedProfile(); + List sp = aggregateSpeedProfile(); if (sp.size() > 0) { sb.append(" \"speedprofile\": [\n"); for (int i = sp.size() - 1; i >= 0; i--) { diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 2311a75b..596dc757 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -309,7 +309,7 @@ private OsmTrack tryFindTrack(OsmTrack[] refTracks, OsmTrack[] lastTracks) { } if (hasInfo()) { boolean found = nearbyTrack != null; - boolean dirty = found ? nearbyTrack.isDirty : false; + boolean dirty = found && nearbyTrack.isDirty; logInfo("read referenceTrack, found=" + found + " dirty=" + dirty + " " + debugInfo); } } @@ -1078,7 +1078,7 @@ public int[] getOpenSet() { synchronized (openSet) { if (guideTrack != null) { - ArrayList nodes = guideTrack.nodes; + List nodes = guideTrack.nodes; int[] res = new int[nodes.size() * 2]; int i = 0; for (OsmPathElement n : nodes) { diff --git a/brouter-core/src/main/java/btools/router/VoiceHintList.java b/brouter-core/src/main/java/btools/router/VoiceHintList.java index 61534bc3..09eb05e1 100644 --- a/brouter-core/src/main/java/btools/router/VoiceHintList.java +++ b/brouter-core/src/main/java/btools/router/VoiceHintList.java @@ -12,7 +12,7 @@ public class VoiceHintList { private String transportMode; int turnInstructionMode; - ArrayList list = new ArrayList(); + List list = new ArrayList(); public void setTransportMode(boolean isCar, boolean isBike) { transportMode = isCar ? "car" : (isBike ? "bike" : "foot"); diff --git a/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java b/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java index 49acae9d..ce2eb473 100644 --- a/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java +++ b/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java @@ -1,11 +1,7 @@ package btools.router; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import btools.util.CheapRuler; diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java index 141595f2..c0ff9bc7 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java @@ -37,9 +37,9 @@ public abstract class BExpressionContext implements IByteArrayUnifier { public String _modelClass; private Map lookupNumbers = new HashMap(); - private ArrayList lookupValues = new ArrayList(); - private ArrayList lookupNames = new ArrayList(); - private ArrayList lookupHistograms = new ArrayList(); + private List lookupValues = new ArrayList(); + private List lookupNames = new ArrayList(); + private List lookupHistograms = new ArrayList(); private boolean[] lookupIdxUsed; private boolean lookupDataFrozen = false; @@ -805,10 +805,9 @@ public void parseFile(File file, String readOnlyContext) { for (int i = 0; i < minWriteIdx; i++) { variableData[i] = readOnlyData[i]; } + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException("ParseException " + file + " at line " + linenr + ": " + e.getMessage()); } catch (Exception e) { - if (e instanceof IllegalArgumentException) { - throw new IllegalArgumentException("ParseException " + file + " at line " + linenr + ": " + e.getMessage()); - } throw new RuntimeException(e); } if (expressionList.size() == 0) { @@ -883,7 +882,7 @@ public final void markLookupIdxUsed(int idx) { } public final boolean isLookupIdxUsed(int idx) { - return idx < lookupIdxUsed.length ? lookupIdxUsed[idx] : false; + return idx < lookupIdxUsed.length && lookupIdxUsed[idx]; } public final void setAllTagsUsed() { diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionLookupValue.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionLookupValue.java index 9954c691..e40f314f 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpressionLookupValue.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionLookupValue.java @@ -10,10 +10,11 @@ package btools.expressions; import java.util.ArrayList; +import java.util.List; final class BExpressionLookupValue { String value; - ArrayList aliases; + List aliases; @Override public String toString() { diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java index 40c87491..30132dd0 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java @@ -9,16 +9,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.StringTokenizer; -import java.util.TreeMap; - -import btools.util.BitCoderContext; -import btools.util.Crc32; public final class BExpressionMetaData { @@ -30,7 +22,7 @@ public final class BExpressionMetaData { public short lookupVersion = -1; public short lookupMinorVersion = -1; - private HashMap listeners = new HashMap(); + private Map listeners = new HashMap(); public void registerListener(String context, BExpressionContext ctx) { listeners.put(context, ctx); diff --git a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java index c5b3a55a..6b9c85fb 100644 --- a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java +++ b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java @@ -1,11 +1,10 @@ package btools.expressions; import java.io.File; -import java.io.IOException; public class IntegrityCheckProfile { - public static void main(final java.lang.String[] args) { + public static void main(final String[] args) { if (args.length != 2) { System.out.println("usage: java IntegrityCheckProfile "); return; diff --git a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java index d445c458..69793873 100644 --- a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java +++ b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java @@ -1,12 +1,11 @@ package btools.expressions; -import java.util.*; -import java.io.*; -import java.net.URL; - import org.junit.Assert; import org.junit.Test; +import java.io.File; +import java.net.URL; + public class EncodeDecodeTest { @Test public void encodeDecodeTest() { diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/DPFilter.java b/brouter-map-creator/src/main/java/btools/mapcreator/DPFilter.java index 1ac64f6f..2d3e407b 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/DPFilter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/DPFilter.java @@ -5,7 +5,7 @@ */ package btools.mapcreator; -import java.util.ArrayList; +import java.util.List; import btools.util.CheapRuler; @@ -15,7 +15,7 @@ public class DPFilter { /* * for each node (except first+last), eventually set the DP_SURVIVOR_BIT */ - public static void doDPFilter(ArrayList nodes) { + public static void doDPFilter(List nodes) { int first = 0; int last = nodes.size() - 1; while (first < last && (nodes.get(first + 1).bits & OsmNodeP.DP_SURVIVOR_BIT) != 0) { @@ -30,7 +30,7 @@ public static void doDPFilter(ArrayList nodes) { } - public static void doDPFilter(ArrayList nodes, int first, int last) { + public static void doDPFilter(List nodes, int first, int last) { double maxSqDist = -1.; int index = -1; OsmNodeP p1 = nodes.get(first); diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java b/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java index c207b2a7..e7092a4f 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java @@ -14,6 +14,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.HashMap; +import java.util.Map; import btools.util.DiffCoderDataOutputStream; @@ -21,7 +22,7 @@ public abstract class MapCreatorBase implements WayListener, NodeListener, Relat private DiffCoderDataOutputStream[] tileOutStreams; protected File outTileDir; - protected HashMap tags; + protected Map tags; public void putTag(String key, String value) { if (tags == null) tags = new HashMap(); @@ -32,11 +33,11 @@ public String getTag(String key) { return tags == null ? null : tags.get(key); } - public HashMap getTagsOrNull() { + public Map getTagsOrNull() { return tags; } - public void setTags(HashMap tags) { + public void setTags(Map tags) { this.tags = tags; } diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java index 9d0f6ef1..0479a408 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java @@ -11,7 +11,7 @@ import java.io.DataOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.util.HashMap; +import java.io.IOException; import java.util.Map; import btools.expressions.BExpressionContextNode; @@ -142,7 +142,7 @@ public void nextNode(NodeData n) throws Exception { } - private void generatePseudoTags(HashMap map) { + private void generatePseudoTags(Map map) { // add pseudo.tags for concrete:lanes and concrete:plates String concrete = null; @@ -204,7 +204,7 @@ public void nextWay(WayData w) throws Exception { } @Override - public void nextRelation(RelationData r) throws Exception { + public void nextRelation(RelationData r) throws IOException { relsParsed++; checkStats(); diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmTrafficMap.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmTrafficMap.java index f3878512..146ffd2c 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmTrafficMap.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmTrafficMap.java @@ -14,7 +14,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; +import java.util.List; import btools.expressions.BExpressionContextWay; import btools.util.CheapRuler; @@ -188,7 +188,7 @@ public OsmTrafficElement getElement(long n) { return map.get(n); } - public byte[] addTrafficClass(ArrayList linkNodes, byte[] description) throws IOException { + public byte[] addTrafficClass(List linkNodes, byte[] description) throws IOException { double distance = 0.; double sum = 0.; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java index ccfcacde..2943052c 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java @@ -7,6 +7,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.HashMap; +import java.util.Map; import btools.util.CompactLongSet; import btools.util.DiffCoderDataOutputStream; @@ -26,7 +27,7 @@ public class PosUnifier extends MapCreatorBase { private File nodeTilesOut; private CompactLongSet[] positionSets; - private HashMap srtmmap; + private Map srtmmap; private int lastSrtmLonIdx; private int lastSrtmLatIdx; private SrtmRaster lastSrtmRaster; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RelationMerger.java b/brouter-map-creator/src/main/java/btools/mapcreator/RelationMerger.java index 2cacdda9..4defd2fe 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationMerger.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationMerger.java @@ -5,6 +5,7 @@ import java.io.EOFException; import java.io.File; import java.util.HashMap; +import java.util.Map; import btools.expressions.BExpressionContextWay; import btools.expressions.BExpressionMetaData; @@ -19,7 +20,7 @@ * @author ab */ public class RelationMerger extends MapCreatorBase { - private HashMap routesets; + private Map routesets; private CompactLongSet routesetall; private BExpressionContextWay expctxReport; private BExpressionContextWay expctxCheck; 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 d62f3a07..25aef0b1 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java @@ -5,9 +5,6 @@ import java.io.File; import java.util.HashMap; -import btools.util.DenseLongMap; -import btools.util.TinyDenseLongMap; - /** * WayCutter does 2 step in map-processing: *

diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RestrictionData.java b/brouter-map-creator/src/main/java/btools/mapcreator/RestrictionData.java index 5fafd0e6..90144ce1 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RestrictionData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RestrictionData.java @@ -6,6 +6,8 @@ import java.io.FileWriter; import java.io.IOException; import java.util.HashMap; +import java.util.Map; +import java.util.Set; import java.util.TreeSet; import btools.util.CheapAngleMeter; @@ -35,8 +37,8 @@ public class RestrictionData extends MapCreatorBase { public boolean badWayMatch; - private static HashMap names = new HashMap<>(); - private static TreeSet badTRs = new TreeSet<>(); + private static Map names = new HashMap<>(); + private static Set badTRs = new TreeSet<>(); public RestrictionData() { } 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 195a16ea..37220e3c 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java @@ -38,7 +38,6 @@ public class WayLinker extends MapCreatorBase implements Runnable { private File trafficTilesIn; private File dataTilesOut; private File borderFileIn; - private File restrictionsFileIn; private String dataTilesSuffix; @@ -157,7 +156,6 @@ private void _process(File nodeTilesIn, File wayTilesIn, File borderFileIn, File this.trafficTilesIn = new File("../traffic"); this.dataTilesOut = dataTilesOut; this.borderFileIn = borderFileIn; - this.restrictionsFileIn = restrictionsFileIn; this.dataTilesSuffix = dataTilesSuffix; BExpressionMetaData meta = new BExpressionMetaData(); diff --git a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java index 090d6d10..5daae745 100644 --- a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java +++ b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java @@ -1,19 +1,16 @@ package btools.mapcreator; -import java.util.Random; -import java.util.HashMap; - import org.junit.Assert; import org.junit.Test; -import java.net.URL; import java.io.File; +import java.net.URL; public class MapcreatorTest { @Test public void mapcreatorTest() throws Exception { URL mapurl = this.getClass().getResource("/dreieich.osm.gz"); - Assert.assertTrue("test-osm-map dreieich.osm not found", mapurl != null); + Assert.assertNotNull("test-osm-map dreieich.osm not found", mapurl); File mapFile = new File(mapurl.getFile()); File workingDir = mapFile.getParentFile(); File profileDir = new File(workingDir, "/../../../../misc/profiles2"); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java index 216d8dd9..29b113dd 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java @@ -8,7 +8,6 @@ import btools.codec.TagValueWrapper; import btools.codec.WaypointMatcher; import btools.util.ByteDataWriter; -import btools.util.IByteArrayUnifier; /** * DirectWeaver does the same decoding as MicroCache2, but decodes directly @@ -17,8 +16,6 @@ public final class DirectWeaver extends ByteDataWriter { private long id64Base; - private int size = 0; - public DirectWeaver(StatCoderContext bc, DataBuffers dataBuffers, int lonIdx, int latIdx, int divisor, TagValueValidator wayValidator, WaypointMatcher waypointMatcher, OsmNodesMap hollowNodes) { super(null); int cellsize = 1000000 / divisor; @@ -32,7 +29,7 @@ public DirectWeaver(StatCoderContext bc, DataBuffers dataBuffers, int lonIdx, in NoisyDiffCoder extLatDiff = new NoisyDiffCoder(bc); NoisyDiffCoder transEleDiff = new NoisyDiffCoder(bc); - size = bc.decodeNoisyNumber(5); + int size = bc.decodeNoisyNumber(5); int[] faid = size > dataBuffers.ibuf2.length ? new int[size] : dataBuffers.ibuf2; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java b/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java index f084f3f6..8926e9a0 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java @@ -9,8 +9,6 @@ import java.io.DataOutput; import java.io.IOException; -import btools.mapaccess.OsmNode; - public final class MatchedWaypoint { public OsmNode node1; public OsmNode node2; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java index d39a24e0..cef46b0c 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; +import java.util.Map; import btools.codec.DataBuffers; import btools.codec.MicroCache; @@ -26,7 +27,7 @@ public final class NodesCache { private boolean forceSecondaryData; private String currentFileName; - private HashMap fileCache; + private Map fileCache; private DataBuffers dataBuffers; private OsmFile[][] fileRows; @@ -38,7 +39,7 @@ public final class NodesCache { private long cacheSum = 0; private long maxmemtiles; - private boolean detailed; + private boolean detailed; // NOPMD used in constructor private boolean garbageCollectionEnabled = false; private boolean ghostCleaningDone = false; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java index b71c54db..c0dc1ecc 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java @@ -7,12 +7,13 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import btools.util.ByteArrayUnifier; -import btools.util.SortedHeap; public final class OsmNodesMap { - private HashMap hmap = new HashMap(4096); + private Map hmap = new HashMap(4096); private ByteArrayUnifier abUnifier = new ByteArrayUnifier(16384, false); @@ -123,14 +124,10 @@ public boolean isInMemoryBounds(int npaths, boolean extend) { return total <= currentmaxmem; } - private void addActiveNode(ArrayList nodes2check, OsmNode n) { - n.visitID = lastVisitID; - nodesCreated++; - nodes2check.add(n); - } + private List nodes2check; // is there an escape from this node - // to a hollow node (or destination node) ? + // to a hollow node (or destination node) ? public boolean canEscape(OsmNode n0) { boolean sawLowIDs = false; lastVisitID++; @@ -170,7 +167,11 @@ public boolean canEscape(OsmNode n0) { return false; } - private ArrayList nodes2check; + private void addActiveNode(List nodes2check, OsmNode n) { + n.visitID = lastVisitID; + nodesCreated++; + nodes2check.add(n); + } public void clearTemp() { nodes2check = null; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java index 15ece822..e0c262ba 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java @@ -7,16 +7,16 @@ public interface OsmPos { - public int getILat(); + int getILat(); - public int getILon(); + int getILon(); - public short getSElev(); + short getSElev(); - public double getElev(); + double getElev(); - public int calcDistance(OsmPos p); + int calcDistance(OsmPos p); - public long getIdFromPos(); + long getIdFromPos(); } diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java index 75ac995f..921bd31e 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java @@ -19,7 +19,6 @@ final public class PhysicalFile { long[] fileIndex = new long[25]; int[] fileHeaderCrcs; - private int fileIndexCrc; public long creationTime; String fileName; @@ -75,7 +74,7 @@ public PhysicalFile(File f, DataBuffers dataBuffers, int lookupVersion, int look byte[] iobuffer = dataBuffers.iobuffer; ra = new RandomAccessFile(f, "r"); ra.readFully(iobuffer, 0, 200); - fileIndexCrc = Crc32.crc(iobuffer, 0, 200); + int fileIndexCrc = Crc32.crc(iobuffer, 0, 200); ByteDataReader dis = new ByteDataReader(iobuffer); for (int i = 0; i < 25; i++) { long lv = dis.readLong(); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java index 0d71d3d3..11618da9 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java @@ -3,8 +3,6 @@ import java.util.List; import btools.codec.WaypointMatcher; -import btools.mapaccess.OsmNode; -import btools.mapaccess.OsmNodePairSet; import btools.util.CheapRuler; /** diff --git a/brouter-server/src/main/java/btools/server/IpAccessMonitor.java b/brouter-server/src/main/java/btools/server/IpAccessMonitor.java index f2b15158..d9169bbb 100644 --- a/brouter-server/src/main/java/btools/server/IpAccessMonitor.java +++ b/brouter-server/src/main/java/btools/server/IpAccessMonitor.java @@ -5,7 +5,7 @@ public class IpAccessMonitor { private static Object sync = new Object(); - private static HashMap ipAccess = new HashMap(); + private static Map ipAccess = new HashMap(); private static long MAX_IDLE = 900000; // 15 minutes private static long CLEANUP_INTERVAL = 10000; // 10 seconds private static long lastCleanup; diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index b11d752f..628cf3e3 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -146,7 +146,7 @@ public void run() { } String url = getline.split(" ")[1]; - HashMap params = getUrlParams(url); + Map params = getUrlParams(url); long maxRunningTime = getMaxRunningTime(); @@ -226,7 +226,7 @@ public void run() { if (track != null) { if (headers != null) // compressed { - java.io.ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); Writer w = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8"); w.write(handler.formatTrack(track)); w.close(); @@ -359,7 +359,7 @@ public static void main(String[] args) throws Exception { } - private static HashMap getUrlParams(String url) throws UnsupportedEncodingException { + private static Map getUrlParams(String url) throws UnsupportedEncodingException { HashMap params = new HashMap(); String decoded = URLDecoder.decode(url, "UTF-8"); StringTokenizer tk = new StringTokenizer(decoded, "?&"); diff --git a/brouter-server/src/main/java/btools/server/SuspectManager.java b/brouter-server/src/main/java/btools/server/SuspectManager.java index ea40886e..27befc5d 100644 --- a/brouter-server/src/main/java/btools/server/SuspectManager.java +++ b/brouter-server/src/main/java/btools/server/SuspectManager.java @@ -8,6 +8,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.Map; import java.util.StringTokenizer; import java.util.TreeSet; @@ -542,7 +543,6 @@ private static void _process(String url, BufferedWriter bw) throws IOException { } bw.write("\n"); bw.flush(); - return; } @@ -581,7 +581,7 @@ int trigger4Id(long id) { } } - private static HashMap allSuspectsMap = new HashMap(); + private static Map allSuspectsMap = new HashMap(); private static SuspectList getDailySuspectsIfLoaded() throws IOException { synchronized (allSuspectsMap) { diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java index 73641bea..2e158c3b 100644 --- a/brouter-server/src/main/java/btools/server/request/ServerHandler.java +++ b/brouter-server/src/main/java/btools/server/request/ServerHandler.java @@ -1,18 +1,17 @@ package btools.server.request; -import btools.mapaccess.OsmNode; -import btools.router.OsmNodeNamed; -import btools.router.OsmNogoPolygon; -import btools.router.OsmTrack; -import btools.router.RoutingContext; -import btools.server.ServiceContext; - import java.io.BufferedWriter; import java.io.File; import java.io.StringWriter; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; +import java.util.Map; + +import btools.router.OsmNodeNamed; +import btools.router.OsmNogoPolygon; +import btools.router.OsmTrack; +import btools.router.RoutingContext; +import btools.server.ServiceContext; /** * URL query parameter handler for web and standalone server. Supports all @@ -37,7 +36,7 @@ public class ServerHandler extends RequestHandler { private RoutingContext rc; - public ServerHandler(ServiceContext serviceContext, HashMap params) { + public ServerHandler(ServiceContext serviceContext, Map params) { super(serviceContext, params); } diff --git a/brouter-util/src/main/java/btools/util/BitCoderContext.java b/brouter-util/src/main/java/btools/util/BitCoderContext.java index 72991891..1482207d 100644 --- a/brouter-util/src/main/java/btools/util/BitCoderContext.java +++ b/brouter-util/src/main/java/btools/util/BitCoderContext.java @@ -309,12 +309,12 @@ public static void main(String[] args) { for (int i = 0; i < 31; i++) { int value = ctx.decodeVarBits(); int v0 = (1 << i) + 3; - if (!(v0 == value)) + if (v0 != value) throw new RuntimeException("value mismatch value=" + value + "v0=" + v0); } for (int i = 0; i < 100000; i += 13) { int value = ctx.decodeVarBits(); - if (!(value == i)) + if (value != i) throw new RuntimeException("value mismatch i=" + i + "v=" + value); } } diff --git a/brouter-util/src/main/java/btools/util/ByteDataWriter.java b/brouter-util/src/main/java/btools/util/ByteDataWriter.java index 04e76995..0a6c3054 100644 --- a/brouter-util/src/main/java/btools/util/ByteDataWriter.java +++ b/brouter-util/src/main/java/btools/util/ByteDataWriter.java @@ -142,7 +142,6 @@ public final void writeVarLengthUnsigned(int v) { ab[aboffset++] = (byte) (i7 | 0x80); ab[aboffset++] = (byte) (v); - return; } public int size() { diff --git a/brouter-util/src/main/java/btools/util/CompactLongMap.java b/brouter-util/src/main/java/btools/util/CompactLongMap.java index a16e1299..b5bc3e1e 100644 --- a/brouter-util/src/main/java/btools/util/CompactLongMap.java +++ b/brouter-util/src/main/java/btools/util/CompactLongMap.java @@ -1,6 +1,6 @@ package btools.util; -import java.util.ArrayList; +import java.util.List; /** * Memory efficient Map to map a long-key to an object-value @@ -243,7 +243,7 @@ private boolean contains(int idx, long id, boolean doPut) { return false; } - protected void moveToFrozenArrays(long[] faid, ArrayList flv) { + protected void moveToFrozenArrays(long[] faid, List flv) { for (int i = 1; i < MAXLISTS; i++) { pa[i] = 0; } diff --git a/brouter-util/src/main/java/btools/util/CompactLongSet.java b/brouter-util/src/main/java/btools/util/CompactLongSet.java index 8398fca3..5ac8559f 100644 --- a/brouter-util/src/main/java/btools/util/CompactLongSet.java +++ b/brouter-util/src/main/java/btools/util/CompactLongSet.java @@ -141,10 +141,7 @@ private boolean contains(int idx, long id) { n = nn; } } - if (a[n] == id) { - return true; - } - return false; + return a[n] == id; } protected void moveToFrozenArray(long[] faid) { diff --git a/brouter-util/src/main/java/btools/util/DenseLongMap.java b/brouter-util/src/main/java/btools/util/DenseLongMap.java index 0295b62e..d0142df0 100644 --- a/brouter-util/src/main/java/btools/util/DenseLongMap.java +++ b/brouter-util/src/main/java/btools/util/DenseLongMap.java @@ -1,6 +1,7 @@ package btools.util; import java.util.ArrayList; +import java.util.List; /** * Special Memory efficient Map to map a long-key to @@ -16,7 +17,7 @@ * @author ab */ public class DenseLongMap { - private ArrayList blocklist = new ArrayList(4096); + private List blocklist = new ArrayList(4096); private int blocksize; // bytes per bitplane in one block private int blocksizeBits; diff --git a/brouter-util/src/main/java/btools/util/FrozenLongMap.java b/brouter-util/src/main/java/btools/util/FrozenLongMap.java index 8048297a..b93f3917 100644 --- a/brouter-util/src/main/java/btools/util/FrozenLongMap.java +++ b/brouter-util/src/main/java/btools/util/FrozenLongMap.java @@ -12,7 +12,7 @@ */ public class FrozenLongMap extends CompactLongMap { private long[] faid; - private ArrayList flv; + private List flv; private int size = 0; private int p2size; // next power of 2 of size diff --git a/brouter-util/src/main/java/btools/util/FrozenLongSet.java b/brouter-util/src/main/java/btools/util/FrozenLongSet.java index 2d97b8a1..bc9e9676 100644 --- a/brouter-util/src/main/java/btools/util/FrozenLongSet.java +++ b/brouter-util/src/main/java/btools/util/FrozenLongSet.java @@ -61,10 +61,7 @@ public boolean contains(long id) { } offset >>= 1; } - if (a[n] == id) { - return true; - } - return false; + return a[n] == id; } } diff --git a/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java b/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java index e25244c8..4285738a 100644 --- a/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java +++ b/brouter-util/src/main/java/btools/util/LazyArrayOfLists.java @@ -1,7 +1,7 @@ package btools.util; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * Behaves like an Array of list @@ -10,7 +10,7 @@ * @author ab */ public class LazyArrayOfLists { - private ArrayList> lists; + private List> lists; public LazyArrayOfLists(int size) { lists = new ArrayList>(size); diff --git a/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java b/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java index 31acac97..60a05245 100644 --- a/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java +++ b/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java @@ -37,7 +37,7 @@ public int readMixed() throws IOException { return lastValue; } - public final boolean decodeBit() throws IOException { + public boolean decodeBit() throws IOException { fillBuffer(); boolean value = ((b & 1) != 0); b >>>= 1; @@ -45,7 +45,7 @@ public final boolean decodeBit() throws IOException { return value; } - public final int decodeVarBits2() throws IOException { + public int decodeVarBits2() throws IOException { int range = 0; while (!decodeBit()) { range = 2 * range + 1; @@ -58,7 +58,7 @@ public final int decodeVarBits2() throws IOException { * * @see #encodeBounded */ - public final int decodeBounded(int max) throws IOException { + public int decodeBounded(int max) throws IOException { int value = 0; int im = 1; // integer mask while ((value | im) <= max) { @@ -75,7 +75,7 @@ public final int decodeBounded(int max) throws IOException { * @see #encodeVarBits */ - public final int decodeVarBits() throws IOException { + public int decodeVarBits() throws IOException { fillBuffer(); int b12 = b & 0xfff; int len = vl_length[b12]; diff --git a/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java b/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java index 99f8aec9..ea32b5c8 100644 --- a/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java +++ b/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java @@ -59,7 +59,7 @@ public void flush() throws IOException { } } - public final void encodeBit(boolean value) throws IOException { + public void encodeBit(boolean value) throws IOException { if (bm == 0x100) { writeByte((byte) b); bm = 1; @@ -71,7 +71,7 @@ public final void encodeBit(boolean value) throws IOException { bm <<= 1; } - public final void encodeVarBits(int value) throws IOException { + public void encodeVarBits(int value) throws IOException { int range = 0; while (value > range) { encodeBit(false); @@ -82,7 +82,7 @@ public final void encodeVarBits(int value) throws IOException { encodeBounded(range, value); } - public final void encodeBounded(int max, int value) throws IOException { + public void encodeBounded(int max, int value) throws IOException { int im = 1; // integer mask while (im <= max) { if (bm == 0x100) { diff --git a/brouter-util/src/main/java/btools/util/ProgressListener.java b/brouter-util/src/main/java/btools/util/ProgressListener.java index 88179eed..193d5bcf 100644 --- a/brouter-util/src/main/java/btools/util/ProgressListener.java +++ b/brouter-util/src/main/java/btools/util/ProgressListener.java @@ -2,7 +2,7 @@ public interface ProgressListener { - public void updateProgress(String task, int progress); + void updateProgress(String task, int progress); - public boolean isCanceled(); + boolean isCanceled(); } diff --git a/brouter-util/src/main/java/btools/util/SortedHeap.java b/brouter-util/src/main/java/btools/util/SortedHeap.java index 564750f7..0e69624b 100644 --- a/brouter-util/src/main/java/btools/util/SortedHeap.java +++ b/brouter-util/src/main/java/btools/util/SortedHeap.java @@ -1,7 +1,5 @@ package btools.util; -import java.util.Random; - /** * Memory efficient and lightning fast heap to get the lowest-key value of a set of key-object pairs * diff --git a/brouter-util/src/test/java/btools/util/BitCoderContextTest.java b/brouter-util/src/test/java/btools/util/BitCoderContextTest.java index 619f96a6..87db2f70 100644 --- a/brouter-util/src/test/java/btools/util/BitCoderContextTest.java +++ b/brouter-util/src/test/java/btools/util/BitCoderContextTest.java @@ -20,11 +20,11 @@ public void varBitsEncodeDecodeTest() { for (int i = 0; i < 31; i++) { int value = ctx.decodeVarBits(); int v0 = (1 << i) + 3; - Assert.assertTrue("value mismatch value=" + value + "v0=" + v0, v0 == value); + Assert.assertEquals("value mismatch value=" + value + "v0=" + v0, v0, value); } for (int i = 0; i < 100000; i += 13) { int value = ctx.decodeVarBits(); - Assert.assertTrue("value mismatch i=" + i + "v=" + value, value == i); + Assert.assertEquals("value mismatch i=" + i + "v=" + value, value, i); } } diff --git a/brouter-util/src/test/java/btools/util/ByteDataIOTest.java b/brouter-util/src/test/java/btools/util/ByteDataIOTest.java index 82fee2f2..7cd443d0 100644 --- a/brouter-util/src/test/java/btools/util/ByteDataIOTest.java +++ b/brouter-util/src/test/java/btools/util/ByteDataIOTest.java @@ -1,8 +1,5 @@ package btools.util; -import java.util.Random; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; @@ -18,7 +15,7 @@ public void varLengthEncodeDecodeTest() { for (int i = 0; i < 1000; i++) { int value = r.readVarLengthUnsigned(); - Assert.assertTrue("value mismatch", value == i); + Assert.assertEquals("value mismatch", value, i); } } } diff --git a/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java b/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java index e5b7a3b0..935e4309 100644 --- a/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java +++ b/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java @@ -1,11 +1,7 @@ package btools.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class CheapAngleMeterTest { diff --git a/brouter-util/src/test/java/btools/util/CompactMapTest.java b/brouter-util/src/test/java/btools/util/CompactMapTest.java index 8303875d..1dee6662 100644 --- a/brouter-util/src/test/java/btools/util/CompactMapTest.java +++ b/brouter-util/src/test/java/btools/util/CompactMapTest.java @@ -1,11 +1,11 @@ package btools.util; -import java.util.Random; -import java.util.HashMap; - import org.junit.Assert; import org.junit.Test; +import java.util.HashMap; +import java.util.Random; + public class CompactMapTest { @Test public void hashMapComparisonTest() { @@ -48,8 +48,8 @@ private void hashMapComparison(int mapsize, int trycount) { String s = hmap.get(KK); boolean contained = hmap.containsKey(KK); - Assert.assertTrue("containsKey missmatch (slow)", contained == cmap_slow.contains(k)); - Assert.assertTrue("containsKey missmatch (fast)", contained == cmap_fast.contains(k)); + Assert.assertEquals("containsKey missmatch (slow)", contained, cmap_slow.contains(k)); + Assert.assertEquals("containsKey missmatch (fast)", contained, cmap_fast.contains(k)); if (contained) { Assert.assertEquals("object missmatch (fast)", s, cmap_fast.get(k)); diff --git a/brouter-util/src/test/java/btools/util/CompactSetTest.java b/brouter-util/src/test/java/btools/util/CompactSetTest.java index 68026adb..fb323663 100644 --- a/brouter-util/src/test/java/btools/util/CompactSetTest.java +++ b/brouter-util/src/test/java/btools/util/CompactSetTest.java @@ -1,11 +1,11 @@ package btools.util; -import java.util.Random; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; +import java.util.HashSet; +import java.util.Random; + public class CompactSetTest { @Test public void hashSetComparisonTest() { @@ -46,8 +46,8 @@ private void hashSetComparison(int setsize, int trycount) { Long KK = new Long(k); boolean contained = hset.contains(KK); - Assert.assertTrue("contains missmatch (slow)", contained == cset_slow.contains(k)); - Assert.assertTrue("contains missmatch (fast)", contained == cset_fast.contains(k)); + Assert.assertEquals("contains missmatch (slow)", contained, cset_slow.contains(k)); + Assert.assertEquals("contains missmatch (fast)", contained, cset_fast.contains(k)); } } } diff --git a/brouter-util/src/test/java/btools/util/DenseLongMapTest.java b/brouter-util/src/test/java/btools/util/DenseLongMapTest.java index ecbbc40a..d9d18036 100644 --- a/brouter-util/src/test/java/btools/util/DenseLongMapTest.java +++ b/brouter-util/src/test/java/btools/util/DenseLongMapTest.java @@ -1,12 +1,12 @@ package btools.util; -import java.util.Random; -import java.util.HashMap; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Random; + public class DenseLongMapTest { @Test public void hashMapComparisonTest() { @@ -94,7 +94,7 @@ public void memoryUsageTest() { } // need to use the map again for valid memory measure - Assert.assertTrue("out of range test", dmap.getInt(-1) == -1); + Assert.assertEquals("out of range test", -1, dmap.getInt(-1)); } } diff --git a/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java b/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java index 062073ad..1c709d07 100644 --- a/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java +++ b/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java @@ -1,11 +1,10 @@ package btools.util; -import java.util.Random; -import java.io.*; - import org.junit.Assert; import org.junit.Test; +import java.io.IOException; + public class ReducedMedianFilterTest { @Test public void reducedMedianFilterTest() throws IOException { diff --git a/brouter-util/src/test/java/btools/util/SortedHeapTest.java b/brouter-util/src/test/java/btools/util/SortedHeapTest.java index d2538d7c..80220556 100644 --- a/brouter-util/src/test/java/btools/util/SortedHeapTest.java +++ b/brouter-util/src/test/java/btools/util/SortedHeapTest.java @@ -1,12 +1,10 @@ package btools.util; -import java.util.Random; -import java.util.HashMap; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; +import java.util.Random; + public class SortedHeapTest { @Test public void sortedHeapTest1() { @@ -30,7 +28,7 @@ public void sortedHeapTest1() { Assert.assertTrue("sorting test", val >= lastval); lastval = val; } - Assert.assertTrue("total count test", cnt == 100000); + Assert.assertEquals("total count test", 100000, cnt); } @@ -49,10 +47,10 @@ public void sortedHeapTest2() { if (s == null) break; cnt++; int val = Integer.parseInt(s); - Assert.assertTrue("sequence test", val == expected); + Assert.assertEquals("sequence test", val, expected); expected++; } - Assert.assertTrue("total count test", cnt == 100000); + Assert.assertEquals("total count test", 100000, cnt); } } diff --git a/build.gradle b/build.gradle index f4571baf..8d58199e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + repositories { mavenCentral() google() } dependencies { classpath 'com.android.tools.build:gradle:7.0.2' - + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -23,12 +23,12 @@ allprojects { // OsmTrack (version and versionDate) project.version "1.6.3" group 'org.btools' - + repositories { mavenCentral() google() } - + apply plugin: "maven-publish" publishing { repositories { @@ -47,6 +47,16 @@ allprojects { } apply plugin: "checkstyle" + apply plugin: "pmd" + + pmd { + consoleOutput = true + toolVersion = "6.51.0" + rulesMinimumPriority = 5 + ruleSetFiles = files("${rootProject.rootDir}/config/pmd/pmd-ruleset.xml") + ruleSets = [] + // ignoreFailures = true + } } task clean(type: Delete) { diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml new file mode 100644 index 00000000..b8cd1ed4 --- /dev/null +++ b/config/pmd/pmd-ruleset.xml @@ -0,0 +1,51 @@ + + + + + + BRouter PMD Ruleset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +