METRON-1734: Src and Dst port filters are incorrect after changing to empty

[merrimanr]

Contributor Comments

This PR removes the src and dst port filters when the input forms are cleared. Before the previous query filters would be sent instead causing incorrect query results.

Changes Included

• Added else condition to clear port filters
• Added test cases

Testing

This has been tested in full dev:

• Set either a src or dst port filter and run a query
• Clear out the filter and run another query
• Results should be returned for the current query

Pull Request Checklist

Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines for complete smoke testing guides.

In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:

For all changes:

• [ x] Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.
• Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
• Has your PR been rebased against the latest commit within the target branch (typically master)?

For code changes:

• Have you included steps to reproduce the behavior or problem that is being changed or addressed?

• Have you included steps or a guide to how the change may be verified and tested manually?

• Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:

  mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
  

• Have you written or updated unit tests and or integration tests to verify your changes?

• If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

• Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?

For documentation related changes:

• Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via site-book/target/site/index.html:

  cd site-book
  mvn site
  

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that travis-ci is set up for your personal repository such that your branches are built there before submitting a pull request.

[justinleet]

This is probably a dumb question, but why do we have to specifically delete the value? Don't we treat empty string the same as missing? If that's the case, why isn't this just

this.model.ipSrcPort = +this.ipSrcPort;
this.model.ipDstPort = +this.ipDstPort;

Sidenote, are the pluses in here even doing anything? Could it just be

this.model.ipSrcPort = this.ipSrcPort;
this.model.ipDstPort = this.ipDstPort;

[merrimanr]

They are different types, one is a string and one is a number. I believe we created the this.ipSrcPort and this.ipDstPort string variables for regex validation purposes. As such we can't just assign an empty string to a number type. The + operator converts a string to a number.

[justinleet]

+1 by inspection, thanks for the explanation on the string vs. number and the casting.