mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-10 13:21:53 +01:00
Renamed packages
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp
Kai Kreuzer
parent
fca7c215a5
commit
59675788e0
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
||||
@ -10,10 +10,10 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.core.audio.internal.AudioServlet;
|
||||
import org.openhab.core.audio.internal.AudioServlet;
|
||||
|
||||
/**
|
||||
* This is an interface that is implemented by {@link AudioServlet} and which allows exposing audio streams through
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
|
||||
/**
|
||||
* This service provides functionality around audio services and is the central service to be used directly by others.
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
@ -18,7 +18,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
|
||||
/**
|
||||
* Definition of an audio output like headphones, a speaker or for writing to
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
@ -20,7 +20,7 @@ import java.io.InputStream;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
|
||||
import org.openhab.core.audio.utils.AudioStreamUtils;
|
||||
|
||||
/**
|
||||
* This is an AudioStream from an audio file
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@ -25,7 +25,7 @@ import java.util.regex.Pattern;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
|
||||
import org.openhab.core.audio.utils.AudioStreamUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio;
|
||||
package org.openhab.core.audio;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static java.util.Comparator.comparing;
|
||||
|
||||
@ -22,15 +22,15 @@ import java.util.Set;
|
||||
import org.apache.commons.lang.ArrayUtils;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.eclipse.smarthome.core.audio.AudioSink;
|
||||
import org.eclipse.smarthome.core.audio.AudioSource;
|
||||
import org.eclipse.smarthome.core.i18n.LocaleProvider;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.eclipse.smarthome.io.console.Console;
|
||||
import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
|
||||
import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.audio.AudioSink;
|
||||
import org.openhab.core.audio.AudioSource;
|
||||
import org.openhab.core.i18n.LocaleProvider;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
import org.openhab.core.io.console.Console;
|
||||
import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
|
||||
import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Reference;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static java.util.Comparator.comparing;
|
||||
import static java.util.stream.Collectors.toList;
|
||||
@ -28,20 +28,20 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigConstants;
|
||||
import org.eclipse.smarthome.config.core.ConfigOptionProvider;
|
||||
import org.eclipse.smarthome.config.core.ConfigurableService;
|
||||
import org.eclipse.smarthome.config.core.ParameterOption;
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.eclipse.smarthome.core.audio.AudioSink;
|
||||
import org.eclipse.smarthome.core.audio.AudioSource;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FileAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.URLAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
|
||||
import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.openhab.core.config.core.ConfigConstants;
|
||||
import org.openhab.core.config.core.ConfigOptionProvider;
|
||||
import org.openhab.core.config.core.ConfigurableService;
|
||||
import org.openhab.core.config.core.ParameterOption;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.audio.AudioSink;
|
||||
import org.openhab.core.audio.AudioSource;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.FileAudioStream;
|
||||
import org.openhab.core.audio.URLAudioStream;
|
||||
import org.openhab.core.audio.UnsupportedAudioFormatException;
|
||||
import org.openhab.core.audio.UnsupportedAudioStreamException;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
import org.osgi.framework.Constants;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
@ -63,8 +63,8 @@ import org.slf4j.LoggerFactory;
|
||||
* @author Wouter Born - Sort audio sink and source options
|
||||
*/
|
||||
@NonNullByDefault
|
||||
@Component(immediate = true, configurationPid = "org.eclipse.smarthome.audio", property = { //
|
||||
Constants.SERVICE_PID + "=org.eclipse.smarthome.audio", //
|
||||
@Component(immediate = true, configurationPid = "org.openhab.core.audio", property = { //
|
||||
Constants.SERVICE_PID + "=org.openhab.core.audio", //
|
||||
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
|
||||
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, //
|
||||
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" //
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@ -31,12 +31,12 @@ import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioHTTPServer;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
|
||||
import org.eclipse.smarthome.io.http.servlet.SmartHomeServlet;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioHTTPServer;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.FixedLengthAudioStream;
|
||||
import org.openhab.core.io.http.servlet.SmartHomeServlet;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Deactivate;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.utils;
|
||||
package org.openhab.core.audio.utils;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
@ -21,13 +21,13 @@ import org.eclipse.jetty.client.api.ContentResponse;
|
||||
import org.eclipse.jetty.client.api.Request;
|
||||
import org.eclipse.jetty.http.HttpMethod;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
|
||||
import org.eclipse.smarthome.test.TestPortUtil;
|
||||
import org.eclipse.smarthome.test.TestServer;
|
||||
import org.eclipse.smarthome.test.java.JavaTest;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.ByteArrayAudioStream;
|
||||
import org.openhab.core.audio.FixedLengthAudioStream;
|
||||
import org.openhab.core.test.TestPortUtil;
|
||||
import org.openhab.core.test.TestServer;
|
||||
import org.openhab.core.test.java.JavaTest;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
import static org.junit.Assert.assertThat;
|
||||
@ -20,16 +20,16 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioSource;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FileAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.URLAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.eclipse.smarthome.core.i18n.LocaleProvider;
|
||||
import org.eclipse.smarthome.io.console.Console;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioSource;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.FileAudioStream;
|
||||
import org.openhab.core.audio.URLAudioStream;
|
||||
import org.openhab.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.openhab.core.i18n.LocaleProvider;
|
||||
import org.openhab.core.io.console.Console;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
import static org.junit.Assert.assertThat;
|
||||
@ -18,7 +18,7 @@ import static org.junit.Assert.assertThat;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.URLAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.ByteArrayAudioStream;
|
||||
import org.openhab.core.audio.URLAudioStream;
|
||||
import org.openhab.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
import static org.junit.Assert.*;
|
||||
@ -25,17 +25,17 @@ import java.util.Collections;
|
||||
import java.util.Locale;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ParameterOption;
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioSource;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FileAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
|
||||
import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.openhab.core.config.core.ParameterOption;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioSource;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.ByteArrayAudioStream;
|
||||
import org.openhab.core.audio.FileAudioStream;
|
||||
import org.openhab.core.audio.UnsupportedAudioStreamException;
|
||||
import org.openhab.core.audio.internal.fake.AudioSinkFake;
|
||||
import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal;
|
||||
package org.openhab.core.audio.internal;
|
||||
|
||||
import static org.hamcrest.Matchers.*;
|
||||
import static org.junit.Assert.assertThat;
|
||||
@ -21,10 +21,10 @@ import java.util.concurrent.TimeUnit;
|
||||
import org.eclipse.jetty.client.api.ContentResponse;
|
||||
import org.eclipse.jetty.client.api.Request;
|
||||
import org.eclipse.jetty.http.HttpStatus;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FileAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.FileAudioStream;
|
||||
import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal.fake;
|
||||
package org.openhab.core.audio.internal.fake;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
@ -21,14 +21,14 @@ import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.audio.AudioFormat;
|
||||
import org.eclipse.smarthome.core.audio.AudioSink;
|
||||
import org.eclipse.smarthome.core.audio.AudioStream;
|
||||
import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.URLAudioStream;
|
||||
import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
|
||||
import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.openhab.core.audio.AudioFormat;
|
||||
import org.openhab.core.audio.AudioSink;
|
||||
import org.openhab.core.audio.AudioStream;
|
||||
import org.openhab.core.audio.FixedLengthAudioStream;
|
||||
import org.openhab.core.audio.URLAudioStream;
|
||||
import org.openhab.core.audio.UnsupportedAudioFormatException;
|
||||
import org.openhab.core.audio.UnsupportedAudioStreamException;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
|
||||
/**
|
||||
* An {@link AudioSink} fake used for the tests.
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.core.audio.internal.utils;
|
||||
package org.openhab.core.audio.internal.utils;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.File;
|
||||
@ -22,8 +22,8 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Comparator;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigConstants;
|
||||
import org.eclipse.smarthome.core.audio.internal.AudioManagerTest;
|
||||
import org.openhab.core.config.core.ConfigConstants;
|
||||
import org.openhab.core.audio.internal.AudioManagerTest;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.jaas.internal;
|
||||
package org.openhab.core.auth.jaas.internal;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.Principal;
|
||||
@ -26,11 +26,11 @@ import javax.security.auth.callback.UnsupportedCallbackException;
|
||||
import javax.security.auth.login.LoginContext;
|
||||
import javax.security.auth.login.LoginException;
|
||||
|
||||
import org.eclipse.smarthome.core.auth.Authentication;
|
||||
import org.eclipse.smarthome.core.auth.AuthenticationException;
|
||||
import org.eclipse.smarthome.core.auth.AuthenticationProvider;
|
||||
import org.eclipse.smarthome.core.auth.Credentials;
|
||||
import org.eclipse.smarthome.core.auth.UsernamePasswordCredentials;
|
||||
import org.openhab.core.auth.Authentication;
|
||||
import org.openhab.core.auth.AuthenticationException;
|
||||
import org.openhab.core.auth.AuthenticationProvider;
|
||||
import org.openhab.core.auth.Credentials;
|
||||
import org.openhab.core.auth.UsernamePasswordCredentials;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Deactivate;
|
||||
@ -45,7 +45,7 @@ import org.osgi.service.component.annotations.Modified;
|
||||
* @author Łukasz Dywicki - Initial contribution
|
||||
* @author Kai Kreuzer - Removed ManagedService and used DS configuration instead
|
||||
*/
|
||||
@Component(configurationPid = "org.eclipse.smarthome.jaas")
|
||||
@Component(configurationPid = "org.openhab.core.jaas")
|
||||
public class JaasAuthenticationProvider implements AuthenticationProvider {
|
||||
|
||||
private String realmName;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
/**
|
||||
* Just a place to store all the important, reused keywords.
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import static org.eclipse.smarthome.auth.oauth2client.internal.Keyword.*;
|
||||
import static org.openhab.core.auth.oauth2client.internal.Keyword.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
@ -27,12 +27,12 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.jetty.util.StringUtil;
|
||||
import org.eclipse.jetty.util.UrlEncoded;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenRefreshListener;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
|
||||
import org.eclipse.smarthome.io.net.http.HttpClientFactory;
|
||||
import org.openhab.core.auth.client.oauth2.AccessTokenRefreshListener;
|
||||
import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthClientService;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthException;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthResponseException;
|
||||
import org.openhab.core.io.net.http.HttpClientFactory;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
|
||||
*
|
||||
* It requires the following services:
|
||||
*
|
||||
* org.eclipse.smarthome.core.storage.Storage (mandatory; for storing grant tokens, access tokens and refresh tokens)
|
||||
* org.openhab.core.storage.Storage (mandatory; for storing grant tokens, access tokens and refresh tokens)
|
||||
*
|
||||
* HttpClientFactory for http connections with Jetty
|
||||
*
|
||||
@ -83,7 +83,7 @@ public class OAuthClientServiceImpl implements OAuthClientService {
|
||||
*
|
||||
* @param bundleContext Bundle Context
|
||||
* @param handle The handle produced previously from
|
||||
* {@link org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}
|
||||
* {@link org.openhab.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}
|
||||
* @param storeHandler Storage handler
|
||||
* @param tokenExpiresInSeconds Positive integer; a small time buffer in seconds. It is used to calculate the expiry
|
||||
* of the access tokens. This allows the access token to expire earlier than the
|
||||
@ -113,7 +113,7 @@ public class OAuthClientServiceImpl implements OAuthClientService {
|
||||
*
|
||||
* @param bundleContext Bundle Context*
|
||||
* @param handle The handle produced previously from
|
||||
* {@link org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}*
|
||||
* {@link org.openhab.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}*
|
||||
* @param storeHandler Storage handler
|
||||
* @param httpClientFactory Http client factory
|
||||
* @param persistedParams These parameters are static with respect to the oauth provider and thus can be persisted.
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import static org.eclipse.smarthome.auth.oauth2client.internal.Keyword.*;
|
||||
import static org.openhab.core.auth.oauth2client.internal.Keyword.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
@ -36,11 +36,11 @@ import org.eclipse.jetty.http.HttpHeader;
|
||||
import org.eclipse.jetty.http.HttpMethod;
|
||||
import org.eclipse.jetty.http.HttpStatus;
|
||||
import org.eclipse.jetty.util.Fields;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
|
||||
import org.eclipse.smarthome.io.net.http.HttpClientFactory;
|
||||
import org.eclipse.smarthome.io.net.http.TrustManagerProvider;
|
||||
import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthException;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthResponseException;
|
||||
import org.openhab.core.io.net.http.HttpClientFactory;
|
||||
import org.openhab.core.io.net.http.TrustManagerProvider;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
@ -10,17 +10,17 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory;
|
||||
import org.eclipse.smarthome.io.net.http.HttpClientFactory;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthClientService;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthException;
|
||||
import org.openhab.core.auth.client.oauth2.OAuthFactory;
|
||||
import org.openhab.core.io.net.http.HttpClientFactory;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Deactivate;
|
||||
import org.osgi.service.component.annotations.Reference;
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import java.security.GeneralSecurityException;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
|
||||
|
||||
/**
|
||||
* This is for OAuth client internal use.
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import static org.eclipse.smarthome.auth.oauth2client.internal.StorageRecordType.*;
|
||||
import static org.openhab.core.auth.oauth2client.internal.StorageRecordType.*;
|
||||
|
||||
import java.security.GeneralSecurityException;
|
||||
import java.time.LocalDateTime;
|
||||
@ -28,11 +28,11 @@ import java.util.concurrent.locks.ReentrantLock;
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.StorageCipher;
|
||||
import org.eclipse.smarthome.core.storage.Storage;
|
||||
import org.eclipse.smarthome.core.storage.StorageService;
|
||||
import org.openhab.core.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
|
||||
import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
|
||||
import org.openhab.core.auth.client.oauth2.StorageCipher;
|
||||
import org.openhab.core.storage.Storage;
|
||||
import org.openhab.core.storage.StorageService;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Deactivate;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal;
|
||||
package org.openhab.core.auth.oauth2client.internal;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: EPL-2.0
|
||||
*/
|
||||
package org.eclipse.smarthome.auth.oauth2client.internal.cipher;
|
||||
package org.openhab.core.auth.oauth2client.internal.cipher;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@ -29,7 +29,7 @@ import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.auth.client.oauth2.StorageCipher;
|
||||
import org.openhab.core.auth.client.oauth2.StorageCipher;
|
||||
import org.osgi.service.cm.Configuration;
|
||||
import org.osgi.service.cm.ConfigurationAdmin;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
|
||||
@ -24,14 +24,14 @@ import java.util.stream.Stream;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigConstants;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
|
||||
import org.eclipse.smarthome.config.core.ParameterOption;
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.eclipse.smarthome.core.audio.AudioSink;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.config.core.ConfigConstants;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
|
||||
import org.openhab.core.config.core.ParameterOption;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.audio.AudioSink;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.Visibility;
|
||||
import org.openhab.core.automation.type.ActionType;
|
||||
import org.openhab.core.automation.type.ModuleType;
|
||||
|
||||
@ -17,8 +17,8 @@ import static java.util.Collections.unmodifiableList;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.eclipse.smarthome.core.voice.VoiceManager;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.voice.VoiceManager;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
|
||||
|
||||
@ -17,8 +17,8 @@ import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.eclipse.smarthome.core.voice.VoiceManager;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.voice.VoiceManager;
|
||||
import org.openhab.core.automation.module.script.ScriptExtensionProvider;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
import org.osgi.service.component.annotations.Reference;
|
||||
|
||||
@ -14,8 +14,8 @@ package org.openhab.core.automation.module.media.internal;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.audio.AudioException;
|
||||
import org.eclipse.smarthome.core.audio.AudioManager;
|
||||
import org.openhab.core.audio.AudioException;
|
||||
import org.openhab.core.audio.AudioManager;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.handler.BaseActionModuleHandler;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
@ -14,7 +14,7 @@ package org.openhab.core.automation.module.media.internal;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.voice.VoiceManager;
|
||||
import org.openhab.core.voice.VoiceManager;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.handler.BaseActionModuleHandler;
|
||||
|
||||
|
||||
@ -21,8 +21,8 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Rule;
|
||||
|
||||
@ -21,7 +21,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.type.ModuleType;
|
||||
import org.openhab.core.automation.type.ModuleTypeProvider;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
|
||||
@ -35,8 +35,8 @@ import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigConstants;
|
||||
import org.eclipse.smarthome.core.service.AbstractWatchService;
|
||||
import org.openhab.core.config.core.ConfigConstants;
|
||||
import org.openhab.core.service.AbstractWatchService;
|
||||
import org.openhab.core.automation.module.script.ScriptEngineContainer;
|
||||
import org.openhab.core.automation.module.script.ScriptEngineManager;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
|
||||
@ -19,7 +19,7 @@ import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.RuleRegistry;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Rule;
|
||||
|
||||
@ -17,7 +17,7 @@ import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.RuleProvider;
|
||||
import org.osgi.service.component.annotations.Component;
|
||||
|
||||
@ -20,8 +20,8 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -22,36 +22,36 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.smarthome.core.events.EventPublisher;
|
||||
import org.eclipse.smarthome.core.items.ItemRegistry;
|
||||
import org.eclipse.smarthome.core.library.types.DateTimeType;
|
||||
import org.eclipse.smarthome.core.library.types.DecimalType;
|
||||
import org.eclipse.smarthome.core.library.types.HSBType;
|
||||
import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
|
||||
import org.eclipse.smarthome.core.library.types.NextPreviousType;
|
||||
import org.eclipse.smarthome.core.library.types.OnOffType;
|
||||
import org.eclipse.smarthome.core.library.types.OpenClosedType;
|
||||
import org.eclipse.smarthome.core.library.types.PercentType;
|
||||
import org.eclipse.smarthome.core.library.types.PlayPauseType;
|
||||
import org.eclipse.smarthome.core.library.types.PointType;
|
||||
import org.eclipse.smarthome.core.library.types.QuantityType;
|
||||
import org.eclipse.smarthome.core.library.types.RawType;
|
||||
import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
|
||||
import org.eclipse.smarthome.core.library.types.StopMoveType;
|
||||
import org.eclipse.smarthome.core.library.types.StringListType;
|
||||
import org.eclipse.smarthome.core.library.types.StringType;
|
||||
import org.eclipse.smarthome.core.library.types.UpDownType;
|
||||
import org.eclipse.smarthome.core.library.unit.BinaryPrefix;
|
||||
import org.eclipse.smarthome.core.library.unit.ImperialUnits;
|
||||
import org.eclipse.smarthome.core.library.unit.MetricPrefix;
|
||||
import org.eclipse.smarthome.core.library.unit.SIUnits;
|
||||
import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
|
||||
import org.eclipse.smarthome.core.thing.ThingRegistry;
|
||||
import org.eclipse.smarthome.core.thing.binding.ThingActions;
|
||||
import org.eclipse.smarthome.core.types.Command;
|
||||
import org.eclipse.smarthome.core.types.RefreshType;
|
||||
import org.eclipse.smarthome.core.types.State;
|
||||
import org.eclipse.smarthome.core.types.UnDefType;
|
||||
import org.openhab.core.events.EventPublisher;
|
||||
import org.openhab.core.items.ItemRegistry;
|
||||
import org.openhab.core.library.types.DateTimeType;
|
||||
import org.openhab.core.library.types.DecimalType;
|
||||
import org.openhab.core.library.types.HSBType;
|
||||
import org.openhab.core.library.types.IncreaseDecreaseType;
|
||||
import org.openhab.core.library.types.NextPreviousType;
|
||||
import org.openhab.core.library.types.OnOffType;
|
||||
import org.openhab.core.library.types.OpenClosedType;
|
||||
import org.openhab.core.library.types.PercentType;
|
||||
import org.openhab.core.library.types.PlayPauseType;
|
||||
import org.openhab.core.library.types.PointType;
|
||||
import org.openhab.core.library.types.QuantityType;
|
||||
import org.openhab.core.library.types.RawType;
|
||||
import org.openhab.core.library.types.RewindFastforwardType;
|
||||
import org.openhab.core.library.types.StopMoveType;
|
||||
import org.openhab.core.library.types.StringListType;
|
||||
import org.openhab.core.library.types.StringType;
|
||||
import org.openhab.core.library.types.UpDownType;
|
||||
import org.openhab.core.library.unit.BinaryPrefix;
|
||||
import org.openhab.core.library.unit.ImperialUnits;
|
||||
import org.openhab.core.library.unit.MetricPrefix;
|
||||
import org.openhab.core.library.unit.SIUnits;
|
||||
import org.openhab.core.library.unit.SmartHomeUnits;
|
||||
import org.openhab.core.thing.ThingRegistry;
|
||||
import org.openhab.core.thing.binding.ThingActions;
|
||||
import org.openhab.core.types.Command;
|
||||
import org.openhab.core.types.RefreshType;
|
||||
import org.openhab.core.types.State;
|
||||
import org.openhab.core.types.UnDefType;
|
||||
import org.openhab.core.automation.RuleRegistry;
|
||||
import org.openhab.core.automation.module.script.ScriptExtensionProvider;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
|
||||
@ -18,10 +18,10 @@ import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.core.items.Item;
|
||||
import org.eclipse.smarthome.core.items.ItemNotFoundException;
|
||||
import org.eclipse.smarthome.core.items.ItemRegistry;
|
||||
import org.eclipse.smarthome.core.types.State;
|
||||
import org.openhab.core.items.Item;
|
||||
import org.openhab.core.items.ItemNotFoundException;
|
||||
import org.openhab.core.items.ItemRegistry;
|
||||
import org.openhab.core.types.State;
|
||||
|
||||
/**
|
||||
* This is a helper class that can be added to script scopes. It provides easy access to the current item states.
|
||||
|
||||
@ -16,15 +16,15 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.eclipse.smarthome.core.events.EventPublisher;
|
||||
import org.eclipse.smarthome.core.items.GroupItem;
|
||||
import org.eclipse.smarthome.core.items.Item;
|
||||
import org.eclipse.smarthome.core.items.ItemNotFoundException;
|
||||
import org.eclipse.smarthome.core.items.ItemRegistry;
|
||||
import org.eclipse.smarthome.core.items.events.ItemEventFactory;
|
||||
import org.eclipse.smarthome.core.types.Command;
|
||||
import org.eclipse.smarthome.core.types.State;
|
||||
import org.eclipse.smarthome.core.types.TypeParser;
|
||||
import org.openhab.core.events.EventPublisher;
|
||||
import org.openhab.core.items.GroupItem;
|
||||
import org.openhab.core.items.Item;
|
||||
import org.openhab.core.items.ItemNotFoundException;
|
||||
import org.openhab.core.items.ItemRegistry;
|
||||
import org.openhab.core.items.events.ItemEventFactory;
|
||||
import org.openhab.core.types.Command;
|
||||
import org.openhab.core.types.State;
|
||||
import org.openhab.core.types.TypeParser;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
|
||||
@ -15,12 +15,12 @@ package org.openhab.core.automation.module.script.internal.defaultscope;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.thing.Thing;
|
||||
import org.eclipse.smarthome.core.thing.ThingRegistry;
|
||||
import org.eclipse.smarthome.core.thing.ThingUID;
|
||||
import org.eclipse.smarthome.core.thing.binding.ThingActions;
|
||||
import org.eclipse.smarthome.core.thing.binding.ThingActionsScope;
|
||||
import org.eclipse.smarthome.core.thing.binding.ThingHandler;
|
||||
import org.openhab.core.thing.Thing;
|
||||
import org.openhab.core.thing.ThingRegistry;
|
||||
import org.openhab.core.thing.ThingUID;
|
||||
import org.openhab.core.thing.binding.ThingActions;
|
||||
import org.openhab.core.thing.binding.ThingActionsScope;
|
||||
import org.openhab.core.thing.binding.ThingHandler;
|
||||
import org.osgi.service.component.annotations.Reference;
|
||||
import org.osgi.service.component.annotations.ReferenceCardinality;
|
||||
import org.osgi.service.component.annotations.ReferencePolicy;
|
||||
|
||||
@ -22,7 +22,7 @@ import javax.script.ScriptContext;
|
||||
import javax.script.ScriptEngine;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.handler.BaseModuleHandler;
|
||||
import org.openhab.core.automation.module.script.ScriptEngineContainer;
|
||||
|
||||
@ -23,11 +23,11 @@ import java.util.stream.Stream;
|
||||
|
||||
import javax.script.ScriptEngine;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
|
||||
import org.eclipse.smarthome.config.core.ParameterOption;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
|
||||
import org.openhab.core.config.core.ParameterOption;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.Visibility;
|
||||
import org.openhab.core.automation.module.script.ScriptEngineFactory;
|
||||
import org.openhab.core.automation.module.script.internal.handler.AbstractScriptModuleHandler;
|
||||
|
||||
@ -30,8 +30,8 @@ import javax.ws.rs.core.UriInfo;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.io.rest.LocaleService;
|
||||
import org.eclipse.smarthome.io.rest.RESTResource;
|
||||
import org.openhab.core.io.rest.LocaleService;
|
||||
import org.openhab.core.io.rest.RESTResource;
|
||||
import org.openhab.core.automation.dto.ActionTypeDTOMapper;
|
||||
import org.openhab.core.automation.dto.ConditionTypeDTOMapper;
|
||||
import org.openhab.core.automation.dto.ModuleTypeDTO;
|
||||
|
||||
@ -37,10 +37,10 @@ import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.Response.Status;
|
||||
import javax.ws.rs.core.UriInfo;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigUtil;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.eclipse.smarthome.io.rest.JSONResponse;
|
||||
import org.eclipse.smarthome.io.rest.RESTResource;
|
||||
import org.openhab.core.config.core.ConfigUtil;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.io.rest.JSONResponse;
|
||||
import org.openhab.core.io.rest.RESTResource;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -29,8 +29,8 @@ import javax.ws.rs.core.UriInfo;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.io.rest.LocaleService;
|
||||
import org.eclipse.smarthome.io.rest.RESTResource;
|
||||
import org.openhab.core.io.rest.LocaleService;
|
||||
import org.openhab.core.io.rest.RESTResource;
|
||||
import org.openhab.core.automation.dto.RuleTemplateDTO;
|
||||
import org.openhab.core.automation.dto.RuleTemplateDTOMapper;
|
||||
import org.openhab.core.automation.template.RuleTemplate;
|
||||
|
||||
@ -22,7 +22,7 @@ Its category should also be `RuleActions`.
|
||||
|
||||
### Thing
|
||||
|
||||
For actions that need access to the logic of a `ThingHandler`, one has to implement a service which implements the `org.eclipse.smarthome.core.thing.binding.AnnotatedActionThingHandlerService` interface.
|
||||
For actions that need access to the logic of a `ThingHandler`, one has to implement a service which implements the `org.openhab.core.thing.binding.AnnotatedActionThingHandlerService` interface.
|
||||
The `ThingHandler` has to override the `Collection<Class> getServices()` method from the `BaseThingHandler` and return the class of the aforementioned service.
|
||||
The framework takes care of registering and un-registering of that service.
|
||||
|
||||
@ -45,4 +45,4 @@ Within the implementation of the method, only those output names which are speci
|
||||
|
||||
## Examples
|
||||
|
||||
For examples, please see the package `org.eclipse.smarthome.magic.binding.internal.automation.modules` inside the `org.eclipse.smarthome.magic` bundle.
|
||||
For examples, please see the package `org.openhab.core.magic.binding.internal.automation.modules` inside the `org.openhab.core.magic` bundle.
|
||||
|
||||
@ -15,7 +15,7 @@ package org.openhab.core.automation;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.automation.type.ActionType;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
import org.openhab.core.automation.type.Output;
|
||||
|
||||
@ -15,7 +15,7 @@ package org.openhab.core.automation;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.automation.type.ConditionType;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
import org.openhab.core.automation.type.Output;
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
*/
|
||||
package org.openhab.core.automation;
|
||||
|
||||
import org.eclipse.smarthome.core.common.registry.AbstractManagedProvider;
|
||||
import org.eclipse.smarthome.core.storage.StorageService;
|
||||
import org.openhab.core.common.registry.AbstractManagedProvider;
|
||||
import org.openhab.core.storage.StorageService;
|
||||
import org.openhab.core.automation.dto.RuleDTO;
|
||||
import org.openhab.core.automation.dto.RuleDTOMapper;
|
||||
import org.osgi.service.component.annotations.Activate;
|
||||
|
||||
@ -14,8 +14,8 @@ package org.openhab.core.automation;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
import org.openhab.core.automation.type.ModuleType;
|
||||
import org.openhab.core.automation.type.Output;
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.common.registry.RegistryChangeListener;
|
||||
|
||||
/**
|
||||
* This class is responsible to provide a {@link RegistryChangeListener} logic. A instance of it is added to
|
||||
|
||||
@ -17,9 +17,9 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.eclipse.smarthome.core.common.registry.Identifiable;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.common.registry.Identifiable;
|
||||
import org.openhab.core.automation.template.RuleTemplate;
|
||||
|
||||
/**
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.common.registry.RegistryChangeListener;
|
||||
|
||||
/**
|
||||
* This class is responsible to provide a {@link RegistryChangeListener} logic. A instance of it is added to
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
package org.openhab.core.automation;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.core.common.registry.Provider;
|
||||
import org.openhab.core.common.registry.Provider;
|
||||
|
||||
/**
|
||||
* This class is responsible for providing {@link Rule}s. {@link RuleProvider}s are tracked by the {@link RuleRegistry}
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.Collection;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.Registry;
|
||||
import org.openhab.core.common.registry.Registry;
|
||||
|
||||
/**
|
||||
* The {@link RuleRegistry} provides basic functionality for managing {@link Rule}s.
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
package org.openhab.core.automation;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
import org.openhab.core.automation.type.Output;
|
||||
import org.openhab.core.automation.type.TriggerType;
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.util.ModuleBuilder;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.type.ActionType;
|
||||
import org.openhab.core.automation.type.CompositeActionType;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ package org.openhab.core.automation.dto;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.util.ModuleBuilder;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.type.CompositeConditionType;
|
||||
import org.openhab.core.automation.type.ConditionType;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ package org.openhab.core.automation.dto;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.automation.Visibility;
|
||||
|
||||
/**
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*/
|
||||
package org.openhab.core.automation.dto;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.dto.ModuleTypeDTO;
|
||||
import org.openhab.core.automation.type.ModuleType;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.automation.Visibility;
|
||||
|
||||
/**
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
*/
|
||||
package org.openhab.core.automation.dto;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.dto.RuleDTO;
|
||||
import org.openhab.core.automation.util.RuleBuilder;
|
||||
|
||||
@ -15,7 +15,7 @@ package org.openhab.core.automation.dto;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
|
||||
import org.openhab.core.automation.Visibility;
|
||||
|
||||
/**
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*/
|
||||
package org.openhab.core.automation.dto;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.dto.RuleTemplateDTO;
|
||||
import org.openhab.core.automation.template.RuleTemplate;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Trigger;
|
||||
import org.openhab.core.automation.util.ModuleBuilder;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
|
||||
import org.openhab.core.automation.type.CompositeTriggerType;
|
||||
import org.openhab.core.automation.type.TriggerType;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*/
|
||||
package org.openhab.core.automation.events;
|
||||
|
||||
import org.eclipse.smarthome.core.events.AbstractEvent;
|
||||
import org.openhab.core.events.AbstractEvent;
|
||||
import org.openhab.core.automation.dto.RuleDTO;
|
||||
|
||||
/**
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*/
|
||||
package org.openhab.core.automation.events;
|
||||
|
||||
import org.eclipse.smarthome.core.events.AbstractEvent;
|
||||
import org.openhab.core.events.AbstractEvent;
|
||||
import org.openhab.core.automation.RuleStatusInfo;
|
||||
|
||||
/**
|
||||
|
||||
@ -17,7 +17,7 @@ import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
associations="true" dependencies="true" nesting-relationships="true" router="FAN">
|
||||
<interface id="1" language="java" name="org.openhab.core.automation.RuleProvider"
|
||||
project="org.openhab.core.automation.api"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/RuleProvider.java"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/RuleProvider.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="997" y="197"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -14,7 +14,7 @@
|
||||
</interface>
|
||||
<interface id="2" language="java" name="org.openhab.core.automation.handler.ModuleHandlerFactory"
|
||||
project="org.openhab.core.automation.api"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/handler/ModuleHandlerFactory.java"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/handler/ModuleHandlerFactory.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="580" y="72"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -25,7 +25,7 @@
|
||||
</interface>
|
||||
<class id="3" language="java" name="org.openhab.core.automation.core.ManagedRuleProvider"
|
||||
project="org.openhab.core.automation.core"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/ManagedRuleProvider.java"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/ManagedRuleProvider.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="883" y="29"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -36,7 +36,7 @@
|
||||
</class>
|
||||
<interface id="4" language="java" name="org.openhab.core.automation.handler.ModuleHandler"
|
||||
project="org.openhab.core.automation.api"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/handler/ModuleHandler.java"
|
||||
file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/handler/ModuleHandler.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="371" y="-60"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -47,7 +47,7 @@
|
||||
</interface>
|
||||
<class id="5" language="java" name="org.openhab.core.automation.core.internal.RuleEngineCallbackImpl.TriggerData"
|
||||
project="org.openhab.core.automation.core"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineCallbackImpl.java"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineCallbackImpl.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="99" y="558"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -58,7 +58,7 @@
|
||||
</class>
|
||||
<class id="6" language="java" name="org.openhab.core.automation.core.internal.RuleEngineCallbackImpl"
|
||||
project="org.openhab.core.automation.core"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineCallbackImpl.java"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineCallbackImpl.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="102" y="257"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -69,7 +69,7 @@
|
||||
</class>
|
||||
<class id="7" language="java" name="org.openhab.core.automation.core.internal.RuleEngineImpl"
|
||||
project="org.openhab.core.automation.core"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineImpl.java"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineImpl.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="345" y="573"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
@ -80,7 +80,7 @@
|
||||
</class>
|
||||
<class id="8" language="java" name="org.openhab.core.automation.core.internal.RuleRegistryImpl"
|
||||
project="org.openhab.core.automation.core"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryImpl.java"
|
||||
file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleRegistryImpl.java"
|
||||
binary="false" corner="BOTTOM_RIGHT">
|
||||
<position height="-1" width="-1" x="928" y="766"/>
|
||||
<display autosize="false" stereotype="false" package="false" initial-value="false" signature="false"
|
||||
|
||||
@ -17,7 +17,7 @@ import java.util.Map;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
|
||||
@ -13,8 +13,8 @@
|
||||
package org.openhab.core.automation.internal;
|
||||
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.type.Input;
|
||||
|
||||
@ -31,11 +31,11 @@ import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
|
||||
import org.eclipse.smarthome.core.events.Event;
|
||||
import org.eclipse.smarthome.core.events.EventPublisher;
|
||||
import org.eclipse.smarthome.core.storage.Storage;
|
||||
import org.eclipse.smarthome.core.storage.StorageService;
|
||||
import org.openhab.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.events.Event;
|
||||
import org.openhab.core.events.EventPublisher;
|
||||
import org.openhab.core.storage.Storage;
|
||||
import org.openhab.core.storage.StorageService;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -17,9 +17,9 @@ import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.core.events.AbstractEventFactory;
|
||||
import org.eclipse.smarthome.core.events.Event;
|
||||
import org.eclipse.smarthome.core.events.EventFactory;
|
||||
import org.openhab.core.events.AbstractEventFactory;
|
||||
import org.openhab.core.events.Event;
|
||||
import org.openhab.core.events.EventFactory;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.RuleStatusInfo;
|
||||
import org.openhab.core.automation.dto.RuleDTO;
|
||||
|
||||
@ -21,8 +21,8 @@ import java.util.UUID;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -25,14 +25,14 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
|
||||
import org.eclipse.smarthome.core.common.registry.Provider;
|
||||
import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
|
||||
import org.eclipse.smarthome.core.events.EventPublisher;
|
||||
import org.eclipse.smarthome.core.storage.StorageService;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.common.registry.AbstractRegistry;
|
||||
import org.openhab.core.common.registry.Provider;
|
||||
import org.openhab.core.common.registry.RegistryChangeListener;
|
||||
import org.openhab.core.events.EventPublisher;
|
||||
import org.openhab.core.storage.StorageService;
|
||||
import org.openhab.core.automation.ManagedRuleProvider;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.Rule;
|
||||
@ -247,21 +247,21 @@ public class RuleRegistryImpl extends AbstractRegistry<Rule, String, RuleProvide
|
||||
}
|
||||
|
||||
/**
|
||||
* @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
|
||||
* @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
|
||||
*/
|
||||
protected void postRuleAddedEvent(Rule rule) {
|
||||
postEvent(RuleEventFactory.createRuleAddedEvent(rule, SOURCE));
|
||||
}
|
||||
|
||||
/**
|
||||
* @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
|
||||
* @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
|
||||
*/
|
||||
protected void postRuleRemovedEvent(Rule rule) {
|
||||
postEvent(RuleEventFactory.createRuleRemovedEvent(rule, SOURCE));
|
||||
}
|
||||
|
||||
/**
|
||||
* @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
|
||||
* @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
|
||||
*/
|
||||
protected void postRuleUpdatedEvent(Rule rule, Rule oldRule) {
|
||||
postEvent(RuleEventFactory.createRuleUpdatedEvent(rule, oldRule, SOURCE));
|
||||
|
||||
@ -14,7 +14,7 @@ package org.openhab.core.automation.internal;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Trigger;
|
||||
|
||||
/**
|
||||
|
||||
@ -25,7 +25,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.parser.Parser;
|
||||
import org.openhab.core.automation.parser.ParsingException;
|
||||
import org.openhab.core.automation.template.TemplateProvider;
|
||||
|
||||
@ -22,8 +22,8 @@ import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.jdt.annotation.NonNull;
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.io.console.Console;
|
||||
import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
|
||||
import org.openhab.core.io.console.Console;
|
||||
import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
|
||||
import org.openhab.core.automation.Rule;
|
||||
import org.openhab.core.automation.RuleManager;
|
||||
import org.openhab.core.automation.RuleRegistry;
|
||||
|
||||
@ -28,7 +28,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.parser.Parser;
|
||||
import org.openhab.core.automation.parser.ParsingException;
|
||||
import org.openhab.core.automation.parser.ParsingNestedException;
|
||||
|
||||
@ -26,7 +26,7 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.common.registry.ProviderChangeListener;
|
||||
import org.openhab.core.automation.parser.Parser;
|
||||
import org.openhab.core.automation.parser.ParsingException;
|
||||
import org.openhab.core.automation.parser.ParsingNestedException;
|
||||
|
||||
@ -19,9 +19,9 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
|
||||
import org.eclipse.smarthome.config.core.FilterCriteria;
|
||||
import org.eclipse.smarthome.config.core.ParameterOption;
|
||||
import org.openhab.core.config.core.ConfigDescriptionParameter;
|
||||
import org.openhab.core.config.core.FilterCriteria;
|
||||
import org.openhab.core.config.core.ParameterOption;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -19,7 +19,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.config.core.Configuration;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -15,8 +15,8 @@ package org.openhab.core.automation.internal.module.factory;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.eclipse.smarthome.core.events.EventPublisher;
|
||||
import org.eclipse.smarthome.core.items.ItemRegistry;
|
||||
import org.openhab.core.events.EventPublisher;
|
||||
import org.openhab.core.items.ItemRegistry;
|
||||
import org.openhab.core.automation.Action;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
|
||||
@ -19,7 +19,7 @@ import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
|
||||
import org.openhab.core.ephemeris.EphemerisManager;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.Module;
|
||||
import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
|
||||
|
||||
@ -19,10 +19,10 @@ import java.util.Hashtable;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.smarthome.core.events.Event;
|
||||
import org.eclipse.smarthome.core.events.EventFilter;
|
||||
import org.eclipse.smarthome.core.events.EventSubscriber;
|
||||
import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent;
|
||||
import org.openhab.core.events.Event;
|
||||
import org.openhab.core.events.EventFilter;
|
||||
import org.openhab.core.events.EventSubscriber;
|
||||
import org.openhab.core.thing.events.ChannelTriggeredEvent;
|
||||
import org.openhab.core.automation.Trigger;
|
||||
import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
|
||||
import org.openhab.core.automation.handler.TriggerHandlerCallback;
|
||||
|
||||
@ -18,8 +18,8 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.smarthome.core.types.State;
|
||||
import org.eclipse.smarthome.core.types.TypeParser;
|
||||
import org.openhab.core.types.State;
|
||||
import org.openhab.core.types.TypeParser;
|
||||
import org.openhab.core.automation.Condition;
|
||||
import org.openhab.core.automation.handler.BaseConditionModuleHandler;
|
||||
import org.openhab.core.automation.internal.module.exception.UncomparableException;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user