Fixes to ogc-server-statistics to pass all tests #2392
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Move repeated hardcoded values for statistics table and column names to a constants in a LogColumns utility. - Use try-with-resources when dealing with JDBC prepared statements and resultsets. - Do now swallow exception cause when throwing DataCommandException
groldan
force-pushed
the
bug/ogc_statistics_tests
branch
2 times, most recently
from
5b0f929
to
b6cef72
Compare
pmauduit
approved these changes
Jan 21, 2019
| pStmt.execute("DELETE FROM ogcstatistics.OGC_SERVICES_LOG"); | ||
|
|
||
| try (Statement pStmt = this.connection.createStatement()){ | ||
| pStmt.execute(String.format("DELETE FROM %s", QUALIFIED_TABLE_NAME)); |
There was a problem hiding this comment.
I'm aware that QUALIFIED_TABLE_NAME is not an user input, but String.format() to format SQL queries is prone to sql injections
There was a problem hiding this comment.
Right. In this case it's safe as QUALIFIED_TABLE_NAME is a constant to avoid possible typos. It would also make it safe in the event the table name changed (e.g. it has the schema hardcoded, might that change eventually?).
There was a problem hiding this comment.
No plan to change this.
Honestly, this looks safe enough for me.
| try { | ||
| this.connection.setAutoCommit(true); | ||
| } catch (SQLException e1) { | ||
| e1.printStackTrace(); |
There was a problem hiding this comment.
Should be logged instead of putting it on stdout ?
...erver-statistics/src/main/java/org/georchestra/ogcservstatistics/log4j/OGCServiceParser.java
Show resolved
Hide resolved
Most failed because OGCServiceParser couldn't parse the OGC service name, especially out of the HTTP POST requests log messages. Fixed using regular expressions. The only test passing was OGCServiceParserTest, but lacked test cases for the failing messages, which were added.
groldan
force-pushed
the
bug/ogc_statistics_tests
branch
from
b6cef72
to
6227a61
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request fixes #2076
There were two major errors:
RetrieveAllCommandhad a hardcoded column namesecroleinstead ofroles, which directly prevented all online tests from running.After fixing that, most tests failed because OGCServiceParser couldn't parse the service name, especially out of the HTTP POST requests log messages. Fixed using regular expressions.
The only test passing was OGCServiceParserTest, but test cases for the failing messages, which were added.