Skip to content

Commit f5c0d3e

Browse files
lsiepellsiepel
committed
Review comments
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
1 parent 08983d9 commit f5c0d3e

5 files changed

Lines changed: 19 additions & 21 deletions

File tree

‎bundles/org.openhab.binding.jellyfin/src/main/java/org/openhab/binding/jellyfin/internal/discovery/ClientDiscoveryService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public void discoverClients() {
198198
}
199199

200200
// Second pass: publish discovery results for deduplicated clients
201-
Configuration config = thingHandler.getBindingConfig();
201+
Configuration config = thingHandler.getBridgeConfig();
202202
for (Map.Entry<String, SessionInfoDto> entry : deduped.entrySet()) {
203203
SessionInfoDto session = entry.getValue();
204204
String deviceId = entry.getKey();

‎bundles/org.openhab.binding.jellyfin/src/main/java/org/openhab/binding/jellyfin/internal/handler/ServerHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ public void initialize() {
673673
}
674674
}
675675

676-
public Configuration getBindingConfig() {
676+
public Configuration getBridgeConfig() {
677677
return getConfigAs(Configuration.class);
678678
}
679679

‎bundles/org.openhab.binding.jellyfin/src/test/java/org/openhab/binding/jellyfin/internal/handler/ClientDiscoveryServiceTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void setUp() throws Exception {
7171
when(serverHandler.getThing()).thenReturn(bridge);
7272

7373
// All categories enabled by default so existing tests are unaffected
74-
when(serverHandler.getBindingConfig()).thenReturn(allCategoriesEnabled());
74+
when(serverHandler.getBridgeConfig()).thenReturn(allCategoriesEnabled());
7575

7676
// Return empty collection by default so existing tests are unaffected
7777
when(thingRegistry.getAll()).thenReturn(Collections.emptyList());
@@ -394,7 +394,7 @@ void testDiscoverClientsDeduplicatesPrefixDeviceIds() {
394394

395395
@Test
396396
void testWebClientSkippedWhenDiscoverWebClientsIsFalse() {
397-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(false, true, true, true, true, true, true));
397+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(false, true, true, true, true, true, true));
398398
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("web-1", "Jellyfin Web")));
399399

400400
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -406,7 +406,7 @@ void testWebClientSkippedWhenDiscoverWebClientsIsFalse() {
406406

407407
@Test
408408
void testWebClientDiscoveredWhenDiscoverWebClientsIsTrue() {
409-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, true, true, true, true));
409+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, true, true, true, true));
410410
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("web-1", "Jellyfin Web")));
411411

412412
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -418,7 +418,7 @@ void testWebClientDiscoveredWhenDiscoverWebClientsIsTrue() {
418418

419419
@Test
420420
void testAndroidClientSkippedWhenDiscoverAndroidClientsIsFalse() {
421-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, false, true, true, true, true, true));
421+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, false, true, true, true, true, true));
422422
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("android-1", "Jellyfin for Android")));
423423

424424
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -431,7 +431,7 @@ void testAndroidClientSkippedWhenDiscoverAndroidClientsIsFalse() {
431431
@Test
432432
void testAndroidTvClientSkippedWhenDiscoverAndroidTvClientsIsFalse() {
433433
// Android TV disabled, plain Android enabled — TV client must be skipped
434-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, false, true, true, true, true));
434+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, false, true, true, true, true));
435435
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("atv-1", "Jellyfin for Android TV")));
436436

437437
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -444,7 +444,7 @@ void testAndroidTvClientSkippedWhenDiscoverAndroidTvClientsIsFalse() {
444444
@Test
445445
void testAndroidTvClientNotMatchedByAndroidFilter() {
446446
// Android TV enabled, plain Android disabled — TV client must still be discovered
447-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, false, true, true, true, true, true));
447+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, false, true, true, true, true, true));
448448
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("atv-1", "Jellyfin for Android TV")));
449449

450450
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -456,7 +456,7 @@ void testAndroidTvClientNotMatchedByAndroidFilter() {
456456

457457
@Test
458458
void testIosClientSkippedWhenDiscoverIosClientsIsFalse() {
459-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
459+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
460460
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("ios-1", "Jellyfin iOS")));
461461

462462
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -468,7 +468,7 @@ void testIosClientSkippedWhenDiscoverIosClientsIsFalse() {
468468

469469
@Test
470470
void testSwiftfinMatchedAsIosCategory() {
471-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
471+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
472472
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("swiftfin-1", "Swiftfin")));
473473

474474
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -480,7 +480,7 @@ void testSwiftfinMatchedAsIosCategory() {
480480

481481
@Test
482482
void testInfuseMatchedAsIosCategory() {
483-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
483+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, false, true, true, true));
484484
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("infuse-1", "Infuse")));
485485

486486
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -492,7 +492,7 @@ void testInfuseMatchedAsIosCategory() {
492492

493493
@Test
494494
void testKodiClientSkippedWhenDiscoverKodiClientsIsFalse() {
495-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, true, false, true, true));
495+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, true, false, true, true));
496496
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("kodi-1", "JellyCon")));
497497

498498
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -504,7 +504,7 @@ void testKodiClientSkippedWhenDiscoverKodiClientsIsFalse() {
504504

505505
@Test
506506
void testRokuClientSkippedWhenDiscoverRokuClientsIsFalse() {
507-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, true, true, false, true));
507+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, true, true, false, true));
508508
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("roku-1", "Jellyfin for Roku")));
509509

510510
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -516,7 +516,7 @@ void testRokuClientSkippedWhenDiscoverRokuClientsIsFalse() {
516516

517517
@Test
518518
void testUnknownClientSkippedWhenDiscoverOtherClientsIsFalse() {
519-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, true, true, true, false));
519+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, true, true, true, false));
520520
when(serverHandler.getClients()).thenReturn(Map.of("s1", sessionWith("other-1", "Some Unknown App")));
521521

522522
DiscoveryListener listener = mock(DiscoveryListener.class);
@@ -528,7 +528,7 @@ void testUnknownClientSkippedWhenDiscoverOtherClientsIsFalse() {
528528

529529
@Test
530530
void testNullClientNameFallsIntoOtherCategory() {
531-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(true, true, true, true, true, true, false));
531+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(true, true, true, true, true, true, false));
532532
SessionInfoDto session = new SessionInfoDto();
533533
session.setDeviceId("null-client-1");
534534
session.setDeviceName("Unknown Device");
@@ -544,7 +544,7 @@ void testNullClientNameFallsIntoOtherCategory() {
544544

545545
@Test
546546
void testAllFiltersDisabledResultsInNoDiscovery() {
547-
when(serverHandler.getBindingConfig()).thenReturn(buildConfig(false, false, false, false, false, false, false));
547+
when(serverHandler.getBridgeConfig()).thenReturn(buildConfig(false, false, false, false, false, false, false));
548548

549549
Map<String, SessionInfoDto> clients = new HashMap<>();
550550
clients.put("s1", sessionWith("web-1", "Jellyfin Web"));

‎bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/IPBridgeHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
131131
}
132132

133133
@Override
134-
public synchronized void initialize() {
134+
public void initialize() {
135135
this.config = getConfigAs(IPBridgeConfig.class);
136136

137137
if (validConfiguration(this.config)) {

‎bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/handler/NeeoDeviceHandler.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,8 @@ private void addProperty(Map<String, String> properties, String key, @Nullable S
306306
@Nullable
307307
private String getRoomKey() {
308308
final Bridge bridge = getBridge();
309-
if (bridge != null) {
310-
if (bridge.getHandler() instanceof NeeoRoomHandler neeoRoomHandler) {
311-
return neeoRoomHandler.getBindingConfig().getRoomKey();
312-
}
309+
if (bridge != null && bridge.getHandler() instanceof NeeoRoomHandler neeoRoomHandler) {
310+
return neeoRoomHandler.getBridgeConfig().getRoomKey();
313311
}
314312
return null;
315313
}

0 commit comments

Comments
 (0)