Skip to content

Commit 779f06b

Browse files
mlobsteinmarkus7017
authored andcommitted
[oppo] rollforward a few review changes from sister bindings and fix a title (openhab#8335)
* Rollforward a few review changes * fix thread naming convention Signed-off-by: Michael Lobstein <[email protected]>
1 parent 9e2864f commit 779f06b

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

bundles/org.openhab.binding.oppo/src/main/feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<features name="org.openhab.binding.oppo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
33
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
44

5-
<feature name="openhab-binding-oppo" description="Oppo Whole House Audio Binding" version="${project.version}">
5+
<feature name="openhab-binding-oppo" description="Oppo Blu-ray Player Binding" version="${project.version}">
66
<feature>openhab-runtime-base</feature>
77
<feature>openhab-transport-serial</feature>
88
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.oppo/${project.version}</bundle>

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public enum OppoCommand {
6666
SET_INPUT_SOURCE("SIS"),
6767
NO_OP("NOP");
6868

69-
private String value;
69+
private final String value;
7070

7171
public static final Set<OppoCommand> INITIAL_COMMANDS = new HashSet<>(
7272
Arrays.asList(QUERY_POWER_STATUS, QUERY_FIRMWARE_VERSION, QUERY_VOLUME, QUERY_HDMI_RESOLUTION,

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class OppoConnector {
5858

5959
private @Nullable Thread readerThread;
6060

61-
private List<OppoMessageEventListener> listeners = new ArrayList<>();
61+
private final List<OppoMessageEventListener> listeners = new ArrayList<>();
6262

6363
/**
6464
* Called when using direct IP connection for 83/93/95/103/105
@@ -135,12 +135,12 @@ protected void cleanup() {
135135
}
136136
if (readerThread != null) {
137137
readerThread.interrupt();
138+
this.readerThread = null;
138139
try {
139140
readerThread.join(3000);
140141
} catch (InterruptedException e) {
141142
logger.warn("Error joining readerThread: {}", e.getMessage());
142143
}
143-
this.readerThread = null;
144144
}
145145
}
146146

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoIpConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
public class OppoIpConnector extends OppoConnector {
3636
private final Logger logger = LoggerFactory.getLogger(OppoIpConnector.class);
3737

38-
private @Nullable String address;
39-
private int port;
38+
private final @Nullable String address;
39+
private final int port;
4040

4141
private @Nullable Socket clientSocket;
4242

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoMessageEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
public class OppoMessageEvent extends EventObject {
2626

2727
private static final long serialVersionUID = 1L;
28-
private String key;
29-
private String value;
28+
private final String key;
29+
private final String value;
3030

3131
public OppoMessageEvent(Object source, String key, String value) {
3232
super(source);

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoReaderThread.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ public class OppoReaderThread extends Thread {
4040
* Constructor
4141
*
4242
* @param connector the object that should handle the received message
43+
* @param connectionId a string that uniquely identifies the particular connection
4344
*/
44-
public OppoReaderThread(OppoConnector connector, String uid) {
45-
super(OppoBindingConstants.BINDING_ID + "-" + uid);
45+
public OppoReaderThread(OppoConnector connector, String connectionId) {
46+
super("OH-binding-" + OppoBindingConstants.THING_TYPE_PLAYER + "-" + connectionId);
4647
this.connector = connector;
4748
setDaemon(true);
4849
}

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoSerialConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
public class OppoSerialConnector extends OppoConnector {
3838
private final Logger logger = LoggerFactory.getLogger(OppoSerialConnector.class);
3939

40-
private String serialPortName;
41-
private SerialPortManager serialPortManager;
40+
private final String serialPortName;
41+
private final SerialPortManager serialPortManager;
4242

4343
private @Nullable SerialPort serialPort;
4444

0 commit comments

Comments
 (0)