mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
Refactor XML handling (#3385)
* Refactor XML handling for things * integrate config.xml and improve naming Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
@@ -51,12 +51,12 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openhab.core.bundles</groupId>
|
||||
<artifactId>org.openhab.core.addon.xml</artifactId>
|
||||
<artifactId>org.openhab.core.addon</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openhab.core.bundles</groupId>
|
||||
<artifactId>org.openhab.core.config.xml</artifactId>
|
||||
<artifactId>org.openhab.core.config.core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -19,7 +19,7 @@ import java.util.Optional;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.openhab.core.addon.xml.internal.AddonInfoXmlResult;
|
||||
import org.openhab.core.addon.internal.xml.AddonInfoXmlResult;
|
||||
import org.openhab.core.config.core.ConfigDescription;
|
||||
import org.openhab.core.thing.xml.internal.ChannelGroupTypeXmlResult;
|
||||
import org.openhab.core.thing.xml.internal.ChannelTypeXmlResult;
|
||||
|
||||
+3
-3
@@ -25,10 +25,10 @@ import java.util.stream.StreamSupport;
|
||||
|
||||
import org.apache.maven.plugin.logging.Log;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.openhab.core.addon.xml.internal.AddonInfoReader;
|
||||
import org.openhab.core.addon.xml.internal.AddonInfoXmlResult;
|
||||
import org.openhab.core.addon.internal.xml.AddonInfoReader;
|
||||
import org.openhab.core.addon.internal.xml.AddonInfoXmlResult;
|
||||
import org.openhab.core.config.core.ConfigDescription;
|
||||
import org.openhab.core.config.xml.internal.ConfigDescriptionReader;
|
||||
import org.openhab.core.config.core.xml.internal.ConfigDescriptionReader;
|
||||
import org.openhab.core.thing.xml.internal.ChannelGroupTypeXmlResult;
|
||||
import org.openhab.core.thing.xml.internal.ChannelTypeXmlResult;
|
||||
import org.openhab.core.thing.xml.internal.ThingDescriptionReader;
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import java.util.stream.Stream.Builder;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.openhab.core.addon.AddonInfo;
|
||||
import org.openhab.core.addon.xml.internal.AddonInfoXmlResult;
|
||||
import org.openhab.core.addon.internal.xml.AddonInfoXmlResult;
|
||||
import org.openhab.core.config.core.ConfigDescription;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import java.nio.file.Path;
|
||||
import org.apache.maven.plugin.logging.SystemStreamLog;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.openhab.core.addon.xml.internal.AddonInfoXmlResult;
|
||||
import org.openhab.core.addon.internal.xml.AddonInfoXmlResult;
|
||||
|
||||
/**
|
||||
* Tests {@link BundleInfoReader}.
|
||||
|
||||
Reference in New Issue
Block a user