Renamed a few packages to internal in the org.eclipse.smarthome.io.re…

…st.core bundle. (#4225) See openhab/static-code-analysis#100 Signed-off-by: VelinYordanov <velin.iordanov@gmail.com>
eclipse-archived · Sep 21, 2017 · b41ab36 · b41ab36
1 parent ae86aa4
commit b41ab36
Show file tree

Hide file tree

Showing 30 changed files with 51 additions and 35 deletions.
diff --git a/...re/discovery/InboxResourceOSGITest.groovy → ...al/discovery/InboxResourceOSGITest.groovy b/...re/discovery/InboxResourceOSGITest.groovy → ...al/discovery/InboxResourceOSGITest.groovy
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.discovery
+package org.eclipse.smarthome.io.rest.core.internal.discovery
 
 import static org.junit.Assert.*
 
@@ -19,6 +19,7 @@ import org.eclipse.smarthome.core.thing.ThingRegistry
 import org.eclipse.smarthome.core.thing.ThingUID
 import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder
 import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry
+import org.eclipse.smarthome.io.rest.core.internal.discovery.InboxResource
 import org.eclipse.smarthome.test.OSGiTest
 import org.junit.Before
 import org.junit.Test

diff --git a/...rg/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.groovy b/...rg/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.groovy
@@ -12,7 +12,7 @@ import static org.junit.Assert.*
 
 import javax.ws.rs.core.Response
 
-import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceResource
+import org.eclipse.smarthome.io.rest.core.internal.service.ConfigurableServiceResource
 import org.eclipse.smarthome.test.OSGiTest
 import org.junit.After
 import org.junit.Before

diff --git a/...edItemDTOMapperWithTransformOSGiTest.java → ...edItemDTOMapperWithTransformOSGiTest.java b/...edItemDTOMapperWithTransformOSGiTest.java → ...edItemDTOMapperWithTransformOSGiTest.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.eclipse.smarthome.io.rest.core.internal.item;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,6 +20,8 @@
 import org.eclipse.smarthome.core.types.StateDescription;
 import org.eclipse.smarthome.core.types.StateDescriptionProvider;
 import org.eclipse.smarthome.core.types.StateOption;
+import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO;
+import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
 import org.eclipse.smarthome.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/.../rest/core/item/ItemResourceOSGiTest.java → ...e/internal/item/ItemResourceOSGiTest.java b/.../rest/core/item/ItemResourceOSGiTest.java → ...e/internal/item/ItemResourceOSGiTest.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.eclipse.smarthome.io.rest.core.internal.item;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -31,6 +31,7 @@
 import org.eclipse.smarthome.core.items.dto.GroupItemDTO;
 import org.eclipse.smarthome.core.library.items.DimmerItem;
 import org.eclipse.smarthome.core.library.items.SwitchItem;
+import org.eclipse.smarthome.io.rest.core.internal.item.ItemResource;
 import org.eclipse.smarthome.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/META-INF/MANIFEST.MF b/bundles/io/org.eclipse.smarthome.io.rest.core/META-INF/MANIFEST.MF
@@ -59,8 +59,14 @@ Import-Package:
  org.eclipse.smarthome.io.rest,
  org.eclipse.smarthome.io.rest.core.item,
  org.eclipse.smarthome.io.rest.core.thing,
+ org.eclipse.smarthome.io.rest.core.persistence,
  org.osgi.framework,
  org.osgi.service.cm,
  org.osgi.service.component,
  org.slf4j
+Export-Package: org.eclipse.smarthome.io.rest.core.config,
+ org.eclipse.smarthome.io.rest.core.persistence,
+ org.eclipse.smarthome.io.rest.core.service,
+ org.eclipse.smarthome.io.rest.core.item,
+ org.eclipse.smarthome.io.rest.core.thing
 Service-Component: OSGI-INF/*.xml
diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/bindingresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/bindingresource.xml
@@ -8,7 +8,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.binding.BindingResource">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.internal.binding.BindingResource">
    <implementation class="org.eclipse.smarthome.io.rest.core.binding.BindingResource"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.core.binding.BindingResource"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/channeltyperesource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/channeltyperesource.xml
@@ -11,7 +11,7 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.thing.ChannelTypeResource">
    <implementation class="org.eclipse.smarthome.io.rest.core.channel.ChannelTypeResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.channel.ChannelTypeResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.channel.ChannelTypeResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setConfigDescriptionRegistry" cardinality="0..1" interface="org.eclipse.smarthome.config.core.ConfigDescriptionRegistry" name="ConfigDescriptionRegistry" policy="dynamic" unbind="unsetConfigDescriptionRegistry"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/configdescriptionresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/configdescriptionresource.xml
@@ -9,7 +9,7 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.config.ConfigDescriptionResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.config.ConfigDescriptionResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.config.ConfigDescriptionResource"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.core.config.ConfigDescriptionResource"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/configurableserviceresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/configurableserviceresource.xml
@@ -9,10 +9,10 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.service.ConfigurableServiceResource"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
-      <provide interface="org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.service.ConfigurableServiceResource"/>
    </service>
    <reference bind="setConfigurationService" cardinality="0..1" interface="org.eclipse.smarthome.io.rest.core.config.ConfigurationService" name="ConfigurationService" policy="dynamic" unbind="unsetConfigurationService"/>
    <reference bind="setConfigDescriptionRegistry" cardinality="0..1" interface="org.eclipse.smarthome.config.core.ConfigDescriptionRegistry" name="ConfigDescriptionRegistry" policy="dynamic" unbind="unsetConfigDescriptionRegistry"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/discoveryresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/discoveryresource.xml
@@ -8,10 +8,10 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.discovery.DiscoveryResource">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.internal.discovery.DiscoveryResource">
    <implementation class="org.eclipse.smarthome.io.rest.core.discovery.DiscoveryResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.discovery.DiscoveryResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.discovery.DiscoveryResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setDiscoveryServiceRegistry" cardinality="0..1" interface="org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry" name="DiscoveryServiceRegistry" policy="dynamic" unbind="unsetDiscoveryServiceRegistry"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/extensionresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/extensionresource.xml
@@ -12,7 +12,7 @@
    <implementation class="org.eclipse.smarthome.io.rest.core.extensions.ExtensionResource"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
-      <provide interface="org.eclipse.smarthome.io.rest.core.extensions.ExtensionResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.extensions.ExtensionResource"/>
    </service>
    <reference bind="addExtensionService" cardinality="0..n" interface="org.eclipse.smarthome.core.extension.ExtensionService" name="ExtensionService" policy="dynamic" unbind="removeExtensionService"/>
    <reference bind="setEventPublisher" cardinality="0..1" interface="org.eclipse.smarthome.core.events.EventPublisher" name="EventPublisher" policy="dynamic" unbind="unsetEventPublisher"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/inboxresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/inboxresource.xml
@@ -9,9 +9,9 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.discovery.InboxResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.discovery.InboxResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.discovery.InboxResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.discovery.InboxResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.discovery.InboxResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setInbox" cardinality="0..1" interface="org.eclipse.smarthome.config.discovery.inbox.Inbox" name="Inbox" policy="dynamic" unbind="unsetInbox"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/itemchannellinkresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/itemchannellinkresource.xml
@@ -9,10 +9,10 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.link.ItemChannelLinkResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.link.ItemChannelLinkResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.link.ItemChannelLinkResource"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
-      <provide interface="org.eclipse.smarthome.io.rest.core.link.ItemChannelLinkResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.link.ItemChannelLinkResource"/>
    </service>
    <reference bind="setItemChannelLinkRegistry" cardinality="0..1" interface="org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry" name="ItemChannelLinkRegistry" policy="dynamic" unbind="unsetItemChannelLinkRegistry"/>
    <reference bind="setThingLinkManager" cardinality="0..1" interface="org.eclipse.smarthome.core.thing.link.ThingLinkManager" name="ThingLinkManager" policy="dynamic" unbind="unsetThingLinkManager"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/itemresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/itemresource.xml
@@ -11,7 +11,7 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.smarthome.io.rest.core.item">
    <implementation class="org.eclipse.smarthome.io.rest.core.item.ItemResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.item.ItemResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.item.ItemResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setItemRegistry" cardinality="0..1" interface="org.eclipse.smarthome.core.items.ItemRegistry" name="ItemRegistry" policy="dynamic" unbind="unsetItemRegistry"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/persistenceresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/persistenceresource.xml
@@ -9,7 +9,7 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.smarthome.core.persistence.internal.rest">
-   <implementation class="org.eclipse.smarthome.io.rest.core.persistence.PersistenceResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.persistence.PersistenceResource"/>
    <reference bind="setItemRegistry" cardinality="1..1" interface="org.eclipse.smarthome.core.items.ItemRegistry" name="ItemRegistry" policy="dynamic" unbind="unsetItemRegistry"/>
    <service>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/thingresource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/thingresource.xml
@@ -9,9 +9,9 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.thing.ThingResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.thing.ThingResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.thing.ThingResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.thing.ThingResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.thing.ThingResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setItemChannelLinkRegistry" cardinality="0..1" interface="org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry" name="ItemChannelLinkRegistry" policy="dynamic" unbind="unsetItemChannelLinkRegistry"/>

diff --git a/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/thingtyperesource.xml b/bundles/io/org.eclipse.smarthome.io.rest.core/OSGI-INF/thingtyperesource.xml
@@ -9,9 +9,9 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.smarthome.io.rest.core.thing.ThingTypeResource">
-   <implementation class="org.eclipse.smarthome.io.rest.core.thing.ThingTypeResource"/>
+   <implementation class="org.eclipse.smarthome.io.rest.core.internal.thing.ThingTypeResource"/>
    <service>
-      <provide interface="org.eclipse.smarthome.io.rest.core.thing.ThingTypeResource"/>
+      <provide interface="org.eclipse.smarthome.io.rest.core.internal.thing.ThingTypeResource"/>
       <provide interface="org.eclipse.smarthome.io.rest.RESTResource"/>
    </service>
    <reference bind="setConfigDescriptionRegistry" cardinality="0..1" interface="org.eclipse.smarthome.config.core.ConfigDescriptionRegistry" name="ConfigDescriptionRegistry" policy="dynamic" unbind="unsetConfigDescriptionRegistry"/>

diff --git a/...io/rest/core/binding/BindingResource.java → ...ore/internal/binding/BindingResource.java b/...io/rest/core/binding/BindingResource.java → ...ore/internal/binding/BindingResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.binding;
+package org.eclipse.smarthome.io.rest.core.internal.binding;
 
 import java.io.IOException;
 import java.net.URI;
@@ -41,7 +41,7 @@
 import org.eclipse.smarthome.io.rest.RESTResource;
 import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
 import org.eclipse.smarthome.io.rest.core.config.ConfigurationService;
-import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceResource;
+import org.eclipse.smarthome.io.rest.core.internal.service.ConfigurableServiceResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...est/core/channel/ChannelTypeResource.java → ...internal/channel/ChannelTypeResource.java b/...est/core/channel/ChannelTypeResource.java → ...internal/channel/ChannelTypeResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.channel;
+package org.eclipse.smarthome.io.rest.core.internal.channel;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ore/config/ConfigDescriptionResource.java → ...nal/config/ConfigDescriptionResource.java b/...ore/config/ConfigDescriptionResource.java → ...nal/config/ConfigDescriptionResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.config;
+package org.eclipse.smarthome.io.rest.core.internal.config;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/...est/core/discovery/DiscoveryResource.java → ...internal/discovery/DiscoveryResource.java b/...est/core/discovery/DiscoveryResource.java → ...internal/discovery/DiscoveryResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.discovery;
+package org.eclipse.smarthome.io.rest.core.internal.discovery;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;

diff --git a/...io/rest/core/discovery/InboxResource.java → ...ore/internal/discovery/InboxResource.java b/...io/rest/core/discovery/InboxResource.java → ...ore/internal/discovery/InboxResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.discovery;
+package org.eclipse.smarthome.io.rest.core.internal.discovery;
 
 import java.util.stream.Stream;
 

diff --git a/...st/core/extensions/ExtensionResource.java → ...nternal/extensions/ExtensionResource.java b/...st/core/extensions/ExtensionResource.java → ...nternal/extensions/ExtensionResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.extensions;
+package org.eclipse.smarthome.io.rest.core.internal.extensions;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/...thome/io/rest/core/item/ItemResource.java → ...rest/core/internal/item/ItemResource.java b/...thome/io/rest/core/item/ItemResource.java → ...rest/core/internal/item/ItemResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.eclipse.smarthome.io.rest.core.internal.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -61,6 +61,8 @@
 import org.eclipse.smarthome.io.rest.LocaleUtil;
 import org.eclipse.smarthome.io.rest.RESTResource;
 import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO;
+import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...st/core/link/ItemChannelLinkResource.java → ...nternal/link/ItemChannelLinkResource.java b/...st/core/link/ItemChannelLinkResource.java → ...nternal/link/ItemChannelLinkResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.link;
+package org.eclipse.smarthome.io.rest.core.internal.link;
 
 import java.util.stream.Stream;
 

diff --git a/...core/persistence/PersistenceResource.java → ...rnal/persistence/PersistenceResource.java b/...core/persistence/PersistenceResource.java → ...rnal/persistence/PersistenceResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.persistence;
+package org.eclipse.smarthome.io.rest.core.internal.persistence;
 
 import java.util.ArrayList;
 import java.util.Date;

diff --git a/.../service/ConfigurableServiceResource.java → .../service/ConfigurableServiceResource.java b/.../service/ConfigurableServiceResource.java → .../service/ConfigurableServiceResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.service;
+package org.eclipse.smarthome.io.rest.core.internal.service;
 
 import java.io.IOException;
 import java.net.URI;
@@ -36,6 +36,7 @@
 import org.eclipse.smarthome.io.rest.RESTResource;
 import org.eclipse.smarthome.io.rest.core.config.ConfigurationService;
 import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator;
+import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceDTO;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;

diff --git a/...ome/io/rest/core/thing/ThingResource.java → ...st/core/internal/thing/ThingResource.java b/...ome/io/rest/core/thing/ThingResource.java → ...st/core/internal/thing/ThingResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.eclipse.smarthome.io.rest.core.internal.thing;
 
 import java.io.IOException;
 import java.net.URI;
@@ -79,6 +79,8 @@
 import org.eclipse.smarthome.io.rest.LocaleUtil;
 import org.eclipse.smarthome.io.rest.RESTResource;
 import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTO;
+import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTOMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...io/rest/core/thing/ThingTypeResource.java → ...ore/internal/thing/ThingTypeResource.java b/...io/rest/core/thing/ThingTypeResource.java → ...ore/internal/thing/ThingTypeResource.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.eclipse.smarthome.io.rest.core.internal.thing;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...est.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapper.java b/...est.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapper.java
@@ -19,6 +19,7 @@
 import org.eclipse.smarthome.core.transform.TransformationHelper;
 import org.eclipse.smarthome.core.types.StateDescription;
 import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator;
+import org.eclipse.smarthome.io.rest.core.internal.item.ItemResource;
 
 /**
  * The {@link EnrichedItemDTOMapper} is a utility class to map items into enriched item data transform objects (DTOs).