Make some weighting fields final

graphhopper · Dec 13, 2019 · af0993f · af0993f
1 parent 7796f46
commit af0993f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/weighting/FastestWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/FastestWeighting.java
@@ -41,9 +41,9 @@ public class FastestWeighting extends AbstractWeighting {
     private final double headingPenalty;
     private final long headingPenaltyMillis;
     private final double maxSpeed;
-    private EnumEncodedValue<RoadAccess> roadAccessEnc = null;
+    private final EnumEncodedValue<RoadAccess> roadAccessEnc;
     // this factor puts a penalty on roads with a "destination"-only access, see #733
-    private double roadAccessPenalty;
+    private final double roadAccessPenalty;
 
     public FastestWeighting(FlagEncoder encoder, PMap map) {
         super(encoder);
@@ -55,6 +55,9 @@ public FastestWeighting(FlagEncoder encoder, PMap map) {
             // ensure that we do not need to change getMinWeight, i.e. road_access_factor >= 1
             roadAccessPenalty = checkBounds("road_access_factor", map.getDouble("road_access_factor", 10), 1, 10);
             roadAccessEnc = encoder.getEnumEncodedValue(RoadAccess.KEY, RoadAccess.class);
+        } else {
+            roadAccessPenalty = 0;
+            roadAccessEnc = null;
         }
     }
 

diff --git a/core/src/main/java/com/graphhopper/routing/weighting/GenericWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/GenericWeighting.java
@@ -50,9 +50,9 @@ public class GenericWeighting extends AbstractWeighting {
 
     private final DecimalEncodedValue carMaxSpeedEnc;
     private final EnumEncodedValue<RoadAccess> roadAccessEnc;
-    private DecimalEncodedValue maxWeightEnc;
-    private DecimalEncodedValue maxHeightEnc;
-    private DecimalEncodedValue maxWidthEnc;
+    private final DecimalEncodedValue maxWeightEnc;
+    private final DecimalEncodedValue maxHeightEnc;
+    private final DecimalEncodedValue maxWidthEnc;
 
     public GenericWeighting(DataFlagEncoder encoder, PMap hintsMap) {
         super(encoder);
@@ -72,12 +72,9 @@ public GenericWeighting(DataFlagEncoder encoder, PMap hintsMap) {
         roadAccessEnc = encoder.getEnumEncodedValue(RoadAccess.KEY, RoadAccess.class);
         carMaxSpeedEnc = encoder.getDecimalEncodedValue(MaxSpeed.KEY);
 
-        if (encoder.hasEncodedValue(MaxWeight.KEY))
-            maxWeightEnc = encoder.getDecimalEncodedValue(MaxWeight.KEY);
-        if (encoder.hasEncodedValue(MaxWidth.KEY))
-            maxWidthEnc = encoder.getDecimalEncodedValue(MaxWidth.KEY);
-        if (encoder.hasEncodedValue(MaxHeight.KEY))
-            maxHeightEnc = encoder.getDecimalEncodedValue(MaxHeight.KEY);
+        maxWeightEnc = encoder.hasEncodedValue(MaxWeight.KEY) ? encoder.getDecimalEncodedValue(MaxWeight.KEY) : null;
+        maxWidthEnc = encoder.hasEncodedValue(MaxWidth.KEY) ? encoder.getDecimalEncodedValue(MaxWidth.KEY) : null;
+        maxHeightEnc = encoder.hasEncodedValue(MaxHeight.KEY) ? encoder.getDecimalEncodedValue(MaxHeight.KEY) : null;
     }
 
     @Override