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.

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

Siri 2.7 - fixes for using the new 2.7 MOT server #323

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Conversation

evyatark
Copy link
Collaborator

@evyatark evyatark commented Jun 5, 2020

Siri 2.7 - fixes for using the new 2.7 MOT server

  • url moved to configuration so it can be changed easily
  • some changes in XML of request, because former request is not accepted by the new 2.7 MOT server
  • some changes in stripping the soap envelope from the response, because it failed with the XML of responses from the new 2.7 MOT server

…ion (preparing to docker), in classes [GtfsDataManip, SchedulingDataCre, GtfsCollectorSer] I remained with my version because it contains some necessary fixes. Logic changes in GtfsFtp and GtfsZipFile should be investigated
# Conflicts:
#	siri/gtfs_reader/.gitignore
#	siri/gtfs_reader/.settings/org.eclipse.core.resources.prefs
#	siri/gtfs_reader/.settings/org.eclipse.jdt.core.prefs
#	siri/gtfs_reader/.settings/org.eclipse.m2e.core.prefs
#	siri/gtfs_reader/pom.xml
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/analysis/GtfsDataManipulations.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/analysis/SchedulingDataCreator.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/DownloadFailedException.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/FtpClientService.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/GtfsRetriever.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/crud/GtfsZipFile.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/main/GtfsCollectorConfiguration.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/main/GtfsCollectorService.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/main/GtfsCollectorStartup.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/service/BackupCleanupService.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/service/SiriCollectorClient.java
#	siri/gtfs_reader/src/main/java/il/org/hasadna/siri_client/gtfs/service/SiriCollectorClientImpl.java
#	siri/gtfs_reader/src/main/resources/applicationContext.xml
#	siri/gtfs_reader/src/main/resources/sdf.tmp
#	siri/gtfs_reader/src/test/java/il/org/hasadna/siri_client/gtfs/crud/GtfsCrudTest.java
#	siri/gtfs_reader/src/test/java/il/org/hasadna/siri_client/gtfs/crud/GtfsZipFileTest.java
#	siri/gtfs_reader/src/test/java/il/org/hasadna/siri_client/gtfs/service/TestBackupCleanupService.java
@evyatark evyatark requested review from cjer and AvivSela June 5, 2020 17:44
@codecov-commenter
Copy link

Codecov Report

Merging #323 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #323   +/-   ##
=======================================
  Coverage   93.96%   93.96%           
=======================================
  Files           3        3           
  Lines         116      116           
=======================================
  Hits          109      109           
  Misses          7        7           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5373fad...0370b69. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants