diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptDependencyTrackerTest.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptDependencyTrackerTest.java index 6ae95ce99..b840f73c8 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptDependencyTrackerTest.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptDependencyTrackerTest.java @@ -48,7 +48,7 @@ public class AbstractScriptDependencyTrackerTest { private @NonNullByDefault({}) AbstractScriptDependencyTracker scriptDependencyTracker; private @Mock @NonNullByDefault({}) WatchService watchServiceMock; - private @TempDir @NonNullByDefault({}) Path rootWatchPath; + private @NonNullByDefault({}) @TempDir Path rootWatchPath; private @NonNullByDefault({}) Path depPath; private @NonNullByDefault({}) Path depPath2; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java index 9cbdd8b22..01ac53593 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java @@ -73,7 +73,7 @@ class AbstractScriptFileWatcherTest extends JavaTest { private @Mock @NonNullByDefault({}) ReadyService readyServiceMock; private @Mock @NonNullByDefault({}) WatchService watchServiceMock; - protected @TempDir @NonNullByDefault({}) Path tempScriptDir; + protected @NonNullByDefault({}) @TempDir Path tempScriptDir; private final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java index d4edf6666..000a2b204 100644 --- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java +++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java @@ -45,10 +45,10 @@ import org.osgi.framework.BundleContext; @NonNullByDefault @ExtendWith(MockitoExtension.class) public class DateTimeTriggerHandlerTest { - private @Mock @NonNullByDefault({}) Trigger mockTrigger; - private @Mock @NonNullByDefault({}) ItemRegistry mockItemRegistry; - private @Mock @NonNullByDefault({}) BundleContext mockBundleContext; - private @Mock @NonNullByDefault({}) CronScheduler mockScheduler; + private @NonNullByDefault({}) @Mock Trigger mockTrigger; + private @NonNullByDefault({}) @Mock ItemRegistry mockItemRegistry; + private @NonNullByDefault({}) @Mock BundleContext mockBundleContext; + private @NonNullByDefault({}) @Mock CronScheduler mockScheduler; private static final String ITEM_NAME = "myItem"; private final DateTimeItem item = new DateTimeItem(ITEM_NAME); diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandlerTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandlerTest.java index 0b0e9085b..787c7ccd6 100644 --- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandlerTest.java +++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandlerTest.java @@ -204,9 +204,9 @@ public class ItemStateConditionHandlerTest extends JavaTest { private @NonNullByDefault({}) Item item; - private @Mock @NonNullByDefault({}) ItemRegistry mockItemRegistry; - private @Mock @NonNullByDefault({}) BundleContext mockBundleContext; - private @Mock @NonNullByDefault({}) TimeZoneProvider mockTimeZoneProvider; + private @NonNullByDefault({}) @Mock ItemRegistry mockItemRegistry; + private @NonNullByDefault({}) @Mock BundleContext mockBundleContext; + private @NonNullByDefault({}) @Mock TimeZoneProvider mockTimeZoneProvider; @BeforeEach public void setup() throws ItemNotFoundException { diff --git a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceEqualsFilterTest.java b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceEqualsFilterTest.java index 2316e1076..726250e24 100644 --- a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceEqualsFilterTest.java +++ b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceEqualsFilterTest.java @@ -49,7 +49,7 @@ import org.openhab.core.types.State; public class PersistenceEqualsFilterTest { private static final String ITEM_NAME = "itemName"; - private @Mock @NonNullByDefault({}) GenericItem item; + private @NonNullByDefault({}) @Mock GenericItem item; @ParameterizedTest @MethodSource("argumentProvider") diff --git a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceIncludeFilterTest.java b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceIncludeFilterTest.java index 249bd86e7..f95c8346c 100644 --- a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceIncludeFilterTest.java +++ b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/filter/PersistenceIncludeFilterTest.java @@ -44,7 +44,7 @@ import org.openhab.core.types.State; public class PersistenceIncludeFilterTest { private static final String ITEM_NAME = "itemName"; - private @Mock @NonNullByDefault({}) GenericItem item; + private @NonNullByDefault({}) @Mock GenericItem item; @ParameterizedTest @MethodSource("argumentProvider") diff --git a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java index e5987cd2a..7e00d3bee 100644 --- a/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java +++ b/bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java @@ -152,18 +152,18 @@ public class PersistenceManagerTest { private static final String TEST_MODIFIABLE_PERSISTENCE_SERVICE_ID = "testModifiablePersistenceService"; - private @Mock @NonNullByDefault({}) CronScheduler cronSchedulerMock; - private @Mock @NonNullByDefault({}) Scheduler schedulerMock; - private @Mock @NonNullByDefault({}) ScheduledCompletableFuture scheduledFutureMock; - private @Mock @NonNullByDefault({}) ItemRegistry itemRegistryMock; - private @Mock @NonNullByDefault({}) SafeCaller safeCallerMock; - private @Mock @NonNullByDefault({}) SafeCallerBuilder<@NonNull QueryablePersistenceService> safeCallerBuilderMock; - private @Mock @NonNullByDefault({}) ReadyService readyServiceMock; - private @Mock @NonNullByDefault({}) PersistenceServiceConfigurationRegistry persistenceServiceConfigurationRegistryMock; + private @NonNullByDefault({}) @Mock CronScheduler cronSchedulerMock; + private @NonNullByDefault({}) @Mock Scheduler schedulerMock; + private @NonNullByDefault({}) @Mock ScheduledCompletableFuture scheduledFutureMock; + private @NonNullByDefault({}) @Mock ItemRegistry itemRegistryMock; + private @NonNullByDefault({}) @Mock SafeCaller safeCallerMock; + private @NonNullByDefault({}) @Mock SafeCallerBuilder<@NonNull QueryablePersistenceService> safeCallerBuilderMock; + private @NonNullByDefault({}) @Mock ReadyService readyServiceMock; + private @NonNullByDefault({}) @Mock PersistenceServiceConfigurationRegistry persistenceServiceConfigurationRegistryMock; - private @Mock @NonNullByDefault({}) PersistenceService persistenceServiceMock; - private @Mock @NonNullByDefault({}) QueryablePersistenceService queryablePersistenceServiceMock; - private @Mock @NonNullByDefault({}) ModifiablePersistenceService modifiablePersistenceServiceMock; + private @NonNullByDefault({}) @Mock PersistenceService persistenceServiceMock; + private @NonNullByDefault({}) @Mock QueryablePersistenceService queryablePersistenceServiceMock; + private @NonNullByDefault({}) @Mock ModifiablePersistenceService modifiablePersistenceServiceMock; private @NonNullByDefault({}) PersistenceManagerImpl manager; diff --git a/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/FileTransformationProviderTest.java b/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/FileTransformationProviderTest.java index dce4b7544..de0aa20ad 100644 --- a/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/FileTransformationProviderTest.java +++ b/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/FileTransformationProviderTest.java @@ -65,7 +65,7 @@ public class FileTransformationProviderTest { private @Mock @NonNullByDefault({}) ProviderChangeListener<@NonNull Transformation> listenerMock; private @NonNullByDefault({}) FileTransformationProvider provider; - private @TempDir @NonNullByDefault({}) Path configPath; + private @NonNullByDefault({}) @TempDir Path configPath; private @NonNullByDefault({}) Path transformationPath; @BeforeEach diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/cache/TTSLRUCacheImplTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/cache/TTSLRUCacheImplTest.java index c8c736739..432ef9ace 100644 --- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/cache/TTSLRUCacheImplTest.java +++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/cache/TTSLRUCacheImplTest.java @@ -51,7 +51,7 @@ public class TTSLRUCacheImplTest { private @TempDir @NonNullByDefault({}) Path tempDir; - private @Mock @NonNullByDefault({}) Voice voiceMock; + private @NonNullByDefault({}) @Mock Voice voiceMock; private @Mock @NonNullByDefault({}) CachedTTSService ttsServiceMock; diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheEntryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheEntryTest.java index 711a7d22f..eba1da899 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheEntryTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheEntryTest.java @@ -52,8 +52,8 @@ public class LRUMediaCacheEntryTest { private @Mock @NonNullByDefault({}) LRUMediaCache ttsServiceMock; private @Mock @NonNullByDefault({}) Supplier> supplier; - private @Mock @NonNullByDefault({}) StorageService storageService; - private @Mock @NonNullByDefault({}) Storage storage; + private @NonNullByDefault({}) @Mock StorageService storageService; + private @NonNullByDefault({}) @Mock Storage storage; @BeforeEach public void init() { diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java index 18ee23955..b648183af 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java @@ -53,8 +53,8 @@ public class LRUMediaCacheTest { private @Mock @NonNullByDefault({}) InputStream inputStreamMock; private @Mock @NonNullByDefault({}) Supplier> supplier; - private @Mock @NonNullByDefault({}) StorageService storageService; - private @Mock @NonNullByDefault({}) Storage storage; + private @NonNullByDefault({}) @Mock StorageService storageService; + private @NonNullByDefault({}) @Mock Storage storage; @BeforeEach public void init() { diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/common/SafeCallerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/common/SafeCallerImplTest.java index 0ae0624d2..662a3315c 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/common/SafeCallerImplTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/common/SafeCallerImplTest.java @@ -81,8 +81,8 @@ public class SafeCallerImplTest extends JavaTest { private @NonNullByDefault({}) QueueingThreadPoolExecutor scheduler; private @NonNullByDefault({}) TestInfo testInfo; - private @Mock @NonNullByDefault({}) Runnable timeoutHandlerMock; - private @Mock @NonNullByDefault({}) Consumer errorHandlerMock; + private @NonNullByDefault({}) @Mock Runnable timeoutHandlerMock; + private @NonNullByDefault({}) @Mock Consumer errorHandlerMock; @FunctionalInterface public interface ITarget { diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/WatchServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/WatchServiceImplTest.java index a424ea647..b32335ecf 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/WatchServiceImplTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/WatchServiceImplTest.java @@ -55,7 +55,7 @@ public class WatchServiceImplTest extends JavaTest { public @Mock @NonNullByDefault({}) BundleContext bundleContextMock; private @NonNullByDefault({}) WatchServiceImpl watchService; - private @TempDir @NonNullByDefault({}) Path rootPath; + private @NonNullByDefault({}) @TempDir Path rootPath; private @NonNullByDefault({}) TestWatchEventListener listener; @BeforeEach diff --git a/pom.xml b/pom.xml index 16bd7bce7..3753aebf2 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ Import-Package: \\ org.eclipse.jdt ecj - 3.44.0 + 3.43.0