Skip to content

Commit 29aeb7d

Browse files
Merge branch 'development' into feature/#948-integrate-orcid-public-api-search-for-person-query
2 parents 7adccb5 + 0ebd75f commit 29aeb7d

49 files changed

Lines changed: 1682 additions & 281 deletions

File tree

Some content is hidden

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

.github/workflows/inactive_issue_handling.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
steps:
1313
- uses: actions/stale@v9
1414
with:
15-
days-before-issue-stale: 30
16-
days-before-issue-close: 30
15+
days-before-issue-stale: 60
16+
days-before-issue-close: 180
1717
stale-issue-label: "stale"
1818
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
1919
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."

application-commons/pom.xml

Lines changed: 1 addition & 1 deletion
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.8.2</version>
8+
<version>1.9.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>application-commons</artifactId>
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package life.qbic.application.commons;
2+
3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
import java.nio.ByteBuffer;
6+
import java.util.Iterator;
7+
import java.util.Objects;
8+
9+
/**
10+
* An input stream generated from a (lazy) iterator of {@link ByteBuffer}s.
11+
*/
12+
public class ByteBufferIteratorInputStream extends InputStream {
13+
14+
private final Iterator<ByteBuffer> bufferIterator;
15+
private ByteBuffer currentBuffer;
16+
17+
public ByteBufferIteratorInputStream(Iterator<ByteBuffer> iterator) {
18+
this.bufferIterator = iterator;
19+
}
20+
21+
@Override
22+
public int read(byte[] b, int off, int len) throws IOException {
23+
Objects.checkFromIndexSize(off, len, b.length);
24+
if (len == 0) {
25+
return 0;
26+
}
27+
boolean bufferAvailable = makeBufferAvailable();
28+
if (!bufferAvailable) {
29+
return -1;
30+
}
31+
32+
int requestedBytes = Math.min(currentBuffer.remaining(), len);
33+
currentBuffer.get(currentBuffer.position(), b, off, requestedBytes);
34+
currentBuffer.position(currentBuffer.position() + requestedBytes);
35+
36+
return requestedBytes;
37+
}
38+
39+
@Override
40+
public int read() {
41+
boolean bufferAvailable = makeBufferAvailable();
42+
if (!bufferAvailable) {
43+
return -1;
44+
}
45+
var currentPosition = currentBuffer.position();
46+
var value = currentBuffer.get(currentPosition) & 0xFF;
47+
currentBuffer.position(currentPosition + 1);
48+
return value;
49+
}
50+
51+
/**
52+
* Ensures a readable buffer is set.
53+
*
54+
* @return true if a readable buffer is selected; false if no readable buffer is available.
55+
*/
56+
private boolean makeBufferAvailable() {
57+
var buffer = currentBuffer;
58+
if (buffer != null && !buffer.hasRemaining()) {
59+
// the current buffer is read completely
60+
buffer = null;
61+
}
62+
while (buffer == null) {
63+
if (!bufferIterator.hasNext()) {
64+
return false;
65+
}
66+
buffer = bufferIterator.next();
67+
}
68+
currentBuffer = buffer;
69+
return true;
70+
}
71+
}

broadcasting/pom.xml

Lines changed: 1 addition & 1 deletion
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.8.2</version>
8+
<version>1.9.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>broadcasting</artifactId>

domain-concept/pom.xml

Lines changed: 2 additions & 2 deletions
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.8.2</version>
9+
<version>1.9.1</version>
1010
</parent>
1111

1212
<artifactId>domain-concept</artifactId>
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.fasterxml.jackson.core</groupId>
2929
<artifactId>jackson-annotations</artifactId>
30-
<version>2.18.1</version>
30+
<version>2.18.3</version>
3131
</dependency>
3232
</dependencies>
3333

email-service-provider/pom.xml

Lines changed: 3 additions & 3 deletions
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.8.2</version>
9+
<version>1.9.1</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.8.2</version>
24+
<version>1.9.1</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>life.qbic</groupId>
2929
<artifactId>project-management</artifactId>
30-
<version>1.8.2</version>
30+
<version>1.9.1</version>
3131
<scope>compile</scope>
3232
</dependency>
3333
<dependency>

finances-api/pom.xml

Lines changed: 1 addition & 1 deletion
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.8.2</version>
9+
<version>1.9.1</version>
1010
</parent>
1111

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

finances-infrastructure/pom.xml

Lines changed: 2 additions & 2 deletions
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.8.2</version>
9+
<version>1.9.1</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.8.2</version>
23+
<version>1.9.1</version>
2424
<scope>compile</scope>
2525
</dependency>
2626
<dependency>

finances/pom.xml

Lines changed: 2 additions & 2 deletions
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.8.2</version>
8+
<version>1.9.1</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.8.2</version>
41+
<version>1.9.1</version>
4242
<scope>compile</scope>
4343
</dependency>
4444
</dependencies>

identity-api/pom.xml

Lines changed: 2 additions & 2 deletions
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.8.2</version>
9+
<version>1.9.1</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.8.2</version>
24+
<version>1.9.1</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
</dependencies>

0 commit comments

Comments
 (0)