Merge branch 'cache-hashes' of github.com:HSLdevcom/OpenTripPlanner into v2

Author: VillePihlava

application/src/main/java/org/opentripplanner/framework/i18n/TranslatedString.java

@@ -27,6 +27,7 @@ public class TranslatedString implements I18NString, Serializable {
   private static final HashMap<Map<String, String>, I18NString> translationCache = new HashMap<>();
 
   private final Map<String, String> translations = new HashMap<>();
+  private final int hashCode;
 
   private TranslatedString(Map<String, String> translations) {
     for (Map.Entry<String, String> i : translations.entrySet()) {
@@ -36,6 +37,7 @@ private TranslatedString(Map<String, String> translations) {
         this.translations.put(i.getKey().toLowerCase(), i.getValue());
       }
     }
+    this.hashCode = Objects.hash(translations);
   }
 
   public static I18NString getI18NString(String untranslated, String... translations) {
@@ -98,7 +100,7 @@ public static I18NString getI18NString(
 
   @Override
   public int hashCode() {
-    return Objects.hash(translations);
+    return hashCode;
   }
 
   @Override

application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java

@@ -37,6 +37,7 @@ public final class RealTimeTripTimes implements TripTimes {
   private final I18NString[] stopHeadsigns;
   private final OccupancyStatus[] occupancyStatus;
   private final Accessibility wheelchairAccessibility;
+  private final int hash;
 
   RealTimeTripTimes(RealTimeTripTimesBuilder builder) {
     scheduledTripTimes = builder.scheduledTripTimes();
@@ -49,6 +50,7 @@ public final class RealTimeTripTimes implements TripTimes {
     occupancyStatus = builder.occupancyStatus();
     wheelchairAccessibility = builder.wheelchairAccessibility();
     validateNonIncreasingTimes();
+    hash = hash();
   }
 
   /**
@@ -64,6 +66,7 @@ private RealTimeTripTimes(RealTimeTripTimes original, ScheduledTripTimes schedul
     this.stopHeadsigns = original.stopHeadsigns;
     this.occupancyStatus = original.occupancyStatus;
     this.wheelchairAccessibility = original.wheelchairAccessibility;
+    hash = hash();
   }
 
   /**
@@ -82,6 +85,7 @@ private RealTimeTripTimes(RealTimeTripTimes original, int timeShift) {
     this.stopHeadsigns = original.stopHeadsigns;
     this.occupancyStatus = original.occupancyStatus;
     this.wheelchairAccessibility = original.wheelchairAccessibility;
+    hash = hash();
   }
 
   ScheduledTripTimes scheduledTripTimes() {
@@ -369,6 +373,10 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
+    return hash;
+  }
+
+  public int hash() {
     return Objects.hash(
       scheduledTripTimes,
       Arrays.hashCode(arrivalTimes),

application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java

@@ -53,6 +53,7 @@ public final class ScheduledTripTimes implements TripTimes {
   private final Trip trip;
   private final List<BookingInfo> dropOffBookingInfos;
   private final List<BookingInfo> pickupBookingInfos;
+  private final int hash;
 
   /**
    * Any number of array elements may point to the same I18NString instance if the headsign remains
@@ -86,6 +87,7 @@ public final class ScheduledTripTimes implements TripTimes {
     this.headsignVias = builder.headsignVias();
     this.gtfsSequenceOfStopIndex = builder.gtfsSequenceOfStopIndex();
     validate();
+    this.hash = hash();
   }
 
   /**
@@ -343,6 +345,10 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
+    return hash;
+  }
+
+  private int hash() {
     return Objects.hash(
       timeShift,
       serviceCode,