Skip to content
Snippets Groups Projects
Commit 534e27b6 authored by Workum, Dirk-Jan van's avatar Workum, Dirk-Jan van
Browse files

Merge branch 'fix_nullpointerexception_remove_grouping' into 'develop'

Fix NullPointerException in `remove_grouping`

See merge request bioinformatics/pantools!124
parents 899fe1f8 f2119a14
Branches
Tags
2 merge requests!126Release PanTools v4.1.1,!124Fix NullPointerException in `remove_grouping`
Pipeline #61761 passed
...@@ -8,6 +8,7 @@ All notable changes to Pantools will be documented in this file. ...@@ -8,6 +8,7 @@ All notable changes to Pantools will be documented in this file.
### Changed ### Changed
- `add_functions` can now specify a directory where functional databases are stored (!117). - `add_functions` can now specify a directory where functional databases are stored (!117).
- parameter `-v` is now required for `change_grouping` (!124).
### Fixed ### Fixed
- `msa` now works correctly with 'alt_id' properties of GO nodes (!118). - `msa` now works correctly with 'alt_id' properties of GO nodes (!118).
......
...@@ -1461,16 +1461,15 @@ Options ...@@ -1461,16 +1461,15 @@ Options
- Do not remove the 'is_similar' relationships between mRNA nodes. - Do not remove the 'is_similar' relationships between mRNA nodes.
This does not influence the next grouping. This does not influence the next grouping.
* - ``--grouping-version``/``-v`` * - ``--grouping-version``/``-v``
- Select a specific grouping version to be removed. Two additional - Select a specific grouping version to be removed. Should be either a
options: 'all' to remove all groupings and 'all_inactive' to grouping number, 'all' for all groupings or 'all_inactive' for
remove all inactive groupings. all inactive groupings.
Example commands Example commands
"""""""""""""""" """"""""""""""""
.. code:: bash .. code:: bash
$ pantools remove_grouping tomato_DB
$ pantools remove_grouping --version=1 tomato_DB $ pantools remove_grouping --version=1 tomato_DB
$ pantools remove_grouping --version=all --fast tomato_DB $ pantools remove_grouping --version=all --fast tomato_DB
$ pantools remove_grouping --version=all_inactive tomato_DB $ pantools remove_grouping --version=all_inactive tomato_DB
......
...@@ -26,7 +26,7 @@ public class RemoveGrouping implements Callable<Integer> { ...@@ -26,7 +26,7 @@ public class RemoveGrouping implements Callable<Integer> {
@GraphDatabase @GraphDatabase
private Pantools pantools; private Pantools pantools;
@Option(names = {"-v", "--grouping-version"}) @Option(names = {"-v", "--grouping-version"}, required = true)
@Pattern(regexp = "[0-9]+|all|all-inactive", flags = CASE_INSENSITIVE, message = "{pattern.grouping-version}") @Pattern(regexp = "[0-9]+|all|all-inactive", flags = CASE_INSENSITIVE, message = "{pattern.grouping-version}")
String groupingVersion; String groupingVersion;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment