Skip to content

Commit 2870a75

Browse files
sven1103sven1103
committed
Merge remote-tracking branch 'origin/development' into reactify
2 parents d2558ad + f3bbed3 commit 2870a75

File tree

20 files changed

+58
-61
lines changed

20 files changed

+58
-61
lines changed

‎README.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -253,17 +253,7 @@ $$
253253

254254
$$
255255
\begin{aligned}
256-
\text{where } & \text{ P(x_i) is the probability of character } x_i, \\
257-
& n \text{ is the total length of the password}.
258-
\end{aligned}
259-
$$
260-
$$
261-
H = -\sum_{i=1}^{n} P(x_i) \log_2 P(x_i) \times n > 100.,
262-
$$
263-
264-
$$
265-
\begin{aligned}
266-
\text{where } & \text{ P(x_i) is the probability of character } x_i, \\
256+
\text{where } & P(x_i) \text{ is the probability of character } x_i, \\
267257
& n \text{ is the total length of the password}.
268258
\end{aligned}
269259
$$

‎application-commons/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>application-commons</artifactId>

‎broadcasting/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>broadcasting</artifactId>

‎domain-concept/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<artifactId>domain-concept</artifactId>

‎email-service-provider/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
2121
<dependency>
2222
<groupId>life.qbic</groupId>
2323
<artifactId>identity</artifactId>
24-
<version>1.7.2</version>
24+
<version>1.8.2</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>life.qbic</groupId>
2929
<artifactId>project-management</artifactId>
30-
<version>1.7.2</version>
30+
<version>1.8.2</version>
3131
<scope>compile</scope>
3232
</dependency>
3333
<dependency>

‎finances-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.finances</groupId>

‎finances-infrastructure/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>life.qbic</groupId>
2222
<artifactId>finances</artifactId>
23-
<version>1.7.2</version>
23+
<version>1.8.2</version>
2424
<scope>compile</scope>
2525
</dependency>
2626
<dependency>

‎finances/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>life.qbic.finances</groupId>
4040
<artifactId>finances-api</artifactId>
41-
<version>1.7.2</version>
41+
<version>1.8.2</version>
4242
<scope>compile</scope>
4343
</dependency>
4444
</dependencies>

‎identity-api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>life.qbic</groupId>
2323
<artifactId>application-commons</artifactId>
24-
<version>1.7.2</version>
24+
<version>1.8.2</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
</dependencies>

‎identity-infrastructure/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111
<artifactId>identity-infrastructure</artifactId>
1212
<dependencies>
1313
<dependency>
1414
<groupId>life.qbic</groupId>
1515
<artifactId>identity</artifactId>
16-
<version>1.7.2</version>
16+
<version>1.8.2</version>
1717
<scope>compile</scope>
1818
</dependency>
1919
<dependency>

‎identity/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -45,25 +45,25 @@
4545
<dependency>
4646
<groupId>life.qbic</groupId>
4747
<artifactId>broadcasting</artifactId>
48-
<version>1.7.2</version>
48+
<version>1.8.2</version>
4949
<scope>compile</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>life.qbic</groupId>
5353
<artifactId>application-commons</artifactId>
54-
<version>1.7.2</version>
54+
<version>1.8.2</version>
5555
<scope>compile</scope>
5656
</dependency>
5757
<dependency>
5858
<groupId>life.qbic</groupId>
5959
<artifactId>logging</artifactId>
60-
<version>1.7.2</version>
60+
<version>1.8.2</version>
6161
<scope>compile</scope>
6262
</dependency>
6363
<dependency>
6464
<groupId>life.qbic</groupId>
6565
<artifactId>domain-concept</artifactId>
66-
<version>1.7.2</version>
66+
<version>1.8.2</version>
6767
<scope>compile</scope>
6868
</dependency>
6969
<dependency>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>life.qbic.datamanager</groupId>
8888
<artifactId>identity-api</artifactId>
89-
<version>1.7.2</version>
89+
<version>1.8.2</version>
9090
<scope>compile</scope>
9191
</dependency>
9292
</dependencies>

‎logging/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>life.qbic.logging</groupId>
5555
<artifactId>subscription-api</artifactId>
56-
<version>1.7.2</version>
56+
<version>1.8.2</version>
5757
<scope>compile</scope>
5858
</dependency>
5959
</dependencies>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
99
<name>Data Manager</name>
10-
<version>1.7.2</version>
10+
<version>1.8.2</version>
1111
<modules>
1212
<module>user-interface</module>
1313
<module>identity</module>

‎project-management-infrastructure/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>life.qbic</groupId>
88
<artifactId>datamanager</artifactId>
9-
<version>1.7.2</version>
9+
<version>1.8.2</version>
1010
</parent>
1111

1212
<groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>life.qbic</groupId>
3131
<artifactId>project-management</artifactId>
32-
<version>1.7.2</version>
32+
<version>1.8.2</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
<dependency>

‎project-management/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>datamanager</artifactId>
66
<groupId>life.qbic</groupId>
7-
<version>1.7.2</version>
7+
<version>1.8.2</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>project-management</artifactId>
@@ -42,13 +42,13 @@
4242
<dependency>
4343
<groupId>life.qbic</groupId>
4444
<artifactId>application-commons</artifactId>
45-
<version>1.7.2</version>
45+
<version>1.8.2</version>
4646
<scope>compile</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>life.qbic</groupId>
5050
<artifactId>logging</artifactId>
51-
<version>1.7.2</version>
51+
<version>1.8.2</version>
5252
<scope>compile</scope>
5353
</dependency>
5454
<dependency>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>life.qbic</groupId>
6161
<artifactId>domain-concept</artifactId>
62-
<version>1.7.2</version>
62+
<version>1.8.2</version>
6363
<scope>compile</scope>
6464
</dependency>
6565
<dependency>
@@ -82,13 +82,13 @@
8282
<dependency>
8383
<groupId>life.qbic.datamanager</groupId>
8484
<artifactId>identity-api</artifactId>
85-
<version>1.7.2</version>
85+
<version>1.8.2</version>
8686
<scope>compile</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>life.qbic.finances</groupId>
9090
<artifactId>finances-api</artifactId>
91-
<version>1.7.2</version>
91+
<version>1.8.2</version>
9292
<scope>compile</scope>
9393
</dependency>
9494
<dependency>

‎project-management/src/main/java/life/qbic/projectmanagement/domain/model/batch/Batch.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,17 @@ public static Batch create(String label, boolean isPilot) {
9090
}
9191

9292
public void addSample(SampleId sampleId) {
93-
this.sampleIds.add(sampleId);
93+
addSampleIfNotExists(sampleId);
9494
this.lastModified = Instant.now();
9595
}
9696

97+
private void addSampleIfNotExists(SampleId sampleId) {
98+
if (sampleIds.contains(sampleId)) {
99+
return;
100+
}
101+
sampleIds.add(sampleId);
102+
}
103+
97104
public void removeSample(SampleId sampleToRemove) {
98105
this.sampleIds.remove(sampleToRemove);
99106
this.lastModified = Instant.now();

‎subscription-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<groupId>life.qbic.logging</groupId>

‎subscription-provider/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>datamanager</artifactId>
77
<groupId>life.qbic</groupId>
8-
<version>1.7.2</version>
8+
<version>1.8.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<groupId>life.qbic.logging</groupId>
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>life.qbic.logging</groupId>
1616
<artifactId>subscription-api</artifactId>
17-
<version>1.7.2</version>
17+
<version>1.8.2</version>
1818
<scope>compile</scope>
1919
</dependency>
2020
<dependency>

0 commit comments

Comments
 (0)