Skip to content

Commit d6f8f44

Browse files
Bump org.eclipse.jdt:ecj from 3.43.0 to 3.45.0
Co-authored-by: holgerfriedrich <2121139+holgerfriedrich@users.noreply.github.com>
1 parent 495332f commit d6f8f44

12 files changed

Lines changed: 31 additions & 31 deletions

File tree

bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptDependencyTrackerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class AbstractScriptDependencyTrackerTest {
4848

4949
private @NonNullByDefault({}) AbstractScriptDependencyTracker scriptDependencyTracker;
5050
private @Mock @NonNullByDefault({}) WatchService watchServiceMock;
51-
private @NonNullByDefault({}) @TempDir Path rootWatchPath;
51+
private @TempDir @NonNullByDefault({}) Path rootWatchPath;
5252
private @NonNullByDefault({}) Path depPath;
5353
private @NonNullByDefault({}) Path depPath2;
5454

bundles/org.openhab.core.automation.module.script.rulesupport/src/test/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcherTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class AbstractScriptFileWatcherTest extends JavaTest {
7373
private @Mock @NonNullByDefault({}) ReadyService readyServiceMock;
7474
private @Mock @NonNullByDefault({}) WatchService watchServiceMock;
7575

76-
protected @NonNullByDefault({}) @TempDir Path tempScriptDir;
76+
protected @TempDir @NonNullByDefault({}) Path tempScriptDir;
7777

7878
private final AtomicInteger atomicInteger = new AtomicInteger();
7979

bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/DateTimeTriggerHandlerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
@NonNullByDefault
4646
@ExtendWith(MockitoExtension.class)
4747
public class DateTimeTriggerHandlerTest {
48-
private @NonNullByDefault({}) @Mock Trigger mockTrigger;
49-
private @NonNullByDefault({}) @Mock ItemRegistry mockItemRegistry;
50-
private @NonNullByDefault({}) @Mock BundleContext mockBundleContext;
51-
private @NonNullByDefault({}) @Mock CronScheduler mockScheduler;
48+
private @Mock @NonNullByDefault({}) Trigger mockTrigger;
49+
private @Mock @NonNullByDefault({}) ItemRegistry mockItemRegistry;
50+
private @Mock @NonNullByDefault({}) BundleContext mockBundleContext;
51+
private @Mock @NonNullByDefault({}) CronScheduler mockScheduler;
5252

5353
private static final String ITEM_NAME = "myItem";
5454
private final DateTimeItem item = new DateTimeItem(ITEM_NAME);

bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandlerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ public static Collection<Object[]> lessThanOrEqualsParameters() {
204204

205205
private @NonNullByDefault({}) Item item;
206206

207-
private @NonNullByDefault({}) @Mock ItemRegistry mockItemRegistry;
208-
private @NonNullByDefault({}) @Mock BundleContext mockBundleContext;
209-
private @NonNullByDefault({}) @Mock TimeZoneProvider mockTimeZoneProvider;
207+
private @Mock @NonNullByDefault({}) ItemRegistry mockItemRegistry;
208+
private @Mock @NonNullByDefault({}) BundleContext mockBundleContext;
209+
private @Mock @NonNullByDefault({}) TimeZoneProvider mockTimeZoneProvider;
210210

211211
@BeforeEach
212212
public void setup() throws ItemNotFoundException {

bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,18 @@ public String getName() {
151151

152152
private static final String TEST_MODIFIABLE_PERSISTENCE_SERVICE_ID = "testModifiablePersistenceService";
153153

154-
private @NonNullByDefault({}) @Mock CronScheduler cronSchedulerMock;
155-
private @NonNullByDefault({}) @Mock Scheduler schedulerMock;
156-
private @NonNullByDefault({}) @Mock ScheduledCompletableFuture<Void> scheduledFutureMock;
157-
private @NonNullByDefault({}) @Mock ItemRegistry itemRegistryMock;
158-
private @NonNullByDefault({}) @Mock SafeCaller safeCallerMock;
159-
private @NonNullByDefault({}) @Mock SafeCallerBuilder<@NonNull QueryablePersistenceService> safeCallerBuilderMock;
160-
private @NonNullByDefault({}) @Mock ReadyService readyServiceMock;
161-
private @NonNullByDefault({}) @Mock PersistenceServiceConfigurationRegistry persistenceServiceConfigurationRegistryMock;
162-
163-
private @NonNullByDefault({}) @Mock PersistenceService persistenceServiceMock;
164-
private @NonNullByDefault({}) @Mock QueryablePersistenceService queryablePersistenceServiceMock;
165-
private @NonNullByDefault({}) @Mock ModifiablePersistenceService modifiablePersistenceServiceMock;
154+
private @Mock @NonNullByDefault({}) CronScheduler cronSchedulerMock;
155+
private @Mock @NonNullByDefault({}) Scheduler schedulerMock;
156+
private @Mock @NonNullByDefault({}) ScheduledCompletableFuture<Void> scheduledFutureMock;
157+
private @Mock @NonNullByDefault({}) ItemRegistry itemRegistryMock;
158+
private @Mock @NonNullByDefault({}) SafeCaller safeCallerMock;
159+
private @Mock @NonNullByDefault({}) SafeCallerBuilder<@NonNull QueryablePersistenceService> safeCallerBuilderMock;
160+
private @Mock @NonNullByDefault({}) ReadyService readyServiceMock;
161+
private @Mock @NonNullByDefault({}) PersistenceServiceConfigurationRegistry persistenceServiceConfigurationRegistryMock;
162+
163+
private @Mock @NonNullByDefault({}) PersistenceService persistenceServiceMock;
164+
private @Mock @NonNullByDefault({}) QueryablePersistenceService queryablePersistenceServiceMock;
165+
private @Mock @NonNullByDefault({}) ModifiablePersistenceService modifiablePersistenceServiceMock;
166166

167167
private @NonNullByDefault({}) PersistenceManagerImpl manager;
168168

bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/FileTransformationProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class FileTransformationProviderTest {
6565
private @Mock @NonNullByDefault({}) ProviderChangeListener<@NonNull Transformation> listenerMock;
6666

6767
private @NonNullByDefault({}) FileTransformationProvider provider;
68-
private @NonNullByDefault({}) @TempDir Path configPath;
68+
private @TempDir @NonNullByDefault({}) Path configPath;
6969
private @NonNullByDefault({}) Path transformationPath;
7070

7171
@BeforeEach

bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/internal/cache/TTSLRUCacheImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class TTSLRUCacheImplTest {
5151

5252
private @TempDir @NonNullByDefault({}) Path tempDir;
5353

54-
private @NonNullByDefault({}) @Mock Voice voiceMock;
54+
private @Mock @NonNullByDefault({}) Voice voiceMock;
5555

5656
private @Mock @NonNullByDefault({}) CachedTTSService ttsServiceMock;
5757

bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheEntryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public class LRUMediaCacheEntryTest {
5252
private @Mock @NonNullByDefault({}) LRUMediaCache<MetadataSample> ttsServiceMock;
5353
private @Mock @NonNullByDefault({}) Supplier<LRUMediaCacheEntry<MetadataSample>> supplier;
5454

55-
private @NonNullByDefault({}) @Mock StorageService storageService;
56-
private @NonNullByDefault({}) @Mock Storage<MetadataSample> storage;
55+
private @Mock @NonNullByDefault({}) StorageService storageService;
56+
private @Mock @NonNullByDefault({}) Storage<MetadataSample> storage;
5757

5858
@BeforeEach
5959
public void init() {

bundles/org.openhab.core/src/test/java/org/openhab/core/cache/lru/LRUMediaCacheTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public class LRUMediaCacheTest {
5353
private @Mock @NonNullByDefault({}) InputStream inputStreamMock;
5454
private @Mock @NonNullByDefault({}) Supplier<LRUMediaCacheEntry<MetadataSample>> supplier;
5555

56-
private @NonNullByDefault({}) @Mock StorageService storageService;
57-
private @NonNullByDefault({}) @Mock Storage<MetadataSample> storage;
56+
private @Mock @NonNullByDefault({}) StorageService storageService;
57+
private @Mock @NonNullByDefault({}) Storage<MetadataSample> storage;
5858

5959
@BeforeEach
6060
public void init() {

bundles/org.openhab.core/src/test/java/org/openhab/core/internal/common/SafeCallerImplTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public class SafeCallerImplTest extends JavaTest {
8181
private @NonNullByDefault({}) QueueingThreadPoolExecutor scheduler;
8282
private @NonNullByDefault({}) TestInfo testInfo;
8383

84-
private @NonNullByDefault({}) @Mock Runnable timeoutHandlerMock;
85-
private @NonNullByDefault({}) @Mock Consumer<Throwable> errorHandlerMock;
84+
private @Mock @NonNullByDefault({}) Runnable timeoutHandlerMock;
85+
private @Mock @NonNullByDefault({}) Consumer<Throwable> errorHandlerMock;
8686

8787
@FunctionalInterface
8888
public interface ITarget {

0 commit comments

Comments
 (0)