Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes in GTFS-Reader (of Siri Retriever) #305

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
+2,180 −349
Open

changes in GTFS-Reader (of Siri Retriever) #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b37cf70
temporary solution for NullPointerExceptions during GTFS file processing
evyatark Mar 22, 2019
070212f
issue #183, sections 1+3
evyatark May 20, 2019
8d22ac4
issue #183, section 2
evyatark May 20, 2019
f3197e1
issue #183, section 4 (adding dataFrameRef)
evyatark May 20, 2019
b321efb
issue #183, section 5 (adding stopPointRef)
evyatark May 20, 2019
df0f05c
issue #183, section 6 (adding isVehicleAtStop)
evyatark May 20, 2019
660bf80
issue #183, section 7 (different file name - from now on will be siri…
evyatark May 20, 2019
7d55327
add logging of response XML to debug file
evyatark May 26, 2019
b0bcb8a
add logging of response XML to debug file
evyatark May 26, 2019
d17bd23
add logging of response XML to debug file
evyatark May 26, 2019
b9d03b3
q
evyatark May 29, 2019
74b940d
disable response logging
evyatark May 29, 2019
2eed7e9
add sending to external system
evyatark Jun 9, 2019
b1bd096
add sending to external system
evyatark Jun 9, 2019
1d695af
add sending to external system
evyatark Jun 9, 2019
7e8ab92
Merge branch 'siri_retriever_debug' of https://github.com/hasadna/ope…
evyatark Jun 9, 2019
8f31958
add unit tests
evyatark Jun 10, 2019
1659c24
merge siri_retriever_debug version from prod
evyatark Jun 10, 2019
d56acef
Merge branch 'siri_retriever_debug' into siri/results_file_v2
evyatark Jun 10, 2019
c429e68
merge siri_retriever_debug version from prod
evyatark Jun 10, 2019
d7e1f90
start moving prod version (siri-client from 22/03/2018) to master
evyatark Sep 24, 2019
0c58c40
(8f07f60) changes by eldad 07/01/2019 - convert to Spring Boot App (e…
evyatark Sep 24, 2019
ccf8484
(7d5d2d6) changes by eldad 04/03/2019 - moving temp dir to configurat…
evyatark Sep 24, 2019
3f0ec4d
(5fd2b16) changes by eldad 04/03/2019 - most of them config prepare f…
evyatark Sep 24, 2019
c626ddd
(a20b62e) changes by eldad 19/03/2019 - rearrange code, many new classes
evyatark Sep 28, 2019
bf2b9de
(b37cf70) re-merge changes by evyatar 22/03/2019 - catch exceptions i…
evyatark Sep 28, 2019
4393270
(b37cf70) complete merging changes by eldad up to 25/03/2019 - docker…
evyatark Sep 29, 2019
27d2e1f
Merge branch 'master' into eldad_changes_201901
evyatark Sep 29, 2019
d4252c2
add debug log, fix docker image names
evyatark Oct 7, 2019
4a57f59
Merge branch 'master' into eldad_changes_201901
evyatark Jan 27, 2020
6d754ac
improve logging
evyatark Jun 5, 2020
8733cfc
Merge branch 'master' into siri/results_file_v2
evyatark Jun 5, 2020
cd35137
Merge branch 'siri/results_file_v2' into eldad_changes_201901
evyatark Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions siri/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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/
Expand Down
102 changes: 48 additions & 54 deletions siri/gtfs_reader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
6 changes: 3 additions & 3 deletions siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/analysis/MakatFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions ...fs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/DownloadFailedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Loading