update fork

CODEOWNERS

@@ -2,7 +2,7 @@
 # It should always list the active maintainers of certain add-ons.
 
 # As a fallback, if no specific maintainer is listed below, assign the PR to the repo maintainers team:
-*       @openhab/2-x-add-ons-maintainers
+*       @openhab/add-ons-maintainers
 
 # Add-on maintainers:
 /bundles/org.openhab.binding.adorne/ @theiding
@@ -41,10 +41,12 @@
 /bundles/org.openhab.binding.doorbird/ @mhilbush
 /bundles/org.openhab.binding.dscalarm/ @RSStephens
 /bundles/org.openhab.binding.dsmr/ @Hilbrand
+/bundles/org.openhab.binding.dwdpollenflug/ @DerOetzi
 /bundles/org.openhab.binding.dwdunwetter/ @limdul79
 /bundles/org.openhab.binding.elerotransmitterstick/ @vbier
 /bundles/org.openhab.binding.enocean/ @fruggy83
 /bundles/org.openhab.binding.enturno/ @klocsson
+/bundles/org.openhab.binding.etherrain/ @dfad1469
 /bundles/org.openhab.binding.evohome/ @Nebula83
 /bundles/org.openhab.binding.exec/ @kgoderis
 /bundles/org.openhab.binding.feed/ @svilenvul
@@ -154,6 +156,7 @@
 /bundles/org.openhab.binding.rotel/ @lolodomo
 /bundles/org.openhab.binding.rotelra1x/ @fa2k
 /bundles/org.openhab.binding.russound/ @tmrobert8
+/bundles/org.openhab.binding.sagercaster/ @clinique
 /bundles/org.openhab.binding.samsungtv/ @paulianttila
 /bundles/org.openhab.binding.satel/ @druciak
 /bundles/org.openhab.binding.seneye/ @nikotanghe
@@ -216,15 +219,15 @@
 /bundles/org.openhab.io.transport.modbus/ @ssalonen
 /bundles/org.openhab.io.webaudio/ @kaikreuzer
 /bundles/org.openhab.persistence.mapdb/ @mkhl
-/bundles/org.openhab.transform.exec/ @openhab/2-x-add-ons-maintainers
-/bundles/org.openhab.transform.javascript/ @openhab/2-x-add-ons-maintainers
+/bundles/org.openhab.transform.exec/ @openhab/add-ons-maintainers
+/bundles/org.openhab.transform.javascript/ @openhab/add-ons-maintainers
 /bundles/org.openhab.transform.jinja/ @jochen314
 /bundles/org.openhab.transform.jsonpath/ @clinique
-/bundles/org.openhab.transform.map/ @openhab/2-x-add-ons-maintainers
-/bundles/org.openhab.transform.regex/ @openhab/2-x-add-ons-maintainers
+/bundles/org.openhab.transform.map/ @openhab/add-ons-maintainers
+/bundles/org.openhab.transform.regex/ @openhab/add-ons-maintainers
 /bundles/org.openhab.transform.scale/ @clinique
-/bundles/org.openhab.transform.xpath/ @openhab/2-x-add-ons-maintainers
-/bundles/org.openhab.transform.xslt/ @openhab/2-x-add-ons-maintainers
+/bundles/org.openhab.transform.xpath/ @openhab/add-ons-maintainers
+/bundles/org.openhab.transform.xslt/ @openhab/add-ons-maintainers
 /bundles/org.openhab.voice.googletts/ @gbicskei
 /bundles/org.openhab.voice.mactts/ @kaikreuzer
 /bundles/org.openhab.voice.marytts/ @kaikreuzer

bom/openhab-addons/pom.xml

@@ -194,6 +194,11 @@
       <artifactId>org.openhab.binding.dsmr</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.dwdpollenflug</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.dwdunwetter</artifactId>
@@ -214,6 +219,11 @@
       <artifactId>org.openhab.binding.enturno</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.etherrain</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.evohome</artifactId>
@@ -764,6 +774,11 @@
       <artifactId>org.openhab.binding.russound</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.sagercaster</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.samsungtv</artifactId>

bundles/org.openhab.binding.adorne/.classpath

@@ -28,5 +28,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

bundles/org.openhab.binding.adorne/README.md

@@ -110,4 +110,4 @@ sitemap demo label="Adorne Binding Demo"
 		Setpoint item=LightBedroomDimmer2 label="Bedroom 2" icon="light-on" minValue=1 maxValue=100 step=5
 	}
 }
-```
+```

bundles/org.openhab.binding.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() {

bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/handler/AirQualityHandler.java

@@ -23,9 +23,6 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.measure.quantity.Pressure;
-import javax.measure.quantity.Temperature;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.smarthome.core.library.types.DateTimeType;
@@ -265,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);
@@ -300,7 +296,7 @@ public static Object getValue(String channelId, AirQualityJsonResponse data) thr
                 case CO:
                     return data.getData().getIaqi().getCo();
                 case SO2:
-                    return data.getData().getIaqi().getSo2();                    
+                    return data.getData().getIaqi().getSo2();
                 case LOCATIONNAME:
                     return data.getData().getCity().getName();
                 case STATIONID:
@@ -310,9 +306,9 @@ public static Object getValue(String channelId, AirQualityJsonResponse data) thr
                 case OBSERVATIONTIME:
                     return data.getData().getTime().getObservationTime();
                 case TEMPERATURE:
-                    return new QuantityType<Temperature>(data.getData().getIaqi().getT(), API_TEMPERATURE_UNIT);
+                    return new QuantityType<>(data.getData().getIaqi().getT(), API_TEMPERATURE_UNIT);
                 case PRESSURE:
-                    return new QuantityType<Pressure>(data.getData().getIaqi().getP(), API_PRESSURE_UNIT);
+                    return new QuantityType<>(data.getData().getIaqi().getP(), API_PRESSURE_UNIT);
                 case HUMIDITY:
                     return new QuantityType<>(data.getData().getIaqi().getH(), API_HUMIDITY_UNIT);
                 case DOMINENTPOL:

bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonCity.java

@@ -39,7 +39,7 @@ public String getUrl() {
     }
 
     public String getGeo() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (int i = 0; i < geo.size(); i++) {
             list.add(geo.get(i).toString());
         }

bundles/org.openhab.binding.airquality/src/main/java/org/openhab/binding/airquality/internal/json/AirQualityJsonData.java

@@ -87,7 +87,7 @@ public AirQualityJsonCity getCity() {
      * @return {String}
      */
     public String getAttributions() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (int i = 0; i < attributions.size(); i++) {
             list.add(attributions.get(i).getName());
         }

bundles/org.openhab.binding.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);

bundles/org.openhab.binding.allplay/src/main/java/org/openhab/binding/allplay/internal/AllPlayHandlerFactory.java

@@ -99,7 +99,7 @@ private void registerAudioSink(Thing thing, AllPlayHandler handler) {
         AllPlayAudioSink audioSink = new AllPlayAudioSink(handler, audioHTTPServer, callbackUrl);
         @SuppressWarnings("unchecked")
         ServiceRegistration<AudioSink> reg = (ServiceRegistration<AudioSink>) bundleContext
-                .registerService(AudioSink.class.getName(), audioSink, new Hashtable<String, Object>());
+                .registerService(AudioSink.class.getName(), audioSink, new Hashtable<>());
         audioSinkRegistrations.put(thing.getUID().toString(), reg);
     }
 

bundles/org.openhab.binding.amazonechocontrol/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() + "/";

bundles/org.openhab.binding.amazonechocontrol/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());

bundles/org.openhab.binding.amazonechocontrol/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;

bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/channelhandler/ChannelHandlerAnnouncement.java

@@ -66,10 +66,10 @@ public boolean tryHandleCommand(Device device, Connection connection, String cha
                             }
                             Boolean sound = request.sound;
                             if (sound != null) {
-                                if (sound == false && !speak.startsWith("<speak>")) {
+                                if (!sound && !speak.startsWith("<speak>")) {
                                     speak = "<speak>" + StringEscapeUtils.escapeXml(speak) + "</speak>";
                                 }
-                                if (sound == true && speak.startsWith("<speak>")) {
+                                if (sound && speak.startsWith("<speak>")) {
                                     body = "Error: The combination of sound and speak in SSML syntax is not allowed";
                                     title = "Error";
                                     speak = "<speak><lang xml:lang=\"en-UK\">Error: The combination of sound and speak in <prosody rate=\"x-slow\"><say-as interpret-as=\"characters\">SSML</say-as></prosody> syntax is not allowed</lang></speak>";

bundles/org.openhab.binding.amazonechocontrol/src/main/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++) {

bundles/org.openhab.binding.amazonechocontrol/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<>();