Fix review comments

Signed-off-by: Anders Alfredsson <andersb86@gmail.com>

Author: pacive

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/ForecastAggregator.java

@@ -38,8 +38,9 @@ public class ForecastAggregator {
      * @return
      */
     public static State max(SmhiTimeSeries timeSeries, int dayOffset, @Nullable ParameterMetadata metadata) {
-        if (metadata == null)
+        if (metadata == null) {
             return UnDefType.UNDEF;
+        }
 
         List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().map(forecast -> forecast.getParameter(metadata.name()))
@@ -57,8 +58,9 @@ public static State max(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Para
      * @return
      */
     public static State min(SmhiTimeSeries timeSeries, int dayOffset, @Nullable ParameterMetadata metadata) {
-        if (metadata == null)
+        if (metadata == null) {
             return UnDefType.UNDEF;
+        }
 
         List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().map(forecast -> forecast.getParameter(metadata.name()))
@@ -79,8 +81,9 @@ public static State min(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Para
      */
     public static State total(SmhiTimeSeries timeSeries, int dayOffset, @Nullable ParameterMetadata baseMetadata,
             @Nullable ParameterMetadata totalMetadata) {
-        if (baseMetadata == null || totalMetadata == null)
+        if (baseMetadata == null || totalMetadata == null) {
             return UnDefType.UNDEF;
+        }
 
         List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, true);
         if (dayForecasts.size() == 1) {
@@ -105,8 +108,9 @@ public static State total(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Pa
      * @return
      */
     public static State noonOrFirst(SmhiTimeSeries timeSeries, int dayOffset, @Nullable ParameterMetadata metadata) {
-        if (metadata == null)
+        if (metadata == null) {
             return UnDefType.UNDEF;
+        }
 
         List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().filter(forecast -> forecast.getTime().getHour() >= 12).findFirst()

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiConnector.java

@@ -12,13 +12,15 @@
  */
 package org.openhab.binding.smhi.internal;
 
+import static org.eclipse.jetty.http.HttpStatus.*;
 import static org.openhab.binding.smhi.internal.SmhiBindingConstants.*;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -58,7 +60,7 @@ public ZonedDateTime getCreatedTime() throws SmhiException {
         logger.debug("Fetching reference time");
         ContentResponse resp = makeRequest(CREATED_TIME_URL);
 
-        if (resp.getStatus() == 200) {
+        if (resp.getStatus() == OK_200) {
             return Parser.parseCreatedTime(resp.getContentAsString());
         } else {
             throw new SmhiException(resp.getReason());
@@ -78,14 +80,14 @@ public SmhiTimeSeries getForecast(double lat, double lon) throws SmhiException,
         ContentResponse resp = makeRequest(url);
 
         switch (resp.getStatus()) {
-            case 200:
+            case OK_200:
                 try {
                     return Parser.parseTimeSeries(resp.getContentAsString());
                 } catch (JsonParseException | DateTimeParseException e) {
                     throw new SmhiException(e);
                 }
-            case 400:
-            case 404:
+            case BAD_REQUEST_400:
+            case NOT_FOUND_404:
                 throw new PointOutOfBoundsException();
             default:
                 throw new SmhiException(resp.getReason());
@@ -96,7 +98,7 @@ public List<ParameterMetadata> getParameterMetadata() throws SmhiException {
         logger.debug("Fetching parameter metadata");
         ContentResponse resp = makeRequest(PARAMETER_METADATA_URL);
 
-        if (resp.getStatus() == 200) {
+        if (resp.getStatus() == OK_200) {
             try {
                 return Parser.parseParameterMetadata(resp.getContentAsString());
             } catch (JsonParseException | DateTimeParseException e) {
@@ -108,6 +110,7 @@ public List<ParameterMetadata> getParameterMetadata() throws SmhiException {
 
     private ContentResponse makeRequest(String url) throws SmhiException {
         Request req = httpClient.newRequest(url);
+        req.timeout(5, TimeUnit.SECONDS);
         req.accept(ACCEPT);
         ContentResponse resp;
         try {

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiHandler.java

@@ -230,8 +230,9 @@ private void updateChannels(SmhiTimeSeries timeSeries) {
                 id = PMP3G_BACKWARD_COMP.getOrDefault(id, id);
                 // TODO: end
                 ParameterMetadata metadata = channelTypeProvider.getParameterMetadata(id);
-                if (metadata == null)
+                if (metadata == null) {
                     return;
+                }
 
                 updateState(c.getUID(), f.getParameterAsState(metadata));
             }));
@@ -399,8 +400,9 @@ private List<Channel> createChannels() {
         channelTypeProvider.getAllParameterMetadata().forEach(metadata -> {
             ChannelType channelType = channelTypeRegistry
                     .getChannelType(new ChannelTypeUID(BINDING_ID, metadata.name()));
-            if (channelType == null)
+            if (channelType == null) {
                 return;
+            }
 
             if (!AGGREGATE_CHANNELS.contains(metadata.name())) {
                 channels.add(createChannel(tsGroup, channelType));