Skip to content

Commit 1e82df5

Browse files
KochTobisven1103
andcommitted
Make parse method static
Co-authored-by: Sven F. <[email protected]>
1 parent 8c81704 commit 1e82df5

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

src/main/java/life/qbic/registration/openbis/OpenBisDropboxETL.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,8 @@
3636
public class OpenBisDropboxETL extends AbstractJavaDataSetRegistrationDropboxV2 {
3737

3838
private static final String PROVENANCE_FILE_NAME = "provenance.json";
39-
private final ProvenanceParser provenanceParser;
4039

41-
public OpenBisDropboxETL() {
42-
provenanceParser = new ProvenanceParser();
43-
}
44-
45-
protected OpenBisDropboxETL(ProvenanceParser provenanceParser) {
46-
this.provenanceParser = requireNonNull(provenanceParser, "provenanceParser must not be null");
40+
public OpenBisDropboxETL(){
4741
}
4842

4943

@@ -58,7 +52,7 @@ public boolean shouldRetryProcessing(DataSetRegistrationContext context, Excepti
5852

5953
@Override
6054
public void process(IDataSetRegistrationTransactionV2 transaction) {
61-
DataSetProvenance dataSetProvenance = provenanceParser.parseProvenanceJson(
55+
DataSetProvenance dataSetProvenance = ProvenanceParser.parseProvenanceJson(
6256
new File(transaction.getIncoming(), PROVENANCE_FILE_NAME));
6357

6458
String measurementId = dataSetProvenance.measurementId();

src/main/java/life/qbic/registration/openbis/ProvenanceParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ProvenanceParser {
1414
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
1515
private static final Class<DataSetProvenance> DATA_SET_PROVENANCE_CLASS = DataSetProvenance.class;
1616

17-
DataSetProvenance parseProvenanceJson(File provenanceFile) {
17+
static DataSetProvenance parseProvenanceJson(File provenanceFile) {
1818
try {
1919
return OBJECT_MAPPER.readValue(provenanceFile,
2020
DATA_SET_PROVENANCE_CLASS);

src/test/java/life/qbic/registration/openbis/ProvenanceParserTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ProvenanceParserTest extends Specification {
88

99
def "parsing a valid file works"() {
1010
when:
11-
var resultingProvenanceObject = new ProvenanceParser().parseProvenanceJson(validFile)
11+
var resultingProvenanceObject = ProvenanceParser.parseProvenanceJson(validFile)
1212
then:
1313
resultingProvenanceObject.measurementId() == "NGSQTEST001AE-1234512312"
1414
and:

0 commit comments

Comments
 (0)