From e3ae01df9102a378bdaff43062d5b491617077e3 Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Tue, 12 Jan 2021 22:15:21 +0100 Subject: [PATCH] [kostalinverter] Fixed package structure (#9559) The internal package was placed before the binding specific package, and it should be the other way around. Signed-off-by: Hilbrand Bouwkamp --- .../internal}/KostalInverterFactory.java | 10 +++++----- .../internal}/firstgeneration/ChannelConfig.java | 2 +- .../internal}/firstgeneration/SourceConfig.java | 2 +- .../internal}/firstgeneration/WebscrapeHandler.java | 2 +- .../ThirdGenerationBindingConstants.java | 2 +- .../ThirdGenerationChannelDatatypes.java | 2 +- .../ThirdGenerationChannelMappingToWebApi.java | 2 +- .../thirdgeneration/ThirdGenerationConfiguration.java | 2 +- .../ThirdGenerationEncryptionHelper.java | 4 ++-- .../thirdgeneration/ThirdGenerationHandler.java | 4 ++-- .../thirdgeneration/ThirdGenerationHttpHelper.java | 2 +- .../thirdgeneration/ThirdGenerationInverterTypes.java | 2 +- .../ThirdGenerationMappingInverterToChannel.java | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/KostalInverterFactory.java (91%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/firstgeneration/ChannelConfig.java (92%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/firstgeneration/SourceConfig.java (89%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/firstgeneration/WebscrapeHandler.java (98%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationBindingConstants.java (99%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationChannelDatatypes.java (91%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java (95%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationConfiguration.java (90%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationEncryptionHelper.java (95%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationHandler.java (99%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationHttpHelper.java (98%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationInverterTypes.java (93%) rename bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/{internal/kostal/inverter => kostalinverter/internal}/thirdgeneration/ThirdGenerationMappingInverterToChannel.java (99%) diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/KostalInverterFactory.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/KostalInverterFactory.java similarity index 91% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/KostalInverterFactory.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/KostalInverterFactory.java index 47a3c4926e2..79a00e2912f 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/KostalInverterFactory.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/KostalInverterFactory.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter; +package org.openhab.binding.kostalinverter.internal; -import static org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationBindingConstants.*; +import static org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationBindingConstants.*; import java.util.HashMap; import java.util.Map; @@ -20,9 +20,9 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; -import org.openhab.binding.internal.kostal.inverter.firstgeneration.WebscrapeHandler; -import org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationHandler; -import org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationInverterTypes; +import org.openhab.binding.kostalinverter.internal.firstgeneration.WebscrapeHandler; +import org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationHandler; +import org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationInverterTypes; import org.openhab.core.io.net.http.HttpClientFactory; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/ChannelConfig.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/ChannelConfig.java similarity index 92% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/ChannelConfig.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/ChannelConfig.java index 145c53292a6..2216753182a 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/ChannelConfig.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/ChannelConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.firstgeneration; +package org.openhab.binding.kostalinverter.internal.firstgeneration; import javax.measure.Unit; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/SourceConfig.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/SourceConfig.java similarity index 89% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/SourceConfig.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/SourceConfig.java index 04c7060b1ec..deec9e74152 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/SourceConfig.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/SourceConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.firstgeneration; +package org.openhab.binding.kostalinverter.internal.firstgeneration; /** * @author Christian Schneider - Initial contribution diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/WebscrapeHandler.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/WebscrapeHandler.java similarity index 98% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/WebscrapeHandler.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/WebscrapeHandler.java index 5238893aa35..c635db30698 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/WebscrapeHandler.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/firstgeneration/WebscrapeHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.firstgeneration; +package org.openhab.binding.kostalinverter.internal.firstgeneration; import java.io.IOException; import java.math.BigDecimal; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationBindingConstants.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java similarity index 99% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationBindingConstants.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java index 9390ccb0e98..d279b706d1e 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationBindingConstants.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationBindingConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelDatatypes.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java similarity index 91% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelDatatypes.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java index 1004ee2a1a6..75b4e023d1b 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelDatatypes.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelDatatypes.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; /** * The {@link ThirdGenerationChannelDatatypes} enumeration contains the data types provided by the device diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java similarity index 95% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java index ebb299b814d..b74b31a33ab 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationChannelMappingToWebApi.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; /*** * The {@link ThirdGenerationChannelMappingToWebApi}} is used to map the channel name to the web API commands diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationConfiguration.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationConfiguration.java similarity index 90% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationConfiguration.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationConfiguration.java index a77a6a2cf75..9683751f694 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationConfiguration.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationConfiguration.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; /** * The {@link ThirdGenerationConfiguration} class contains fields mapping thing configuration parameters. diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationEncryptionHelper.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationEncryptionHelper.java similarity index 95% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationEncryptionHelper.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationEncryptionHelper.java index db4079d1675..7c3a07eeaf5 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationEncryptionHelper.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationEncryptionHelper.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; -import static org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationBindingConstants.*; +import static org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationBindingConstants.*; import java.security.InvalidKeyException; import java.security.MessageDigest; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHandler.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java similarity index 99% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHandler.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java index 7f815b71716..b4c16e004f9 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHandler.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHandler.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; -import static org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationBindingConstants.*; +import static org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationBindingConstants.*; import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHttpHelper.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHttpHelper.java similarity index 98% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHttpHelper.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHttpHelper.java index c20a995a2f3..9759b6f58d3 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHttpHelper.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationHttpHelper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationInverterTypes.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationInverterTypes.java similarity index 93% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationInverterTypes.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationInverterTypes.java index c8cefc9ec50..f49b03d34cc 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationInverterTypes.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationInverterTypes.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; /** * The {@link ThirdGenerationInverterTypes} contains the list of supported devices diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationMappingInverterToChannel.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java similarity index 99% rename from bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationMappingInverterToChannel.java rename to bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java index 6197e947f3d..3d61b8a39a4 100644 --- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationMappingInverterToChannel.java +++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/thirdgeneration/ThirdGenerationMappingInverterToChannel.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.internal.kostal.inverter.thirdgeneration; +package org.openhab.binding.kostalinverter.internal.thirdgeneration; -import static org.openhab.binding.internal.kostal.inverter.thirdgeneration.ThirdGenerationBindingConstants.*; +import static org.openhab.binding.kostalinverter.internal.thirdgeneration.ThirdGenerationBindingConstants.*; import java.util.ArrayList; import java.util.Arrays;