From 5bb82993f4e91332437bd02dbcc62c64aa9be1ee Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 24 Jan 2019 23:07:09 +0100 Subject: [PATCH] [nuki] Made constants and handler packages internal (#4688) See eclipse/smarthome#4330 Signed-off-by: Wouter Born --- .../binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF | 5 ----- .../binding/nuki/{ => internal}/NukiBindingConstants.java | 2 +- .../openhab/binding/nuki/internal/NukiHandlerFactory.java | 5 ++--- .../nuki/internal/converter/LockActionConverter.java | 2 +- .../binding/nuki/internal/dataexchange/NukiApiServlet.java | 6 +++--- .../binding/nuki/internal/dataexchange/NukiHttpClient.java | 2 +- .../nuki/{ => internal}/handler/NukiBridgeHandler.java | 4 ++-- .../nuki/{ => internal}/handler/NukiSmartLockHandler.java | 4 ++-- 8 files changed, 12 insertions(+), 18 deletions(-) rename addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/{ => internal}/NukiBindingConstants.java (98%) rename addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/{ => internal}/handler/NukiBridgeHandler.java (98%) rename addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/{ => internal}/handler/NukiSmartLockHandler.java (99%) diff --git a/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF index 920e436afad5e..4e2be77a985f7 100644 --- a/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.nuki/META-INF/MANIFEST.MF @@ -8,9 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.nuki;singleton:=true Bundle-Vendor: openHAB Bundle-Version: 2.5.0.qualifier -Export-Package: - org.openhab.binding.nuki, - org.openhab.binding.nuki.handler Import-Package: com.google.gson, javax.servlet, @@ -33,8 +30,6 @@ Import-Package: org.eclipse.smarthome.core.thing.type, org.eclipse.smarthome.core.types, org.eclipse.smarthome.io.net.http, - org.openhab.binding.nuki, - org.openhab.binding.nuki.handler, org.osgi.framework, org.osgi.service.http, org.slf4j diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/NukiBindingConstants.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiBindingConstants.java similarity index 98% rename from addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/NukiBindingConstants.java rename to addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiBindingConstants.java index 4599af6449c27..423922d2d92a4 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/NukiBindingConstants.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiBindingConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.nuki; +package org.openhab.binding.nuki.internal; import java.util.Collections; import java.util.Set; diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java index 7048d43448085..677810edfc335 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java @@ -24,10 +24,9 @@ import org.eclipse.smarthome.core.thing.binding.ThingHandler; import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; import org.eclipse.smarthome.io.net.http.HttpClientFactory; -import org.openhab.binding.nuki.NukiBindingConstants; -import org.openhab.binding.nuki.handler.NukiBridgeHandler; -import org.openhab.binding.nuki.handler.NukiSmartLockHandler; import org.openhab.binding.nuki.internal.dataexchange.NukiApiServlet; +import org.openhab.binding.nuki.internal.handler.NukiBridgeHandler; +import org.openhab.binding.nuki.internal.handler.NukiSmartLockHandler; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.http.HttpService; diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/converter/LockActionConverter.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/converter/LockActionConverter.java index 6f680cf8c5252..6549189f8ddda 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/converter/LockActionConverter.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/converter/LockActionConverter.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import org.openhab.binding.nuki.NukiBindingConstants; +import org.openhab.binding.nuki.internal.NukiBindingConstants; /** * The {@link LockActionConverter} is responsible for mapping Binding Lock States to Bridge HTTP-API Lock Actions. diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiApiServlet.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiApiServlet.java index 2e326e906f81d..528342ab72aa5 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiApiServlet.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiApiServlet.java @@ -31,11 +31,11 @@ import org.eclipse.smarthome.core.thing.Channel; import org.eclipse.smarthome.core.thing.Thing; import org.eclipse.smarthome.core.types.State; -import org.openhab.binding.nuki.NukiBindingConstants; -import org.openhab.binding.nuki.handler.NukiBridgeHandler; -import org.openhab.binding.nuki.handler.NukiSmartLockHandler; +import org.openhab.binding.nuki.internal.NukiBindingConstants; import org.openhab.binding.nuki.internal.dto.BridgeApiLockStateRequestDto; import org.openhab.binding.nuki.internal.dto.NukiHttpServerStatusResponseDto; +import org.openhab.binding.nuki.internal.handler.NukiBridgeHandler; +import org.openhab.binding.nuki.internal.handler.NukiSmartLockHandler; import org.osgi.service.http.HttpService; import org.osgi.service.http.NamespaceException; import org.slf4j.Logger; diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java index 72c4bc59d6885..723e94a40fbbc 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java @@ -26,7 +26,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.smarthome.config.core.Configuration; -import org.openhab.binding.nuki.NukiBindingConstants; +import org.openhab.binding.nuki.internal.NukiBindingConstants; import org.openhab.binding.nuki.internal.dto.BridgeApiCallbackAddDto; import org.openhab.binding.nuki.internal.dto.BridgeApiCallbackListDto; import org.openhab.binding.nuki.internal.dto.BridgeApiCallbackRemoveDto; diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiBridgeHandler.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiBridgeHandler.java similarity index 98% rename from addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiBridgeHandler.java rename to addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiBridgeHandler.java index 822757e749807..f1aaaaa7dbc9f 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiBridgeHandler.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiBridgeHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.nuki.handler; +package org.openhab.binding.nuki.internal.handler; import java.util.List; import java.util.concurrent.ScheduledFuture; @@ -24,7 +24,7 @@ import org.eclipse.smarthome.core.thing.ThingStatusDetail; import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler; import org.eclipse.smarthome.core.types.Command; -import org.openhab.binding.nuki.NukiBindingConstants; +import org.openhab.binding.nuki.internal.NukiBindingConstants; import org.openhab.binding.nuki.internal.dataexchange.BridgeCallbackAddResponse; import org.openhab.binding.nuki.internal.dataexchange.BridgeCallbackListResponse; import org.openhab.binding.nuki.internal.dataexchange.BridgeCallbackRemoveResponse; diff --git a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiSmartLockHandler.java b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiSmartLockHandler.java similarity index 99% rename from addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiSmartLockHandler.java rename to addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiSmartLockHandler.java index 5da4bf6a01108..d69c8d511b4fd 100644 --- a/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/handler/NukiSmartLockHandler.java +++ b/addons/binding/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/handler/NukiSmartLockHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.nuki.handler; +package org.openhab.binding.nuki.internal.handler; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -27,7 +27,7 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.RefreshType; import org.eclipse.smarthome.core.types.State; -import org.openhab.binding.nuki.NukiBindingConstants; +import org.openhab.binding.nuki.internal.NukiBindingConstants; import org.openhab.binding.nuki.internal.converter.LockActionConverter; import org.openhab.binding.nuki.internal.dataexchange.BridgeLockActionResponse; import org.openhab.binding.nuki.internal.dataexchange.BridgeLockStateResponse;