Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[oppo] rollforward a few review changes from sister bindings and fix a title #8335

Merged
merged 14 commits into from
Aug 26, 2020
Merged

[oppo] rollforward a few review changes from sister bindings and fix a title #8335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
29400b5
Merge pull request #1 from openhab/2.5.x
mlobstein Apr 13, 2020
37d791e
Merge pull request #2 from openhab/2.5.x
mlobstein Apr 19, 2020
82462cd
Merge pull request #3 from openhab/2.5.x
mlobstein May 27, 2020
5d548cc
Merge pull request #4 from openhab/2.5.x
mlobstein Jun 4, 2020
41709ef
Merge pull request #5 from openhab/2.5.x
mlobstein Jun 24, 2020
b3285d6
Merge pull request #6 from openhab/2.5.x
mlobstein Jul 16, 2020
9b57919
Merge pull request #7 from openhab/2.5.x
mlobstein Jul 25, 2020
78f6977
Merge pull request #8 from openhab/2.5.x
mlobstein Jul 28, 2020
f49106b
Merge pull request #9 from openhab/2.5.x
mlobstein Aug 22, 2020
6c17b5b
Rollforward a few review changes
mlobstein Aug 24, 2020
6f287e2
review changes
mlobstein Aug 24, 2020
fb7f65b
review changes
mlobstein Aug 25, 2020
93224d6
review changes
mlobstein Aug 25, 2020
465d1e6
fix thread naming convention
mlobstein Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.oppo/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<features name="org.openhab.binding.oppo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>

<feature name="openhab-binding-oppo" description="Oppo Whole House Audio Binding" version="${project.version}">
<feature name="openhab-binding-oppo" description="Oppo Blu-ray Player Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-transport-serial</feature>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.oppo/${project.version}</bundle>
Expand Down
2 changes: 1 addition & 1 deletion ...nding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public enum OppoCommand {
SET_INPUT_SOURCE("SIS"),
NO_OP("NOP");

private String value;
private final String value;

public static final Set<OppoCommand> INITIAL_COMMANDS = new HashSet<>(
Arrays.asList(QUERY_POWER_STATUS, QUERY_FIRMWARE_VERSION, QUERY_VOLUME, QUERY_HDMI_RESOLUTION,
Expand Down
4 changes: 2 additions & 2 deletions ...ing.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public abstract class OppoConnector {

private @Nullable Thread readerThread;

private List<OppoMessageEventListener> listeners = new ArrayList<>();
private final List<OppoMessageEventListener> listeners = new ArrayList<>();

/**
* Called when using direct IP connection for 83/93/95/103/105
Expand Down Expand Up @@ -135,12 +135,12 @@ protected void cleanup() {
}
if (readerThread != null) {
readerThread.interrupt();
this.readerThread = null;
try {
readerThread.join(3000);
} catch (InterruptedException e) {
logger.warn("Error joining readerThread: {}", e.getMessage());
}
this.readerThread = null;
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...g.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoIpConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
public class OppoIpConnector extends OppoConnector {
private final Logger logger = LoggerFactory.getLogger(OppoIpConnector.class);

private @Nullable String address;
private int port;
private final @Nullable String address;
private final int port;

private @Nullable Socket clientSocket;

Expand Down
4 changes: 2 additions & 2 deletions ....oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoMessageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
public class OppoMessageEvent extends EventObject {

private static final long serialVersionUID = 1L;
private String key;
private String value;
private final String key;
private final String value;

public OppoMessageEvent(Object source, String key, String value) {
super(source);
Expand Down
5 changes: 3 additions & 2 deletions ....oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoReaderThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ public class OppoReaderThread extends Thread {
* Constructor
*
* @param connector the object that should handle the received message
* @param connectionId a string that uniquely identifies the particular connection
*/
public OppoReaderThread(OppoConnector connector, String uid) {
super(OppoBindingConstants.BINDING_ID + "-" + uid);
public OppoReaderThread(OppoConnector connector, String connectionId) {
super("OH-binding-" + OppoBindingConstants.THING_TYPE_PLAYER + "-" + connectionId);
this.connector = connector;
setDaemon(true);
}
Expand Down
4 changes: 2 additions & 2 deletions ...po/src/main/java/org/openhab/binding/oppo/internal/communication/OppoSerialConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
public class OppoSerialConnector extends OppoConnector {
private final Logger logger = LoggerFactory.getLogger(OppoSerialConnector.class);

private String serialPortName;
private SerialPortManager serialPortManager;
private final String serialPortName;
private final SerialPortManager serialPortManager;

private @Nullable SerialPort serialPort;

Expand Down