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

chore:bump dependencies, resolve warnings #79

Merged
merged 7 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.5</version>
<version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<groupId>org.molgenis</groupId>
<artifactId>vip-decision-tree</artifactId>
<version>3.7.0</version>
<version>3.7.1</version>

<name>vip-decision-tree</name>
<description>Decision tree module for filtering and labelling VCF files</description>
Expand Down Expand Up @@ -41,9 +41,9 @@
<properties>
<java.version>17</java.version>
<commons.cli.version>1.5.0</commons.cli.version>
<samtools.htsjdk.version>3.0.5</samtools.htsjdk.version>
<jacoco-maven-plugin.version>0.8.9</jacoco-maven-plugin.version>
<vip.utils.version>1.4.0</vip.utils.version>
<samtools.htsjdk.version>4.0.1</samtools.htsjdk.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<vip.utils.version>1.4.1</vip.utils.version>
</properties>

<profiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
public class Allele {

@NonNull String bases;
@NonNull int index;
int index;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

import org.molgenis.vcf.decisiontree.filter.model.Node;

public class EvaluationException extends RuntimeException {
import java.io.Serial;

public class EvaluationException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public EvaluationException(Node node, Variant variant, String message) {
super(
format(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.molgenis.vcf.decisiontree.filter;

import java.io.Serial;

import static java.lang.String.format;

public class FlagListException extends RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "INFO field '%s' of type FLAG cannot contain a list of values.";
private final String field;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import static java.lang.String.format;

import java.io.Serial;
import java.util.List;
import org.molgenis.vcf.decisiontree.filter.model.FieldType;

public class InvalidNumberOfTokensException extends RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "Unsupported number of tokens for input '%s' expecting %d tokens for fieldtype '%s'.";
private final List<String> fieldTokens;
private final FieldType type;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package org.molgenis.vcf.decisiontree.filter;

import java.io.Serial;

import static java.lang.String.format;

public class MissingPhenotypesException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "Attempting to filter on phenotypes without specifying phenotypes for smaple '%s'.";
private final String sample;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@

import org.molgenis.vcf.decisiontree.filter.model.FieldType;

import java.io.Serial;

public class UnknownFieldException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "Unknown '%s' field '%s'.";
private final String field;
private final FieldType type;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package org.molgenis.vcf.decisiontree.filter;

import java.io.Serial;

import static java.lang.String.format;

public class UnsupportedFieldException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "Unsupported field '%s'.";
private final String rootField;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package org.molgenis.vcf.decisiontree.filter;

import java.io.Serial;

import static java.util.Objects.requireNonNull;

public class UnsupportedFormatFieldException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private final Class<?> clazz;

public UnsupportedFormatFieldException(Class<?> clazz) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package org.molgenis.vcf.decisiontree.filter;

import java.io.Serial;

public class UnsupportedNestedFieldException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
private final String field;

public UnsupportedNestedFieldException(String field) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
@NonFinal
public class NestedField extends FieldImpl implements Comparable<NestedField> {

@NonNull
final int index;
@NonNull
final Field parent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package org.molgenis.vcf.decisiontree.loader;

public class ConfigDecisionTreeValidationException extends RuntimeException {
import java.io.Serial;

public class ConfigDecisionTreeValidationException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public ConfigDecisionTreeValidationException(String message) {
super(message);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@

import org.molgenis.vcf.decisiontree.loader.model.ConfigBoolQuery;

public class CountMismatchException extends RuntimeException {
import java.io.Serial;

public class CountMismatchException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public CountMismatchException(ConfigBoolQuery query) {
super(
format("Query value for field '%s' should be a collection for query '%s'.", query.getField(), query.toString()));
format("Query value for field '%s' should be a collection for query '%s'.", query.getField(), query));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

import org.molgenis.vcf.decisiontree.loader.model.ConfigOperator;

public class FileValueNotAllowedException extends RuntimeException {
import java.io.Serial;

public class FileValueNotAllowedException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public FileValueNotAllowedException(ConfigOperator operator, String allowedFileOperators,
String field) {
super(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

import static java.lang.String.format;

import java.io.Serial;
import java.util.List;

public class MissingProbandsException extends RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
public MissingProbandsException(List<String> probands) {
super(
format(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
import org.molgenis.vcf.decisiontree.filter.model.Field;
import org.molgenis.vcf.decisiontree.loader.model.ConfigOperator;

public class UnsupportedOperatorException extends RuntimeException {
import java.io.Serial;

public class UnsupportedOperatorException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public UnsupportedOperatorException(ConfigOperator operator, Field field,
DecisionType decisionType) {
super(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
import org.molgenis.vcf.decisiontree.filter.model.DecisionType;
import org.molgenis.vcf.decisiontree.filter.model.Field;

public class UnsupportedValueCountException extends RuntimeException {
import java.io.Serial;

public class UnsupportedValueCountException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public UnsupportedValueCountException(Field field, DecisionType decisionType) {
super(
format(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
import org.molgenis.vcf.decisiontree.filter.model.DecisionType;
import org.molgenis.vcf.decisiontree.filter.model.Field;

public class UnsupportedValueCountTypeException extends RuntimeException {
import java.io.Serial;

public class UnsupportedValueCountTypeException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public UnsupportedValueCountTypeException(Field field, DecisionType decisionType) {
super(
format(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
import org.molgenis.vcf.decisiontree.filter.model.DecisionType;
import org.molgenis.vcf.decisiontree.filter.model.Field;

public class UnsupportedValueTypeException extends RuntimeException {
import java.io.Serial;

public class UnsupportedValueTypeException extends RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
public UnsupportedValueTypeException(Field field, DecisionType decisionType) {
super(
format(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package org.molgenis.vcf.decisiontree.runner.info;

import java.io.Serial;

import static java.lang.String.format;

public class InvalidHeaderLineException extends
RuntimeException {
@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "VCF header with id '%s' is not a SnpEff header.";

public InvalidHeaderLineException(String id) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package org.molgenis.vcf.decisiontree.runner.info;

import java.io.Serial;

import static java.lang.String.format;

public class MissingRequiredNestedValueException extends RuntimeException{
@Serial
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "For '%s' annotations the '%s' field is expected to be present.";

public MissingRequiredNestedValueException(String fieldName, String nestedFieldName) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package org.molgenis.vcf.decisiontree.runner.info;

import java.io.Serial;

public class MissingVepException extends
RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
@Override
public String getMessage() {
return "Input VCF is missing required VEP annotation.";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.molgenis.vcf.decisiontree.utils;

import java.io.Serial;

import static java.lang.String.format;

public class TypeConversionException extends RuntimeException {

@Serial
private static final long serialVersionUID = 1L;
public TypeConversionException(Object value, Class<?> thatClass) {
super(
format(
Expand Down