[nuki] Made constants and handler packages internal (#4688)

See eclipse-archived/smarthome#4330 Signed-off-by: Wouter Born <[email protected]>
openhab · Jan 24, 2019 · 5bb8299 · 5bb8299
1 parent fb1d85b
commit 5bb8299
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git 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/...ab/binding/nuki/NukiBindingConstants.java → ...g/nuki/internal/NukiBindingConstants.java b/...ab/binding/nuki/NukiBindingConstants.java → ...g/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/...nhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java b/...nhab.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/...g.nuki/src/main/java/org/openhab/binding/nuki/internal/converter/LockActionConverter.java b/...g.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/...ing.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiApiServlet.java b/...ing.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/...ing.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java b/...ing.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/...nding/nuki/handler/NukiBridgeHandler.java → ...i/internal/handler/NukiBridgeHandler.java b/...nding/nuki/handler/NukiBridgeHandler.java → ...i/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/...ng/nuki/handler/NukiSmartLockHandler.java → ...nternal/handler/NukiSmartLockHandler.java b/...ng/nuki/handler/NukiSmartLockHandler.java → ...nternal/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;