From 8c766aa5d3ff4f4dac8313b0b0f843760df39f31 Mon Sep 17 00:00:00 2001 From: VelinYordanov Date: Sat, 26 Jan 2019 14:12:01 +0200 Subject: [PATCH] [zoneminder] Made constants and handler packages ineternal (#4037) Signed-off-by: VelinYordanov Signed-off-by: Maximilian Hess --- .../org.openhab.binding.zoneminder/META-INF/MANIFEST.MF | 5 ----- .../zoneminder/{ => internal}/ZoneMinderConstants.java | 2 +- .../zoneminder/internal/ZoneMinderHandlerFactory.java | 5 ++--- .../zoneminder/{ => internal}/ZoneMinderProperties.java | 2 +- .../internal/config/ZoneMinderBridgeServerConfig.java | 2 +- .../zoneminder/internal/config/ZoneMinderThingConfig.java | 2 +- .../internal/config/ZoneMinderThingMonitorConfig.java | 2 +- .../internal/discovery/ZoneMinderDiscoveryService.java | 6 +++--- .../{ => internal}/handler/ZoneMinderBaseThingHandler.java | 4 ++-- .../{ => internal}/handler/ZoneMinderHandler.java | 2 +- .../handler/ZoneMinderServerBridgeHandler.java | 6 +++--- .../handler/ZoneMinderThingMonitorHandler.java | 6 +++--- .../{ => internal}/handler/ZoneMinderThingType.java | 2 +- 13 files changed, 20 insertions(+), 26 deletions(-) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/ZoneMinderConstants.java (98%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/ZoneMinderProperties.java (96%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/handler/ZoneMinderBaseThingHandler.java (99%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/handler/ZoneMinderHandler.java (95%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/handler/ZoneMinderServerBridgeHandler.java (99%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/handler/ZoneMinderThingMonitorHandler.java (99%) rename addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/{ => internal}/handler/ZoneMinderThingType.java (91%) diff --git a/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF index fa7d4eeaefa2e..d234fa386e02c 100644 --- a/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF +++ b/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF @@ -15,9 +15,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.binding.zoneminder;singleton:=true Bundle-Vendor: openHAB Bundle-Version: 2.5.0.qualifier -Export-Package: - org.openhab.binding.zoneminder, - org.openhab.binding.zoneminder.handler Import-Package: com.google.common.collect, javax.ws.rs.client, @@ -33,8 +30,6 @@ Import-Package: org.eclipse.smarthome.core.thing.binding.builder, org.eclipse.smarthome.core.thing.type, org.eclipse.smarthome.core.types, - org.openhab.binding.zoneminder, - org.openhab.binding.zoneminder.handler, org.osgi.framework, org.slf4j Service-Component: OSGI-INF/*.xml diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderConstants.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderConstants.java similarity index 98% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderConstants.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderConstants.java index 898674a5990d2..a0a2e1a581332 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderConstants.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder; +package org.openhab.binding.zoneminder.internal; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.smarthome.core.thing.ThingTypeUID; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java index abb90621780ff..66e9983b2f68b 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java @@ -20,9 +20,8 @@ import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory; import org.eclipse.smarthome.core.thing.binding.ThingHandler; import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.openhab.binding.zoneminder.ZoneMinderConstants; -import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler; -import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler; +import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler; +import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderProperties.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderProperties.java similarity index 96% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderProperties.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderProperties.java index da116c2bd0729..3bf8cbf21ea80 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/ZoneMinderProperties.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderProperties.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder; +package org.openhab.binding.zoneminder.internal; /** * diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java index 9db103474bdd0..94343975e5718 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.zoneminder.internal.config; -import org.openhab.binding.zoneminder.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; /** * Configuration data according to zoneminderserver.xml diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java index ffbeefafa3471..21b6ca2ecb545 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.zoneminder.internal.config; -import org.openhab.binding.zoneminder.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; /** * Monitor configuration from openHAB. diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java index 36f107a725bb9..5ab5999b705cb 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.zoneminder.internal.config; -import org.openhab.binding.zoneminder.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; /** * Specific configuration class for Monitor COnfig. diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java index f86f5a1cb4ff6..a8741a07dfbe2 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java @@ -23,9 +23,9 @@ import org.eclipse.smarthome.config.discovery.ExtendedDiscoveryService; import org.eclipse.smarthome.core.thing.ThingTypeUID; import org.eclipse.smarthome.core.thing.ThingUID; -import org.openhab.binding.zoneminder.ZoneMinderConstants; -import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler; -import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler; +import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderBaseThingHandler.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderBaseThingHandler.java similarity index 99% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderBaseThingHandler.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderBaseThingHandler.java index de6f2ba366d48..3f9c05e7392fa 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderBaseThingHandler.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderBaseThingHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder.handler; +package org.openhab.binding.zoneminder.internal.handler; import java.io.IOException; import java.math.BigDecimal; @@ -33,8 +33,8 @@ import org.eclipse.smarthome.core.types.Command; import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.UnDefType; -import org.openhab.binding.zoneminder.ZoneMinderConstants; import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderHandler.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderHandler.java similarity index 95% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderHandler.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderHandler.java index 2d5cb0062bd81..1c6cefc0f3373 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderHandler.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder.handler; +package org.openhab.binding.zoneminder.internal.handler; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderServerBridgeHandler.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderServerBridgeHandler.java similarity index 99% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderServerBridgeHandler.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderServerBridgeHandler.java index 503a41375e112..f668e5c954b59 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderServerBridgeHandler.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderServerBridgeHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder.handler; +package org.openhab.binding.zoneminder.internal.handler; import java.io.IOException; import java.math.BigDecimal; @@ -43,9 +43,9 @@ import org.eclipse.smarthome.core.types.RefreshType; import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.UnDefType; -import org.openhab.binding.zoneminder.ZoneMinderConstants; -import org.openhab.binding.zoneminder.ZoneMinderProperties; import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.ZoneMinderProperties; import org.openhab.binding.zoneminder.internal.config.ZoneMinderBridgeServerConfig; import org.openhab.binding.zoneminder.internal.discovery.ZoneMinderDiscoveryService; import org.osgi.framework.ServiceRegistration; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingMonitorHandler.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingMonitorHandler.java similarity index 99% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingMonitorHandler.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingMonitorHandler.java index ee9c76690e872..a8cbcadb636a5 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingMonitorHandler.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingMonitorHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder.handler; +package org.openhab.binding.zoneminder.internal.handler; import java.io.IOException; import java.math.BigDecimal; @@ -34,9 +34,9 @@ import org.eclipse.smarthome.core.types.RefreshType; import org.eclipse.smarthome.core.types.State; import org.eclipse.smarthome.core.types.UnDefType; -import org.openhab.binding.zoneminder.ZoneMinderConstants; -import org.openhab.binding.zoneminder.ZoneMinderProperties; import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum; +import org.openhab.binding.zoneminder.internal.ZoneMinderConstants; +import org.openhab.binding.zoneminder.internal.ZoneMinderProperties; import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingMonitorConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingType.java b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingType.java similarity index 91% rename from addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingType.java rename to addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingType.java index f4619d69ed351..12f49c10a93a0 100644 --- a/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/handler/ZoneMinderThingType.java +++ b/addons/binding/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZoneMinderThingType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.zoneminder.handler; +package org.openhab.binding.zoneminder.internal.handler; /** * Enumerator for each Bridge and Thing