OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed configurationPid prefixes from 'org.openhab.core' ot 'org.openhab' (#1314) 

* Changed configurationPid prefixes from 'org.openhab.core' ot 'org.openhab'

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/1315/head
Christoph Weitkamp 2020-01-02 09:12:34 +01:00 committed by Kai Kreuzer
parent 3811cb9560
commit 84009652a8
34 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
View File

@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* @author Wouter Born - Sort audio sink and source options * @author Wouter Born - Sort audio sink and source options
*/ */
@NonNullByDefault @NonNullByDefault
@Component(immediate = true, configurationPid = "org.openhab.core.audio", property = { // @Component(immediate = true, configurationPid = "org.openhab.audio", property = { //
Constants.SERVICE_PID + "=org.openhab.core.audio", // Constants.SERVICE_PID + "=org.openhab.core.audio", //
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, //

2
bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
View File

@ -45,7 +45,7 @@ import org.osgi.service.component.annotations.Modified;
* @author Łukasz Dywicki - Initial contribution * @author Łukasz Dywicki - Initial contribution
* @author Kai Kreuzer - Removed ManagedService and used DS configuration instead * @author Kai Kreuzer - Removed ManagedService and used DS configuration instead
*/ */
@Component(configurationPid = "org.openhab.core.jaas") @Component(configurationPid = "org.openhab.jaas")
public class JaasAuthenticationProvider implements AuthenticationProvider { public class JaasAuthenticationProvider implements AuthenticationProvider {
private String realmName; private String realmName;

2
bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
View File

@ -86,7 +86,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - added auto-approve functionality * @author Kai Kreuzer - added auto-approve functionality
* @author Henning Sudbrock - added hook for selectively auto-approving inbox entries * @author Henning Sudbrock - added hook for selectively auto-approving inbox entries
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.inbox", service = EventSubscriber.class, property = { @Component(immediate = true, configurationPid = "org.openhab.inbox", service = EventSubscriber.class, property = {
Constants.SERVICE_PID + "=org.openhab.core.inbox", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", Constants.SERVICE_PID + "=org.openhab.core.inbox", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Inbox", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Inbox",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" })

2
bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
View File

@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Łukasz Dywicki - Initial contribution. * @author Łukasz Dywicki - Initial contribution.
*/ */
@Component(configurationPid = "org.openhab.core.auth") @Component(configurationPid = "org.openhab.auth")
public class AuthenticationHandler implements Handler { public class AuthenticationHandler implements Handler {
private static final String AUTHENTICATION_ENABLED = "enabled"; private static final String AUTHENTICATION_ENABLED = "enabled";

2
bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
View File

@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - added web socket support * @author Kai Kreuzer - added web socket support
* @author Martin van Wingerden - Add support for ESHTrustManager * @author Martin van Wingerden - Add support for ESHTrustManager
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.webclient") @Component(immediate = true, configurationPid = "org.openhab.webclient")
@NonNullByDefault @NonNullByDefault
public class WebClientFactoryImpl implements HttpClientFactory, WebSocketFactory { public class WebClientFactoryImpl implements HttpClientFactory, WebSocketFactory {

2
bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
View File

@ -34,7 +34,7 @@ import org.osgi.service.component.annotations.ReferencePolicy;
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
* @author Markus Rathgeb - Use HTTP service utility functions * @author Markus Rathgeb - Use HTTP service utility functions
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.mdns", property = { @Component(immediate = true, configurationPid = "org.openhab.mdns", property = {
Constants.SERVICE_PID + "=org.openhab.core.mdns" // Constants.SERVICE_PID + "=org.openhab.core.mdns" //
}) })
public class MDNSAnnouncer { public class MDNSAnnouncer {

2
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
View File

@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Component(service = { SitemapSubscriptionService.class, @Component(service = { SitemapSubscriptionService.class,
EventSubscriber.class }, configurationPid = "org.openhab.core.sitemapsubscription") EventSubscriber.class }, configurationPid = "org.openhab.sitemapsubscription")
public class SitemapSubscriptionService implements ModelRepositoryChangeListener, EventSubscriber { public class SitemapSubscriptionService implements ModelRepositoryChangeListener, EventSubscriber {
private static final String SITEMAP_PAGE_SEPARATOR = "#"; private static final String SITEMAP_PAGE_SEPARATOR = "#";

2
bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
View File

@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/ */
@Provider @Provider
@Component(immediate = true, property = { @Component(immediate = true, property = {
"service.pid=org.openhab.core.cors" }, configurationPid = "org.openhab.core.cors", configurationPolicy = ConfigurationPolicy.REQUIRE) "service.pid=org.openhab.core.cors" }, configurationPid = "org.openhab.cors", configurationPolicy = ConfigurationPolicy.REQUIRE)
public class CorsFilter implements ContainerResponseFilter { public class CorsFilter implements ContainerResponseFilter {
static final String HTTP_HEAD_METHOD = "HEAD"; static final String HTTP_HEAD_METHOD = "HEAD";

2
bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
View File

@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/ */
@Provider @Provider
@PreMatching @PreMatching
@Component(configurationPid = "org.openhab.core.io.rest.proxyfilter", immediate = true, service = ProxyFilter.class) @Component(configurationPid = "org.openhab.proxyfilter", immediate = true, service = ProxyFilter.class)
public class ProxyFilter implements ContainerRequestFilter { public class ProxyFilter implements ContainerRequestFilter {
static final String PROTO_PROXY_HEADER = "x-forwarded-proto"; static final String PROTO_PROXY_HEADER = "x-forwarded-proto";

2
bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
View File

@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Path("/") @Path("/")
@Component(service = RootResource.class, configurationPid = "org.openhab.core.io.rest.root") @Component(service = RootResource.class, configurationPid = "org.openhab.restroot")
public class RootResource { public class RootResource {
private final transient Logger logger = LoggerFactory.getLogger(RootResource.class); private final transient Logger logger = LoggerFactory.getLogger(RootResource.class);

2
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
View File

@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
* *
* @author David Graeff - Initial contribution * @author David Graeff - Initial contribution
*/ */
@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.openhab.core.mqttbroker") @Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.openhab.mqttbroker")
@NonNullByDefault @NonNullByDefault
public class MqttBrokerConnectionServiceInstance { public class MqttBrokerConnectionServiceInstance {
private final Logger logger = LoggerFactory.getLogger(MqttBrokerConnectionServiceInstance.class); private final Logger logger = LoggerFactory.getLogger(MqttBrokerConnectionServiceInstance.class);

2
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
View File

@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* @author David Graeff - Added/Removed observer interface, Add/Remove/Enumerate broker connections. * @author David Graeff - Added/Removed observer interface, Add/Remove/Enumerate broker connections.
* @author Markus Rathgeb - Synchronize access to broker connections * @author Markus Rathgeb - Synchronize access to broker connections
*/ */
@Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.core.mqtt", property = { @Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.mqtt", property = {
Constants.SERVICE_PID + "=org.openhab.core.mqtt" }) Constants.SERVICE_PID + "=org.openhab.core.mqtt" })
@NonNullByDefault @NonNullByDefault
public class MqttServiceImpl implements MqttService { public class MqttServiceImpl implements MqttService {

6
bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
View File

@ -44,14 +44,14 @@ import com.google.inject.Injector;
* *
* @author Simon Kaufmann - Initial contribution * @author Simon Kaufmann - Initial contribution
*/ */
@Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIG_PID, property = { @Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIGURATION_PID, property = {
Constants.SERVICE_PID + "=" + ModelServer.CONFIG_PID, Constants.SERVICE_PID + "=org.openhab.core.lsp",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Language Server (LSP)", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Language Server (LSP)",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" }) ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" })
public class ModelServer { public class ModelServer {
static final String CONFIG_PID = "org.openhab.core.lsp"; public static final String CONFIGURATION_PID = "org.openhab.lsp";
private static final String KEY_PORT = "port"; private static final String KEY_PORT = "port";
private static final int DEFAULT_PORT = 5007; private static final int DEFAULT_PORT = 5007;
private final ExecutorService pool = ThreadPoolManager.getPool("lsp"); private final ExecutorService pool = ThreadPoolManager.getPool("lsp");

5
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
View File

@ -42,9 +42,8 @@ import org.slf4j.LoggerFactory;
* *
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.core.rulehli", property = { @Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.rulehli", property = {
Constants.SERVICE_PID + "=org.openhab.core.rulehli", Constants.SERVICE_PID + "=org.openhab.core.rulehli", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Rule Voice Interpreter", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Rule Voice Interpreter",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI })
public class RuleHumanLanguageInterpreter implements HumanLanguageInterpreter { public class RuleHumanLanguageInterpreter implements HumanLanguageInterpreter {

2
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
View File

@ -41,7 +41,7 @@ import org.osgi.service.component.annotations.ReferencePolicy;
* *
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.persistence", property = { @Component(immediate = true, configurationPid = "org.openhab.persistence", property = {
Constants.SERVICE_PID + "=org.openhab.core.persistence", Constants.SERVICE_PID + "=org.openhab.core.persistence",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence",

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
View File

@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Henning Treu - Initial contribution * @author Henning Treu - Initial contribution
*/ */
@Component(configurationPid = "org.openhab.core.magic", service = ConfigOptionProvider.class, immediate = true, property = { @Component(configurationPid = "org.openhab.magic", service = ConfigOptionProvider.class, immediate = true, property = {
"service.pid=org.openhab.core.magic", "service.config.description.uri=test:magic", "service.config.label=Magic", "service.pid=org.openhab.core.magic", "service.config.description.uri=test:magic", "service.config.label=Magic",
"service.config.category=test" }) "service.config.category=test" })
public class MagicServiceImpl implements MagicService { public class MagicServiceImpl implements MagicService {

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
View File

@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
*/ */
@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.openhab.core.MagicMultiAction") @Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.openhab.magicmultiaction")
@ActionScope(name = "binding.magic") @ActionScope(name = "binding.magic")
public class MagicMultiServiceMultiActions implements AnnotatedActions { public class MagicMultiServiceMultiActions implements AnnotatedActions {

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
View File

@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
*/ */
@Component(configurationPid = "org.openhab.core.automation.action.magicSingleActionService", property = { @Component(configurationPid = "org.openhab.magicsingleaction", property = {
Constants.SERVICE_PID + "=org.openhab.core.automation.action.magicSingleActionService", Constants.SERVICE_PID + "=org.openhab.core.automation.action.magicSingleActionService",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=automationAction:magicSingleAction", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=automationAction:magicSingleAction",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service",

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
View File

@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
* *
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
*/ */
@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.openhab.core.magicMultiInstance") @Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.openhab.magicmultiinstance")
public class MagicMultiInstanceService { public class MagicMultiInstanceService {
private final Logger logger = LoggerFactory.getLogger(MagicMultiInstanceService.class); private final Logger logger = LoggerFactory.getLogger(MagicMultiInstanceService.class);

2
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
View File

@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/ */
@NonNullByDefault @NonNullByDefault
@Component(immediate = true, service = { @Component(immediate = true, service = {
AutoUpdateManager.class }, configurationPid = "org.openhab.core.autoupdate", configurationPolicy = ConfigurationPolicy.OPTIONAL) AutoUpdateManager.class }, configurationPid = "org.openhab.autoupdate", configurationPolicy = ConfigurationPolicy.OPTIONAL)
public class AutoUpdateManager { public class AutoUpdateManager {
private static final String AUTOUPDATE_KEY = "autoupdate"; private static final String AUTOUPDATE_KEY = "autoupdate";

2
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
View File

@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* @author Markus Rathgeb - Add locale provider support * @author Markus Rathgeb - Add locale provider support
* @author Thomas Höfer - Added modified operation * @author Thomas Höfer - Added modified operation
*/ */
@Component(configurationPid = "org.openhab.core.channelitemprovider", immediate = true) @Component(configurationPid = "org.openhab.channelitemprovider", immediate = true)
@NonNullByDefault @NonNullByDefault
public class ChannelItemProvider implements ItemProvider { public class ChannelItemProvider implements ItemProvider {

8
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
View File

@ -57,13 +57,17 @@ import org.slf4j.LoggerFactory;
* ThingSetupManager) * ThingSetupManager)
* @author Markus Rathgeb - Send link notification if item and link exists and unlink on the first removal * @author Markus Rathgeb - Send link notification if item and link exists and unlink on the first removal
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.links", service = { ThingLinkManager.class, @Component(immediate = true, configurationPid = ThingLinkManager.CONFIGURATION_PID, service = { ThingLinkManager.class,
EventSubscriber.class }, property = { "service.config.description.uri:String=system:links", EventSubscriber.class }, property = { "service.config.description.uri:String=system:links",
"service.config.label:String=Item Linking", "service.config.category:String=system", "service.config.label:String=Item Linking", "service.config.category:String=system",
"service.pid:String=org.openhab.core.links" }) "service.pid:String=org.openhab.core.links" })
@NonNullByDefault @NonNullByDefault
public class ThingLinkManager extends AbstractTypedEventSubscriber<ThingStatusInfoChangedEvent> { public class ThingLinkManager extends AbstractTypedEventSubscriber<ThingStatusInfoChangedEvent> {
public static final String CONFIGURATION_PID = "org.openhab.links";
public static final String AUTO_LINKS = "autoLinks";
private static final String THREADPOOL_NAME = "thingLinkManager"; private static final String THREADPOOL_NAME = "thingLinkManager";
private final Logger logger = LoggerFactory.getLogger(ThingLinkManager.class); private final Logger logger = LoggerFactory.getLogger(ThingLinkManager.class);
@ -103,7 +107,7 @@ public class ThingLinkManager extends AbstractTypedEventSubscriber<ThingStatusIn
protected void modified(ComponentContext context) { protected void modified(ComponentContext context) {
// check whether we want to enable the automatic link creation or not // check whether we want to enable the automatic link creation or not
if (context != null) { if (context != null) {
Object value = context.getProperties().get("autoLinks"); Object value = context.getProperties().get(AUTO_LINKS);
autoLinks = value == null || !value.toString().equals("false"); autoLinks = value == null || !value.toString().equals("false");
} }
} }

2
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
View File

@ -69,7 +69,7 @@ import org.osgi.service.http.HttpService;
* @author Chris Jackson - Initial contribution * @author Chris Jackson - Initial contribution
* @author Holger Reichert - Support for themes, DPI, legend hiding * @author Holger Reichert - Support for themes, DPI, legend hiding
*/ */
@Component(immediate = true, service = ChartServlet.class, configurationPid = "org.openhab.core.chart", property = { @Component(immediate = true, service = ChartServlet.class, configurationPid = "org.openhab.chart", property = {
Constants.SERVICE_PID + "=org.openhab.core.chart", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", Constants.SERVICE_PID + "=org.openhab.core.chart", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Charts", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Charts",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + "system:chart" }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + "system:chart" })

4
bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
View File

@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
* @author Christoph Weitkamp - Added parameter to adjust the volume * @author Christoph Weitkamp - Added parameter to adjust the volume
* @author Wouter Born - Sort TTS options * @author Wouter Born - Sort TTS options
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.voice", property = { // @Component(immediate = true, configurationPid = VoiceManagerImpl.CONFIGURATION_PID, property = { //
Constants.SERVICE_PID + "=org.openhab.core.voice", // Constants.SERVICE_PID + "=org.openhab.core.voice", //
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", //
@ -79,6 +79,8 @@ import org.slf4j.LoggerFactory;
}) })
public class VoiceManagerImpl implements VoiceManager, ConfigOptionProvider { public class VoiceManagerImpl implements VoiceManager, ConfigOptionProvider {
public static final String CONFIGURATION_PID = "org.openhab.voice";
// the default keyword to use if no other is configured // the default keyword to use if no other is configured
private static final String DEFAULT_KEYWORD = "Wakeup"; private static final String DEFAULT_KEYWORD = "Wakeup";

2
bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
View File

@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
@Component(configurationPid = ThreadPoolManager.CONFIGURATION_PID) @Component(configurationPid = ThreadPoolManager.CONFIGURATION_PID)
public class ThreadPoolManager { public class ThreadPoolManager {
public static final String CONFIGURATION_PID = "org.openhab.core.threadpool"; public static final String CONFIGURATION_PID = "org.openhab.threadpool";
/** /**
* The common thread pool is reserved for occasional, light weight tasks that run quickly, and * The common thread pool is reserved for occasional, light weight tasks that run quickly, and

2
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
View File

@ -33,7 +33,7 @@ import org.osgi.service.component.annotations.Modified;
* @author Simon Kaufmann - Initial contribution * @author Simon Kaufmann - Initial contribution
*/ */
@NonNullByDefault @NonNullByDefault
@Component(configurationPid = "org.openhab.core.safecaller", immediate = true) @Component(configurationPid = "org.openhab.safecaller", immediate = true)
public class SafeCallerImpl implements SafeCaller { public class SafeCallerImpl implements SafeCaller {
private static final String SAFE_CALL_POOL_NAME = "safeCall"; private static final String SAFE_CALL_POOL_NAME = "safeCall";

12
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
View File

@ -76,7 +76,7 @@ import org.slf4j.LoggerFactory;
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
* @author Erdoan Hadzhiyusein - Added time zone * @author Erdoan Hadzhiyusein - Added time zone
*/ */
@Component(immediate = true, configurationPid = "org.openhab.core.i18n", property = { @Component(immediate = true, configurationPid = I18nProviderImpl.CONFIGURATION_PID, property = {
Constants.SERVICE_PID + "=org.openhab.core.i18n", // Constants.SERVICE_PID + "=org.openhab.core.i18n", //
"service.config.label=Regional Settings", // "service.config.label=Regional Settings", //
"service.config.category=system", // "service.config.category=system", //
@ -87,11 +87,13 @@ public class I18nProviderImpl
private final Logger logger = LoggerFactory.getLogger(I18nProviderImpl.class); private final Logger logger = LoggerFactory.getLogger(I18nProviderImpl.class);
public static final String CONFIGURATION_PID = "org.openhab.i18n";
// LocaleProvider // LocaleProvider
static final String LANGUAGE = "language"; public static final String LANGUAGE = "language";
static final String SCRIPT = "script"; public static final String SCRIPT = "script";
static final String REGION = "region"; public static final String REGION = "region";
static final String VARIANT = "variant"; public static final String VARIANT = "variant";
private @Nullable Locale locale; private @Nullable Locale locale;
// TranslationProvider // TranslationProvider

2
bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
View File

@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* @author Gary Tse - Network address change listener * @author Gary Tse - Network address change listener
* @author Tim Roberts - Added primary address change to network address change listener * @author Tim Roberts - Added primary address change to network address change listener
*/ */
@Component(configurationPid = "org.openhab.core.network", property = { "service.pid=org.openhab.core.network", @Component(configurationPid = "org.openhab.network", property = { "service.pid=org.openhab.core.network",
"service.config.description.uri=system:network", "service.config.label=Network Settings", "service.config.description.uri=system:network", "service.config.label=Network Settings",
"service.config.category=system" }) "service.config.category=system" })
@NonNullByDefault @NonNullByDefault

3
itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
View File

@ -25,6 +25,7 @@ import org.junit.Test;
import org.openhab.core.binding.BindingInfo; import org.openhab.core.binding.BindingInfo;
import org.openhab.core.binding.BindingInfoRegistry; import org.openhab.core.binding.BindingInfoRegistry;
import org.openhab.core.i18n.LocaleProvider; import org.openhab.core.i18n.LocaleProvider;
import org.openhab.core.internal.i18n.I18nProviderImpl;
import org.openhab.core.test.java.JavaOSGiTest; import org.openhab.core.test.java.JavaOSGiTest;
import org.osgi.service.cm.Configuration; import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationAdmin;
@ -91,7 +92,7 @@ public class BindingInfoI18nTest extends JavaOSGiTest {
ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class);
assertThat(configAdmin, is(notNullValue())); assertThat(configAdmin, is(notNullValue()));
Configuration config = configAdmin.getConfiguration("org.openhab.core.i18n", null); Configuration config = configAdmin.getConfiguration(I18nProviderImpl.CONFIGURATION_PID, null);
assertThat(config, is(notNullValue())); assertThat(config, is(notNullValue()));
Dictionary<String, Object> properties = config.getProperties(); Dictionary<String, Object> properties = config.getProperties();

5
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
View File

@ -75,6 +75,7 @@ import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
import org.openhab.core.thing.link.ItemChannelLink; import org.openhab.core.thing.link.ItemChannelLink;
import org.openhab.core.thing.link.ItemChannelLinkRegistry; import org.openhab.core.thing.link.ItemChannelLinkRegistry;
import org.openhab.core.thing.link.ManagedItemChannelLinkProvider; import org.openhab.core.thing.link.ManagedItemChannelLinkProvider;
import org.openhab.core.thing.link.ThingLinkManager;
import org.openhab.core.thing.type.ChannelDefinitionBuilder; import org.openhab.core.thing.type.ChannelDefinitionBuilder;
import org.openhab.core.thing.type.ChannelGroupType; import org.openhab.core.thing.type.ChannelGroupType;
import org.openhab.core.thing.type.ChannelGroupTypeBuilder; import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
@ -1055,12 +1056,12 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
private void configureAutoLinking(Boolean on) throws IOException { private void configureAutoLinking(Boolean on) throws IOException {
ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class);
org.osgi.service.cm.Configuration config = configAdmin.getConfiguration("org.openhab.core.links", null); org.osgi.service.cm.Configuration config = configAdmin.getConfiguration(ThingLinkManager.CONFIGURATION_PID);
Dictionary<String, Object> properties = config.getProperties(); Dictionary<String, Object> properties = config.getProperties();
if (properties == null) { if (properties == null) {
properties = new Hashtable<>(); properties = new Hashtable<>();
} }
properties.put("autoLinks", on.toString()); properties.put(ThingLinkManager.AUTO_LINKS, on.toString());
config.update(properties); config.update(properties);
} }

11
itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
View File

@ -21,6 +21,7 @@ import java.util.Dictionary;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Locale; import java.util.Locale;
import org.openhab.core.internal.i18n.I18nProviderImpl;
import org.osgi.service.cm.Configuration; import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationAdmin;
@ -48,7 +49,7 @@ public class DefaultLocaleSetter {
public void setDefaultLocale(Locale locale) throws IOException { public void setDefaultLocale(Locale locale) throws IOException {
assertThat(locale, is(notNullValue())); assertThat(locale, is(notNullValue()));
Configuration config = configAdmin.getConfiguration("org.openhab.core.i18n", null); Configuration config = configAdmin.getConfiguration(I18nProviderImpl.CONFIGURATION_PID, null);
assertThat(config, is(notNullValue())); assertThat(config, is(notNullValue()));
Dictionary<String, Object> properties = config.getProperties(); Dictionary<String, Object> properties = config.getProperties();
@ -56,10 +57,10 @@ public class DefaultLocaleSetter {
properties = new Hashtable<>(); properties = new Hashtable<>();
} }
properties.put("language", locale.getLanguage()); properties.put(I18nProviderImpl.LANGUAGE, locale.getLanguage());
properties.put("script", locale.getScript()); properties.put(I18nProviderImpl.SCRIPT, locale.getScript());
properties.put("region", locale.getCountry()); properties.put(I18nProviderImpl.REGION, locale.getCountry());
properties.put("variant", locale.getVariant()); properties.put(I18nProviderImpl.VARIANT, locale.getVariant());
config.update(properties); config.update(properties);
} }

9
itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
View File

@ -53,7 +53,6 @@ import org.osgi.service.cm.ConfigurationAdmin;
* @author Velin Yordanov - migrated tests from groovy to java * @author Velin Yordanov - migrated tests from groovy to java
*/ */
public class VoiceManagerTest extends JavaOSGiTest { public class VoiceManagerTest extends JavaOSGiTest {
private static final String PID = "org.openhab.core.voice";
private static final String CONFIG_DEFAULT_HLI = "defaultHLI"; private static final String CONFIG_DEFAULT_HLI = "defaultHLI";
private static final String CONFIG_DEFAULT_KS = "defaultKS"; private static final String CONFIG_DEFAULT_KS = "defaultKS";
private static final String CONFIG_DEFAULT_STT = "defaultSTT"; private static final String CONFIG_DEFAULT_STT = "defaultSTT";
@ -92,7 +91,7 @@ public class VoiceManagerTest extends JavaOSGiTest {
Dictionary<String, Object> voiceConfig = new Hashtable<>(); Dictionary<String, Object> voiceConfig = new Hashtable<>();
voiceConfig.put(CONFIG_DEFAULT_TTS, ttsService.getId()); voiceConfig.put(CONFIG_DEFAULT_TTS, ttsService.getId());
ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
Configuration configuration = configAdmin.getConfiguration(PID); Configuration configuration = configAdmin.getConfiguration(VoiceManagerImpl.CONFIGURATION_PID);
configuration.update(voiceConfig); configuration.update(voiceConfig);
audioManager = new AudioManagerStub(); audioManager = new AudioManagerStub();
@ -164,8 +163,7 @@ public class VoiceManagerTest extends JavaOSGiTest {
Dictionary<String, Object> voiceConfig = new Hashtable<>(); Dictionary<String, Object> voiceConfig = new Hashtable<>();
voiceConfig.put("defaultHLI", hliStub.getId()); voiceConfig.put("defaultHLI", hliStub.getId());
ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
String pid = "org.openhab.core.voice"; Configuration configuration = configAdmin.getConfiguration(VoiceManagerImpl.CONFIGURATION_PID);
Configuration configuration = configAdmin.getConfiguration(pid);
configuration.update(voiceConfig); configuration.update(voiceConfig);
String result = voiceManager.interpret("something", hliStub.getId()); String result = voiceManager.interpret("something", hliStub.getId());
@ -249,8 +247,7 @@ public class VoiceManagerTest extends JavaOSGiTest {
config.put(CONFIG_DEFAULT_VOICE, voice.getUID()); config.put(CONFIG_DEFAULT_VOICE, voice.getUID());
ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
String pid = "org.openhab.core.voice"; Configuration configuration = configAdmin.getConfiguration(VoiceManagerImpl.CONFIGURATION_PID);
Configuration configuration = configAdmin.getConfiguration(pid);
configuration.update(config); configuration.update(config);
waitForAssert(() -> { waitForAssert(() -> {

4
itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
View File

@ -23,6 +23,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.openhab.core.voice.internal.HumanLanguageInterpreterStub; import org.openhab.core.voice.internal.HumanLanguageInterpreterStub;
import org.openhab.core.voice.internal.TTSServiceStub; import org.openhab.core.voice.internal.TTSServiceStub;
import org.openhab.core.voice.internal.VoiceManagerImpl;
import org.openhab.core.voice.internal.VoiceStub; import org.openhab.core.voice.internal.VoiceStub;
import org.osgi.service.cm.Configuration; import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationAdmin;
@ -61,8 +62,7 @@ public class InterpretCommandTest extends VoiceConsoleCommandExtensionTest {
config.put(CONFIG_DEFAULT_HLI, hliStub.getId()); config.put(CONFIG_DEFAULT_HLI, hliStub.getId());
config.put(CONFIG_DEFAULT_VOICE, voice.getUID()); config.put(CONFIG_DEFAULT_VOICE, voice.getUID());
ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
String pid = "org.openhab.core.voice"; Configuration configuration = configAdmin.getConfiguration(VoiceManagerImpl.CONFIGURATION_PID);
Configuration configuration = configAdmin.getConfiguration(pid);
configuration.update(config); configuration.update(config);
} }

4
itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
View File

@ -35,6 +35,7 @@ import org.openhab.core.thing.ThingProvider;
import org.openhab.core.voice.TTSService; import org.openhab.core.voice.TTSService;
import org.openhab.core.voice.internal.SinkStub; import org.openhab.core.voice.internal.SinkStub;
import org.openhab.core.voice.internal.TTSServiceStub; import org.openhab.core.voice.internal.TTSServiceStub;
import org.openhab.core.voice.internal.VoiceManagerImpl;
import org.openhab.core.voice.internal.VoiceStub; import org.openhab.core.voice.internal.VoiceStub;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration; import org.osgi.service.cm.Configuration;
@ -112,8 +113,7 @@ public class SayCommandTest extends VoiceConsoleCommandExtensionTest {
Dictionary<String, Object> config = new Hashtable<>(); Dictionary<String, Object> config = new Hashtable<>();
config.put(CONFIG_DEFAULT_TTS, defaultTTSService); config.put(CONFIG_DEFAULT_TTS, defaultTTSService);
ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class); ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
String pid = "org.openhab.core.voice"; Configuration configuration = configAdmin.getConfiguration(VoiceManagerImpl.CONFIGURATION_PID);
Configuration configuration = configAdmin.getConfiguration(pid);
configuration.update(config); configuration.update(config);
} }