Fix SAT NoEmptyLineSeparatorCheck findings (openhab#7296)

* Fix SAT NoEmptyLineSeparatorCheck findings * Fix sloppy coding and fragile comment Signed-off-by: Wouter Born <[email protected]> Signed-off-by: Daan Meijer <[email protected]>
DaanMeijer · Sep 1, 2020 · d8a3787 · d8a3787
1 parent 1b0a558
commit d8a3787
Show file tree

Hide file tree

Showing 251 changed files with 281 additions and 730 deletions.
diff --git a/...ing.adorne/src/main/java/org/openhab/binding/adorne/internal/hub/AdorneHubController.java b/...ing.adorne/src/main/java/org/openhab/binding/adorne/internal/hub/AdorneHubController.java
@@ -333,7 +333,6 @@ private void msgLoop() {
         cancelCommands();
         hubControllerConnected.cancel(false);
         logger.info("Exiting hub controller");
-
     }
 
     private boolean shouldStop() {

diff --git a/...lity/src/main/java/org/openhab/binding/airquality/internal/handler/AirQualityHandler.java b/...lity/src/main/java/org/openhab/binding/airquality/internal/handler/AirQualityHandler.java
@@ -262,7 +262,6 @@ private AirQualityJsonResponse getAirQualityData() {
                 errorMsg = "missing data sub-object";
                 logger.warn("Error in aqicn.org (Air Quality) response: {}", errorMsg);
             }
-
         } catch (MalformedURLException e) {
             errorMsg = e.getMessage();
             logger.warn("Constructed url is not valid: {}", errorMsg);

diff --git a/....allplay/src/main/java/org/openhab/binding/allplay/internal/AllPlayBindingProperties.java b/....allplay/src/main/java/org/openhab/binding/allplay/internal/AllPlayBindingProperties.java
@@ -40,7 +40,6 @@ public class AllPlayBindingProperties {
     private static final String ZONE_MEMBER_SEPARATOR_DEFAULT_VALUE = ",";
 
     public AllPlayBindingProperties(Dictionary<String, Object> properties) {
-
         rewindSkipTimeInSec = getIntegerProperty(properties, REWIND_SKIP_TIME_PROPERTY, REWIND_SKIP_TIME_DEFAULT_VALUE);
         fastForwardSkipTimeInSec = getIntegerProperty(properties, FAST_FORWARD_SKIP_TIME_PROPERTY,
                 FAST_FORWARD_SKIP_TIME_DEFAULT_VALUE);

diff --git a/...ocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java b/...ocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java
@@ -247,7 +247,6 @@ protected void doGet(@Nullable HttpServletRequest req, @Nullable HttpServletResp
         try {
             Connection connection = this.connectionToInitialize;
             if (uri.startsWith(FORWARD_URI_PART) && connection != null) {
-
                 String getUrl = "https://www." + connection.getAmazonSite() + "/"
                         + uri.substring(FORWARD_URI_PART.length());
 
@@ -271,7 +270,6 @@ protected void doGet(@Nullable HttpServletRequest req, @Nullable HttpServletResp
             }
 
             if (connection != null && connection.verifyLogin()) {
-
                 // handle commands
                 if (baseUrl.equals("/logout") || baseUrl.equals("/logout/")) {
                     this.connectionToInitialize = reCreateConnection();
@@ -633,7 +631,6 @@ void handleProxyRequest(Connection connection, HttpServletResponse resp, String
                 {
                     String location = urlConnection.getHeaderField("location");
                     if (location.contains("/ap/maplanding")) {
-
                         try {
                             connection.registerConnectionAsApp(location);
                             account.setConnection(connection);
@@ -646,7 +643,6 @@ void handleProxyRequest(Connection connection, HttpServletResponse resp, String
                             this.connectionToInitialize = null;
                             return;
                         }
-
                     }
 
                     String startString = "https://www." + connection.getAmazonSite() + "/";

diff --git a/...nechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java b/...nechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java
@@ -336,7 +336,6 @@ public boolean tryRestoreLogin(@Nullable String data, @Nullable String overloade
             } catch (IOException e) {
                 return false;
             } catch (URISyntaxException e) {
-
             }
         }
         return false;
@@ -539,7 +538,6 @@ public HttpsURLConnection makeRequest(String verb, String url, @Nullable String
                 URI uri = connection.getURL().toURI();
 
                 if (customHeaders == null || !customHeaders.containsKey("Cookie")) {
-
                     StringBuilder cookieHeaderBuilder = new StringBuilder();
                     for (HttpCookie cookie : cookieManager.getCookieStore().get(uri)) {
                         if (cookieHeaderBuilder.length() > 0) {
@@ -559,7 +557,6 @@ public HttpsURLConnection makeRequest(String verb, String url, @Nullable String
                     }
                 }
                 if (postData != null) {
-
                     logger.debug("{}: {}", verb, postData);
                     // post data
                     byte[] postDataBytes = postData.getBytes(StandardCharsets.UTF_8);
@@ -595,7 +592,6 @@ public HttpsURLConnection makeRequest(String verb, String url, @Nullable String
                             // store cookie
                             for (String cookieHeader : header.getValue()) {
                                 if (StringUtils.isNotEmpty(cookieHeader)) {
-
                                     List<HttpCookie> cookies = HttpCookie.parse(cookieHeader);
                                     for (HttpCookie cookie : cookies) {
                                         cookieManager.getCookieStore().add(uri, cookie);
@@ -646,9 +642,7 @@ public HttpsURLConnection makeRequest(String verb, String url, @Nullable String
                     return connection;
                 }
                 throw new HttpException(code, verb + " url '" + url + "' failed: " + connection.getResponseMessage());
-
             } catch (IOException e) {
-
                 if (connection != null) {
                     connection.disconnect();
                 }
@@ -753,7 +747,6 @@ public String registerConnectionAsApp(String oAutRedirectUrl)
     }
 
     private void exchangeToken() throws IOException, URISyntaxException {
-
         this.renewTime = 0;
         String cookiesJson = "{\"cookies\":{\"." + getAmazonSite() + "\":[]}}";
         String cookiesBase64 = Base64.getEncoder().encodeToString(cookiesJson.getBytes());

diff --git a/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/WebSocketConnection.java b/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/WebSocketConnection.java
@@ -382,7 +382,6 @@ public void onWebSocketBinary(byte @Nullable [] data, int offset, int len) {
                 sendMessage(
                         "0xa6f6a951 0x0000009c {\"protocolName\":\"A:H\",\"parameters\":{\"AlphaProtocolHandler.receiveWindowSize\":\"16\",\"AlphaProtocolHandler.maxFragmentSize\":\"16000\"}}TUNE");
                 sendMessage(encodeGWHandshake());
-
             } else if (this.msgCounter == 1) {
                 sendMessage(encodeGWRegister());
                 sendPing();
@@ -395,7 +394,6 @@ public void onWebSocketBinary(byte @Nullable [] data, int offset, int len) {
                     Message message = parseIncomingMessage(buffer);
                     if (message.service.equals("FABE") && message.content.messageType.equals("PON")
                             && message.content.payloadData.length > 0) {
-
                         logger.debug("Pong received");
                         WebSocketConnection.this.clearPongTimeoutTimer();
                         return;
@@ -416,7 +414,6 @@ public void onWebSocketBinary(byte @Nullable [] data, int offset, int len) {
 
         @Override
         public void onWebSocketText(@Nullable String message) {
-
         }
 
         @Override
@@ -464,7 +461,6 @@ long computeBits(long input, long len) {
         }
 
         long toUnsignedInt(long value) {
-
             long result = value;
             if (0 > value) {
                 result = 4294967295L + value + 1;
@@ -559,7 +555,6 @@ void encode(byte[] data, long b, int offset, int len) {
         }
 
         byte[] encodePing() {
-
             // MSG 0x00000065 0x0e414e47 f 0x00000001 0xbc2fbb5f 0x00000062 PIN� ��� ��RegularFABE
             this.messageId++;
             String msg = "MSG 0x00000065 "; // Message-type and Channel = CHANNEL_FOR_HEARTBEAT;

diff --git a/...in/java/org/openhab/binding/amazonechocontrol/internal/discovery/AmazonEchoDiscovery.java b/...in/java/org/openhab/binding/amazonechocontrol/internal/discovery/AmazonEchoDiscovery.java
@@ -194,7 +194,6 @@ public synchronized void discoverFlashBriefingProfiles(String currentFlashBriefi
         }
 
         if (!discoverdFlashBriefings.contains(currentFlashBriefingJson)) {
-
             ThingUID freeThingUID = null;
             int freeIndex = 0;
             for (int i = 1; i < 1000; i++) {

diff --git a/.../src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java b/.../src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java
@@ -315,7 +315,6 @@ private void checkLogin() {
                             setConnection(currentConnection);
                         }
                     } else {
-
                         // read session data from property
                         String sessionStore = this.stateStorage.get("sessionStorage");
 
@@ -582,7 +581,6 @@ private void refreshData() {
     }
 
     public List<Device> updateDeviceList() {
-
         Connection currentConnection = connection;
         if (currentConnection == null) {
             return new ArrayList<>();

diff --git a/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java b/...rol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java
@@ -324,7 +324,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
             // Media progress commands
             Long mediaPosition = null;
             if (channelId.equals(CHANNEL_MEDIA_PROGRESS)) {
-
                 if (command instanceof PercentType) {
                     PercentType value = (PercentType) command;
                     int percent = value.intValue();
@@ -356,18 +355,15 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     mediaStartMs = System.currentTimeMillis() - this.mediaProgressMs;
                     updateMediaProgress(false);
                 }
-
             }
             // Volume commands
             if (channelId.equals(CHANNEL_VOLUME)) {
                 Integer volume = null;
                 if (command instanceof PercentType) {
                     PercentType value = (PercentType) command;
                     volume = value.intValue();
-
                 } else if (command == OnOffType.OFF) {
                     volume = 0;
-
                 } else if (command == OnOffType.ON) {
                     volume = lastKnownVolume;
                 } else if (command == IncreaseDecreaseType.INCREASE) {
@@ -385,7 +381,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     if (StringUtils.equals(device.deviceFamily, "WHA")) {
                         connection.command(device, "{\"type\":\"VolumeLevelCommand\",\"volumeLevel\":" + volume
                                 + ",\"contentFocusClientId\":\"Default\"}");
-
                     } else {
                         Map<String, Object> parameters = new HashMap<>();
                         parameters.put("value", volume);
@@ -395,7 +390,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     updateState(CHANNEL_VOLUME, new PercentType(lastKnownVolume));
                     waitForUpdate = -1;
                 }
-
             }
             // equalizer commands
             if (channelId.equals(CHANNEL_EQUALIZER_BASS) || channelId.equals(CHANNEL_EQUALIZER_MIDRANGE)
@@ -427,7 +421,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                             waitForUpdate = 3000;
                         }
                     }
-
                 }
             }
             if (channelId.equals(CHANNEL_PLAY_MUSIC_VOICE_COMMAND)) {
@@ -485,28 +478,23 @@ public void handleCommand(ChannelUID channelUID, Command command) {
             // amazon music commands
             if (channelId.equals(CHANNEL_AMAZON_MUSIC_TRACK_ID)) {
                 if (command instanceof StringType) {
-
                     String trackId = ((StringType) command).toFullString();
                     if (StringUtils.isNotEmpty(trackId)) {
                         waitForUpdate = 3000;
                     }
                     connection.playAmazonMusicTrack(device, trackId);
-
                 }
             }
             if (channelId.equals(CHANNEL_AMAZON_MUSIC_PLAY_LIST_ID)) {
                 if (command instanceof StringType) {
-
                     String playListId = ((StringType) command).toFullString();
                     if (StringUtils.isNotEmpty(playListId)) {
                         waitForUpdate = 3000;
                     }
                     connection.playAmazonMusicPlayList(device, playListId);
-
                 }
             }
             if (channelId.equals(CHANNEL_AMAZON_MUSIC)) {
-
                 if (command == OnOffType.ON) {
                     String lastKnownAmazonMusicId = this.lastKnownAmazonMusicId;
                     if (StringUtils.isNotEmpty(lastKnownAmazonMusicId)) {
@@ -575,7 +563,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                         currentNotifcationUpdateTimer = scheduler.scheduleWithFixedDelay(() -> {
                             updateNotificationTimerState();
                         }, 1, 1, TimeUnit.SECONDS);
-
                     }
                 }
             }
@@ -718,7 +705,6 @@ private boolean handleEqualizerCommands(String channelId, Command command, Conne
                     logger.debug("Update equalizer failed", e);
                     this.lastKnownEqualizer = null;
                 }
-
             }
         }
         return false;
@@ -935,7 +921,6 @@ public void updateState(AccountHandler accountHandler, @Nullable Device device,
                     } else {
                         stopProgressTimer();
                     }
-
                 } else {
                     stopProgressTimer();
                     mediaProgressMs = 0;
@@ -947,17 +932,13 @@ public void updateState(AccountHandler accountHandler, @Nullable Device device,
 
             JsonMediaState mediaState = null;
             try {
-
                 if (StringUtils.equalsIgnoreCase(musicProviderId, "AMAZON_MUSIC")
                         || StringUtils.equalsIgnoreCase(musicProviderId, "TUNEIN")) {
                     mediaState = connection.getMediaState(device);
                 }
-
             } catch (HttpException e) {
                 if (e.getCode() == 400) {
-
                     updateState(CHANNEL_RADIO_STATION_ID, new StringType(""));
-
                 } else {
                     logger.info("getMediaState fails", e);
                 }
@@ -1053,7 +1034,6 @@ public void updateState(AccountHandler accountHandler, @Nullable Device device,
                 if (queueEntries != null && queueEntries.length > 0) {
                     QueueEntry entry = queueEntries[0];
                     if (entry != null) {
-
                         if (isRadio) {
                             if (StringUtils.isEmpty(imageUrl) && entry.imageURL != null) {
                                 imageUrl = entry.imageURL;
@@ -1087,7 +1067,6 @@ public void updateState(AccountHandler accountHandler, @Nullable Device device,
                     volume = mediaState.volume;
                 }
                 if (playerInfo != null && volume == null) {
-
                     Volume volumnInfo = playerInfo.volume;
                     if (volumnInfo != null) {
                         volume = volumnInfo.volume;
@@ -1155,7 +1134,6 @@ public void updateState(AccountHandler accountHandler, @Nullable Device device,
             } else {
                 updateState(CHANNEL_NOTIFICATION_VOLUME, UnDefType.UNDEF);
             }
-
         } catch (Exception e) {
             this.logger.debug("Handle updateState {} failed: {}", this.getThing().getUID(), e.getMessage(), e);
 
@@ -1199,7 +1177,6 @@ private void updateEqualizerState() {
         if (treble != null) {
             updateState(CHANNEL_EQUALIZER_TREBLE, new DecimalType(treble));
         }
-
     }
 
     private void updateMediaProgress() {

diff --git a/...ing.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java b/...ing.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java
@@ -77,7 +77,6 @@ public void statusChanged(ThingStatus status, ThingStatusDetail detail, String m
         }
         // If we got this far - call the underlying one
         wrappedCallback.statusChanged(status, detail, msg);
-
     }
 
     /**
@@ -108,7 +107,6 @@ public void stateChanged(String channelId, State state) {
         // Something changed - save the new state and call the underlying wrapped
         this.state.put(channelId, state);
         wrappedCallback.stateChanged(channelId, state);
-
     }
 
     /**
@@ -133,7 +131,6 @@ public void removeState(String channelId) {
     @Override
     public void setProperty(String propertyName, String propertyValue) {
         wrappedCallback.setProperty(propertyName, propertyValue);
-
     }
 
     /**

diff --git a/...luegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/BlueGigaBluetoothDevice.java b/...luegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/BlueGigaBluetoothDevice.java
@@ -86,19 +86,16 @@ private enum BlueGigaProcedure {
     private @Nullable ScheduledFuture<?> procedureTimer;
 
     private Runnable connectTimeoutTask = new Runnable() {
-
         @Override
         public void run() {
             if (connectionState == ConnectionState.CONNECTING) {
                 logger.debug("Connection timeout for device {}", address);
                 connectionState = ConnectionState.DISCONNECTED;
             }
-
         }
     };
 
     private Runnable procedureTimeoutTask = new Runnable() {
-
         @Override
         public void run() {
             logger.debug("Procedure {} timeout for device {}", procedureProgress, address);
@@ -248,7 +245,6 @@ else if (event instanceof BlueGigaAttributeValueEvent) {
     }
 
     private void handleScanEvent(BlueGigaScanResponseEvent event) {
-
         // Check if this is addressed to this device
         if (!address.equals(new BluetoothAddress(event.getSender()))) {
             return;

diff --git a/...a/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java b/...a/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java
@@ -648,7 +648,6 @@ private boolean bgStartScanning(boolean active, int interval, int window) {
      */
     private <T extends BlueGigaResponse> T sendCommand(BlueGigaCommand command, Class<T> expectedResponse,
             boolean schedulePassiveScan) throws BlueGigaException {
-
         if (!initComplete) {
             throw new BlueGigaException("BlueGiga not initialized");
         }

diff --git a/...penhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/BluetoothDevice.java b/...penhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/BluetoothDevice.java
@@ -624,7 +624,6 @@ public boolean hasListeners() {
      *
      */
     protected void dispose() {
-
     }
 
     /**

diff --git a/...c/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDeviceSnapshot.java b/...c/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDeviceSnapshot.java
@@ -210,7 +210,6 @@ public boolean equals(@Nullable Object obj) {
      * @return true if this snapshot changed as a result of this operation
      */
     public void merge(BluetoothDevice device) {
-
         Integer txPower = device.getTxPower();
         Integer manufacturer = device.getManufacturerId();
         String name = device.getName();
-Original file line number
+Diff line change
@@ Expand Up / @@ -624,7 +624,6 @@ public boolean hasListeners() { @@
          *
          */
         protected void dispose() {
         }
         /**
@@ Expand Down @@