From 55cce13a0c04156e4ce3d22941cb74864815dba5 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Thu, 16 Feb 2023 21:05:46 +0100 Subject: [PATCH 01/10] Remove org.apache.commons Signed-off-by: lsiepel --- .../internal/connection/EnturNoConnection.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 8d9b01fe5e463..3d1efc40fcaa4 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; @@ -189,10 +188,8 @@ private String getRequestBody(Map params) throws IOException { } private List processData(StopPlace stopPlace, String lineCode) { - Map> departures = stopPlace.estimatedCalls.stream() - .filter(call -> StringUtils.equalsIgnoreCase( - StringUtils.trimToEmpty(call.serviceJourney.journeyPattern.line.publicCode), - StringUtils.trimToEmpty(lineCode))) + Map> departures = stopPlace.estimatedCalls.stream().filter( + call -> call.serviceJourney.journeyPattern.line.publicCode.strip().equalsIgnoreCase(lineCode.strip())) .collect(groupingBy(call -> call.quay.id)); List processedData = new ArrayList<>(); @@ -235,11 +232,10 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map Date: Thu, 16 Feb 2023 21:58:44 +0100 Subject: [PATCH 02/10] Fix substring length Signed-off-by: lsiepel --- .../binding/enturno/internal/connection/EnturNoConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 3d1efc40fcaa4..a1d6375ed779b 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -233,7 +233,7 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map Date: Thu, 16 Feb 2023 21:59:16 +0100 Subject: [PATCH 03/10] sat Signed-off-by: lsiepel --- .../binding/enturno/internal/connection/EnturNoConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index a1d6375ed779b..1ec5799ac9abd 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -233,7 +233,7 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map Date: Sat, 29 Jul 2023 23:21:16 +0200 Subject: [PATCH 04/10] Fix possible IndexOutOfBoundsException Signed-off-by: lsiepel --- .../enturno/internal/connection/EnturNoConnection.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 1ec5799ac9abd..bb70e82b7a86f 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -232,8 +232,12 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map 0) { + dateTime = dateTimeWithoutColonInZone.substring(0, dateTimeWithoutColonInZone.lastIndexOf("+")); + offset = dateTimeWithoutColonInZone.substring(dateTimeWithoutColonInZone.lastIndexOf("+") + 1); + } StringBuilder builder = new StringBuilder(); return builder.append(dateTime).append("+").append(offset.substring(0, 2)).append(":00").toString(); From 8df8fa05e265b2c296166ef06d9234e982869778 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Sat, 29 Jul 2023 23:27:26 +0200 Subject: [PATCH 05/10] Fix substringAfterLast alternative Signed-off-by: lsiepel --- .../enturno/internal/connection/EnturNoConnection.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index bb70e82b7a86f..8cce213e19630 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; @@ -233,13 +234,16 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map 0) { dateTime = dateTimeWithoutColonInZone.substring(0, dateTimeWithoutColonInZone.lastIndexOf("+")); offset = dateTimeWithoutColonInZone.substring(dateTimeWithoutColonInZone.lastIndexOf("+") + 1); + if (offset.length() > 1) { + offset = offset.substring(0,2); + } } StringBuilder builder = new StringBuilder(); - return builder.append(dateTime).append("+").append(offset.substring(0, 2)).append(":00").toString(); + return builder.append(dateTime).append("+").append(offset).append(":00").toString(); } } From d93e82a42b248890aaff831c6c5a9fb9eb6732e0 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Sat, 29 Jul 2023 23:27:55 +0200 Subject: [PATCH 06/10] Spotless Signed-off-by: lsiepel --- .../binding/enturno/internal/connection/EnturNoConnection.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 8cce213e19630..0ec1aa4aee15e 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; @@ -239,7 +238,7 @@ private String getIsoDateTime(String dateTimeWithoutColonInZone) { dateTime = dateTimeWithoutColonInZone.substring(0, dateTimeWithoutColonInZone.lastIndexOf("+")); offset = dateTimeWithoutColonInZone.substring(dateTimeWithoutColonInZone.lastIndexOf("+") + 1); if (offset.length() > 1) { - offset = offset.substring(0,2); + offset = offset.substring(0, 2); } } From c3005e67340e2749c003431753ed4483261eb01d Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Thu, 26 Oct 2023 14:40:33 +0200 Subject: [PATCH 07/10] Add tests Signed-off-by: Leo Siepel --- .../connection/EnturNoConnection.java | 14 ++++-- .../internal/EnturNoConnectionTest.java | 43 +++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 0ec1aa4aee15e..6712c6a17ba02 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -211,8 +211,8 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map keys = new ArrayList<>(departures.keySet()); DisplayData processedData = new DisplayData(); List quayCalls = departures.get(keys.get(quayIndex)); - List departureTimes = quayCalls.stream().map(eq -> eq.expectedDepartureTime).map(this::getIsoDateTime) - .collect(Collectors.toList()); + List departureTimes = quayCalls.stream().map(eq -> eq.expectedDepartureTime) + .map(EnturNoConnection::getIsoDateTime).collect(Collectors.toList()); List estimatedFlags = quayCalls.stream().map(es -> es.realtime).collect(Collectors.toList()); @@ -231,9 +231,15 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map 0) { dateTime = dateTimeWithoutColonInZone.substring(0, dateTimeWithoutColonInZone.lastIndexOf("+")); offset = dateTimeWithoutColonInZone.substring(dateTimeWithoutColonInZone.lastIndexOf("+") + 1); diff --git a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java new file mode 100644 index 0000000000000..ba5e2dc79fa3f --- /dev/null +++ b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2010-2023 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.enturno.internal; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.junit.jupiter.api.Test; +import org.openhab.binding.enturno.internal.connection.EnturNoConnection; + +/** + * The {@link EnturNoConnectionTest} class defines tests for the {@link EnturNoConnection} implemenation + * + * @author Leo Siepel - Initial contribution + */ +@NonNullByDefault +public class EnturNoConnectionTest { + + @Test + public void getIsoDateTime_WithoutColonInZone() { + assertEquals("2023-10-25T09:01:00+02:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00+0200")); + } + + @Test + public void getIsoDateTime_WithColonInZone() { + assertEquals("2023-10-25T09:01:00+02:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00+02:00")); + } + + @Test + public void getIsoDateTime_WithoutZone() { + assertEquals("2023-10-25T09:01:00+00:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00")); + } +} From 2591428860b937d8b5bf22749406dfe2bd837626 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Thu, 26 Oct 2023 14:49:41 +0200 Subject: [PATCH 08/10] typo Signed-off-by: Leo Siepel --- .../openhab/binding/enturno/internal/EnturNoConnectionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java index ba5e2dc79fa3f..266a3273845dc 100644 --- a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java +++ b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java @@ -19,7 +19,7 @@ import org.openhab.binding.enturno.internal.connection.EnturNoConnection; /** - * The {@link EnturNoConnectionTest} class defines tests for the {@link EnturNoConnection} implemenation + * The {@link EnturNoConnectionTest} class defines tests for the {@link EnturNoConnection} class * * @author Leo Siepel - Initial contribution */ From 74bcfef46de00f4c5eca7ef32653954c33405386 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Fri, 27 Oct 2023 10:33:03 +0200 Subject: [PATCH 09/10] Review comment Signed-off-by: Leo Siepel --- .../connection/EnturNoConnection.java | 24 +-------- .../enturno/internal/util/DateUtil.java | 51 +++++++++++++++++++ .../internal/EnturNoConnectionTest.java | 43 ---------------- .../enturno/internal/util/DateUtilTest.java | 46 +++++++++++++++++ 4 files changed, 99 insertions(+), 65 deletions(-) create mode 100644 bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/util/DateUtil.java delete mode 100644 bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java create mode 100644 bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/util/DateUtilTest.java diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index 6712c6a17ba02..d9b73d18116b6 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -45,6 +45,7 @@ import org.openhab.binding.enturno.internal.model.estimated.EstimatedCalls; import org.openhab.binding.enturno.internal.model.simplified.DisplayData; import org.openhab.binding.enturno.internal.model.stopplace.StopPlace; +import org.openhab.binding.enturno.internal.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -212,7 +213,7 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map quayCalls = departures.get(keys.get(quayIndex)); List departureTimes = quayCalls.stream().map(eq -> eq.expectedDepartureTime) - .map(EnturNoConnection::getIsoDateTime).collect(Collectors.toList()); + .map(DateUtil::getIsoDateTime).collect(Collectors.toList()); List estimatedFlags = quayCalls.stream().map(es -> es.realtime).collect(Collectors.toList()); @@ -230,25 +231,4 @@ private DisplayData getDisplayData(StopPlace stopPlace, Map 0) { - dateTime = dateTimeWithoutColonInZone.substring(0, dateTimeWithoutColonInZone.lastIndexOf("+")); - offset = dateTimeWithoutColonInZone.substring(dateTimeWithoutColonInZone.lastIndexOf("+") + 1); - if (offset.length() > 1) { - offset = offset.substring(0, 2); - } - } - - StringBuilder builder = new StringBuilder(); - return builder.append(dateTime).append("+").append(offset).append(":00").toString(); - } } diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/util/DateUtil.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/util/DateUtil.java new file mode 100644 index 0000000000000..4f1be63128cf0 --- /dev/null +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/util/DateUtil.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010-2023 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.enturno.internal.util; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +import org.eclipse.jdt.annotation.NonNullByDefault; + +/** + * EnturNo date utility methods. + * + * @author Jacob Laursen - Initial contribution + */ +@NonNullByDefault +public class DateUtil { + /** + * Converts a zoned date time string that lacks a colon in the zone to an ISO-8601 formatted string. + * + * @param dateTimeWithoutColonInZone + * @return ISO-8601 formatted string + */ + public static String getIsoDateTime(String dateTimeWithoutColonInZone) { + ZonedDateTime zonedDateTime = null; + try { + zonedDateTime = ZonedDateTime.parse(dateTimeWithoutColonInZone); + } catch (DateTimeParseException e) { + // Skip + } + try { + zonedDateTime = ZonedDateTime.parse(dateTimeWithoutColonInZone.replaceAll("(\\d{2})(\\d{2})$", "$1:$2")); + } catch (DateTimeParseException e) { + // Skip + } + if (zonedDateTime != null) { + return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(zonedDateTime); + } + return dateTimeWithoutColonInZone; + } +} diff --git a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java deleted file mode 100644 index 266a3273845dc..0000000000000 --- a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/EnturNoConnectionTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) 2010-2023 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.openhab.binding.enturno.internal; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.eclipse.jdt.annotation.NonNullByDefault; -import org.junit.jupiter.api.Test; -import org.openhab.binding.enturno.internal.connection.EnturNoConnection; - -/** - * The {@link EnturNoConnectionTest} class defines tests for the {@link EnturNoConnection} class - * - * @author Leo Siepel - Initial contribution - */ -@NonNullByDefault -public class EnturNoConnectionTest { - - @Test - public void getIsoDateTime_WithoutColonInZone() { - assertEquals("2023-10-25T09:01:00+02:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00+0200")); - } - - @Test - public void getIsoDateTime_WithColonInZone() { - assertEquals("2023-10-25T09:01:00+02:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00+02:00")); - } - - @Test - public void getIsoDateTime_WithoutZone() { - assertEquals("2023-10-25T09:01:00+00:00", EnturNoConnection.getIsoDateTime("2023-10-25T09:01:00")); - } -} diff --git a/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/util/DateUtilTest.java b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/util/DateUtilTest.java new file mode 100644 index 0000000000000..c9ac27df9419e --- /dev/null +++ b/bundles/org.openhab.binding.enturno/src/test/java/org/openhab/binding/enturno/internal/util/DateUtilTest.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2010-2023 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.openhab.binding.enturno.internal.util; + +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.util.stream.Stream; + +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +/** + * Tests for {@link DateUtil}. + * + * @author Jacob Laursen - Initial contribution + */ +@NonNullByDefault +public class DateUtilTest { + @ParameterizedTest + @MethodSource("provideTestCasesForGetIsoDateTime") + void getIsoDateTime(String value, String expected) { + assertThat(DateUtil.getIsoDateTime(value), is(expected)); + } + + private static Stream provideTestCasesForGetIsoDateTime() { + return Stream.of( // + Arguments.of("2023-10-25T09:01:00+0200", "2023-10-25T09:01:00+02:00"), + Arguments.of("2023-10-25T09:01:00+02:00", "2023-10-25T09:01:00+02:00"), + Arguments.of("2023-10-25T09:01:00-0300", "2023-10-25T09:01:00-03:00"), + Arguments.of("2023-10-25T09:01:00+02:30", "2023-10-25T09:01:00+02:30"), + Arguments.of("2023-10-25T09:01:00", "2023-10-25T09:01:00")); + } +} From dae120c87f9214b4c6fc4d5e158b136707cb09dc Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Fri, 27 Oct 2023 10:36:07 +0200 Subject: [PATCH 10/10] Fix warnings Signed-off-by: Leo Siepel --- .../openhab/binding/enturno/internal/EnturNoHandler.java | 2 +- .../enturno/internal/connection/EnturNoConnection.java | 8 ++++---- .../binding/enturno/internal/{model => dto}/Data.java | 4 ++-- .../enturno/internal/{model => dto}/EnturData.java | 2 +- .../enturno/internal/{model => dto}/EnturJsonData.java | 2 +- .../{model => dto}/estimated/DestinationDisplay.java | 2 +- .../internal/{model => dto}/estimated/EstimatedCalls.java | 2 +- .../internal/{model => dto}/estimated/JourneyPattern.java | 2 +- .../enturno/internal/{model => dto}/estimated/Line.java | 2 +- .../enturno/internal/{model => dto}/estimated/Quay.java | 2 +- .../internal/{model => dto}/estimated/ServiceJourney.java | 2 +- .../internal/{model => dto}/simplified/DisplayData.java | 2 +- .../internal/{model => dto}/stopplace/StopPlace.java | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/Data.java (82%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/EnturData.java (91%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/EnturJsonData.java (91%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/DestinationDisplay.java (90%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/EstimatedCalls.java (93%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/JourneyPattern.java (90%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/Line.java (91%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/Quay.java (90%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/estimated/ServiceJourney.java (90%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/simplified/DisplayData.java (93%) rename bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/{model => dto}/stopplace/StopPlace.java (83%) diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java index a89e5bcefa978..853f25fa8b2ba 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java @@ -26,7 +26,7 @@ import org.openhab.binding.enturno.internal.connection.EnturCommunicationException; import org.openhab.binding.enturno.internal.connection.EnturConfigurationException; import org.openhab.binding.enturno.internal.connection.EnturNoConnection; -import org.openhab.binding.enturno.internal.model.simplified.DisplayData; +import org.openhab.binding.enturno.internal.dto.simplified.DisplayData; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.StringType; import org.openhab.core.thing.Channel; diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java index d9b73d18116b6..6ed517a6070c3 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java @@ -41,10 +41,10 @@ import org.eclipse.jetty.http.HttpHeader; import org.openhab.binding.enturno.internal.EnturNoConfiguration; import org.openhab.binding.enturno.internal.EnturNoHandler; -import org.openhab.binding.enturno.internal.model.EnturJsonData; -import org.openhab.binding.enturno.internal.model.estimated.EstimatedCalls; -import org.openhab.binding.enturno.internal.model.simplified.DisplayData; -import org.openhab.binding.enturno.internal.model.stopplace.StopPlace; +import org.openhab.binding.enturno.internal.dto.EnturJsonData; +import org.openhab.binding.enturno.internal.dto.estimated.EstimatedCalls; +import org.openhab.binding.enturno.internal.dto.simplified.DisplayData; +import org.openhab.binding.enturno.internal.dto.stopplace.StopPlace; import org.openhab.binding.enturno.internal.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/Data.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/Data.java similarity index 82% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/Data.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/Data.java index f17de89a60734..c6a37b9b87dde 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/Data.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/Data.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model; +package org.openhab.binding.enturno.internal.dto; -import org.openhab.binding.enturno.internal.model.stopplace.StopPlace; +import org.openhab.binding.enturno.internal.dto.stopplace.StopPlace; /** * Generated Plain Old Java Objects class for {@link Data} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturData.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturData.java similarity index 91% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturData.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturData.java index b6d5db3bff671..04293d790dd84 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturData.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturData.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model; +package org.openhab.binding.enturno.internal.dto; /** * Generated Plain Old Java Objects class for {@link Data} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturJsonData.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturJsonData.java similarity index 91% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturJsonData.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturJsonData.java index 446a5ce1a26e0..f175af3fca3e1 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/EnturJsonData.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/EnturJsonData.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model; +package org.openhab.binding.enturno.internal.dto; /** * {@link EnturJsonData} is a root level class to holding reference of data generated from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/DestinationDisplay.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/DestinationDisplay.java similarity index 90% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/DestinationDisplay.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/DestinationDisplay.java index d16d3c30a832b..4818da5240d17 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/DestinationDisplay.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/DestinationDisplay.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link DestinationDisplay} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/EstimatedCalls.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/EstimatedCalls.java similarity index 93% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/EstimatedCalls.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/EstimatedCalls.java index 52f51a7bf9e2d..c3a056c05c7f9 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/EstimatedCalls.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/EstimatedCalls.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link EstimatedCalls} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/JourneyPattern.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/JourneyPattern.java similarity index 90% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/JourneyPattern.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/JourneyPattern.java index 39bbcd5331d68..e5ba379f33a00 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/JourneyPattern.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/JourneyPattern.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link JourneyPattern} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Line.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Line.java similarity index 91% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Line.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Line.java index 068d066552354..db43d2ea0c080 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Line.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Line.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link Line} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Quay.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Quay.java similarity index 90% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Quay.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Quay.java index 114072440a836..310ff8e32350c 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/Quay.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/Quay.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link Quay} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/ServiceJourney.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/ServiceJourney.java similarity index 90% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/ServiceJourney.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/ServiceJourney.java index 7b7dbb969afd2..e5f35fdc79c20 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/estimated/ServiceJourney.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/estimated/ServiceJourney.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.estimated; +package org.openhab.binding.enturno.internal.dto.estimated; /** * Generated Plain Old Java Objects class for {@link ServiceJourney} from JSON. diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/simplified/DisplayData.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/simplified/DisplayData.java similarity index 93% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/simplified/DisplayData.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/simplified/DisplayData.java index bf210c3dca8c0..2ed9afd13bb5c 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/simplified/DisplayData.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/simplified/DisplayData.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.simplified; +package org.openhab.binding.enturno.internal.dto.simplified; import java.util.List; diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/stopplace/StopPlace.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/stopplace/StopPlace.java similarity index 83% rename from bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/stopplace/StopPlace.java rename to bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/stopplace/StopPlace.java index 0f0492ae3ce9a..7881e29a1bd20 100644 --- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/model/stopplace/StopPlace.java +++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/dto/stopplace/StopPlace.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.enturno.internal.model.stopplace; +package org.openhab.binding.enturno.internal.dto.stopplace; -import org.openhab.binding.enturno.internal.model.estimated.EstimatedCalls; +import org.openhab.binding.enturno.internal.dto.estimated.EstimatedCalls; /** * Generated Plain Old Java Objects class for {@link StopPlace} from JSON.