From efb20ddea8d3e23ae03e992fc33b04d528e88e86 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Tue, 23 Jan 2024 18:40:01 +0100 Subject: [PATCH] feat(imp):[#214] fix license header and merge conflict compile problem --- .../irs/common/util/concurrent/ResultFinder.java | 4 ++-- .../irs/common/util/concurrent/ResultFinderTest.java | 6 +++--- .../DecentralDigitalTwinRegistryServiceTest.java | 11 +++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/irs-common/src/main/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinder.java b/irs-common/src/main/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinder.java index 655494eb1b..27d08284a4 100644 --- a/irs-common/src/main/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinder.java +++ b/irs-common/src/main/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinder.java @@ -1,8 +1,8 @@ /******************************************************************************** - * Copyright (c) 2021,2022,2023 + * Copyright (c) 2022,2024 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * 2022,2023: BOSCH AG * Copyright (c) 2021,2024 Contributors to the Eclipse Foundation * diff --git a/irs-common/src/test/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinderTest.java b/irs-common/src/test/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinderTest.java index 7e92ae1f5b..c98ea5e83c 100644 --- a/irs-common/src/test/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinderTest.java +++ b/irs-common/src/test/java/org/eclipse/tractusx/irs/common/util/concurrent/ResultFinderTest.java @@ -1,10 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022,2023 + * Copyright (c) 2022,2024 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * 2022,2023: BOSCH AG - * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation + * Copyright (c) 2021,2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DecentralDigitalTwinRegistryServiceTest.java b/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DecentralDigitalTwinRegistryServiceTest.java index 7111d085a0..76b26d5008 100644 --- a/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DecentralDigitalTwinRegistryServiceTest.java +++ b/irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/decentral/DecentralDigitalTwinRegistryServiceTest.java @@ -225,9 +225,12 @@ void shouldReturnExpectedGlobalAssetId() throws RegistryServiceException { expectedShell); // when - final var assetAdministrationShellDescriptors = sut.lookupGlobalAssetIds(digitalTwinRegistryKey.bpn()); + final var assetAdministrationShellDescriptors = sut.lookupShellsByBPN(digitalTwinRegistryKey.bpn()); - String actualGlobalAssetId = assetAdministrationShellDescriptors.stream().findFirst().map(AssetAdministrationShellDescriptor::getGlobalAssetId).get();// then + String actualGlobalAssetId = assetAdministrationShellDescriptors.stream() + .findFirst() + .map(AssetAdministrationShellDescriptor::getGlobalAssetId) + .get();// then assertThat(actualGlobalAssetId).isEqualTo(expectedGlobalAssetId); } @@ -237,7 +240,7 @@ void whenInterruptedExceptionOccurs() throws ExecutionException, InterruptedExce simulateResultFinderInterrupted(); // when - final ThrowingCallable call = () -> sut.lookupGlobalAssetIds("dummyBpn"); + final ThrowingCallable call = () -> sut.lookupShellsByBPN("dummyBpn"); // then assertThatThrownBy(call).isInstanceOf(ShellNotFoundException.class) @@ -251,7 +254,7 @@ void whenExecutionExceptionOccurs() { // when final var bpn = "dummyBpn"; - final ThrowingCallable call = () -> sut.lookupGlobalAssetIds(bpn); + final ThrowingCallable call = () -> sut.lookupShellsByBPN(bpn); // then assertThatThrownBy(call).isInstanceOf(RegistryServiceRuntimeException.class)