mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
Revert "Bump org.eclipse.jdt:ecj from 3.43.0 to 3.44.0 (#5179)"
This reverts commit e05bf6169e.
This commit is contained in:
Holger Friedrich
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
|
||||
+4
-4
@@ -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);
|
||||
|
||||
+3
-3
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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")
|
||||
|
||||
+1
-1
@@ -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")
|
||||
|
||||
+11
-11
@@ -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<Void> 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<Void> 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;
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
Vendored
+2
-2
@@ -52,8 +52,8 @@ public class LRUMediaCacheEntryTest {
|
||||
private @Mock @NonNullByDefault({}) LRUMediaCache<MetadataSample> ttsServiceMock;
|
||||
private @Mock @NonNullByDefault({}) Supplier<LRUMediaCacheEntry<MetadataSample>> supplier;
|
||||
|
||||
private @Mock @NonNullByDefault({}) StorageService storageService;
|
||||
private @Mock @NonNullByDefault({}) Storage<MetadataSample> storage;
|
||||
private @NonNullByDefault({}) @Mock StorageService storageService;
|
||||
private @NonNullByDefault({}) @Mock Storage<MetadataSample> storage;
|
||||
|
||||
@BeforeEach
|
||||
public void init() {
|
||||
|
||||
+2
-2
@@ -53,8 +53,8 @@ public class LRUMediaCacheTest {
|
||||
private @Mock @NonNullByDefault({}) InputStream inputStreamMock;
|
||||
private @Mock @NonNullByDefault({}) Supplier<LRUMediaCacheEntry<MetadataSample>> supplier;
|
||||
|
||||
private @Mock @NonNullByDefault({}) StorageService storageService;
|
||||
private @Mock @NonNullByDefault({}) Storage<MetadataSample> storage;
|
||||
private @NonNullByDefault({}) @Mock StorageService storageService;
|
||||
private @NonNullByDefault({}) @Mock Storage<MetadataSample> storage;
|
||||
|
||||
@BeforeEach
|
||||
public void init() {
|
||||
|
||||
+2
-2
@@ -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<Throwable> errorHandlerMock;
|
||||
private @NonNullByDefault({}) @Mock Runnable timeoutHandlerMock;
|
||||
private @NonNullByDefault({}) @Mock Consumer<Throwable> errorHandlerMock;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface ITarget {
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user