From 6f8b6a621ae7f12c7f55a9b31aa8ff4afab5a559 Mon Sep 17 00:00:00 2001 From: Laurent ARNAL Date: Thu, 1 Feb 2024 19:31:05 +0100 Subject: [PATCH] spotless:apply Signed-off-by: Laurent ARNAL --- .../src/main/feature/feature.xml | 2 +- .../linky/internal/LinkyAuthService.java | 2 +- .../linky/internal/LinkyAuthServlet.java | 2 +- .../linky/internal/LinkyBindingConstants.java | 1 - .../linky/internal/LinkyHandlerFactory.java | 4 - .../linky/internal/dto/AddressInfo.java | 1 - .../binding/linky/internal/dto/Customer.java | 1 - .../linky/internal/dto/IntervalReading.java | 1 - .../linky/internal/dto/MeterReading.java | 1 - .../linky/internal/dto/MeterResponse.java | 1 - .../linky/internal/handler/LinkyHandler.java | 12 +-- .../resources/OH-INF/thing/thing-types.xml | 101 +++++++++--------- 12 files changed, 57 insertions(+), 72 deletions(-) diff --git a/bundles/org.openhab.binding.linky/src/main/feature/feature.xml b/bundles/org.openhab.binding.linky/src/main/feature/feature.xml index 7e83306ff37..16185d9fffd 100644 --- a/bundles/org.openhab.binding.linky/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.linky/src/main/feature/feature.xml @@ -7,6 +7,6 @@ openhab-core-auth-oauth2client mvn:org.jsoup/jsoup/1.14.3 mvn:org.openhab.addons.bundles/org.openhab.binding.linky/${project.version} - + diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthService.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthService.java index 9f6bed55693..db00174987d 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthService.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthService.java @@ -199,4 +199,4 @@ public class LinkyAuthService { protected void unsetHttpService(HttpService httpService) { this.httpService = null; } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java index e98c810eb56..75ad3d3dd98 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java @@ -169,4 +169,4 @@ public class LinkyAuthServlet extends HttpServlet { m.appendTail(sb); return sb.toString(); } -} \ No newline at end of file +} diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyBindingConstants.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyBindingConstants.java index 4b7289f374c..1787c67f1d6 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyBindingConstants.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyBindingConstants.java @@ -81,5 +81,4 @@ public class LinkyBindingConstants { public static final String ENEDIS_ACCOUNT_URL = "https://mon-compte-particulier.enedis.fr/"; public static final String ENEDIS_AUTHORIZE_URL = ENEDIS_ACCOUNT_URL + "dataconnect/v1/oauth2/authorize"; public static final String ENEDIS_API_TOKEN_URL = ENEDIS_ACCOUNT_URL + "token"; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyHandlerFactory.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyHandlerFactory.java index bdf8bb1bd17..0ec0c6f2f35 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyHandlerFactory.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyHandlerFactory.java @@ -134,7 +134,6 @@ public class LinkyHandlerFactory extends BaseThingHandlerFactory implements Link LinkyBindingConstants.LINKY_AUTHORIZE_URL, clientId, clientSecret, LinkyBindingConstants.LINKY_SCOPES, true); this.authService.setLinkyAccountHandler(this); - } @Override @@ -181,7 +180,6 @@ public class LinkyHandlerFactory extends BaseThingHandlerFactory implements Link return accessTokenResponse != null && accessTokenResponse.getAccessToken() != null && accessTokenResponse.getRefreshToken() != null; - } private @Nullable AccessTokenResponse getAccessTokenResponse() { @@ -288,7 +286,6 @@ public class LinkyHandlerFactory extends BaseThingHandlerFactory implements Link uri = uri + "&response_type=" + "code"; return uri; } - } @Override @@ -308,5 +305,4 @@ public class LinkyHandlerFactory extends BaseThingHandlerFactory implements Link return result.toArray(new String[0]); } - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/AddressInfo.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/AddressInfo.java index bb7170b1649..54f9b19af81 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/AddressInfo.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/AddressInfo.java @@ -35,5 +35,4 @@ public class AddressInfo { public String city; public String country; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/Customer.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/Customer.java index de2caae124a..26e7abe6ade 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/Customer.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/Customer.java @@ -29,5 +29,4 @@ public class Customer { @SerializedName("usage_points") public UsagePoint[] usagePoints; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/IntervalReading.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/IntervalReading.java index 7c8055aebea..bcfadd57069 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/IntervalReading.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/IntervalReading.java @@ -31,5 +31,4 @@ public class IntervalReading { @SerializedName("date") public LocalDateTime date; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterReading.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterReading.java index c182bb86a0a..eb967967af1 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterReading.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterReading.java @@ -45,5 +45,4 @@ public class MeterReading { public IntervalReading[] weekValue; public IntervalReading[] monthValue; public IntervalReading[] yearValue; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterResponse.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterResponse.java index ff307fd9fee..f5d1f85ad73 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterResponse.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/MeterResponse.java @@ -26,5 +26,4 @@ import com.google.gson.annotations.SerializedName; public class MeterResponse { @SerializedName("meter_reading") public MeterReading meterReading; - } diff --git a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java index 03d63b3d4c9..402c68ad2d6 100644 --- a/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java +++ b/bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java @@ -39,11 +39,7 @@ import org.openhab.core.auth.client.oauth2.OAuthFactory; import org.openhab.core.config.core.Configuration; import org.openhab.core.i18n.LocaleProvider; import org.openhab.core.library.types.QuantityType; -<<<<<<< HEAD -import org.openhab.core.library.unit.MetricPrefix; -======= import org.openhab.core.library.types.StringType; ->>>>>>> 8179e0592f (some fixes on connectlinky page) import org.openhab.core.library.unit.Units; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; @@ -594,10 +590,9 @@ public class LinkyHandler extends BaseThingHandler { if (meterReading.intervalReading.length == 0) { throw new LinkyException("Invalid meterReading data: no day period"); } - if (meterReading.intervalReading.length != 1095) { - throw new LinkyException("Imcomplete meterReading data < 1095 days"); - } - + // if (meterReading.intervalReading.length != 1095) { + // throw new LinkyException("Imcomplete meterReading data < 1095 days"); + // } } /* @@ -687,5 +682,4 @@ public class LinkyHandler extends BaseThingHandler { public void saveConfiguration(Configuration config) { updateConfiguration(config); } - } diff --git a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/thing/thing-types.xml index f6d4ff1a4f0..43b60a1fb1d 100644 --- a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/thing/thing-types.xml @@ -12,31 +12,32 @@ https://espace-client-particuliers.enedis.fr/web/espace-particuliers/compteur-linky. - + - + - + - - - + + + - - - Your PrmId - + + + Your PrmId + - Your Enedis token (can be left empty, use the connection page to automatically fill it http://youopenhab/connectlinky) + Your Enedis token (can be left empty, use the connection page to automatically fill it + http://youopenhab/connectlinky) - - + + @@ -46,26 +47,26 @@ - - - - - + + + + + Maximum power usage timestamp - - - - Maximum power usage timestamp - - - - - Maximum power usage timestamp - + + + + Maximum power usage timestamp + + + + + Maximum power usage timestamp + @@ -79,8 +80,8 @@ - - + + @@ -93,9 +94,9 @@ - - - + + + @@ -108,27 +109,27 @@ - - - + + + - + - - - - - - - - - + + + + + + + + + - String - - Test Select - + String + + Test Select + Number:Energy