Skip to content

Commit 568f29a

Browse files
authored
Merge pull request #6 from qbicsoftware/development
Release PR
2 parents 97c75f9 + 7c025d1 commit 568f29a

File tree

73 files changed

+1899
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1899
-359
lines changed

measurement-provider/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>life.qbic</groupId>
8-
<artifactId>data-access-server</artifactId>
8+
<artifactId>data-download-server</artifactId>
99
<version>0.1.0</version>
1010
</parent>
1111

12-
<groupId>life.qbic.data-access</groupId>
12+
<groupId>life.qbic.data-download</groupId>
1313
<artifactId>measurement-provider</artifactId>
1414
<version>0.1.0</version>
1515
<packaging>jar</packaging>
@@ -23,7 +23,7 @@
2323
<configuration>
2424
<archive>
2525
<manifestEntries>
26-
<Automatic-Module-Name>life.qbic.data_access.measurement.provider</Automatic-Module-Name>
26+
<Automatic-Module-Name>life.qbic.data_download.measurement.provider</Automatic-Module-Name>
2727
</manifestEntries>
2828
</archive>
2929
</configuration>

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/FileInfo.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/Measurement.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/MeasurementData.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/MeasurementDataProvider.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/MeasurementInfo.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

measurement-provider/src/main/java/life/qbic/data_access/measurements/api/DataFile.java renamed to measurement-provider/src/main/java/life/qbic/data_download/measurements/api/DataFile.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package life.qbic.data_access.measurements.api;
1+
package life.qbic.data_download.measurements.api;
22

33
import static java.util.Objects.requireNonNull;
44

@@ -7,12 +7,7 @@
77
import java.util.StringJoiner;
88

99
/**
10-
* TODO!
11-
* <b>short description</b>
12-
*
13-
* <p>detailed description</p>
14-
*
15-
* @since <version tag>
10+
* A file with data
1611
*/
1712
public class DataFile {
1813

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package life.qbic.data_download.measurements.api;
2+
3+
/**
4+
* Information about a file
5+
*/
6+
public record FileInfo(String path, long length, long crc32, long registrationMillis, long lastModifiedMillis) {
7+
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package life.qbic.data_download.measurements.api;
2+
3+
/**
4+
* A measurement
5+
*/
6+
public record Measurement(MeasurementId id, MeasurementInfo info, MeasurementData data) {
7+
8+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package life.qbic.data_download.measurements.api;
2+
3+
import java.io.InputStream;
4+
5+
/**
6+
* Measurement data
7+
*/
8+
public interface MeasurementData {
9+
InputStream stream();
10+
}

0 commit comments

Comments
 (0)