Siri 2.7 - fixes for using the new 2.7 MOT server

siri/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   siri-collector:
     container_name: siri-collector
-    image: openbus1/siri-collector:${TAG:-master}
+    image: openbus2/siri-collector:1
     environment:
       - spring.profiles.active=production
       - scheduler.data.file=/opt/hasadna/data/
@@ -15,10 +15,10 @@ services:
     restart: always
   gtfs-collector:
     container_name: gtfs-collector
-    image: openbus1/gtfs-collector:${TAG:-master}
+    image: openbus2/gtfs_reader:1
     environment:
-      - gtfs.agencies=[3,4,5,7,8,14,15,16,18,19,25,30,31,32]
-      - gtfs.dateOfLastDownload=2018-11-17
+      - gtfs.agencies=[2,3,4,5,7,8,14,15,16,18,19,25,30,31,32,6,20,21,23,24,42,44,45,47,49,50,51]
+      - gtfs.dateOfLastDownload=2019-09-17
       - gtfs.reschedule.url=http://siri-collector:8080/data/schedules/read/all
       - gtfs.dir.location=/opt/hasadna/data/
       - gtfs.schedules.location=/opt/hasadna/data/

siri/gtfs_reader/pom.xml

@@ -9,36 +9,36 @@
 
     <name>gtfs-collector</name>
 
-  <description>OpenBus Java Data Retriever</description>
+    <description>OpenBus Java Data Retriever</description>
 
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.0.2.RELEASE</version>
-    <relativePath/> <!-- lookup parent from repository -->
-  </parent>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
     </properties>
 
     <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-actuator</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
 
-      <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
-      <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>3.6</version>
-      </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -53,33 +53,27 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>1.2.3</version>
         </dependency>
 
 
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-web</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework.retry</groupId>
-        <artifactId>spring-retry</artifactId>
-        <version>1.2.2.RELEASE</version>
-      </dependency>
-      <dependency>	<!--  required for Spring-Retry -->
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-aop</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.2.2.RELEASE</version>
+        </dependency>
+        <dependency>	<!--  required for Spring-Retry -->
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -88,12 +82,12 @@
         </dependency>
 
 
-  <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>net.jodah</groupId>
             <artifactId>failsafe</artifactId>
             <version>1.1.0</version>
@@ -102,14 +96,14 @@
 
     </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>

siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/analysis/MakatFile.java

@@ -104,9 +104,9 @@ private Map<String, List<MakatData> > readMakatFile() {
         List<String> lines = readAllLinesOfMakatFileAndDoItFast();
         if (lines.isEmpty()) return new HashMap<>();
         Map<String, List<MakatData> > mapByRoute =
-            lines.stream().
-                map(line -> parseMakatLine(line)).
-                collect(Collectors.groupingBy(MakatData::getRouteId));
+                lines.stream().
+                        map(line -> parseMakatLine(line)).
+                        collect(Collectors.groupingBy(MakatData::getRouteId));
         return mapByRoute;
     }
 

siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/DownloadFailedException.java

@@ -4,11 +4,11 @@
 
 public class DownloadFailedException extends IOException {
 
-  public DownloadFailedException(String message) {
-    super(message);
-  }
+    public DownloadFailedException(String message) {
+        super(message);
+    }
 
-  public DownloadFailedException(Throwable cause) {
-    super(cause);
-  }
+    public DownloadFailedException(Throwable cause) {
+        super(cause);
+    }
 }