[astro] Made constants and handler packages internal (openhab#4673)

See eclipse-archived/smarthome#4330 Signed-off-by: Wouter Born <[email protected]> Signed-off-by: Pshatsillo <[email protected]>
Pshatsillo · Jun 19, 2019 · b7cc35a · b7cc35a
1 parent 56739f0
commit b7cc35a
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 34 deletions.
diff --git a/...ing.astro.test/src/test/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java b/...ing.astro.test/src/test/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java
@@ -14,7 +14,7 @@
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.openhab.binding.astro.AstroBindingConstants.THING_TYPE_SUN;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.THING_TYPE_SUN;
 import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 
 import org.eclipse.smarthome.config.core.Configuration;
@@ -28,8 +28,8 @@
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
 import org.junit.Test;
-import org.openhab.binding.astro.handler.AstroThingHandler;
-import org.openhab.binding.astro.handler.SunHandler;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.SunHandler;
 import org.openhab.binding.astro.internal.model.Sun;
 
 /**

diff --git a/...est/src/test/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java b/...est/src/test/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.astro.handler.test;
 
 import static org.mockito.Mockito.*;
-import static org.openhab.binding.astro.AstroBindingConstants.THING_TYPE_SUN;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.THING_TYPE_SUN;
 import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 
 import org.eclipse.smarthome.config.core.Configuration;
@@ -26,8 +26,8 @@
 import org.eclipse.smarthome.core.thing.binding.ThingHandler;
 import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
 import org.junit.Test;
-import org.openhab.binding.astro.handler.AstroThingHandler;
-import org.openhab.binding.astro.handler.SunHandler;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.SunHandler;
 
 /**
  * Tests for the {@link AstroThingHandler}

diff --git a/...enhab.binding.astro.test/src/test/java/org/openhab/binding/astro/test/AstroStateTest.java b/...enhab.binding.astro.test/src/test/java/org/openhab/binding/astro/test/AstroStateTest.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.astro.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 import static org.openhab.binding.astro.test.cases.AstroParametrizedTestCases.*;
 

diff --git a/addons/binding/org.openhab.binding.astro/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.astro/META-INF/MANIFEST.MF
@@ -7,9 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.binding.astro;singleton:=true
 Bundle-Vendor: openHAB
 Bundle-Version: 2.5.0.qualifier
-Export-Package: 
- org.openhab.binding.astro,
- org.openhab.binding.astro.handler
 Import-Package: 
  javax.measure,
  javax.measure.quantity,
@@ -31,8 +28,6 @@ Import-Package:
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
  org.eclipse.smarthome.io.net.http,
- org.openhab.binding.astro,
- org.openhab.binding.astro.handler,
  org.osgi.framework,
  org.osgi.service.component,
  org.slf4j

diff --git a/.../binding/astro/AstroBindingConstants.java → ...astro/internal/AstroBindingConstants.java b/.../binding/astro/AstroBindingConstants.java → ...astro/internal/AstroBindingConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.astro;
+package org.openhab.binding.astro.internal;
 
 import org.eclipse.smarthome.core.thing.ThingTypeUID;
 

diff --git a/...b.binding.astro/src/main/java/org/openhab/binding/astro/internal/AstroHandlerFactory.java b/...b.binding.astro/src/main/java/org/openhab/binding/astro/internal/AstroHandlerFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.astro.internal;
 
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,9 +27,9 @@
 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.astro.handler.AstroThingHandler;
-import org.openhab.binding.astro.handler.MoonHandler;
-import org.openhab.binding.astro.handler.SunHandler;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.MoonHandler;
+import org.openhab.binding.astro.internal.handler.SunHandler;
 import org.openhab.binding.astro.internal.util.PropertyUtils;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;

diff --git a/...tro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java b/...tro/src/main/java/org/openhab/binding/astro/internal/discovery/AstroDiscoveryService.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.astro.internal.discovery;
 
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 
 import java.util.Arrays;
 import java.util.HashSet;

diff --git a/...ding/astro/handler/AstroThingHandler.java → ...o/internal/handler/AstroThingHandler.java b/...ding/astro/handler/AstroThingHandler.java → ...o/internal/handler/AstroThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.astro.handler;
+package org.openhab.binding.astro.internal.handler;
 
 import static org.eclipse.smarthome.core.thing.ThingStatus.*;
 import static org.eclipse.smarthome.core.thing.type.ChannelKind.TRIGGER;

diff --git a/...ab/binding/astro/handler/MoonHandler.java → ...g/astro/internal/handler/MoonHandler.java b/...ab/binding/astro/handler/MoonHandler.java → ...g/astro/internal/handler/MoonHandler.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.astro.handler;
+package org.openhab.binding.astro.internal.handler;
 
-import static org.openhab.binding.astro.AstroBindingConstants.THING_TYPE_MOON;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.THING_TYPE_MOON;
 
 import java.util.Arrays;
 import java.util.Calendar;

diff --git a/...hab/binding/astro/handler/SunHandler.java → ...ng/astro/internal/handler/SunHandler.java b/...hab/binding/astro/handler/SunHandler.java → ...ng/astro/internal/handler/SunHandler.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.astro.handler;
+package org.openhab.binding.astro.internal.handler;
 
-import static org.openhab.binding.astro.AstroBindingConstants.THING_TYPE_SUN;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.THING_TYPE_SUN;
 
 import java.util.Arrays;
 import java.util.Calendar;

diff --git a/...nhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/DailyJobMoon.java b/...nhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/DailyJobMoon.java
@@ -12,10 +12,10 @@
  */
 package org.openhab.binding.astro.internal.job;
 
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 import static org.openhab.binding.astro.internal.job.Job.scheduleEvent;
 
-import org.openhab.binding.astro.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.model.Eclipse;
 import org.openhab.binding.astro.internal.model.Moon;
 import org.openhab.binding.astro.internal.model.MoonPhase;

diff --git a/...enhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/DailyJobSun.java b/...enhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/DailyJobSun.java
@@ -12,11 +12,11 @@
  */
 package org.openhab.binding.astro.internal.job;
 
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 import static org.openhab.binding.astro.internal.job.Job.*;
 import static org.openhab.binding.astro.internal.model.SunPhaseName.*;
 
-import org.openhab.binding.astro.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.model.Planet;
 import org.openhab.binding.astro.internal.model.Sun;
 import org.openhab.binding.astro.internal.model.SunEclipse;

diff --git a/....openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/EventJob.java b/....openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/EventJob.java
@@ -14,8 +14,8 @@
 
 import static org.openhab.binding.astro.internal.job.Job.checkNull;
 
-import org.openhab.binding.astro.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.AstroHandlerFactory;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 
 /**
  * Scheduled job to trigger events

diff --git a/...g/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/Job.java b/...g/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/Job.java
@@ -18,7 +18,7 @@
 import static java.util.Objects.isNull;
 import static java.util.stream.Collectors.toList;
 import static org.apache.commons.lang.time.DateUtils.truncatedEquals;
-import static org.openhab.binding.astro.AstroBindingConstants.*;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.*;
 import static org.openhab.binding.astro.internal.util.DateTimeUtils.*;
 
 import java.lang.invoke.MethodHandles;
@@ -29,8 +29,8 @@
 import org.eclipse.smarthome.core.thing.Channel;
 import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.openhab.binding.astro.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.config.AstroChannelConfig;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.model.Planet;
 import org.openhab.binding.astro.internal.model.Range;
 import org.openhab.binding.astro.internal.model.SunPhaseName;

diff --git a/...hab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/PositionalJob.java b/...hab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/PositionalJob.java
@@ -14,8 +14,8 @@
 
 import static org.openhab.binding.astro.internal.job.Job.checkNull;
 
-import org.openhab.binding.astro.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.AstroHandlerFactory;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 
 /**
  * Scheduled job for planet positions

diff --git a/....binding.astro/src/main/java/org/openhab/binding/astro/internal/job/PublishPlanetJob.java b/....binding.astro/src/main/java/org/openhab/binding/astro/internal/job/PublishPlanetJob.java
@@ -14,8 +14,8 @@
 
 import static org.openhab.binding.astro.internal.job.Job.checkNull;
 
-import org.openhab.binding.astro.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.AstroHandlerFactory;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 
 /**
  * Scheduled job for planets

diff --git a/...enhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/SunPhaseJob.java b/...enhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/job/SunPhaseJob.java
@@ -12,12 +12,12 @@
  */
 package org.openhab.binding.astro.internal.job;
 
-import static org.openhab.binding.astro.AstroBindingConstants.CHANNEL_ID_SUN_PHASE_NAME;
+import static org.openhab.binding.astro.internal.AstroBindingConstants.CHANNEL_ID_SUN_PHASE_NAME;
 import static org.openhab.binding.astro.internal.job.Job.checkNull;
 
 import org.eclipse.smarthome.core.thing.Channel;
-import org.openhab.binding.astro.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.AstroHandlerFactory;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
 import org.openhab.binding.astro.internal.model.Planet;
 import org.openhab.binding.astro.internal.model.Sun;
 import org.openhab.binding.astro.internal.model.SunPhaseName;