Skip to content

Commit 5bde1ec

Browse files
committed
Update SCL initialisation method to allow the creation with a specific header.id
Signed-off-by: SAINTIER FRANCOIS <[email protected]>
1 parent ab2483a commit 5bde1ec

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public class SclService {
4747

4848
private SclService(){ throw new IllegalStateException("SclService class"); }
4949

50-
public static SclRootAdapter initScl(String hVersion, String hRevision) throws ScdException {
51-
UUID hId = UUID.randomUUID();
52-
return new SclRootAdapter(hId.toString(),hVersion,hRevision);
50+
public static SclRootAdapter initScl(Optional<UUID> hId, String hVersion, String hRevision) throws ScdException {
51+
UUID headerId = hId.orElseGet(UUID::randomUUID);
52+
return new SclRootAdapter(headerId.toString(), hVersion, hRevision);
5353
}
5454

5555
public static SclRootAdapter addHistoryItem(SCL scd, String who, String what, String why){

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/SclServiceTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
3333

3434
import java.util.List;
35+
import java.util.Optional;
3536
import java.util.Set;
3637
import java.util.UUID;
3738

@@ -314,15 +315,23 @@ void testGetDAI() throws Exception {
314315
@Test
315316
void testInitScl(){
316317
assertDoesNotThrow(
317-
() -> SclService.initScl("hVersion","hRevision")
318+
() -> SclService.initScl(Optional.empty(), "hVersion","hRevision")
319+
);
320+
}
321+
322+
@Test
323+
void testInitScl_With_hId_shouldNotThrowError(){
324+
UUID hid = UUID.randomUUID();
325+
assertDoesNotThrow(
326+
() -> SclService.initScl(Optional.of(hid),"hVersion","hRevision")
318327
);
319328
}
320329

321330
@Test
322331
void testUpdateHeader() {
323332

324333
SclRootAdapter sclRootAdapter = assertDoesNotThrow(
325-
() -> SclService.initScl("hVersion","hRevision")
334+
() -> SclService.initScl(Optional.empty(),"hVersion","hRevision")
326335
);
327336
UUID hId = UUID.fromString(sclRootAdapter.getHeaderAdapter().getHeaderId());
328337
HeaderDTO headerDTO = DTO.createHeaderDTO(hId);

0 commit comments

Comments
 (0)