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

Delete feed from RDBMS #134

Merged
merged 17 commits into from
Sep 17, 2018
Merged

Delete feed from RDBMS #134

Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
94323ae
feat(delete): add delete feed feature to SQL code path
landonreed Aug 28, 2018
c8a77f8
refactor(cmd-line): add delete and json to command line options
landonreed Aug 28, 2018
94a3ae4
refactor(graphql): use non-deprecated method for building GraphQL object
landonreed Aug 28, 2018
67e0763
refactor(load): add filename field to FeedLoadResult
landonreed Aug 28, 2018
7acbc6d
refactor(load): add fileSize field to TableLoadResult
landonreed Aug 28, 2018
0eedbdd
style(comments): fix/add comments
landonreed Aug 28, 2018
44038e9
refactor(delete): mark feed as deleted in feeds table (rather than de…
landonreed Aug 28, 2018
e87ab5f
Merge pull request #136 from conveyal/dev
Aug 29, 2018
75e54cf
Merge pull request #137 from conveyal/dev
Aug 29, 2018
32f17ca
Merge pull request #139 from conveyal/dev
Aug 29, 2018
1b394e0
4.0.0 [ci skip]
semantic-release-bot Aug 29, 2018
3328c4b
Prepare next development iteration 4.0.1-SNAPSHOT [ci skip]
semantic-release-bot Aug 29, 2018
811e999
Merge branch 'master' into delete-feed
landonreed Aug 30, 2018
a346fca
refactor: address PR #134 comments
landonreed Sep 11, 2018
75200e9
refactor: add comment
landonreed Sep 11, 2018
8c9d605
move object mapper closer to instantiation
landonreed Sep 12, 2018
c08ba7f
clean up whitespace for options, feedId -> namespace
landonreed Sep 13, 2018
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: 5 additions & 3 deletions src/main/java/com/conveyal/gtfs/GTFS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ public static DataSource createDataSource (String url, String username, String p
* It also lets you run a GraphQL API for all the feeds loaded into the database.
*/
public static void main (String[] args) throws IOException {
// Object mapper used for writing load or validation results to file.
ObjectMapper mapper = new ObjectMapper();
// Object mapper used for writing load or validation results to file (instantia).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There appears to be stray text in this comment. This is a detail, but I'd find the code easier to read if the variable were declared and initialized to null just before it is conditionally set to a new instance, around line 211 where we also declare File directory = null;

ObjectMapper mapper = null;
Options options = getOptions();
CommandLine cmd;
try {
Expand Down Expand Up @@ -210,6 +210,8 @@ public static void main (String[] args) throws IOException {
boolean storeResults = cmd.hasOption("json");
File directory = null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would move the creation of the objectMapper down here, conditional upon storeResults=true.

if (storeResults) {
// Instantiate mapper for use with outputting load/validation results.
mapper = new ObjectMapper();
directory = cmd.getOptionValue("json") != null ? new File(cmd.getOptionValue("json")) : Files.createTempDir();
LOG.info("Storing results in directory: {}", directory.getAbsolutePath());
}
Expand Down Expand Up @@ -296,7 +298,7 @@ public static void main (String[] args) throws IOException {
String namespaceToDelete = cmd.getOptionValue("delete");

if (namespaceToDelete != null) {
LOG.info("Exporting feed with unique identifier {}", namespaceToDelete);
LOG.info("Deleting feed with unique identifier {}", namespaceToDelete);
try {
delete(namespaceToDelete, dataSource);
LOG.info("Feed {} has been successfully deleted.", namespaceToDelete);
Expand Down