Skip to content

Commit ab9d7e3

Browse files
dependabot[bot]dependabot[bot]
authored
Bump org.eclipse.jdt:ecj from 3.43.0 to 3.45.0 (openhab#19764)
* Bump org.eclipse.jdt:ecj from 3.43.0 to 3.45.0 Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.43.0 to 3.45.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) * Change order of Mock and Nullable annotations * Fix visibility Also-by: Holger Friedrich <mail@holger-friedrich.de> Signed-off-by: dependabot[bot] <support@github.com>
1 parent 0c334de commit ab9d7e3

22 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎bundles/org.openhab.binding.bluetooth.grundfosalpha/src/test/java/org/openhab/binding/bluetooth/grundfosalpha/internal/handler/GrundfosAlphaReaderHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
@ExtendWith(MockitoExtension.class)
4545
class GrundfosAlphaReaderHandlerTest {
4646

47-
private @NonNullByDefault({}) @Mock Thing thingMock;
48-
private @NonNullByDefault({}) @Mock ThingHandlerCallback callback;
47+
private @Mock @NonNullByDefault({}) Thing thingMock;
48+
private @Mock @NonNullByDefault({}) ThingHandlerCallback callback;
4949

5050
@Test
5151
public void testMessageType0xf1() {

‎bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/ScenarioHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ protected static Exception[] httpExceptionData() {
7171

7272
private @NonNullByDefault({}) ScenarioHandler fixture;
7373

74-
private @NonNullByDefault({}) @Mock BoschHttpClient httpClient;
75-
private @NonNullByDefault({}) @Mock Request request;
74+
private @Mock @NonNullByDefault({}) BoschHttpClient httpClient;
75+
private @Mock @NonNullByDefault({}) Request request;
7676

7777
@BeforeEach
7878
void beforeEach() {

‎bundles/org.openhab.binding.danfossairunit/src/test/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
@ExtendWith(MockitoExtension.class)
4343
public class DanfossAirUnitTest {
4444

45-
private @NonNullByDefault({}) @Mock CommunicationController communicationController;
46-
private @NonNullByDefault({}) @Mock TimeZoneProvider timeZoneProvider;
45+
private @Mock @NonNullByDefault({}) CommunicationController communicationController;
46+
private @Mock @NonNullByDefault({}) TimeZoneProvider timeZoneProvider;
4747

4848
@Test
4949
void getUnitNameIsReturned() throws IOException {

‎bundles/org.openhab.binding.dsmr/src/test/java/org/openhab/binding/dsmr/internal/device/DSMRSerialAutoDeviceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ public class DSMRSerialAutoDeviceTest {
6565
private static final String DUMMY_PORTNAME = "/dev/dummy-serial";
6666
private static final String TELEGRAM_NAME = "dsmr_50";
6767

68-
private @NonNullByDefault({}) @Mock SerialPortIdentifier mockIdentifier;
69-
private @NonNullByDefault({}) @Mock ScheduledExecutorService scheduler;
70-
private @NonNullByDefault({}) @Mock SerialPort mockSerialPort;
68+
private @Mock @NonNullByDefault({}) SerialPortIdentifier mockIdentifier;
69+
private @Mock @NonNullByDefault({}) ScheduledExecutorService scheduler;
70+
private @Mock @NonNullByDefault({}) SerialPort mockSerialPort;
7171

7272
private final SerialPortManager serialPortManager = new SerialPortManager() {
7373
@Override

‎bundles/org.openhab.binding.dsmr/src/test/java/org/openhab/binding/dsmr/internal/discovery/DSMRMeterDiscoveryServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public class DSMRMeterDiscoveryServiceTest {
5454
private static final String EXPECTED_CONFIGURED_TELEGRAM = "dsmr_50";
5555
private static final String UNREGISTERED_METER_TELEGRAM = "unregistered_meter";
5656

57-
private @NonNullByDefault({}) @Mock(answer = Answers.RETURNS_DEEP_STUBS) DSMRBridgeHandler bridge;
58-
private @NonNullByDefault({}) @Mock Thing thing;
59-
private @NonNullByDefault({}) @Mock DSMRMeterHandler meterHandler;
57+
private @Mock(answer = Answers.RETURNS_DEEP_STUBS) @NonNullByDefault({}) DSMRBridgeHandler bridge;
58+
private @Mock @NonNullByDefault({}) Thing thing;
59+
private @Mock @NonNullByDefault({}) DSMRMeterHandler meterHandler;
6060

6161
/**
6262
* Test if discovery reports when the user has incorrectly configured the binding with the wrong meter types.

‎bundles/org.openhab.binding.energidataservice/src/test/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActionsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
@MockitoSettings(strictness = Strictness.LENIENT)
6969
public class EnergiDataServiceActionsTest {
7070

71-
private @NonNullByDefault({}) @Mock EnergiDataServiceHandler handler;
71+
private @Mock @NonNullByDefault({}) EnergiDataServiceHandler handler;
7272
private EnergiDataServiceActions actions = new EnergiDataServiceActions();
7373

7474
private Gson gson = new GsonBuilder().registerTypeAdapter(Instant.class, new InstantDeserializer())

‎bundles/org.openhab.binding.energidataservice/src/test/java/org/openhab/binding/energidataservice/internal/provider/ElectricityPriceProviderTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
@MockitoSettings(strictness = Strictness.LENIENT)
6767
public class ElectricityPriceProviderTest {
6868

69-
private @NonNullByDefault({}) @Mock Scheduler scheduler;
70-
private @NonNullByDefault({}) @Mock ApiController apiController;
71-
private @NonNullByDefault({}) @Mock TimeZoneProvider timeZoneProvider;
72-
private @NonNullByDefault({}) @Mock MockedListener listener1;
73-
private @NonNullByDefault({}) @Mock MockedListener listener2;
69+
private @Mock @NonNullByDefault({}) Scheduler scheduler;
70+
private @Mock @NonNullByDefault({}) ApiController apiController;
71+
private @Mock @NonNullByDefault({}) TimeZoneProvider timeZoneProvider;
72+
private @Mock @NonNullByDefault({}) MockedListener listener1;
73+
private @Mock @NonNullByDefault({}) MockedListener listener2;
7474
private @NonNullByDefault({}) ElectricityPriceProvider provider;
7575

7676
@SuppressWarnings("unchecked")

‎bundles/org.openhab.binding.groupepsa/src/test/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandlerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public class GroupePSAHandlerTest {
5858
private @NonNullByDefault({}) GroupePSABridgeHandler bridgeHandler;
5959
private @NonNullByDefault({}) GroupePSAHandler thingHandler;
6060

61-
private @NonNullByDefault({}) @Mock ThingHandlerCallback thingCallback;
62-
private @NonNullByDefault({}) @Mock ThingHandlerCallback bridgeCallback;
63-
private @NonNullByDefault({}) @Mock Thing thing;
64-
private @NonNullByDefault({}) @Mock Bridge bridge;
61+
private @Mock @NonNullByDefault({}) ThingHandlerCallback thingCallback;
62+
private @Mock @NonNullByDefault({}) ThingHandlerCallback bridgeCallback;
63+
private @Mock @NonNullByDefault({}) Thing thing;
64+
private @Mock @NonNullByDefault({}) Bridge bridge;
6565

66-
private @NonNullByDefault({}) @Mock OAuthFactory oAuthFactory;
67-
private @NonNullByDefault({}) @Mock HttpClient httpClient;
66+
private @Mock @NonNullByDefault({}) OAuthFactory oAuthFactory;
67+
private @Mock @NonNullByDefault({}) HttpClient httpClient;
6868

6969
static String getResourceFileAsString(String fileName) throws GroupePSACommunicationException {
7070
try (InputStream is = GroupePSAConnectApi.class.getResourceAsStream(fileName)) {

‎bundles/org.openhab.binding.homekit/src/main/java/org/openhab/binding/homekit/internal/dto/Characteristic.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public class Characteristic {
6969
public @NonNullByDefault({}) String description;
7070
public @NonNullByDefault({}) Boolean ev; // e.g. true (events requested)
7171
public @NonNullByDefault({}) Long aid; // e.g. 10
72-
public @NonNullByDefault({}) @SerializedName("valid-values") List<Integer> validValues;
73-
public @NonNullByDefault({}) @SerializedName("valid-values-range") List<Integer> validValuesRange;
72+
public @SerializedName("valid-values") @NonNullByDefault({}) List<Integer> validValues;
73+
public @SerializedName("valid-values-range") @NonNullByDefault({}) List<Integer> validValuesRange;
7474
public @NonNullByDefault({}) Integer status;
7575

7676
/**

‎bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/ProductData.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626
@NonNullByDefault
2727
public class ProductData {
28-
private @NonNullByDefault({}) @SerializedName("model_id") String modelId;
29-
private @NonNullByDefault({}) @SerializedName("manufacturer_name") String manufacturerName;
30-
private @NonNullByDefault({}) @SerializedName("product_name") String productName;
31-
private @NonNullByDefault({}) @SerializedName("product_archetype") String productArchetype;
28+
private @SerializedName("model_id") @NonNullByDefault({}) String modelId;
29+
private @SerializedName("manufacturer_name") @NonNullByDefault({}) String manufacturerName;
30+
private @SerializedName("product_name") @NonNullByDefault({}) String productName;
31+
private @SerializedName("product_archetype") @NonNullByDefault({}) String productArchetype;
3232
private @NonNullByDefault({}) Boolean certified;
33-
private @NonNullByDefault({}) @SerializedName("software_version") String softwareVersion;
34-
private @Nullable @SerializedName("hardware_platform_type") String hardwarePlatformType;
33+
private @SerializedName("software_version") @NonNullByDefault({}) String softwareVersion;
34+
private @SerializedName("hardware_platform_type") @Nullable String hardwarePlatformType;
3535

3636
public String getModelId() {
3737
return modelId;

0 commit comments

Comments
 (0)