[sonyaudio] small cleanup (#15823)

* More SAT fixes

Signed-off-by: Leo Siepel <leosiepel@gmail.com>

diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java
index 849973c1888fd8cb6f2acb5661ef711efd447b0b..fa6a15706c944fcb49315bcced76187f6b4983f9 100644 (file)
--- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/discovery/SonyAudioDiscoveryParticipant.java
@@ -128,19 +128,19 @@ public class SonyAudioDiscoveryParticipant implements UpnpDiscoveryParticipant {
             while ((s = bufferedReader.readLine()) != null) {
                 builder.append(s);
             }
-            Pattern ScalarWebAPImatch = Pattern.compile("<av:X_ScalarWebAPI_BaseURL>(.*)</av:X_ScalarWebAPI_BaseURL>");
+            Pattern scalarWebAPImatch = Pattern.compile("<av:X_ScalarWebAPI_BaseURL>(.*)</av:X_ScalarWebAPI_BaseURL>");
             Pattern baseURLmatch = Pattern.compile("http://(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}):(\\d+)([^<]*)");
 
-            Matcher tagmatch = ScalarWebAPImatch.matcher(builder.toString());
+            Matcher tagmatch = scalarWebAPImatch.matcher(builder.toString());
             if (tagmatch.find()) {
                 Matcher matcher = baseURLmatch.matcher(tagmatch.group());
                 matcher.find();
                 // String scalar_host = matcher.group(0);
-                int scalar_port = Integer.parseInt(matcher.group(2));
-                String scalar_path = matcher.group(3);
+                int scalarPort = Integer.parseInt(matcher.group(2));
+                String scalarPath = matcher.group(3);
 
-                properties.put(SonyAudioBindingConstants.SCALAR_PORT_PARAMETER, scalar_port);
-                properties.put(SonyAudioBindingConstants.SCALAR_PATH_PARAMETER, scalar_path);
+                properties.put(SonyAudioBindingConstants.SCALAR_PORT_PARAMETER, scalarPort);
+                properties.put(SonyAudioBindingConstants.SCALAR_PATH_PARAMETER, scalarPath);
             }
             return properties;
         }

diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java
index a10448559e6ec36991fba8a10d9cfb751cc79900..be6a5ca099d706cfb9ab56606c8cd72ed0b30850 100644 (file)
--- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/handler/SonyAudioHandler.java
@@ -64,7 +64,7 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve
     private ScheduledFuture<?> refreshJob;
 
     private int currentRadioStation = 0;
-    private final Map<Integer, String> input_zone = new HashMap<>();
+    private final Map<Integer, String> inputZone = new HashMap<>();
 
     private static final long CACHE_EXPIRY = TimeUnit.SECONDS.toMillis(5);
 
@@ -303,13 +303,13 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve
                 SonyAudioConnection.SonyAudioInput result = inputCache[zone].getValue();
                 if (result != null) {
                     if (zone > 0) {
-                        input_zone.put(zone, result.input);
+                        inputZone.put(zone, result.input);
                     }
                     updateState(channelUID, inputSource(result.input));
 
-                    if (result.radio_freq.isPresent()) {
+                    if (result.radioFrequency.isPresent()) {
                         updateState(SonyAudioBindingConstants.CHANNEL_RADIO_FREQ,
-                                new DecimalType(result.radio_freq.get() / 1000000.0));
+                                new DecimalType(result.radioFrequency.get() / 1000000.0));
                     }
                 }
             } catch (CompletionException ex) {
@@ -387,7 +387,7 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve
             String radioCommand = "radio:fm?contentId=" + currentRadioStation;
 
             for (int i = 1; i <= 4; i++) {
-                String input = input_zone.get(i);
+                String input = inputZone.get(i);
                 if (input != null && input.startsWith("radio:fm")) {
                     connection.setInput(radioCommand, i);
                 }
@@ -418,20 +418,20 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve
         Configuration config = getThing().getConfiguration();
         String ipAddress = (String) config.get(SonyAudioBindingConstants.HOST_PARAMETER);
         String path = (String) config.get(SonyAudioBindingConstants.SCALAR_PATH_PARAMETER);
-        Object port_o = config.get(SonyAudioBindingConstants.SCALAR_PORT_PARAMETER);
+        Object portO = config.get(SonyAudioBindingConstants.SCALAR_PORT_PARAMETER);
         int port = 10000;
-        if (port_o instanceof BigDecimal decimalValue) {
+        if (portO instanceof BigDecimal decimalValue) {
             port = decimalValue.intValue();
-        } else if (port_o instanceof Integer) {
-            port = (int) port_o;
+        } else if (portO instanceof Integer) {
+            port = (int) portO;
         }
 
-        Object refresh_o = config.get(SonyAudioBindingConstants.REFRESHINTERVAL);
+        Object refreshO = config.get(SonyAudioBindingConstants.REFRESHINTERVAL);
         int refresh = 0;
-        if (refresh_o instanceof BigDecimal decimalValue) {
+        if (refreshO instanceof BigDecimal decimalValue) {
             refresh = decimalValue.intValue();
-        } else if (refresh_o instanceof Integer) {
-            refresh = (int) refresh_o;
+        } else if (refreshO instanceof Integer) {
+            refresh = (int) refreshO;
         }
 
         try {
@@ -509,9 +509,9 @@ abstract class SonyAudioHandler extends BaseThingHandler implements SonyAudioEve
                 break;
         }
 
-        if (input.radio_freq.isPresent()) {
+        if (input.radioFrequency.isPresent()) {
             updateState(SonyAudioBindingConstants.CHANNEL_RADIO_FREQ,
-                    new DecimalType(input.radio_freq.get() / 1000000.0));
+                    new DecimalType(input.radioFrequency.get() / 1000000.0));
         }
     }
 

diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioConnection.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioConnection.java
index 52a3552105bd0c37bc4682384ed64cc1d7751c50..791281bf4786fd5b93c9f1862b56dad72d4da1fc 100644 (file)
--- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioConnection.java
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioConnection.java
@@ -49,7 +49,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
     private final String host;
     private final int port;
     private final String path;
-    private final URI base_uri;
+    private final URI baseUri;
 
     private final WebSocketClient webSocketClient;
 
@@ -59,8 +59,8 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
 
     private final SonyAudioEventListener listener;
 
-    private int min_volume = 0;
-    private int max_volume = 50;
+    private int minVolume = 0;
+    private int maxVolume = 50;
 
     private final Gson gson;
 
@@ -73,14 +73,14 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
         this.gson = new Gson();
         this.webSocketClient = webSocketClient;
 
-        base_uri = new URI(String.format("ws://%s:%d/%s", host, port, path)).normalize();
+        baseUri = new URI(String.format("ws://%s:%d/%s", host, port, path)).normalize();
 
-        URI wsAvContentUri = base_uri.resolve(base_uri.getPath() + "/avContent").normalize();
+        URI wsAvContentUri = baseUri.resolve(baseUri.getPath() + "/avContent").normalize();
         avContentSocket = new SonyAudioClientSocket(this, wsAvContentUri, scheduler);
-        URI wsAudioUri = base_uri.resolve(base_uri.getPath() + "/audio").normalize();
+        URI wsAudioUri = baseUri.resolve(baseUri.getPath() + "/audio").normalize();
         audioSocket = new SonyAudioClientSocket(this, wsAudioUri, scheduler);
 
-        URI wsSystemUri = base_uri.resolve(base_uri.getPath() + "/system").normalize();
+        URI wsSystemUri = baseUri.resolve(baseUri.getPath() + "/system").normalize();
         systemSocket = new SonyAudioClientSocket(this, wsSystemUri, scheduler);
     }
 
@@ -123,7 +123,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
             input.input = param.get("uri").getAsString();
             if (param.has("broadcastFreq")) {
                 int freq = param.get("broadcastFreq").getAsInt();
-                input.radio_freq = Optional.of(freq);
+                input.radioFrequency = Optional.of(freq);
                 checkRadioPreset(input.input);
             }
             listener.updateInput(zone, input);
@@ -134,7 +134,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
             SonyAudioVolume volume = new SonyAudioVolume();
 
             int rawVolume = param.get("volume").getAsInt();
-            volume.volume = Math.round(100 * (rawVolume - min_volume) / (max_volume - min_volume));
+            volume.volume = Math.round(100 * (rawVolume - minVolume) / (maxVolume - minVolume));
 
             volume.mute = "on".equalsIgnoreCase(param.get("mute").getAsString());
             listener.updateVolume(zone, volume);
@@ -274,8 +274,8 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
     }
 
     public String getConnectionName() {
-        if (base_uri != null) {
-            return base_uri.toString();
+        if (baseUri != null) {
+            return baseUri.toString();
         }
         return String.format("ws://%s:%d/%s", host, port, path);
     }
@@ -292,8 +292,9 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
                 Iterator<JsonElement> terminals = element.getAsJsonArray().get(0).getAsJsonArray().iterator();
                 while (terminals.hasNext()) {
                     JsonObject terminal = terminals.next().getAsJsonObject();
+                    String zoneUri = "extOutput:zone?zone=" + Integer.toString(zone);
                     String uri = terminal.get("uri").getAsString();
-                    if (uri.equalsIgnoreCase("extOutput:zone?zone=" + Integer.toString(zone))) {
+                    if (uri.equalsIgnoreCase(zoneUri)) {
                         return "active".equalsIgnoreCase(terminal.get("active").getAsString()) ? true : false;
                     }
                 }
@@ -338,7 +339,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
 
     public class SonyAudioInput {
         public String input = "";
-        public Optional<Integer> radio_freq = Optional.empty();
+        public Optional<Integer> radioFrequency = Optional.empty();
     }
 
     public SonyAudioInput getInput() throws IOException {
@@ -367,7 +368,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
 
             if (result.has("broadcastFreq")) {
                 int freq = result.get("broadcastFreq").getAsInt();
-                ret.radio_freq = Optional.of(freq);
+                ret.radioFrequency = Optional.of(freq);
             }
             return ret;
         }
@@ -425,9 +426,9 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
             SonyAudioVolume ret = new SonyAudioVolume();
 
             int volume = result.get("volume").getAsInt();
-            min_volume = result.get("minVolume").getAsInt();
-            max_volume = result.get("maxVolume").getAsInt();
-            int vol = Math.round(100 * (volume - min_volume) / (max_volume - min_volume));
+            minVolume = result.get("minVolume").getAsInt();
+            maxVolume = result.get("maxVolume").getAsInt();
+            int vol = Math.round(100 * (volume - minVolume) / (maxVolume - minVolume));
             if (vol < 0) {
                 vol = 0;
             }
@@ -445,7 +446,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
         if (audioSocket == null) {
             throw new IOException("Audio Socket not connected");
         }
-        SetAudioVolume setAudioVolume = new SetAudioVolume(volume, min_volume, max_volume);
+        SetAudioVolume setAudioVolume = new SetAudioVolume(volume, minVolume, maxVolume);
         audioSocket.callMethod(setAudioVolume);
     }
 
@@ -461,7 +462,7 @@ public class SonyAudioConnection implements SonyAudioClientSocketEventListener {
         if (audioSocket == null) {
             throw new IOException("Audio Socket not connected");
         }
-        SetAudioVolume setAudioVolume = new SetAudioVolume(zone, volume, min_volume, max_volume);
+        SetAudioVolume setAudioVolume = new SetAudioVolume(zone, volume, minVolume, maxVolume);
         audioSocket.callMethod(setAudioVolume);
     }
 

diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioMethod.java b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioMethod.java
index 49b8d87533879a8c9367813fa12c024056f09a04..789ec5dca8b4b44fed00132a1d9cdbe0108ecb05 100644 (file)
--- a/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioMethod.java
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/java/org/openhab/binding/sonyaudio/internal/protocol/SonyAudioMethod.java
@@ -243,14 +243,14 @@ class SetAudioVolume extends SonyAudioMethod {
 
     SetAudioVolume(int volume, int min, int max) {
         super("setAudioVolume", "1.1");
-        long scaled_volume = scaleVolume(volume, min, max);
-        params = new Param[] { new Param(scaled_volume) };
+        long scaledVolume = scaleVolume(volume, min, max);
+        params = new Param[] { new Param(scaledVolume) };
     }
 
     SetAudioVolume(int zone, int volume, int min, int max) {
         super("setAudioVolume", "1.1");
-        long scaled_volume = scaleVolume(volume, min, max);
-        params = new Param[] { new Param(scaled_volume, zone) };
+        long scaledVolume = scaleVolume(volume, min, max);
+        params = new Param[] { new Param(scaledVolume, zone) };
     }
 
     SetAudioVolume(String volume_change) {