From 59675788e0a662aff26f99094f189564bfc19872 Mon Sep 17 00:00:00 2001 From: Christoph Weitkamp Date: Fri, 27 Dec 2019 11:10:17 +0100 Subject: [PATCH] Renamed packages Signed-off-by: Christoph Weitkamp --- .../openhab/core/audio/AudioException.java | 2 +- .../org/openhab/core/audio/AudioFormat.java | 2 +- .../openhab/core/audio/AudioHTTPServer.java | 4 +- .../org/openhab/core/audio/AudioManager.java | 4 +- .../org/openhab/core/audio/AudioSink.java | 4 +- .../org/openhab/core/audio/AudioSource.java | 2 +- .../org/openhab/core/audio/AudioStream.java | 2 +- .../core/audio/ByteArrayAudioStream.java | 2 +- .../openhab/core/audio/FileAudioStream.java | 4 +- .../core/audio/FixedLengthAudioStream.java | 2 +- .../openhab/core/audio/URLAudioStream.java | 4 +- .../UnsupportedAudioFormatException.java | 2 +- .../UnsupportedAudioStreamException.java | 2 +- .../AudioConsoleCommandExtension.java | 20 +-- .../core/audio/internal/AudioManagerImpl.java | 34 ++--- .../core/audio/internal/AudioServlet.java | 14 +- .../core/audio/utils/AudioStreamUtils.java | 2 +- .../internal/AbstractAudioServletTest.java | 16 +-- .../core/audio/internal/AudioConsoleTest.java | 22 +-- .../core/audio/internal/AudioFormatTest.java | 4 +- .../internal/AudioManagerServletTest.java | 12 +- .../core/audio/internal/AudioManagerTest.java | 24 ++-- .../core/audio/internal/AudioServletTest.java | 10 +- .../audio/internal/fake/AudioSinkFake.java | 18 +-- .../utils/BundledSoundFileHandler.java | 6 +- .../internal/JaasAuthenticationProvider.java | 14 +- .../auth/oauth2client/internal/Keyword.java | 2 +- .../internal/OAuthClientServiceImpl.java | 22 +-- .../oauth2client/internal/OAuthConnector.java | 14 +- .../internal/OAuthFactoryImpl.java | 10 +- .../internal/OAuthStoreHandler.java | 4 +- .../internal/OAuthStoreHandlerImpl.java | 14 +- .../internal/PersistedParams.java | 2 +- .../internal/StorageRecordType.java | 2 +- .../internal/cipher/SymmetricKeyCipher.java | 4 +- .../internal/MediaActionTypeProvider.java | 16 +-- .../internal/MediaModuleHandlerFactory.java | 4 +- .../internal/MediaScriptScopeProvider.java | 4 +- .../media/internal/PlayActionHandler.java | 4 +- .../media/internal/SayActionHandler.java | 2 +- .../internal/RuleSupportScriptExtension.java | 4 +- .../ScriptedCustomModuleTypeProvider.java | 2 +- .../internal/loader/ScriptFileWatcher.java | 4 +- .../RuleSupportRuleRegistryDelegate.java | 2 +- .../shared/ScriptedAutomationManager.java | 2 +- .../shared/ScriptedRuleProvider.java | 2 +- .../rulesupport/shared/simple/SimpleRule.java | 4 +- .../DefaultScriptScopeProvider.java | 60 ++++---- .../defaultscope/ItemRegistryDelegate.java | 8 +- .../internal/defaultscope/ScriptBusEvent.java | 18 +-- .../defaultscope/ScriptThingActions.java | 12 +- .../handler/AbstractScriptModuleHandler.java | 2 +- .../provider/ScriptModuleTypeProvider.java | 10 +- .../rest/internal/ModuleTypeResource.java | 4 +- .../rest/internal/RuleResource.java | 8 +- .../rest/internal/TemplateResource.java | 4 +- bundles/org.openhab.core.automation/README.md | 4 +- .../org/openhab/core/automation/Action.java | 2 +- .../openhab/core/automation/Condition.java | 2 +- .../core/automation/ManagedRuleProvider.java | 4 +- .../org/openhab/core/automation/Module.java | 4 +- .../automation/ModuleHandlerCallback.java | 2 +- .../org/openhab/core/automation/Rule.java | 6 +- .../openhab/core/automation/RuleManager.java | 2 +- .../openhab/core/automation/RuleProvider.java | 2 +- .../openhab/core/automation/RuleRegistry.java | 2 +- .../org/openhab/core/automation/Trigger.java | 2 +- .../core/automation/dto/ActionDTOMapper.java | 2 +- .../automation/dto/ActionTypeDTOMapper.java | 2 +- .../automation/dto/ConditionDTOMapper.java | 2 +- .../dto/ConditionTypeDTOMapper.java | 2 +- .../core/automation/dto/ModuleTypeDTO.java | 2 +- .../automation/dto/ModuleTypeDTOMapper.java | 2 +- .../openhab/core/automation/dto/RuleDTO.java | 2 +- .../core/automation/dto/RuleDTOMapper.java | 4 +- .../core/automation/dto/RuleTemplateDTO.java | 2 +- .../automation/dto/RuleTemplateDTOMapper.java | 2 +- .../core/automation/dto/TriggerDTOMapper.java | 2 +- .../automation/dto/TriggerTypeDTOMapper.java | 2 +- .../events/AbstractRuleRegistryEvent.java | 2 +- .../events/RuleStatusInfoEvent.java | 2 +- .../core/automation/internal/ActionImpl.java | 2 +- .../core/automation/internal/Automation.ucls | 16 +-- .../automation/internal/ConditionImpl.java | 2 +- .../core/automation/internal/ModuleImpl.java | 4 +- .../automation/internal/RuleEngineImpl.java | 10 +- .../automation/internal/RuleEventFactory.java | 6 +- .../core/automation/internal/RuleImpl.java | 4 +- .../automation/internal/RuleRegistryImpl.java | 22 +-- .../core/automation/internal/TriggerImpl.java | 2 +- .../commands/AbstractCommandProvider.java | 2 +- .../commands/AutomationCommandsPluggable.java | 4 +- .../CommandlineModuleTypeProvider.java | 2 +- .../commands/CommandlineTemplateProvider.java | 2 +- .../automation/internal/commands/Printer.java | 6 +- .../CompositeModuleHandlerFactory.java | 2 +- .../factory/CoreModuleHandlerFactory.java | 4 +- .../EphemerisModuleHandlerFactory.java | 2 +- .../handler/ChannelEventTriggerHandler.java | 8 +- .../handler/CompareConditionHandler.java | 4 +- .../handler/EphemerisConditionHandler.java | 4 +- .../handler/GenericCronTriggerHandler.java | 6 +- .../handler/GenericEventConditionHandler.java | 2 +- .../handler/GenericEventTriggerHandler.java | 6 +- .../handler/ItemCommandActionHandler.java | 16 +-- .../handler/ItemCommandTriggerHandler.java | 10 +- .../handler/ItemStateConditionHandler.java | 12 +- .../handler/ItemStateTriggerHandler.java | 14 +- .../handler/RuleEnablementActionHandler.java | 2 +- .../module/handler/RunRuleActionHandler.java | 2 +- .../handler/ThingStatusTriggerHandler.java | 12 +- .../handler/TimeOfDayConditionHandler.java | 2 +- .../handler/TimeOfDayTriggerHandler.java | 6 +- .../handler/TimerModuleHandlerFactory.java | 2 +- .../AnnotatedActionModuleTypeProvider.java | 4 +- .../parser/gson/AbstractGSONParser.java | 6 +- .../AbstractResourceBundleProvider.java | 8 +- .../AutomationResourceBundlesTracker.java | 2 +- .../ModuleTypeResourceBundleProvider.java | 4 +- .../TemplateResourceBundleProvider.java | 10 +- .../provider/file/AbstractFileProvider.java | 6 +- .../provider/file/AutomationWatchService.java | 2 +- .../provider/i18n/ModuleI18nUtil.java | 4 +- .../i18n/ModuleTypeI18nServiceImpl.java | 8 +- .../provider/i18n/ModuleTypeI18nUtil.java | 4 +- .../provider/i18n/RuleTemplateI18nUtil.java | 4 +- .../template/RuleTemplateRegistry.java | 4 +- .../internal/type/ModuleTypeRegistryImpl.java | 4 +- .../AnnotationActionModuleTypeHelper.java | 10 +- .../automation/template/RuleTemplate.java | 2 +- .../template/RuleTemplateProvider.java | 4 +- .../core/automation/template/Template.java | 2 +- .../automation/template/TemplateProvider.java | 2 +- .../automation/template/TemplateRegistry.java | 2 +- ...nnotatedThingActionModuleTypeProvider.java | 8 +- .../core/automation/type/ActionType.java | 2 +- .../automation/type/CompositeActionType.java | 2 +- .../type/CompositeConditionType.java | 2 +- .../automation/type/CompositeTriggerType.java | 2 +- .../core/automation/type/ConditionType.java | 2 +- .../core/automation/type/ModuleType.java | 4 +- .../automation/type/ModuleTypeProvider.java | 2 +- .../automation/type/ModuleTypeRegistry.java | 2 +- .../core/automation/type/TriggerType.java | 2 +- .../util/ConfigurationNormalizer.java | 6 +- .../core/automation/util/ModuleBuilder.java | 2 +- .../automation/util/ReferenceResolver.java | 2 +- .../core/automation/util/RuleBuilder.java | 4 +- .../moduletypes/ChannelTrigger.json | 2 +- .../moduletypes/GenericConditions.json | 2 +- .../moduletypes/GenericTriggers.json | 2 +- .../automation/moduletypes/ItemTriggers.json | 6 +- .../automation/moduletypes/ThingTriggers.json | 10 +- ...nnotationActionModuleTypeProviderTest.java | 8 +- .../util/ReferenceResolverUtilTest.java | 2 +- .../xml/internal/BindingInfoConverter.java | 12 +- .../xml/internal/BindingInfoReader.java | 30 ++-- .../xml/internal/BindingInfoXmlProvider.java | 12 +- .../xml/internal/BindingInfoXmlResult.java | 8 +- .../BindingXmlConfigDescriptionProvider.java | 10 +- .../xml/internal/XmlBindingInfoProvider.java | 26 ++-- .../main/java/org/openhab/core/OpenHAB.java | 2 +- .../openhab/core/internal/CoreActivator.java | 2 +- .../internal/item/DefaultSitemapProvider.java | 24 ++-- .../core/config/core/ConfigConstants.java | 2 +- .../core/config/core/ConfigDescription.java | 4 +- .../core/ConfigDescriptionAliasProvider.java | 2 +- .../config/core/ConfigDescriptionBuilder.java | 2 +- .../core/ConfigDescriptionParameter.java | 4 +- .../ConfigDescriptionParameterBuilder.java | 4 +- .../core/ConfigDescriptionParameterGroup.java | 2 +- .../core/ConfigDescriptionProvider.java | 2 +- .../core/ConfigDescriptionRegistry.java | 2 +- .../config/core/ConfigOptionProvider.java | 2 +- .../openhab/core/config/core/ConfigUtil.java | 10 +- .../core/config/core/ConfigurableService.java | 2 +- .../core/config/core/Configuration.java | 6 +- .../core/ConfigurationDeserializer.java | 2 +- .../config/core/ConfigurationSerializer.java | 2 +- .../core/config/core/FilterCriteria.java | 2 +- .../core/config/core/ParameterOption.java | 2 +- .../config/core/dto/ConfigDescriptionDTO.java | 4 +- .../core/dto/ConfigDescriptionDTOMapper.java | 14 +- .../dto/ConfigDescriptionParameterDTO.java | 4 +- .../ConfigDescriptionParameterGroupDTO.java | 2 +- .../config/core/dto/FilterCriteriaDTO.java | 2 +- .../config/core/dto/ParameterOptionDTO.java | 2 +- .../i18n/ConfigI18nLocalizationService.java | 18 +-- .../config/core/internal/ConfigMapper.java | 2 +- .../i18n/ConfigDescriptionGroupI18nUtil.java | 6 +- .../i18n/ConfigDescriptionI18nUtil.java | 6 +- .../i18n/I18nConfigOptionsProvider.java | 6 +- ...MetadataConfigDescriptionProviderImpl.java | 16 +-- .../net/NetworkConfigOptionProvider.java | 10 +- .../normalization/AbstractNormalizer.java | 2 +- .../normalization/BooleanNormalizer.java | 4 +- .../normalization/DecimalNormalizer.java | 4 +- .../internal/normalization/IntNormalizer.java | 4 +- .../normalization/ListNormalizer.java | 2 +- .../internal/normalization/Normalizer.java | 4 +- .../normalization/NormalizerFactory.java | 6 +- .../normalization/TextNormalizer.java | 4 +- .../ConfigDescriptionParameterValidator.java | 6 +- ...gDescriptionParameterValidatorFactory.java | 2 +- .../ConfigDescriptionValidatorImpl.java | 18 +-- .../core/internal/validation/MessageKey.java | 2 +- .../internal/validation/MinMaxValidator.java | 12 +- .../internal/validation/PatternValidator.java | 8 +- .../validation/RequiredValidator.java | 6 +- .../validation/TypeIntrospections.java | 4 +- .../internal/validation/TypeValidator.java | 10 +- .../MetadataConfigDescriptionProvider.java | 6 +- .../core/status/ConfigStatusCallback.java | 2 +- .../config/core/status/ConfigStatusInfo.java | 4 +- .../core/status/ConfigStatusMessage.java | 2 +- .../core/status/ConfigStatusProvider.java | 4 +- .../core/status/ConfigStatusService.java | 14 +- .../core/status/ConfigStatusSource.java | 2 +- .../events/ConfigStatusEventFactory.java | 10 +- .../status/events/ConfigStatusInfoEvent.java | 6 +- .../ConfigDescriptionValidator.java | 6 +- .../validation/ConfigValidationException.java | 8 +- .../validation/ConfigValidationMessage.java | 6 +- .../core/ConfigDescriptionBuilderTest.java | 4 +- ...ConfigDescriptionParameterBuilderTest.java | 4 +- .../core/ConfigDescriptionRegistryTest.java | 4 +- .../core/config/core/ConfigUtilTest.java | 4 +- .../core/config/core/ConfigurationTest.java | 2 +- .../i18n/I18nConfigOptionsProviderTest.java | 4 +- ...dataConfigDescriptionProviderImplTest.java | 18 +-- .../normalization/NormalizerTest.java | 6 +- .../ConfigDescriptionValidatorTest.java | 18 +-- .../ConfigValidationExceptionTest.java | 8 +- .../core/status/ConfigStatusInfoTest.java | 4 +- .../core/status/ConfigStatusServiceTest.java | 14 +- .../mdns/MDNSDiscoveryParticipant.java | 10 +- .../mdns/internal/MDNSDiscoveryService.java | 38 +++--- .../upnp/UpnpDiscoveryParticipant.java | 8 +- .../upnp/internal/UpnpDiscoveryService.java | 32 ++--- .../internal/DeltaUsbSerialScanner.java | 4 +- .../internal/PollingUsbSerialScanner.java | 12 +- .../internal/SysfsUsbSerialScanner.java | 4 +- .../linuxsysfs/internal/UsbSerialScanner.java | 4 +- .../usbserial/UsbSerialDeviceInformation.java | 2 +- .../usbserial/UsbSerialDiscovery.java | 4 +- .../usbserial/UsbSerialDiscoveryListener.java | 2 +- .../UsbSerialDiscoveryParticipant.java | 10 +- .../internal/UsbSerialDiscoveryService.java | 22 +-- .../discovery/AbstractDiscoveryService.java | 16 +-- .../config/discovery/DiscoveryListener.java | 6 +- .../config/discovery/DiscoveryResult.java | 8 +- .../discovery/DiscoveryResultBuilder.java | 8 +- .../config/discovery/DiscoveryResultFlag.java | 2 +- .../config/discovery/DiscoveryService.java | 4 +- .../discovery/DiscoveryServiceCallback.java | 8 +- .../discovery/DiscoveryServiceRegistry.java | 4 +- .../discovery/ExtendedDiscoveryService.java | 2 +- .../core/config/discovery/ScanListener.java | 2 +- .../discovery/UpnpDiscoveryParticipant.java | 8 +- .../discovery/dto/DiscoveryResultDTO.java | 4 +- .../dto/DiscoveryResultDTOMapper.java | 10 +- .../core/config/discovery/inbox/Inbox.java | 14 +- .../inbox/InboxAutoApprovePredicate.java | 6 +- .../discovery/inbox/InboxFilterCriteria.java | 10 +- .../config/discovery/inbox/InboxListener.java | 4 +- .../discovery/inbox/InboxPredicates.java | 10 +- .../inbox/events/AbstractInboxEvent.java | 8 +- .../inbox/events/InboxAddedEvent.java | 4 +- .../inbox/events/InboxEventFactory.java | 14 +- .../inbox/events/InboxRemovedEvent.java | 4 +- .../inbox/events/InboxUpdatedEvent.java | 4 +- .../internal/AutomaticInboxProcessor.java | 42 +++--- .../internal/DiscoveryResultImpl.java | 10 +- .../DiscoveryServiceRegistryImpl.java | 22 +-- .../discovery/internal/PersistentInbox.java | 62 ++++----- .../DiscoveryConsoleCommandExtension.java | 14 +- .../console/InboxConsoleCommandExtension.java | 22 +-- .../discovery/inbox/InboxPredicatesTest.java | 14 +- .../inbox/events/InboxEventFactoryTest.java | 14 +- .../internal/AutomaticInboxProcessorTest.java | 46 +++---- .../internal/DiscoveryResultImplTest.java | 10 +- .../internal/PersistentInboxTest.java | 50 +++---- .../dispatch/internal/ConfigDispatcher.java | 10 +- .../internal/ConfigDispatcherFileWatcher.java | 6 +- .../ConfigDispatcherFileWatcherTest.java | 2 +- .../internal/SerialConfigOptionProvider.java | 8 +- .../config/xml/AbstractXmlBasedProvider.java | 6 +- .../AbstractXmlConfigDescriptionProvider.java | 8 +- .../xml/ConfigDescriptionConverter.java | 16 +-- .../ConfigDescriptionParameterConverter.java | 20 +-- ...figDescriptionParameterGroupConverter.java | 8 +- .../ConfigXmlConfigDescriptionProvider.java | 24 ++-- .../config/xml/FilterCriteriaConverter.java | 6 +- .../xml/internal/ConfigDescriptionReader.java | 32 ++--- .../ConfigDescriptionXmlProvider.java | 10 +- .../xml/osgi/XmlDocumentBundleTracker.java | 12 +- .../config/xml/osgi/XmlDocumentProvider.java | 4 +- .../xml/osgi/XmlDocumentProviderFactory.java | 2 +- .../config/xml/util/ConverterAssertion.java | 2 +- .../util/ConverterAttributeMapValidator.java | 2 +- .../config/xml/util/ConverterValueMap.java | 2 +- .../config/xml/util/GenericUnmarshaller.java | 2 +- .../core/config/xml/util/NodeAttributes.java | 2 +- .../xml/util/NodeAttributesConverter.java | 2 +- .../core/config/xml/util/NodeIterator.java | 2 +- .../core/config/xml/util/NodeList.java | 2 +- .../config/xml/util/NodeListConverter.java | 2 +- .../core/config/xml/util/NodeName.java | 2 +- .../core/config/xml/util/NodeValue.java | 2 +- .../config/xml/util/NodeValueConverter.java | 2 +- .../config/xml/util/XmlDocumentReader.java | 2 +- .../core/ephemeris/EphemerisManager.java | 2 +- .../internal/EphemerisManagerImpl.java | 12 +- .../internal/SampleExtensionService.java | 14 +- .../org/openhab/core/id/InstanceUUID.java | 4 +- .../core/id/internal/UUIDResource.java | 8 +- .../java/org/openhab/core/id/UUIDTest.java | 4 +- .../openhab/core/io/bin2json/Bin2Json.java | 2 +- .../internal/ConsoleSupportEclipse.java | 8 +- .../console/eclipse/internal/OSGiConsole.java | 4 +- .../karaf/internal/CommandWrapper.java | 8 +- .../karaf/internal/ConsoleSupportKaraf.java | 4 +- .../console/karaf/internal/OSGiConsole.java | 4 +- .../rfc147/internal/CommandWrapper.java | 6 +- .../internal/ConsoleCommandsContainer.java | 4 +- .../rfc147/internal/ConsoleSupportRfc147.java | 6 +- .../console/rfc147/internal/OSGiConsole.java | 4 +- .../HelpConsoleCommandExtension.java | 12 +- .../org/openhab/core/io/console/Console.java | 2 +- .../core/io/console/ConsoleInterpreter.java | 4 +- .../AbstractConsoleCommandExtension.java | 4 +- .../extensions/ConsoleCommandExtension.java | 4 +- .../ItemConsoleCommandExtension.java | 16 +-- .../MetadataConsoleCommandExtension.java | 18 +-- .../SendConsoleCommandExtension.java | 24 ++-- .../StatusConsoleCommandExtension.java | 16 +-- .../UpdateConsoleCommandExtension.java | 24 ++-- .../basic/internal/BasicChallengeHandler.java | 8 +- .../internal/BasicCredentialsExtractor.java | 8 +- .../io/http/auth/CredentialsExtractor.java | 4 +- .../auth/internal/AuthenticationHandler.java | 20 +-- .../http/auth/internal/RedirectHandler.java | 10 +- .../org/openhab/core/io/http/Handler.java | 2 +- .../openhab/core/io/http/HandlerContext.java | 2 +- .../core/io/http/HandlerPriorities.java | 2 +- .../io/http/HttpContextFactoryService.java | 2 +- .../core/io/http/WrappingHttpContext.java | 2 +- .../io/http/internal/BundleHttpContext.java | 2 +- .../core/io/http/internal/CatchHandler.java | 6 +- .../http/internal/DefaultHandlerContext.java | 6 +- .../http/internal/DelegatingHttpContext.java | 2 +- .../HttpContextFactoryServiceImpl.java | 6 +- .../http/internal/SmartHomeHttpContext.java | 6 +- .../io/http/servlet/BaseSmartHomeServlet.java | 2 +- .../http/servlet/SmartHomeBundleServlet.java | 4 +- .../io/http/servlet/SmartHomeServlet.java | 2 +- .../HttpContextFactoryServiceImplTest.java | 4 +- .../core/io/monitor/internal/EventLogger.java | 8 +- .../openhab/core/io/net/exec/ExecUtil.java | 2 +- .../io/net/http/ExtensibleTrustManager.java | 2 +- .../core/io/net/http/HttpClientFactory.java | 2 +- .../HttpClientInitializationException.java | 2 +- .../core/io/net/http/HttpRequestBuilder.java | 2 +- .../openhab/core/io/net/http/HttpUtil.java | 4 +- .../io/net/http/TlsCertificateProvider.java | 2 +- .../openhab/core/io/net/http/TlsProvider.java | 2 +- .../io/net/http/TlsTrustManagerProvider.java | 2 +- .../io/net/http/TrustAllTrustMananger.java | 2 +- .../io/net/http/TrustManagerProvider.java | 2 +- .../core/io/net/http/WebSocketFactory.java | 2 +- .../internal/ExtensibleTrustManagerImpl.java | 8 +- .../TlsCertificateTrustManagerAdapter.java | 6 +- .../net/http/internal/TrustManagerUtil.java | 2 +- .../http/internal/WebClientFactoryImpl.java | 14 +- .../core/io/net/http/BaseHttpUtilTest.java | 2 +- .../io/net/http/HttpRequestBuilderTest.java | 2 +- .../core/io/net/http/HttpUtilTest.java | 2 +- .../ExtensibleTrustManagerImplTest.java | 4 +- .../internal/WebClientFactoryImplTest.java | 4 +- .../io/rest/audio/internal/AudioMapper.java | 6 +- .../io/rest/audio/internal/AudioResource.java | 16 +-- .../io/rest/audio/internal/AudioSinkDTO.java | 4 +- .../rest/audio/internal/AudioSourceDTO.java | 4 +- .../internal/SmartHomeRestServletConfig.java | 2 +- bundles/org.openhab.core.io.rest.core/bnd.bnd | 2 +- .../core/config/ConfigurationService.java | 6 +- .../EnrichedConfigDescriptionDTOMapper.java | 14 +- ...EnrichedConfigDescriptionParameterDTO.java | 10 +- .../io/rest/core/internal/GsonProvider.java | 2 +- .../rest/core/internal/RESTCoreActivator.java | 4 +- .../internal/binding/BindingResource.java | 26 ++-- .../internal/channel/ChannelTypeResource.java | 38 +++--- .../config/ConfigDescriptionResource.java | 20 +-- .../internal/discovery/DiscoveryResource.java | 10 +- .../internal/discovery/InboxResource.java | 22 +-- .../extensions/ExtensionResource.java | 26 ++-- .../rest/core/internal/item/ItemResource.java | 64 ++++----- .../item/MetadataSelectorMatcher.java | 10 +- .../link/ItemChannelLinkResource.java | 24 ++-- .../persistence/PersistenceResource.java | 46 +++---- .../internal/profile/ProfileTypeResource.java | 30 ++-- .../service/ConfigurableServiceResource.java | 24 ++-- .../core/internal/thing/ThingResource.java | 96 ++++++------- .../internal/thing/ThingTypeResource.java | 52 +++---- .../rest/core/item/EnrichedGroupItemDTO.java | 10 +- .../io/rest/core/item/EnrichedItemDTO.java | 8 +- .../rest/core/item/EnrichedItemDTOMapper.java | 22 +-- .../core/persistence/ItemHistoryListDTO.java | 4 +- .../core/service/ConfigurableServiceDTO.java | 2 +- .../rest/core/thing/EnrichedChannelDTO.java | 4 +- .../io/rest/core/thing/EnrichedThingDTO.java | 10 +- .../core/thing/EnrichedThingDTOMapper.java | 14 +- ...nrichedConfigDescriptionDTOMapperTest.java | 14 +- .../channel/ChannelTypeResourceTest.java | 18 +-- .../item/MetadataSelectorMatcherTest.java | 10 +- .../core/item/EnrichedItemDTOMapperTest.java | 10 +- .../thing/EnrichedThingDTOMapperTest.java | 20 +-- .../io/rest/log/internal/LogConstants.java | 2 +- .../core/io/rest/log/internal/LogHandler.java | 4 +- .../io/rest/mdns/internal/MDNSAnnouncer.java | 14 +- .../org.openhab.core.io.rest.optimize/bnd.bnd | 2 +- .../io/rest/optimize/internal/Activator.java | 2 +- .../optimize/internal/ResourceFilterImpl.java | 16 +-- .../sitemap/SitemapSubscriptionService.java | 34 ++--- .../io/rest/sitemap/internal/MappingDTO.java | 2 +- .../sitemap/internal/PageChangeListener.java | 34 ++--- .../io/rest/sitemap/internal/PageDTO.java | 2 +- .../sitemap/internal/ServerAliveEvent.java | 2 +- .../sitemap/internal/SitemapChangedEvent.java | 2 +- .../io/rest/sitemap/internal/SitemapDTO.java | 2 +- .../rest/sitemap/internal/SitemapEvent.java | 2 +- .../sitemap/internal/SitemapEventOutput.java | 4 +- .../sitemap/internal/SitemapResource.java | 68 +++++----- .../sitemap/internal/SitemapWidgetEvent.java | 4 +- .../io/rest/sitemap/internal/WidgetDTO.java | 4 +- .../sitemap/internal/SitemapResourceTest.java | 36 ++--- bundles/org.openhab.core.io.rest.sse/bnd.bnd | 2 +- .../openhab/core/io/rest/sse/SseResource.java | 10 +- .../core/io/rest/sse/beans/EventBean.java | 2 +- .../io/rest/sse/internal/SseActivator.java | 2 +- .../io/rest/sse/internal/SseEventOutput.java | 6 +- .../listeners/SseEventSubscriber.java | 10 +- .../io/rest/sse/internal/util/SseUtil.java | 6 +- .../rest/sse/internal/util/SseUtilTest.java | 2 +- .../io/rest/voice/internal/HLIMapper.java | 4 +- .../internal/HumanLanguageInterpreterDTO.java | 4 +- .../core/io/rest/voice/internal/VoiceDTO.java | 4 +- .../io/rest/voice/internal/VoiceMapper.java | 4 +- .../io/rest/voice/internal/VoiceResource.java | 18 +-- .../org/openhab/core/io/rest/DTOMapper.java | 2 +- .../openhab/core/io/rest/JSONResponse.java | 4 +- .../openhab/core/io/rest/LocaleService.java | 2 +- .../core/io/rest/LocaleServiceImpl.java | 4 +- .../openhab/core/io/rest/RESTConstants.java | 2 +- .../openhab/core/io/rest/RESTResource.java | 2 +- .../core/io/rest/Stream2JSONInputStream.java | 4 +- .../core/io/rest/internal/Constants.java | 2 +- .../core/io/rest/internal/DTOMapperImpl.java | 4 +- .../io/rest/internal/filter/CorsFilter.java | 6 +- .../io/rest/internal/filter/ProxyFilter.java | 4 +- .../filter/SatisfiableResourceFilter.java | 4 +- .../rest/internal/resources/RootResource.java | 12 +- .../internal/resources/beans/RootBean.java | 2 +- .../core/io/rest/JSONResponseTest.java | 2 +- .../io/rest/Stream2JSONInputStreamTest.java | 2 +- .../rest/internal/filter/CorsFilterTest.java | 4 +- .../rest/internal/filter/ProxyFilterTest.java | 4 +- .../filter/SatisfiableResourceFilterTest.java | 4 +- .../bnd.bnd | 2 +- .../core/io/transport/mdns/MDNSClient.java | 2 +- .../core/io/transport/mdns/MDNSService.java | 2 +- .../io/transport/mdns/ServiceDescription.java | 2 +- .../discovery/MDNSDiscoveryParticipant.java | 10 +- .../mdns/internal/MDNSActivator.java | 2 +- .../mdns/internal/MDNSClientImpl.java | 12 +- .../mdns/internal/MDNSServiceImpl.java | 8 +- .../io/transport/mqtt/MqttActionCallback.java | 2 +- .../transport/mqtt/MqttBrokerConnection.java | 22 +-- .../mqtt/MqttBrokerConnectionConfig.java | 2 +- .../mqtt/MqttConnectionObserver.java | 2 +- .../transport/mqtt/MqttConnectionState.java | 2 +- .../core/io/transport/mqtt/MqttException.java | 2 +- .../transport/mqtt/MqttMessageSubscriber.java | 2 +- .../core/io/transport/mqtt/MqttService.java | 4 +- .../transport/mqtt/MqttServiceObserver.java | 2 +- .../transport/mqtt/MqttWillAndTestament.java | 2 +- .../mqtt/internal/ClientCallback.java | 14 +- .../MqttBrokerConnectionServiceInstance.java | 14 +- ...BrokerConnectionServiceInstanceMarker.java | 6 +- .../mqtt/internal/MqttServiceImpl.java | 18 +-- .../mqtt/internal/TopicSubscribers.java | 4 +- .../client/Mqtt3AsyncClientWrapper.java | 10 +- .../client/Mqtt5AsyncClientWrapper.java | 10 +- .../client/MqttAsyncClientWrapper.java | 6 +- .../reconnect/AbstractReconnectStrategy.java | 6 +- .../reconnect/PeriodicReconnectStrategy.java | 4 +- .../mqtt/ssl/CustomTrustManagerFactory.java | 4 +- .../AcceptAllCertificatesSSLContext.java | 2 +- .../sslcontext/CustomSSLContextProvider.java | 2 +- .../mqtt/sslcontext/SSLContextProvider.java | 4 +- .../mqtt/MqttBrokerConnectionEx.java | 4 +- .../mqtt/MqttBrokerConnectionTests.java | 10 +- .../mqtt/internal/MqttServiceTests.java | 10 +- .../mqtt/internal/TopicSubscriberTests.java | 2 +- .../serial/internal/JavaCommPortProvider.java | 10 +- .../serial/internal/SerialPortEventImpl.java | 4 +- .../internal/SerialPortIdentifierImpl.java | 8 +- .../serial/internal/SerialPortImpl.java | 8 +- .../rfc2217/internal/RFC2217PortProvider.java | 10 +- .../internal/SerialPortIdentifierImpl.java | 10 +- .../serial/internal/RxTxPortProvider.java | 10 +- .../serial/internal/SerialPortEventImpl.java | 4 +- .../internal/SerialPortIdentifierImpl.java | 10 +- .../serial/internal/SerialPortUtil.java | 2 +- .../transport/serial/rxtx/RxTxSerialPort.java | 10 +- .../transport/serial/PortInUseException.java | 2 +- .../io/transport/serial/ProtocolType.java | 2 +- .../core/io/transport/serial/SerialPort.java | 2 +- .../io/transport/serial/SerialPortEvent.java | 2 +- .../serial/SerialPortEventListener.java | 2 +- .../serial/SerialPortIdentifier.java | 2 +- .../transport/serial/SerialPortManager.java | 2 +- .../transport/serial/SerialPortProvider.java | 2 +- .../UnsupportedCommOperationException.java | 2 +- .../internal/SerialPortManagerImpl.java | 8 +- .../serial/internal/SerialPortRegistry.java | 6 +- .../console/SerialCommandExtension.java | 14 +- .../io/transport/upnp/UpnpIOParticipant.java | 2 +- .../core/io/transport/upnp/UpnpIOService.java | 2 +- .../upnp/internal/UpnpIOServiceImpl.java | 8 +- .../upnp/internal/UpnpIOServiceTest.java | 4 +- .../core/karaf/internal/FeatureInstaller.java | 10 +- .../karaf/internal/KarafExtensionService.java | 6 +- .../1 Generate Items Model.launch | 8 +- .../2 Generate Sitemap Model.launch | 8 +- .../3 Generate Script Model.launch | 8 +- .../4 Generate Rule Model.launch | 8 +- .../5 Generate Persistence Model.launch | 8 +- .../6 Generate Thing Model.launch | 10 +- bundles/org.openhab.core.model.core/bnd.bnd | 2 +- .../openhab/core/model/core/EventType.java | 2 +- .../core/model/core/ModelCoreConstants.java | 4 +- .../openhab/core/model/core/ModelParser.java | 2 +- .../core/model/core/ModelRepository.java | 2 +- .../core/ModelRepositoryChangeListener.java | 2 +- .../org/openhab/core/model/core/SafeEMF.java | 2 +- .../core/internal/ModelCoreActivator.java | 2 +- .../core/internal/ModelRepositoryImpl.java | 10 +- .../core/model/core/internal/SafeEMFImpl.java | 4 +- .../core/internal/folder/FolderObserver.java | 12 +- .../model/core/internal/util/MathUtils.java | 2 +- .../ValueTypeToStringConverter.java | 2 +- .../core/model/ide/ItemsIdeModule.xtend | 2 +- .../core/model/ide/ItemsIdeSetup.xtend | 6 +- .../internal/ItemRuntimeActivator.java | 6 +- bundles/org.openhab.core.model.item/bnd.bnd | 50 +++---- .../org.openhab.core.model.item/plugin.xml | 4 +- .../plugin.xml_gen | 4 +- bundles/org.openhab.core.model.item/pom.xml | 2 +- .../org/openhab/core/model/GenerateItems.mwe2 | 4 +- .../src/org/openhab/core/model/Items.xtext | 4 +- .../core/model/ItemsRuntimeModule.xtend | 4 +- .../core/model/ItemsStandaloneSetup.xtend | 4 +- .../model/formatting/ItemsFormatter.xtend | 4 +- .../core/model/generator/ItemsGenerator.xtend | 2 +- .../valueconverter/ItemValueConverters.java | 4 +- .../item/BindingConfigParseException.java | 2 +- .../core/model/item/BindingConfigReader.java | 6 +- .../item/internal/GenericItemProvider.java | 52 +++---- .../internal/GenericMetadataProvider.java | 12 +- .../model/scoping/ItemsScopeProvider.xtend | 2 +- .../serializer/ItemsSemanticSequencer.xtend | 2 +- .../serializer/ItemsSyntacticSequencer.xtend | 2 +- .../model/validation/ItemsValidator.xtend | 8 +- .../core/model/lazygen/GlobalResourceSet.java | 2 +- .../core/model/lazygen/LazyGenerator.java | 2 +- .../model/lazygen/LazyLanguageConfig.java | 2 +- .../model/lazygen/LazyStandaloneSetup.java | 2 +- .../lsp/internal/MappingUriExtensions.java | 2 +- .../core/model/lsp/internal/ModelServer.java | 12 +- .../model/lsp/internal/RegistryProvider.java | 18 +-- .../lsp/internal/RuntimeServerModule.java | 8 +- .../internal/MappingUriExtensionsTest.java | 2 +- .../ide/PersistenceIdeModule.xtend | 2 +- .../persistence/ide/PersistenceIdeSetup.xtend | 6 +- .../internal/PersistenceRuntimeActivator.java | 6 +- .../bnd.bnd | 46 +++---- .../plugin.xml | 4 +- .../pom.xml | 2 +- .../persistence/GeneratePersistence.mwe2 | 4 +- .../core/model/persistence/Persistence.xtext | 4 +- .../PersistenceRuntimeModule.xtend | 4 +- .../PersistenceStandaloneSetup.xtend | 4 +- .../extensions/PersistenceExtensions.java | 22 +-- .../formatting/PersistenceFormatter.xtend | 4 +- .../generator/PersistenceGenerator.xtend | 2 +- .../internal/PersistenceModelManager.java | 46 +++---- .../persistence/scoping/GlobalStrategies.java | 6 +- .../PersistenceGlobalScopeProvider.java | 6 +- .../scoping/PersistenceScopeProvider.xtend | 2 +- .../PersistenceSemanticSequencer.xtend | 2 +- .../PersistenceSyntacticSequencer.xtend | 2 +- .../validation/PersistenceValidator.xtend | 2 +- .../core/model/rule/ide/RulesIdeModule.xtend | 4 +- .../core/model/rule/ide/RulesIdeSetup.xtend | 8 +- .../core/model/rule/runtime/RuleEngine.java | 2 +- .../internal/RuleRuntimeActivator.java | 10 +- .../internal/engine/ExecuteRuleJob.java | 14 +- .../internal/engine/GuiceAwareJobFactory.java | 2 +- .../internal/engine/RuleContextHelper.java | 12 +- .../internal/engine/RuleEngineImpl.java | 62 ++++----- .../engine/RuleEvaluationContext.java | 2 +- .../internal/engine/RuleTriggerManager.java | 46 +++---- bundles/org.openhab.core.model.rule/bnd.bnd | 58 ++++---- .../org.openhab.core.model.rule/plugin.xml | 4 +- bundles/org.openhab.core.model.rule/pom.xml | 2 +- .../core/model/rule/GenerateRules.mwe2 | 4 +- .../org/openhab/core/model/rule/Rules.xtext | 4 +- .../core/model/rule/RulesRuntimeModule.xtend | 14 +- .../model/rule/RulesStandaloneSetup.xtend | 12 +- .../rule/formatting/RulesFormatter.xtend | 4 +- .../rule/jvmmodel/RulesItemRefresher.java | 12 +- .../rule/jvmmodel/RulesJvmModelInferrer.xtend | 40 +++--- .../model/rule/jvmmodel/RulesRefresher.java | 6 +- .../rule/jvmmodel/RulesThingRefresher.java | 12 +- .../scoping/RulesImplicitlyImportedTypes.java | 4 +- .../rule/scoping/RulesScopeProvider.xtend | 2 +- .../serializer/RulesSemanticSequencer.xtend | 2 +- .../serializer/RulesSyntacticSequencer.xtend | 2 +- .../rule/validation/RulesValidator.xtend | 2 +- .../model/script/ide/ScriptIdeModule.xtend | 4 +- .../model/script/ide/ScriptIdeSetup.xtend | 8 +- .../model/script/runtime/ScriptRuntime.java | 2 +- .../internal/engine/ScriptEngineImpl.java | 18 +-- .../runtime/internal/engine/ScriptImpl.java | 6 +- bundles/org.openhab.core.model.script/bnd.bnd | 82 +++++------ .../org.openhab.core.model.script/plugin.xml | 4 +- bundles/org.openhab.core.model.script/pom.xml | 2 +- .../core/model/script/GenerateScript.mwe2 | 4 +- ...ptimizingFeatureScopeTrackerProvider2.java | 2 +- .../openhab/core/model/script/Script.xtext | 4 +- .../model/script/ScriptRuntimeModule.xtend | 16 +-- .../core/model/script/ScriptServiceUtil.java | 16 +-- .../model/script/ScriptStandaloneSetup.xtend | 6 +- .../core/model/script/ServiceModule.java | 22 +-- .../core/model/script/actions/Audio.java | 12 +- .../core/model/script/actions/BusEvent.java | 22 +-- .../core/model/script/actions/Ephemeris.java | 6 +- .../core/model/script/actions/Exec.java | 4 +- .../core/model/script/actions/HTTP.java | 4 +- .../core/model/script/actions/LogAction.java | 20 +-- .../core/model/script/actions/Ping.java | 2 +- .../model/script/actions/ScriptExecution.java | 16 +-- .../core/model/script/actions/Things.java | 8 +- .../core/model/script/actions/Timer.java | 2 +- .../core/model/script/actions/Voice.java | 12 +- .../script/engine/IActionServiceProvider.java | 4 +- .../script/engine/IThingActionsProvider.java | 4 +- .../core/model/script/engine/Script.java | 2 +- .../model/script/engine/ScriptEngine.java | 2 +- .../core/model/script/engine/ScriptError.java | 2 +- .../model/script/engine/ScriptException.java | 2 +- .../engine/ScriptExecutionException.java | 2 +- .../script/engine/ScriptParsingException.java | 2 +- .../model/script/engine/action/ActionDoc.java | 2 +- .../script/engine/action/ActionService.java | 2 +- .../model/script/engine/action/ParamDoc.java | 2 +- .../ScriptEngineConsoleCommandExtension.java | 16 +-- .../script/formatting/ScriptFormatter.xtend | 4 +- .../RuleHumanLanguageInterpreter.java | 22 +-- .../internal/ScriptEncodingProvider.java | 2 +- .../internal/actions/TimerExecutionJob.java | 2 +- .../script/internal/actions/TimerImpl.java | 4 +- .../ServiceTrackerActionServiceProvider.xtend | 6 +- .../ServiceTrackerThingActionsProvider.xtend | 6 +- .../engine/action/AudioActionService.java | 8 +- .../engine/action/EphemerisActionService.java | 8 +- .../action/PersistenceActionService.java | 6 +- .../engine/action/ThingActionService.java | 20 +-- .../action/TransformationActionService.java | 6 +- .../engine/action/VoiceActionService.java | 8 +- .../interpreter/ScriptInterpreter.xtend | 22 +-- .../script/jvmmodel/ScriptItemRefresher.java | 12 +- .../jvmmodel/ScriptJvmModelInferrer.xtend | 8 +- .../script/jvmmodel/ScriptTypeComputer.java | 10 +- .../model/script/lib/NumberExtensions.java | 10 +- .../script/scoping/ActionClassLoader.java | 8 +- .../ScriptImplicitlyImportedTypes.java | 42 +++--- ...ptImportSectionNamespaceScopeProvider.java | 2 +- .../script/scoping/ScriptScopeProvider.xtend | 2 +- .../scoping/StateAndCommandProvider.java | 28 ++-- .../serializer/ScriptSemanticSequencer.xtend | 2 +- .../serializer/ScriptSyntacticSequencer.xtend | 2 +- .../script/validation/ScriptValidator.xtend | 2 +- .../model/sitemap/ide/SitemapIdeModule.xtend | 2 +- .../model/sitemap/ide/SitemapIdeSetup.xtend | 6 +- .../bnd.bnd | 2 +- .../internal/SitemapRuntimeActivator.java | 6 +- .../org.openhab.core.model.sitemap/bnd.bnd | 28 ++-- .../org.openhab.core.model.sitemap/plugin.xml | 4 +- .../org.openhab.core.model.sitemap/pom.xml | 2 +- .../core/model/sitemap/GenerateSitemap.mwe2 | 4 +- .../core/model/sitemap/Sitemap.properties | 2 +- .../openhab/core/model/sitemap/Sitemap.xtext | 4 +- .../core/model/sitemap/SitemapProvider.java | 6 +- .../model/sitemap/SitemapRuntimeModule.xtend | 6 +- .../sitemap/SitemapStandaloneSetup.xtend | 4 +- .../sitemap/formatting/SitemapFormatter.xtend | 4 +- .../sitemap/generator/SitemapGenerator.xtend | 2 +- .../sitemap/internal/SitemapProviderImpl.java | 12 +- .../scoping/SitemapScopeProvider.xtend | 2 +- .../serializer/SitemapSemanticSequencer.xtend | 2 +- .../SitemapSyntacticSequencer.xtend | 2 +- .../sitemap/validation/SitemapValidator.xtend | 14 +- .../valueconverter/SitemapConverters.java | 2 +- .../core/model/thing/ide/ThingIdeModule.xtend | 2 +- .../core/model/thing/ide/ThingIdeSetup.xtend | 6 +- .../internal/ThingRuntimeActivator.java | 6 +- bundles/org.openhab.core.model.thing/bnd.bnd | 56 ++++---- .../org.openhab.core.model.thing/plugin.xml | 4 +- .../plugin.xml_gen | 4 +- bundles/org.openhab.core.model.thing/pom.xml | 2 +- ...nericThingProviderMultipleBundlesTest.java | 28 ++-- .../core/model/thing/GenerateThing.mwe2 | 4 +- .../org/openhab/core/model/thing/Thing.xtext | 4 +- .../core/model/thing/ThingRuntimeModule.xtend | 8 +- .../model/thing/ThingStandaloneSetup.xtend | 4 +- .../thing/formatting/ThingFormatter.xtend | 4 +- .../thing/generator/ThingGenerator.xtend | 2 +- .../GenericItemChannelLinkProvider.java | 16 +-- .../thing/internal/GenericThingProvider.xtend | 76 +++++------ .../thing/scoping/ThingScopeProvider.xtend | 2 +- .../serializer/ThingSemanticSequencer.xtend | 2 +- .../serializer/ThingSyntacticSequencer.xtend | 2 +- .../ThingSyntacticSequencerExtension.java | 2 +- .../thing/validation/ThingValidator.xtend | 8 +- .../valueconverter/ThingValueConverters.java | 4 +- .../valueconverter/UIDtoStringConverter.java | 4 +- .../core/persistence/FilterCriteria.java | 4 +- .../core/persistence/HistoricItem.java | 6 +- .../ModifiablePersistenceService.java | 6 +- .../core/persistence/PersistenceItemInfo.java | 2 +- .../core/persistence/PersistenceManager.java | 2 +- .../core/persistence/PersistenceService.java | 4 +- .../PersistenceServiceConfiguration.java | 4 +- .../PersistenceServiceRegistry.java | 2 +- .../QueryablePersistenceService.java | 4 +- .../core/persistence/SimpleFilter.java | 2 +- .../persistence/SimpleItemConfiguration.java | 6 +- .../persistence/config/SimpleAllConfig.java | 2 +- .../core/persistence/config/SimpleConfig.java | 2 +- .../persistence/config/SimpleGroupConfig.java | 2 +- .../persistence/config/SimpleItemConfig.java | 2 +- .../core/persistence/dto/ItemHistoryDTO.java | 4 +- .../dto/PersistenceServiceDTO.java | 2 +- .../persistence/internal/PersistItemsJob.java | 14 +- .../internal/PersistenceManagerImpl.java | 52 +++---- .../PersistenceServiceRegistryImpl.java | 16 +-- .../strategy/SimpleCronStrategy.java | 2 +- .../persistence/strategy/SimpleStrategy.java | 2 +- bundles/org.openhab.core.scheduler/bnd.bnd | 2 +- .../internal/SchedulerActivator.java | 2 +- .../model/generateTagClasses.groovy | 32 ++--- .../openhab/core/semantics/SemanticTags.java | 24 ++-- .../core/semantics/SemanticsPredicates.java | 14 +- .../core/semantics/SemanticsService.java | 6 +- .../internal/SemanticsMetadataProvider.java | 32 ++--- .../internal/SemanticsServiceImpl.java | 30 ++-- .../core/semantics/model/Equipment.java | 2 +- .../core/semantics/model/Location.java | 2 +- .../openhab/core/semantics/model/Point.java | 2 +- .../core/semantics/model/Property.java | 2 +- .../org/openhab/core/semantics/model/Tag.java | 2 +- .../openhab/core/semantics/model/TagInfo.java | 2 +- .../semantics/model/equipment/Battery.java | 6 +- .../semantics/model/equipment/Blinds.java | 6 +- .../semantics/model/equipment/Camera.java | 6 +- .../core/semantics/model/equipment/Car.java | 6 +- .../model/equipment/CleaningRobot.java | 6 +- .../core/semantics/model/equipment/Door.java | 6 +- .../semantics/model/equipment/Equipments.java | 4 +- .../semantics/model/equipment/FrontDoor.java | 4 +- .../semantics/model/equipment/GarageDoor.java | 4 +- .../core/semantics/model/equipment/HVAC.java | 6 +- .../semantics/model/equipment/Inverter.java | 6 +- .../semantics/model/equipment/LawnMower.java | 6 +- .../semantics/model/equipment/Lightbulb.java | 6 +- .../core/semantics/model/equipment/Lock.java | 6 +- .../model/equipment/MotionDetector.java | 6 +- .../model/equipment/NetworkAppliance.java | 6 +- .../model/equipment/PowerOutlet.java | 6 +- .../semantics/model/equipment/Projector.java | 6 +- .../model/equipment/RadiatorControl.java | 6 +- .../semantics/model/equipment/Receiver.java | 6 +- .../model/equipment/RemoteControl.java | 6 +- .../semantics/model/equipment/Screen.java | 6 +- .../core/semantics/model/equipment/Siren.java | 6 +- .../model/equipment/SmokeDetector.java | 6 +- .../semantics/model/equipment/Speaker.java | 6 +- .../core/semantics/model/equipment/Valve.java | 6 +- .../semantics/model/equipment/WallSwitch.java | 6 +- .../semantics/model/equipment/WebService.java | 6 +- .../semantics/model/equipment/WhiteGood.java | 6 +- .../semantics/model/equipment/Window.java | 6 +- .../core/semantics/model/location/Attic.java | 4 +- .../semantics/model/location/Basement.java | 4 +- .../semantics/model/location/Bathroom.java | 4 +- .../semantics/model/location/Bedroom.java | 4 +- .../semantics/model/location/Building.java | 4 +- .../semantics/model/location/Carport.java | 4 +- .../semantics/model/location/Corridor.java | 4 +- .../semantics/model/location/FirstFloor.java | 4 +- .../core/semantics/model/location/Floor.java | 4 +- .../core/semantics/model/location/Garage.java | 4 +- .../core/semantics/model/location/Garden.java | 4 +- .../semantics/model/location/GroundFloor.java | 4 +- .../core/semantics/model/location/Indoor.java | 6 +- .../semantics/model/location/Kitchen.java | 4 +- .../semantics/model/location/LivingRoom.java | 4 +- .../semantics/model/location/Locations.java | 4 +- .../semantics/model/location/Outdoor.java | 6 +- .../core/semantics/model/location/Room.java | 4 +- .../semantics/model/location/Terrace.java | 4 +- .../core/semantics/model/point/Alarm.java | 6 +- .../core/semantics/model/point/Control.java | 6 +- .../semantics/model/point/LowBattery.java | 4 +- .../semantics/model/point/Measurement.java | 6 +- .../core/semantics/model/point/OpenLevel.java | 4 +- .../core/semantics/model/point/OpenState.java | 4 +- .../core/semantics/model/point/Points.java | 4 +- .../core/semantics/model/point/Setpoint.java | 6 +- .../core/semantics/model/point/Status.java | 6 +- .../core/semantics/model/point/Switch.java | 4 +- .../core/semantics/model/point/Tampered.java | 4 +- .../core/semantics/model/point/Tilt.java | 4 +- .../core/semantics/model/property/CO.java | 6 +- .../core/semantics/model/property/CO2.java | 6 +- .../model/property/ColorTemperature.java | 6 +- .../semantics/model/property/Current.java | 6 +- .../core/semantics/model/property/Energy.java | 6 +- .../semantics/model/property/Frequency.java | 6 +- .../core/semantics/model/property/Gas.java | 6 +- .../semantics/model/property/Humidity.java | 6 +- .../core/semantics/model/property/Light.java | 6 +- .../core/semantics/model/property/Noise.java | 6 +- .../core/semantics/model/property/Oil.java | 6 +- .../core/semantics/model/property/Power.java | 6 +- .../semantics/model/property/Presence.java | 6 +- .../semantics/model/property/Pressure.java | 6 +- .../semantics/model/property/Properties.java | 4 +- .../core/semantics/model/property/Rain.java | 6 +- .../core/semantics/model/property/Smoke.java | 6 +- .../semantics/model/property/SoundVolume.java | 6 +- .../semantics/model/property/Temperature.java | 6 +- .../semantics/model/property/Voltage.java | 6 +- .../core/semantics/model/property/Water.java | 6 +- .../core/semantics/model/property/Wind.java | 6 +- .../core/semantics/SemanticTagsTest.java | 22 +-- .../internal/SemanticsServiceImplTest.java | 18 +-- .../storage/json/internal/JsonStorage.java | 8 +- .../json/internal/JsonStorageService.java | 14 +- .../storage/json/internal/StorageEntry.java | 2 +- .../internal/StorageEntryMapDeserializer.java | 2 +- .../json/internal/JsonStorageTest.java | 6 +- .../storage/mapdb/internal/MapDbStorage.java | 10 +- .../mapdb/internal/MapDbStorageService.java | 12 +- .../mapdb/internal/PropertiesTypeAdapter.java | 2 +- .../PropertiesTypeAdapterFactory.java | 2 +- .../internal/MapDbStorageServiceTest.java | 10 +- .../magic/binding/MagicBindingConstants.java | 4 +- .../core/magic/binding/MagicService.java | 4 +- .../MagicActionModuleThingHandler.java | 16 +-- .../binding/handler/MagicBridgeHandler.java | 12 +- .../handler/MagicBridgedThingHandler.java | 16 +-- .../handler/MagicChattyThingHandler.java | 24 ++-- .../handler/MagicColorLightHandler.java | 12 +- .../MagicConfigurableThingHandler.java | 12 +- .../binding/handler/MagicContactHandler.java | 12 +- .../handler/MagicDelayedOnlineHandler.java | 14 +- .../handler/MagicDimmableLightHandler.java | 12 +- ...icDynamicStateDescriptionThingHandler.java | 18 +-- .../handler/MagicExtensibleThingHandler.java | 12 +- .../MagicFirmwareUpdateThingHandler.java | 24 ++-- .../binding/handler/MagicImageHandler.java | 20 +-- .../handler/MagicLocationThingHandler.java | 12 +- .../handler/MagicOnOffLightHandler.java | 12 +- .../handler/MagicOnlineOfflineHandler.java | 12 +- .../binding/handler/MagicPlayerHandler.java | 12 +- .../handler/MagicRolllershutterHandler.java | 12 +- .../handler/MagicThermostatThingHandler.java | 18 +-- .../internal/MagicDiscoveryService.java | 16 +-- .../MagicDynamicStateDescriptionProvider.java | 8 +- .../binding/internal/MagicHandlerFactory.java | 54 ++++---- .../binding/internal/MagicServiceConfig.java | 4 +- .../binding/internal/MagicServiceImpl.java | 14 +- .../modules/MagicMultiActionMarker.java | 6 +- .../MagicMultiServiceMultiActions.java | 4 +- .../modules/MagicSingleActionService.java | 8 +- .../modules/MagicThingActionsService.java | 8 +- .../firmware/MagicFirmwareProvider.java | 12 +- .../internal/http/MagicHttpResource.java | 2 +- .../metadata/MagicMetadataProvider.java | 12 +- .../metadata/MagicMetadataProvider2.java | 8 +- .../metadata/MagicMetadataUsingService.java | 8 +- .../service/MagicMultiInstanceService.java | 4 +- .../MagicMultiInstanceServiceMarker.java | 8 +- .../main/resources/ESH-INF/config/config.xml | 2 +- .../handler/MagicColorLightHandlerTest.java | 12 +- .../MagicDimmableLightHandlerTest.java | 12 +- .../handler/MagicOnOffLightHandlerTest.java | 12 +- .../internal/MagicHandlerFactoryTest.java | 14 +- .../internal/MagicServiceImplTest.java | 6 +- .../web/index.html | 6 +- bundles/org.openhab.core.test/bnd.bnd | 2 +- .../openhab/core/test/AsyncResultWrapper.java | 2 +- .../openhab/core/test/BundleCloseable.java | 2 +- .../core/test/SyntheticBundleInstaller.java | 14 +- .../org/openhab/core/test/TestPortUtil.java | 2 +- .../org/openhab/core/test/TestServer.java | 2 +- .../internal/java/MissingServiceAnalyzer.java | 2 +- .../openhab/core/test/java/JavaOSGiTest.java | 6 +- .../org/openhab/core/test/java/JavaTest.java | 2 +- .../core/test/storage/VolatileStorage.java | 4 +- .../test/storage/VolatileStorageService.java | 6 +- .../openhab/core/test/java/JavaTestTest.java | 2 +- .../AbstractDescriptionTypeConverter.java | 12 +- .../xml/internal/BridgeTypeConverter.java | 6 +- .../xml/internal/BridgeTypeXmlResult.java | 12 +- .../thing/xml/internal/ChannelConverter.java | 12 +- .../internal/ChannelGroupTypeConverter.java | 8 +- .../internal/ChannelGroupTypeXmlResult.java | 10 +- .../xml/internal/ChannelTypeConverter.java | 28 ++-- .../xml/internal/ChannelTypeXmlResult.java | 8 +- .../thing/xml/internal/ChannelXmlResult.java | 12 +- .../internal/CommandDescriptionConverter.java | 16 +-- .../internal/EventDescriptionConverter.java | 14 +- .../internal/StateDescriptionConverter.java | 16 +-- .../internal/ThingDescriptionConverter.java | 6 +- .../xml/internal/ThingDescriptionList.java | 2 +- .../xml/internal/ThingDescriptionReader.java | 38 +++--- .../xml/internal/ThingTypeConverter.java | 12 +- .../xml/internal/ThingTypeXmlProvider.java | 20 +-- .../xml/internal/ThingTypeXmlResult.java | 20 +-- .../ThingXmlConfigDescriptionProvider.java | 10 +- .../internal/XmlChannelGroupTypeProvider.java | 14 +- .../xml/internal/XmlChannelTypeProvider.java | 14 +- .../core/thing/xml/internal/XmlHelper.java | 2 +- .../xml/internal/XmlThingTypeProvider.java | 34 ++--- .../core/thing/xml/internal/Example.java | 2 +- .../thing/xml/internal/XmlHelperTest.java | 2 +- .../java/org/openhab/core/thing/Bridge.java | 4 +- .../java/org/openhab/core/thing/Channel.java | 14 +- .../openhab/core/thing/ChannelGroupUID.java | 2 +- .../org/openhab/core/thing/ChannelUID.java | 2 +- .../core/thing/CommonTriggerEvents.java | 2 +- .../DefaultSystemChannelTypeProvider.java | 26 ++-- .../core/thing/ManagedThingProvider.java | 6 +- .../java/org/openhab/core/thing/Thing.java | 10 +- .../org/openhab/core/thing/ThingManager.java | 2 +- .../org/openhab/core/thing/ThingProvider.java | 4 +- .../org/openhab/core/thing/ThingRegistry.java | 12 +- .../thing/ThingRegistryChangeListener.java | 4 +- .../org/openhab/core/thing/ThingStatus.java | 2 +- .../openhab/core/thing/ThingStatusDetail.java | 2 +- .../openhab/core/thing/ThingStatusInfo.java | 2 +- .../core/thing/ThingTypeMigrationService.java | 4 +- .../org/openhab/core/thing/ThingTypeUID.java | 2 +- .../java/org/openhab/core/thing/ThingUID.java | 2 +- .../main/java/org/openhab/core/thing/UID.java | 4 +- .../core/thing/binding/BaseBridgeHandler.java | 10 +- ...BaseDynamicCommandDescriptionProvider.java | 20 +-- .../BaseDynamicStateDescriptionProvider.java | 20 +-- .../core/thing/binding/BaseThingHandler.java | 36 ++--- .../binding/BaseThingHandlerFactory.java | 22 +-- .../core/thing/binding/BridgeHandler.java | 6 +- .../binding/ConfigStatusBridgeHandler.java | 10 +- .../binding/ConfigStatusThingHandler.java | 10 +- .../core/thing/binding/ThingActions.java | 2 +- .../core/thing/binding/ThingActionsScope.java | 2 +- .../binding/ThingConfigStatusSource.java | 6 +- .../core/thing/binding/ThingFactory.java | 24 ++-- .../core/thing/binding/ThingHandler.java | 18 +-- .../thing/binding/ThingHandlerCallback.java | 36 ++--- .../thing/binding/ThingHandlerFactory.java | 14 +- .../thing/binding/ThingHandlerService.java | 2 +- .../core/thing/binding/ThingTypeProvider.java | 6 +- .../thing/binding/builder/BridgeBuilder.java | 16 +-- .../thing/binding/builder/ChannelBuilder.java | 16 +-- .../thing/binding/builder/ThingBuilder.java | 18 +-- .../builder/ThingStatusInfoBuilder.java | 8 +- .../core/thing/binding/firmware/Firmware.java | 14 +- .../binding/firmware/FirmwareBuilder.java | 6 +- .../binding/firmware/FirmwareRestriction.java | 6 +- ...rmwareUpdateBackgroundTransferHandler.java | 6 +- .../firmware/FirmwareUpdateHandler.java | 10 +- .../binding/firmware/ProgressCallback.java | 2 +- .../thing/binding/firmware/ProgressStep.java | 2 +- .../openhab/core/thing/dto/ChannelDTO.java | 8 +- .../core/thing/dto/ChannelDTOMapper.java | 14 +- .../core/thing/dto/ChannelDefinitionDTO.java | 4 +- .../thing/dto/ChannelGroupDefinitionDTO.java | 2 +- .../core/thing/dto/ChannelTypeDTO.java | 12 +- .../core/thing/dto/StrippedThingTypeDTO.java | 2 +- .../thing/dto/StrippedThingTypeDTOMapper.java | 6 +- .../org/openhab/core/thing/dto/ThingDTO.java | 2 +- .../core/thing/dto/ThingDTOMapper.java | 18 +-- .../openhab/core/thing/dto/ThingTypeDTO.java | 6 +- .../events/AbstractThingRegistryEvent.java | 8 +- .../thing/events/ChannelTriggeredEvent.java | 6 +- .../core/thing/events/ThingAddedEvent.java | 4 +- .../core/thing/events/ThingEventFactory.java | 22 +-- .../core/thing/events/ThingRemovedEvent.java | 4 +- .../events/ThingStatusInfoChangedEvent.java | 8 +- .../thing/events/ThingStatusInfoEvent.java | 8 +- .../core/thing/events/ThingUpdatedEvent.java | 4 +- .../thing/firmware/FirmwareEventFactory.java | 8 +- .../core/thing/firmware/FirmwareProvider.java | 6 +- .../core/thing/firmware/FirmwareRegistry.java | 8 +- .../core/thing/firmware/FirmwareStatus.java | 10 +- .../thing/firmware/FirmwareStatusInfo.java | 6 +- .../firmware/FirmwareStatusInfoEvent.java | 8 +- .../firmware/FirmwareUpdateProgressInfo.java | 8 +- .../FirmwareUpdateProgressInfoEvent.java | 4 +- .../thing/firmware/FirmwareUpdateResult.java | 2 +- .../firmware/FirmwareUpdateResultInfo.java | 4 +- .../FirmwareUpdateResultInfoEvent.java | 4 +- .../thing/firmware/FirmwareUpdateService.java | 12 +- .../core/thing/firmware/dto/FirmwareDTO.java | 2 +- .../thing/firmware/dto/FirmwareStatusDTO.java | 2 +- ...annelGroupTypeI18nLocalizationService.java | 18 +-- .../ChannelTypeI18nLocalizationService.java | 28 ++-- ...hingStatusInfoI18nLocalizationService.java | 14 +- .../ThingTypeI18nLocalizationService.java | 26 ++-- .../AutoUpdateConfigDescriptionProvider.java | 8 +- .../thing/internal/AutoUpdateManager.java | 46 +++---- .../core/thing/internal/BridgeImpl.java | 14 +- .../ChannelCommandDescriptionProvider.java | 20 +-- .../thing/internal/ChannelItemProvider.java | 40 +++--- .../ChannelStateDescriptionProvider.java | 28 ++-- .../thing/internal/CommunicationManager.java | 88 ++++++------ .../thing/internal/ProfileContextImpl.java | 8 +- .../ThingConfigDescriptionAliasProvider.java | 24 ++-- .../thing/internal/ThingFactoryHelper.java | 32 ++--- .../core/thing/internal/ThingImpl.java | 24 ++-- .../core/thing/internal/ThingManagerImpl.java | 108 +++++++-------- .../thing/internal/ThingRegistryImpl.java | 34 ++--- .../core/thing/internal/ThingTracker.java | 6 +- ...FirmwareUpdateConsoleCommandExtension.java | 24 ++-- .../console/LinkConsoleCommandExtension.java | 14 +- .../console/ThingConsoleCommandExtension.java | 32 ++--- .../thing/internal/firmware/FirmwareImpl.java | 12 +- .../firmware/FirmwareRegistryImpl.java | 12 +- .../firmware/FirmwareUpdateServiceImpl.java | 50 +++---- .../internal/firmware/ParameterChecks.java | 2 +- .../firmware/ProgressCallbackImpl.java | 28 ++-- .../internal/i18n/ChannelGroupI18nUtil.java | 14 +- .../thing/internal/i18n/ChannelI18nUtil.java | 18 +-- .../internal/i18n/ThingTypeI18nUtil.java | 16 +-- ...mChannelLinkConfigDescriptionProvider.java | 36 ++--- .../profiles/ProfileCallbackImpl.java | 30 ++-- .../profiles/ProfileTypeRegistryImpl.java | 8 +- .../profiles/RawButtonOnOffSwitchProfile.java | 16 +-- .../RawButtonTogglePlayerProfile.java | 16 +-- .../RawButtonToggleRollershutterProfile.java | 16 +-- .../RawButtonToggleSwitchProfile.java | 16 +-- .../profiles/RawRockerDimmerProfile.java | 22 +-- .../RawRockerNextPreviousProfile.java | 18 +-- .../profiles/RawRockerOnOffProfile.java | 16 +-- .../profiles/RawRockerPlayPauseProfile.java | 18 +-- .../RawRockerRewindFastforwardProfile.java | 18 +-- .../profiles/RawRockerStopMoveProfile.java | 18 +-- .../profiles/RawRockerUpDownProfile.java | 18 +-- .../profiles/StateProfileTypeImpl.java | 6 +- .../profiles/SystemDefaultProfile.java | 16 +-- .../profiles/SystemFollowProfile.java | 16 +-- .../profiles/SystemOffsetProfile.java | 30 ++-- .../profiles/SystemProfileFactory.java | 38 +++--- .../profiles/TimestampChangeProfile.java | 16 +-- .../profiles/TimestampUpdateProfile.java | 16 +-- .../profiles/TriggerProfileTypeImpl.java | 8 +- .../profiles/i18n/ProfileI18nUtil.java | 14 +- .../type/AbstractChannelTypeBuilder.java | 8 +- .../type/StateChannelTypeBuilderImpl.java | 16 +-- .../type/TriggerChannelTypeBuilderImpl.java | 12 +- .../openhab/core/thing/link/AbstractLink.java | 8 +- .../core/thing/link/AbstractLinkRegistry.java | 8 +- .../core/thing/link/ItemChannelLink.java | 8 +- .../thing/link/ItemChannelLinkProvider.java | 4 +- .../thing/link/ItemChannelLinkRegistry.java | 20 +-- .../link/ManagedItemChannelLinkProvider.java | 8 +- .../core/thing/link/ThingLinkManager.java | 44 +++--- .../core/thing/link/dto/AbstractLinkDTO.java | 2 +- .../thing/link/dto/ItemChannelLinkDTO.java | 2 +- .../AbstractItemChannelLinkRegistryEvent.java | 6 +- .../events/ItemChannelLinkAddedEvent.java | 4 +- .../events/ItemChannelLinkRemovedEvent.java | 4 +- .../thing/link/events/LinkEventFactory.java | 14 +- .../openhab/core/thing/profiles/Profile.java | 4 +- .../core/thing/profiles/ProfileAdvisor.java | 6 +- .../core/thing/profiles/ProfileCallback.java | 6 +- .../core/thing/profiles/ProfileContext.java | 4 +- .../core/thing/profiles/ProfileFactory.java | 2 +- .../core/thing/profiles/ProfileType.java | 4 +- .../thing/profiles/ProfileTypeBuilder.java | 8 +- .../thing/profiles/ProfileTypeProvider.java | 2 +- .../thing/profiles/ProfileTypeRegistry.java | 2 +- .../core/thing/profiles/ProfileTypeUID.java | 4 +- .../core/thing/profiles/StateProfile.java | 6 +- .../core/thing/profiles/StateProfileType.java | 2 +- .../core/thing/profiles/SystemProfiles.java | 8 +- .../core/thing/profiles/TriggerProfile.java | 2 +- .../thing/profiles/TriggerProfileType.java | 4 +- .../thing/profiles/dto/ProfileTypeDTO.java | 2 +- .../profiles/dto/ProfileTypeDTOMapper.java | 6 +- .../ProfileTypeI18nLocalizationService.java | 16 +-- .../thing/type/AbstractDescriptionType.java | 6 +- .../core/thing/type/AutoUpdatePolicy.java | 2 +- .../openhab/core/thing/type/BridgeType.java | 6 +- .../core/thing/type/ChannelDefinition.java | 6 +- .../thing/type/ChannelDefinitionBuilder.java | 2 +- .../thing/type/ChannelGroupDefinition.java | 4 +- .../core/thing/type/ChannelGroupType.java | 2 +- .../thing/type/ChannelGroupTypeBuilder.java | 2 +- .../thing/type/ChannelGroupTypeProvider.java | 2 +- .../thing/type/ChannelGroupTypeRegistry.java | 2 +- .../core/thing/type/ChannelGroupTypeUID.java | 4 +- .../openhab/core/thing/type/ChannelKind.java | 2 +- .../openhab/core/thing/type/ChannelType.java | 12 +- .../core/thing/type/ChannelTypeBuilder.java | 6 +- .../core/thing/type/ChannelTypeProvider.java | 2 +- .../core/thing/type/ChannelTypeRegistry.java | 2 +- .../core/thing/type/ChannelTypeUID.java | 4 +- .../DynamicCommandDescriptionProvider.java | 6 +- .../type/DynamicStateDescriptionProvider.java | 6 +- .../thing/type/StateChannelTypeBuilder.java | 8 +- .../openhab/core/thing/type/ThingType.java | 8 +- .../core/thing/type/ThingTypeBuilder.java | 4 +- .../core/thing/type/ThingTypeRegistry.java | 10 +- .../thing/type/TriggerChannelTypeBuilder.java | 4 +- .../core/thing/util/ThingHandlerHelper.java | 8 +- .../openhab/core/thing/util/ThingHelper.java | 28 ++-- .../core/thing/ChannelGroupUIDTest.java | 2 +- .../org/openhab/core/thing/ChannelTest.java | 2 +- .../openhab/core/thing/ChannelUIDTest.java | 2 +- .../org/openhab/core/thing/ThingUIDTest.java | 2 +- .../java/org/openhab/core/thing/UIDTest.java | 2 +- .../binding/builder/ChannelBuilderTest.java | 18 +-- .../binding/builder/ThingBuilderTest.java | 14 +- .../builder/ThingStatusInfoBuilderTest.java | 8 +- .../firmware/FirmwareEventFactoryTest.java | 12 +- .../thing/internal/AutoUpdateManagerTest.java | 44 +++--- .../internal/ChannelItemProviderTest.java | 36 ++--- .../core/thing/internal/ThingImplTest.java | 16 +-- .../thing/internal/ThingManagerImplTest.java | 16 +-- .../firmware/ProgressCallbackTest.java | 34 ++--- .../RawButtonOnOffSwitchProfileTest.java | 12 +- .../RawButtonToggleSwitchProfileTest.java | 20 +-- .../profiles/SystemDefaultProfileTest.java | 6 +- .../profiles/SystemFollowProfileTest.java | 6 +- .../profiles/SystemOffsetProfileTest.java | 20 +-- .../profiles/TimestampProfileTest.java | 12 +- .../type/ChannelGroupTypeBuilderTest.java | 2 +- .../thing/type/ChannelTypeBuilderTest.java | 10 +- .../core/thing/type/ThingTypeBuilderTest.java | 4 +- .../thing/util/ThingHandlerHelperTest.java | 18 +-- .../core/thing/util/ThingHelperTest.java | 18 +-- bundles/org.openhab.core.transform/bnd.bnd | 2 +- .../AbstractFileTransformationService.java | 6 +- .../transform/TransformationException.java | 2 +- .../core/transform/TransformationHelper.java | 2 +- .../core/transform/TransformationService.java | 2 +- .../transform/actions/Transformation.java | 10 +- .../internal/TransformationActivator.java | 2 +- .../transform/actions/TransformationTest.java | 4 +- .../ui/icon/AbstractResourceIconProvider.java | 6 +- .../openhab/core/ui/icon/IconProvider.java | 4 +- .../org/openhab/core/ui/icon/IconSet.java | 2 +- .../ui/icon/internal/CustomIconProvider.java | 10 +- .../core/ui/icon/internal/IconServlet.java | 8 +- .../ui/icon/internal/IconSetResource.java | 10 +- .../AbstractResourceIconProviderTest.java | 4 +- .../ui/icon/internal/IconServletTest.java | 8 +- bundles/org.openhab.core.ui/bnd.bnd | 2 +- .../openhab/core/ui/chart/ChartProvider.java | 4 +- .../openhab/core/ui/internal/UIActivator.java | 2 +- .../core/ui/internal/chart/ChartServlet.java | 14 +- .../defaultchartprovider/ChartTheme.java | 2 +- .../defaultchartprovider/ChartThemeBlack.java | 2 +- .../ChartThemeBright.java | 2 +- .../defaultchartprovider/ChartThemeDark.java | 2 +- .../defaultchartprovider/ChartThemeWhite.java | 2 +- .../DefaultChartProvider.java | 36 ++--- .../ui/internal/items/ItemUIRegistryImpl.java | 108 +++++++-------- .../ui/internal/proxy/AsyncProxyServlet.java | 2 +- .../internal/proxy/BlockingProxyServlet.java | 2 +- .../internal/proxy/ProxyServletService.java | 20 +-- .../openhab/core/ui/items/ItemUIProvider.java | 6 +- .../openhab/core/ui/items/ItemUIRegistry.java | 16 +-- .../items/ItemUIRegistryImplTest.java | 52 +++---- .../proxy/ProxyServletServiceTest.java | 28 ++-- .../openhab/core/voice/AudioStartEvent.java | 2 +- .../openhab/core/voice/AudioStopEvent.java | 2 +- .../org/openhab/core/voice/KSErrorEvent.java | 2 +- .../java/org/openhab/core/voice/KSEvent.java | 2 +- .../org/openhab/core/voice/KSException.java | 2 +- .../org/openhab/core/voice/KSListener.java | 2 +- .../org/openhab/core/voice/KSService.java | 6 +- .../openhab/core/voice/KSServiceHandle.java | 2 +- .../org/openhab/core/voice/KSpottedEvent.java | 2 +- .../core/voice/RecognitionStartEvent.java | 2 +- .../core/voice/RecognitionStopEvent.java | 2 +- .../java/org/openhab/core/voice/STTEvent.java | 2 +- .../org/openhab/core/voice/STTException.java | 2 +- .../org/openhab/core/voice/STTListener.java | 2 +- .../org/openhab/core/voice/STTService.java | 6 +- .../openhab/core/voice/STTServiceHandle.java | 2 +- .../voice/SpeechRecognitionErrorEvent.java | 2 +- .../core/voice/SpeechRecognitionEvent.java | 2 +- .../openhab/core/voice/SpeechStartEvent.java | 2 +- .../openhab/core/voice/SpeechStopEvent.java | 2 +- .../org/openhab/core/voice/TTSException.java | 2 +- .../org/openhab/core/voice/TTSService.java | 6 +- .../java/org/openhab/core/voice/Voice.java | 2 +- .../org/openhab/core/voice/VoiceManager.java | 12 +- .../core/voice/internal/DialogProcessor.java | 62 ++++----- .../VoiceConsoleCommandExtension.java | 26 ++-- .../core/voice/internal/VoiceManagerImpl.java | 48 +++---- .../internal/text/StandardInterpreter.java | 30 ++-- .../org/openhab/core/voice/text/ASTNode.java | 2 +- .../text/AbstractRuleBasedInterpreter.java | 22 +-- .../openhab/core/voice/text/Expression.java | 2 +- .../voice/text/ExpressionAlternatives.java | 2 +- .../voice/text/ExpressionCardinality.java | 2 +- .../core/voice/text/ExpressionIdentifier.java | 2 +- .../core/voice/text/ExpressionLet.java | 2 +- .../core/voice/text/ExpressionMatch.java | 2 +- .../core/voice/text/ExpressionSequence.java | 2 +- .../voice/text/HumanLanguageInterpreter.java | 2 +- .../voice/text/InterpretationException.java | 2 +- .../core/voice/text/InterpretationResult.java | 2 +- .../org/openhab/core/voice/text/Rule.java | 2 +- .../openhab/core/voice/text/TokenList.java | 2 +- .../openhab/core/voice/STTExceptionTest.java | 2 +- .../SpeechRecognitionErrorEventTest.java | 2 +- .../voice/SpeechRecognitionEventTest.java | 2 +- .../openhab/core/voice/TTSExceptionTest.java | 2 +- .../org/openhab/core/auth/Authentication.java | 2 +- .../core/auth/AuthenticationException.java | 2 +- .../core/auth/AuthenticationManager.java | 2 +- .../core/auth/AuthenticationProvider.java | 2 +- .../org/openhab/core/auth/Credentials.java | 2 +- .../main/java/org/openhab/core/auth/Role.java | 2 +- .../openhab/core/auth/SecurityException.java | 2 +- .../auth/UnsupportedCredentialsException.java | 2 +- .../auth/UsernamePasswordCredentials.java | 2 +- .../oauth2/AccessTokenRefreshListener.java | 2 +- .../client/oauth2/AccessTokenResponse.java | 2 +- .../client/oauth2/OAuthClientService.java | 2 +- .../auth/client/oauth2/OAuthException.java | 2 +- .../core/auth/client/oauth2/OAuthFactory.java | 2 +- .../client/oauth2/OAuthResponseException.java | 2 +- .../auth/client/oauth2/StorageCipher.java | 2 +- .../org/openhab/core/binding/BindingInfo.java | 4 +- .../core/binding/BindingInfoProvider.java | 2 +- .../core/binding/BindingInfoRegistry.java | 2 +- .../core/binding/dto/BindingInfoDTO.java | 2 +- .../i18n/BindingI18nLocalizationService.java | 8 +- .../internal/i18n/BindingI18nUtil.java | 6 +- .../org/openhab/core/cache/ExpiringCache.java | 2 +- .../core/cache/ExpiringCacheAsync.java | 4 +- .../openhab/core/cache/ExpiringCacheMap.java | 2 +- .../org/openhab/core/common/AbstractUID.java | 2 +- .../core/common/NamedThreadFactory.java | 2 +- .../common/QueueingThreadPoolExecutor.java | 2 +- .../org/openhab/core/common/SafeCaller.java | 2 +- .../core/common/SafeCallerBuilder.java | 2 +- .../core/common/ThreadFactoryBuilder.java | 2 +- .../core/common/ThreadPoolManager.java | 8 +- .../osgi/ResourceBundleClassLoader.java | 2 +- .../registry/AbstractManagedProvider.java | 6 +- .../common/registry/AbstractProvider.java | 2 +- .../common/registry/AbstractRegistry.java | 6 +- .../DefaultAbstractManagedProvider.java | 4 +- .../core/common/registry/Identifiable.java | 2 +- .../core/common/registry/ManagedProvider.java | 2 +- .../core/common/registry/Provider.java | 2 +- .../registry/ProviderChangeListener.java | 2 +- .../core/common/registry/Registry.java | 2 +- .../registry/RegistryChangeListener.java | 2 +- .../openhab/core/events/AbstractEvent.java | 2 +- .../core/events/AbstractEventFactory.java | 2 +- .../events/AbstractTypedEventSubscriber.java | 2 +- .../java/org/openhab/core/events/Event.java | 2 +- .../org/openhab/core/events/EventFactory.java | 2 +- .../org/openhab/core/events/EventFilter.java | 2 +- .../openhab/core/events/EventPublisher.java | 2 +- .../openhab/core/events/EventSubscriber.java | 2 +- .../openhab/core/events/TopicEventFilter.java | 2 +- .../org/openhab/core/extension/Extension.java | 2 +- .../core/extension/ExtensionEvent.java | 4 +- .../core/extension/ExtensionEventFactory.java | 8 +- .../core/extension/ExtensionService.java | 2 +- .../openhab/core/extension/ExtensionType.java | 2 +- .../java/org/openhab/core/i18n/I18nUtil.java | 2 +- .../org/openhab/core/i18n/LocaleProvider.java | 2 +- .../org/openhab/core/i18n/LocalizedKey.java | 2 +- .../openhab/core/i18n/LocationProvider.java | 4 +- .../openhab/core/i18n/TimeZoneProvider.java | 2 +- .../core/i18n/TranslationProvider.java | 2 +- .../org/openhab/core/i18n/UnitProvider.java | 2 +- .../auth/AuthenticationManagerImpl.java | 14 +- .../common/AbstractInvocationHandler.java | 2 +- .../internal/common/CombinedClassLoader.java | 2 +- .../common/DuplicateExecutionException.java | 2 +- .../core/internal/common/Invocation.java | 2 +- .../common/InvocationHandlerAsync.java | 2 +- .../common/InvocationHandlerSync.java | 2 +- .../core/internal/common/SafeCallManager.java | 2 +- .../internal/common/SafeCallManagerImpl.java | 2 +- .../common/SafeCallerBuilderImpl.java | 6 +- .../core/internal/common/SafeCallerImpl.java | 10 +- .../WrappedScheduledExecutorService.java | 2 +- .../core/internal/events/EventHandler.java | 12 +- .../internal/events/OSGiEventManager.java | 8 +- .../internal/events/OSGiEventPublisher.java | 6 +- .../internal/events/ThreadedEventHandler.java | 6 +- .../core/internal/i18n/I18nProviderImpl.java | 28 ++-- .../i18n/LanguageResourceBundleManager.java | 6 +- .../internal/i18n/ResourceBundleTracker.java | 4 +- .../internal/items/GroupFunctionHelper.java | 16 +-- .../items/ItemBuilderFactoryImpl.java | 14 +- .../core/internal/items/ItemBuilderImpl.java | 14 +- .../core/internal/items/ItemRegistryImpl.java | 40 +++--- .../items/ItemStateConverterImpl.java | 22 +-- .../core/internal/items/ItemUpdater.java | 22 +-- .../items/ManagedMetadataProviderImpl.java | 16 +-- .../internal/items/MetadataRegistryImpl.java | 16 +-- .../library/unit/UnitInitializer.java | 8 +- .../core/internal/scheduler/CronAdjuster.java | 4 +- .../internal/scheduler/CronSchedulerImpl.java | 12 +- .../scheduler/DelegatedSchedulerImpl.java | 10 +- .../internal/scheduler/PeriodicAdjuster.java | 4 +- .../scheduler/PeriodicSchedulerImpl.java | 10 +- .../internal/scheduler/SchedulerImpl.java | 12 +- .../internal/service/BundleResolverImpl.java | 4 +- .../CommandDescriptionServiceImpl.java | 8 +- .../internal/service/ReadyServiceImpl.java | 8 +- .../service/StateDescriptionServiceImpl.java | 16 +-- .../types/CommandDescriptionImpl.java | 6 +- .../types/StateDescriptionFragmentImpl.java | 10 +- .../org/openhab/core/items/ActiveItem.java | 2 +- .../org/openhab/core/items/GenericItem.java | 30 ++-- .../org/openhab/core/items/GroupFunction.java | 6 +- .../org/openhab/core/items/GroupItem.java | 10 +- .../java/org/openhab/core/items/Item.java | 22 +-- .../org/openhab/core/items/ItemBuilder.java | 2 +- .../core/items/ItemBuilderFactory.java | 2 +- .../org/openhab/core/items/ItemFactory.java | 2 +- .../core/items/ItemLookupException.java | 2 +- .../core/items/ItemNotFoundException.java | 2 +- .../core/items/ItemNotUniqueException.java | 2 +- .../openhab/core/items/ItemPredicates.java | 2 +- .../org/openhab/core/items/ItemProvider.java | 4 +- .../org/openhab/core/items/ItemRegistry.java | 8 +- .../items/ItemRegistryChangeListener.java | 4 +- .../core/items/ItemStateConverter.java | 4 +- .../java/org/openhab/core/items/ItemUtil.java | 6 +- .../core/items/ManagedItemProvider.java | 12 +- .../core/items/ManagedMetadataProvider.java | 6 +- .../java/org/openhab/core/items/Metadata.java | 4 +- .../org/openhab/core/items/MetadataKey.java | 4 +- .../core/items/MetadataPredicates.java | 2 +- .../openhab/core/items/MetadataProvider.java | 4 +- .../openhab/core/items/MetadataRegistry.java | 4 +- .../org/openhab/core/items/RegistryHook.java | 4 +- .../core/items/StateChangeListener.java | 4 +- .../core/items/dto/GroupFunctionDTO.java | 2 +- .../openhab/core/items/dto/GroupItemDTO.java | 2 +- .../org/openhab/core/items/dto/ItemDTO.java | 2 +- .../openhab/core/items/dto/ItemDTOMapper.java | 20 +-- .../openhab/core/items/dto/MetadataDTO.java | 2 +- .../events/AbstractItemEventSubscriber.java | 8 +- .../events/AbstractItemRegistryEvent.java | 8 +- .../events/GroupItemStateChangedEvent.java | 4 +- .../core/items/events/ItemAddedEvent.java | 4 +- .../core/items/events/ItemCommandEvent.java | 6 +- .../core/items/events/ItemEventFactory.java | 26 ++-- .../core/items/events/ItemRemovedEvent.java | 4 +- .../items/events/ItemStateChangedEvent.java | 6 +- .../core/items/events/ItemStateEvent.java | 6 +- .../items/events/ItemStatePredictedEvent.java | 6 +- .../core/items/events/ItemUpdatedEvent.java | 4 +- .../openhab/core/library/CoreItemFactory.java | 32 ++--- .../core/library/dimension/ArealDensity.java | 2 +- .../core/library/dimension/DataAmount.java | 2 +- .../library/dimension/DataTransferRate.java | 2 +- .../core/library/dimension/Density.java | 2 +- .../core/library/dimension/Intensity.java | 2 +- .../library/dimension/VolumetricFlowRate.java | 2 +- .../openhab/core/library/items/CallItem.java | 14 +- .../openhab/core/library/items/ColorItem.java | 22 +-- .../core/library/items/ContactItem.java | 16 +-- .../core/library/items/DateTimeItem.java | 16 +-- .../core/library/items/DimmerItem.java | 18 +-- .../openhab/core/library/items/ImageItem.java | 16 +-- .../core/library/items/LocationItem.java | 18 +-- .../core/library/items/NumberItem.java | 26 ++-- .../core/library/items/PlayerItem.java | 20 +-- .../core/library/items/RollershutterItem.java | 20 +-- .../core/library/items/StringItem.java | 20 +-- .../core/library/items/SwitchItem.java | 16 +-- .../types/ArithmeticGroupFunction.java | 10 +- .../library/types/DateTimeGroupFunction.java | 10 +- .../core/library/types/DateTimeType.java | 8 +- .../core/library/types/DecimalType.java | 8 +- .../openhab/core/library/types/HSBType.java | 10 +- .../library/types/IncreaseDecreaseType.java | 6 +- .../core/library/types/NextPreviousType.java | 8 +- .../openhab/core/library/types/OnOffType.java | 8 +- .../core/library/types/OpenClosedType.java | 8 +- .../core/library/types/PercentType.java | 6 +- .../core/library/types/PlayPauseType.java | 10 +- .../openhab/core/library/types/PointType.java | 12 +- .../core/library/types/QuantityType.java | 16 +-- .../QuantityTypeArithmeticGroupFunction.java | 14 +- .../openhab/core/library/types/RawType.java | 6 +- .../library/types/RewindFastforwardType.java | 10 +- .../core/library/types/StopMoveType.java | 6 +- .../core/library/types/StringListType.java | 6 +- .../core/library/types/StringType.java | 8 +- .../core/library/types/UpDownType.java | 8 +- .../core/library/unit/BinaryPrefix.java | 2 +- .../core/library/unit/CustomUnits.java | 2 +- .../core/library/unit/ImperialUnits.java | 2 +- .../core/library/unit/MetricPrefix.java | 2 +- .../openhab/core/library/unit/SIUnits.java | 2 +- .../core/library/unit/SmartHomeUnits.java | 14 +- .../org/openhab/core/net/CidrAddress.java | 2 +- .../org/openhab/core/net/HttpServiceUtil.java | 2 +- .../java/org/openhab/core/net/NetUtil.java | 8 +- .../net/NetworkAddressChangeListener.java | 2 +- .../core/net/NetworkAddressService.java | 2 +- .../org/openhab/core/scheduler/CronJob.java | 2 +- .../openhab/core/scheduler/CronScheduler.java | 2 +- .../core/scheduler/PeriodicScheduler.java | 2 +- .../scheduler/ScheduledCompletableFuture.java | 2 +- .../org/openhab/core/scheduler/Scheduler.java | 2 +- .../core/scheduler/SchedulerRunnable.java | 2 +- .../scheduler/SchedulerTemporalAdjuster.java | 2 +- .../core/service/AbstractWatchService.java | 2 +- .../service/CommandDescriptionService.java | 4 +- .../org/openhab/core/service/ReadyMarker.java | 2 +- .../core/service/ReadyMarkerFilter.java | 2 +- .../core/service/ReadyMarkerUtils.java | 2 +- .../openhab/core/service/ReadyService.java | 2 +- .../core/service/StateDescriptionService.java | 4 +- .../core/service/WatchQueueReader.java | 4 +- .../core/storage/DeletableStorage.java | 2 +- .../core/storage/DeletableStorageService.java | 2 +- .../org/openhab/core/storage/Storage.java | 2 +- .../openhab/core/storage/StorageService.java | 2 +- .../java/org/openhab/core/types/Command.java | 2 +- .../core/types/CommandDescription.java | 2 +- .../core/types/CommandDescriptionBuilder.java | 4 +- .../types/CommandDescriptionProvider.java | 2 +- .../org/openhab/core/types/CommandOption.java | 2 +- .../org/openhab/core/types/ComplexType.java | 2 +- .../openhab/core/types/EventDescription.java | 2 +- .../org/openhab/core/types/EventOption.java | 2 +- .../org/openhab/core/types/EventType.java | 2 +- .../org/openhab/core/types/PrimitiveType.java | 2 +- .../org/openhab/core/types/RefreshType.java | 2 +- .../java/org/openhab/core/types/State.java | 2 +- .../openhab/core/types/StateDescription.java | 2 +- .../core/types/StateDescriptionFragment.java | 2 +- .../StateDescriptionFragmentBuilder.java | 4 +- .../StateDescriptionFragmentProvider.java | 2 +- .../core/types/StateDescriptionProvider.java | 2 +- .../org/openhab/core/types/StateOption.java | 2 +- .../java/org/openhab/core/types/Type.java | 2 +- .../org/openhab/core/types/TypeParser.java | 4 +- .../org/openhab/core/types/UnDefType.java | 2 +- .../openhab/core/types/util/UnitUtils.java | 16 +-- .../org/openhab/core/util/BundleResolver.java | 2 +- .../java/org/openhab/core/util/HexUtils.java | 2 +- .../java/org/openhab/core/util/UIDUtils.java | 2 +- .../oauth2/AccessTokenResponseTest.java | 2 +- .../core/cache/ExpiringCacheMapTest.java | 2 +- .../openhab/core/cache/ExpiringCacheTest.java | 2 +- .../QueueingThreadPoolExecutorTest.java | 2 +- .../core/common/ThreadFactoryBuilderTest.java | 2 +- .../core/common/ThreadPoolManagerTest.java | 2 +- .../osgi/ResourceBundleClassLoaderTest.java | 2 +- .../internal/i18n/I18nProviderImplTest.java | 6 +- .../core/internal/items/ItemBuilderTest.java | 12 +- .../items/ItemStateConverterImplTest.java | 22 +-- .../core/internal/items/ItemTagTest.java | 4 +- .../items/MetadataRegistryImplTest.java | 10 +- .../scheduler/CronAdjusterMiscTest.java | 2 +- .../internal/scheduler/CronAdjusterTest.java | 2 +- .../scheduler/CronSchedulerImplTest.java | 6 +- .../scheduler/DelegatedSchedulerTest.java | 4 +- .../scheduler/PeriodicSchedulerImplTest.java | 4 +- .../internal/scheduler/SchedulerImplTest.java | 8 +- .../service/ReadyServiceImplTest.java | 8 +- .../StateDescriptionServiceImplTest.java | 16 +-- .../StateDescriptionFragmentImplTest.java | 8 +- .../openhab/core/items/GenericItemTest.java | 30 ++-- .../openhab/core/items/MetadataKeyTest.java | 2 +- .../java/org/openhab/core/items/TestItem.java | 6 +- .../core/items/dto/ItemDTOMapperTest.java | 10 +- .../events/AbstractEventFactoryTest.java | 4 +- .../items/events/ItemEventFactoryTest.java | 24 ++-- .../core/library/CoreItemFactoryTest.java | 6 +- .../dimension/VolumetricFlowRateTest.java | 6 +- .../core/library/items/CallItemTest.java | 4 +- .../core/library/items/ColorItemTest.java | 10 +- .../core/library/items/ContactItemTest.java | 4 +- .../core/library/items/DateTimeItemTest.java | 4 +- .../core/library/items/DimmerItemTest.java | 12 +- .../core/library/items/ImageItemTest.java | 6 +- .../core/library/items/LocationItemTest.java | 6 +- .../core/library/items/NumberItemTest.java | 26 ++-- .../core/library/items/PlayerItemTest.java | 6 +- .../library/items/RollershutterItemTest.java | 10 +- .../openhab/core/library/items/StateUtil.java | 36 ++--- .../core/library/items/StringItemTest.java | 8 +- .../core/library/items/SwitchItemTest.java | 10 +- .../types/ArithmeticGroupFunctionTest.java | 18 +-- .../types/DateTimeGroupFunctionTest.java | 14 +- .../core/library/types/DateTimeTypeTest.java | 2 +- .../core/library/types/DecimalTypeTest.java | 2 +- .../core/library/types/HSBTypeTest.java | 2 +- .../core/library/types/OnOffTypeTest.java | 2 +- .../library/types/OpenClosedTypeTest.java | 2 +- .../core/library/types/PercentTypeTest.java | 4 +- .../core/library/types/PointTypeTest.java | 2 +- ...antityTypeArithmeticGroupFunctionTest.java | 18 +-- .../core/library/types/QuantityTypeTest.java | 18 +-- .../library/types/StringListTypeTest.java | 2 +- .../core/library/types/StringTypeTest.java | 2 +- .../core/library/types/UpDownTypeTest.java | 2 +- .../core/library/unit/SmartHomeUnitsTest.java | 12 +- .../openhab/core/net/HttpServiceUtilTest.java | 2 +- .../org/openhab/core/net/NetUtilTest.java | 2 +- .../types/CommandDescriptionBuilderTest.java | 2 +- .../StateDescriptionFragmentBuilderTest.java | 2 +- .../core/types/util/UnitUtilsTest.java | 14 +- .../org/openhab/core/util/HexUtilsTest.java | 2 +- .../org/openhab/core/util/UIDUtilsTest.java | 4 +- .../openhab-core/src/main/feature/feature.xml | 10 +- .../test/internal/AbstractTestAgent.java | 12 +- .../internal/AuthorizationCodeTestAgent.java | 4 +- .../test/internal/ResourceOwnerTestAgent.java | 4 +- .../oauth2client/test/internal/TestAgent.java | 10 +- .../test/internal/cipher/CipherTest.java | 4 +- .../console/ConsoleOAuthCommandExtension.java | 24 ++-- .../test/AutomationIntegrationJsonTest.java | 34 ++--- .../test/AutomationIntegrationTest.java | 34 ++--- .../test/HostFragmentSupportTest.java | 4 +- .../internal/module/RunRuleModuleTest.java | 32 ++--- .../internal/module/RuntimeRuleTest.java | 34 ++--- .../defaultscope/internal/ScopeTest.java | 2 +- .../module/script/ScriptRuleTest.java | 30 ++-- .../internal/BasicConditionHandlerTest.java | 32 ++--- .../DayOfWeekConditionHandlerTest.java | 2 +- .../timer/internal/RuntimeRuleTest.java | 22 +-- .../TimeOfDayConditionHandlerTest.java | 2 +- .../internal/TimeOfDayTriggerHandlerTest.java | 4 +- .../core/automation/event/RuleEventTest.java | 32 ++--- .../automation/internal/RuleEngineTest.java | 14 +- .../automation/internal/RuleRegistryTest.java | 2 +- .../internal/TestModuleTypeProvider.java | 2 +- .../binding/xml/test/BindingInfoI18nTest.java | 12 +- .../binding/xml/test/BindingInfoTest.java | 14 +- .../binding/xml/test/BindingInstaller.java | 8 +- .../core/ConfigOptionRegistryOSGiTest.java | 4 +- .../MDNSDiscoveryServiceOSGiTest.java | 8 +- .../discovery/DiscoveryServiceMock.java | 10 +- .../DiscoveryServiceMockOfBridge.java | 8 +- .../DiscoveryServiceRegistryOSGiTest.java | 12 +- .../inbox/DynamicThingUpdateOSGiTest.java | 38 +++--- .../discovery/internal/InboxOSGiTest.java | 70 +++++----- .../internal/DeltaUsbSerialScannerTest.java | 8 +- .../internal/PollingUsbSerialScannerTest.java | 10 +- .../internal/SysFsUsbSerialScannerTest.java | 6 +- .../UsbSerialDeviceInformationGenerator.java | 4 +- .../itest.bndrun | 2 +- .../UsbSerialDiscoveryServiceTest.java | 22 +-- .../UsbSerialDeviceInformationGenerator.java | 4 +- .../internal/ConfigDispatcherOSGiTest.java | 6 +- .../config/xml/test/BindingInstaller.java | 8 +- .../xml/test/ConfigDescriptionI18nTest.java | 12 +- .../xml/test/ConfigDescriptionsTest.java | 18 +-- .../EphemerisManagerImplOSGiTest.java | 10 +- .../discovery/InboxResourceOSGITest.java | 16 +-- .../internal/item/ItemResourceOSGiTest.java | 28 ++-- .../persistence/PersistenceResourceTest.java | 18 +-- .../profile/ProfileTypeResourceTest.java | 22 +-- .../ConfigurableServiceResourceOSGiTest.java | 10 +- ...hedItemDTOMapperWithTransformOSGiTest.java | 14 +- .../internal/folder/FolderObserverTest.java | 14 +- .../internal/GenericItemProviderTest.java | 54 ++++---- .../internal/GenericMetadataProviderTest.java | 4 +- .../extensions/PersistenceExtensionsTest.java | 18 +-- .../tests/TestPersistenceService.java | 18 +-- .../internal/engine/RuleExecutionTest.java | 34 ++--- .../internal/engine/RuleTriggerTest.java | 20 +-- .../script/actions/ScriptExecutionTest.java | 8 +- .../script/engine/ScriptEngineOSGiTest.java | 42 +++--- .../script/lib/NumberExtensionsTest.java | 10 +- .../scheduler/test/AbstractScheduler.java | 2 +- .../script/scheduler/test/MockClosure.java | 4 +- .../script/scheduler/test/MockScheduler.java | 2 +- .../tests/lib/NumberExtensionsTest.java | 20 +-- ...enericItemChannelLinkProviderJavaTest.java | 26 ++-- .../GenericItemChannelLinkProviderTest.java | 20 +-- .../test/hue/GenericThingProviderTest.java | 32 ++--- .../test/hue/GenericThingProviderTest2.java | 14 +- .../test/hue/GenericThingProviderTest3.java | 30 ++-- .../test/hue/GenericThingProviderTest4.java | 36 ++--- .../hue/DumbThingHandlerFactory.java | 16 +-- .../hue/DumbThingTypeProvider.java | 16 +-- .../hue/TestHueChannelTypeProvider.java | 20 +-- .../hue/TestHueConfigDescriptionProvider.java | 10 +- .../hue/TestHueThingHandlerFactory.java | 28 ++-- .../hue/TestHueThingHandlerFactoryX.java | 16 +-- .../hue/TestHueThingTypeProvider.java | 16 +-- .../internal/JsonStorageServiceOSGiTest.java | 14 +- .../core/cache/ExpiringCacheAsyncTest.java | 4 +- .../internal/common/SafeCallerImplTest.java | 6 +- .../events/OSGiEventManagerOSGiTest.java | 14 +- .../i18n/TranslationProviderOSGiTest.java | 8 +- .../internal/items/ItemUpdaterOSGiTest.java | 24 ++-- .../openhab/core/items/GroupItemOSGiTest.java | 58 ++++---- .../core/items/ItemRegistryImplTest.java | 32 ++--- .../items/ManagedItemProviderOSGiTest.java | 30 ++-- .../java/org/openhab/core/items/TestItem.java | 6 +- .../AbstractItemEventSubscriberOSGiTest.java | 24 ++-- .../service/AbstractWatchServiceTest.java | 4 +- .../thing/SystemWideChannelTypesTest.java | 14 +- .../core/thing/ThingPropertiesTest.java | 12 +- .../binding/BindingBaseClassesOSGiTest.java | 70 +++++----- .../binding/ChangeThingTypeOSGiTest.java | 64 ++++----- .../core/thing/binding/ThingFactoryTest.java | 52 +++---- .../thing/binding/firmware/FirmwareTest.java | 10 +- .../thing/events/ThingEventFactoryTest.java | 30 ++-- .../factory/ManagedThingProviderOSGiTest.java | 18 +-- .../core/thing/firmware/Constants.java | 10 +- ...eUpdateServiceFirmwareRestrictionTest.java | 18 +-- ...eUpdateServicePrerequisiteVersionTest.java | 16 +-- ...strictedFirmwareUpdateServiceOSGiTest.java | 32 ++--- ...usInfoI18nLocalizationServiceOSGiTest.java | 40 +++--- .../CommunicationManagerOSGiTest.java | 100 +++++++------- .../internal/SimpleThingTypeProvider.java | 8 +- .../internal/ThingLinkManagerOSGiTest.java | 56 ++++---- .../internal/ThingManagerOSGiJavaTest.java | 108 +++++++-------- .../thing/internal/ThingManagerOSGiTest.java | 128 +++++++++--------- .../thing/internal/ThingRegistryOSGiTest.java | 46 +++---- .../firmware/FirmwareRegistryOSGiTest.java | 22 +-- .../firmware/FirmwareUpdateServiceTest.java | 52 +++---- .../SystemProfileFactoryOSGiTest.java | 28 ++-- .../thing/link/ItemChannelLinkOSGiTest.java | 18 +-- .../core/thing/link/LinkEventOSGiTest.java | 16 +-- .../i18n/SystemProfileI18nOSGiTest.java | 12 +- .../testutil/i18n/DefaultLocaleSetter.java | 4 +- ...annelStateDescriptionProviderOSGiTest.java | 74 +++++----- .../thing/xml/test/ChannelTypesI18nTest.java | 22 +-- .../core/thing/xml/test/ChannelTypesTest.java | 16 +-- .../xml/test/ConfigDescriptionsTest.java | 16 +-- .../core/thing/xml/test/LoadedTestBundle.java | 14 +- .../SystemChannelsInChannelGroupsTest.java | 20 +-- .../xml/test/SystemWideChannelTypesTest.java | 20 +-- .../thing/xml/test/ThingTypeI18nTest.java | 22 +-- .../core/thing/xml/test/ThingTypesTest.java | 26 ++-- .../ESH-INF/thing/thing-types.xml | 2 +- .../core/voice/internal/AudioManagerStub.java | 14 +- .../core/voice/internal/AudioSourceStub.java | 10 +- .../core/voice/internal/ConsoleStub.java | 4 +- .../HumanLanguageInterpreterStub.java | 6 +- .../core/voice/internal/KSServiceStub.java | 14 +- .../core/voice/internal/STTServiceStub.java | 14 +- .../openhab/core/voice/internal/SinkStub.java | 12 +- .../core/voice/internal/TTSServiceStub.java | 12 +- .../core/voice/internal/VoiceStub.java | 4 +- .../javavoicemanager/VoiceManagerTest.java | 38 +++--- .../InterpretCommandTest.java | 10 +- .../SayCommandTest.java | 24 ++-- .../VoiceConsoleCommandExtensionTest.java | 22 +-- .../VoicesCommandTest.java | 8 +- pom.xml | 8 +- ..._bindingIdCamelCase__BindingConstants.java | 2 +- .../__bindingIdCamelCase__Handler.java | 12 +- .../__bindingIdCamelCase__HandlerFactory.java | 10 +- .../checkstyle/ruleset.properties | 2 +- .../checkstyle/suppressions.xml | 10 +- .../pmd/suppressions.properties | 26 ++-- .../spotbugs/suppressions.xml | 2 +- 1698 files changed, 7941 insertions(+), 7941 deletions(-) diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java index 96308788a..158575180 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java index 6351034ec..6ac2ae80b 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java index c52ee220b..1d22f537b 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java @@ -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 diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java index 72a366be9..a07ae13f4 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java @@ -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. diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java index f7adc24bd..161981605 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java @@ -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 diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java index 86cbc40be..e1b6a127a 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java index eebdba647..f895ce5b2 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java index dc578682b..8f461c4b8 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java index 015b6cba7..70097210d 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java @@ -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 diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java index 596d9df9d..0f81614d8 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java index 5c8237800..1ca095e4d 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java index 0d2724e6a..b1ff6a9aa 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java index 6eb836a66..c68bc9d69 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java index 89aaccb23..4cebd55d7 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java index 3f169efbf..d0bb2b56a 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java @@ -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" // diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java index faf4814f8..b633ed268 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java index c5e3344de..de1f47cd5 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java index e10cfd85f..9b9ca5c12 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java index 5effb279d..eae9e666c 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java index ddd9fc181..658ca0109 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java @@ -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; /** diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java index 1846c710b..340dd9b5e 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java index 98556ed38..79be18c58 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java @@ -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; diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java index 9604ac20b..377d5dbe0 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java @@ -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; /** diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java index 9779e3123..bdfa1feaf 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java @@ -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. diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java index 167b3e669..4a070b929 100644 --- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java +++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java @@ -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; diff --git a/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java b/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java index 592fd1cc1..44deb8fe0 100644 --- a/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java +++ b/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java index 5912cf965..189cc1b52 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java @@ -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. diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java index d8c5e392d..a6a84ac01 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java @@ -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. diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java index fb67de8c2..4ab53c430 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java index de5f9b3c2..6be192330 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java index 269c3b822..226554727 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java @@ -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. diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java index 128825a06..44d73d6ef 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java index a5758f0f5..ac817f100 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java index 166526896..ab2b0f9c7 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java @@ -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; diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java index 572d721f8..247fdc4a0 100644 --- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java +++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java index d2d14a17d..324569b5a 100644 --- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java +++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java index 65068d6e8..9d77c89f2 100644 --- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java +++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java index f0df0e384..a0aaabc36 100644 --- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java +++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java index 09fd906a8..e0aac87ee 100644 --- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java +++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java index de92b74c9..9c9f20628 100644 --- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java +++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java index 63646df30..5cb1f4a02 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java index 15fa9b0a7..4ed8ccfa7 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java index 7651acab8..d6e0b0aad 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java index 1c6a949f7..47bebec27 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java index fa8819e66..2f1617c8f 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java index 5df78a559..14666c886 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java index a1b34cb5d..cc74f9452 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java index 10a09762e..342f623a2 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java index 8a82259c4..84ee00c01 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java @@ -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. diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java index c3f6261cb..84dc902f8 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java index a950089f5..4b6b72050 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java index 63633551e..5ff20c5d3 100644 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java @@ -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; diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java index e582a3820..d6b2a2ef5 100755 --- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java +++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java index 8c61ecf61..d84f70354 100644 --- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java +++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java @@ -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; diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java index 90db8a1bf..0e3d0fc7c 100644 --- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java +++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java @@ -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; diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java index 2e031bd8e..04cf09cf9 100644 --- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java +++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java @@ -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; diff --git a/bundles/org.openhab.core.automation/README.md b/bundles/org.openhab.core.automation/README.md index 66b17075f..1ac578647 100644 --- a/bundles/org.openhab.core.automation/README.md +++ b/bundles/org.openhab.core.automation/README.md @@ -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 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. diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java index 2cd396c0d..3a12ce604 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java index fc9304d8c..65071bff2 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java index a6b9e4e95..1c272db31 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java index 9c10796ee..41306d951 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java index 2e037b1dc..db9c07768 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java @@ -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 diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java index 69603415d..0271e8786 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java index 410224684..14385b56d 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java @@ -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 diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java index 484cfa87a..6b38cfd80 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java @@ -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} diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java index 30449bb7d..103b1ceed 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java @@ -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. diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java index 7f080bf9e..b69f34660 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java index 5664158b7..96ff6b436 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java index 438b7592d..0b0d29a92 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java index 1efa638b9..d834986c7 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java index f755dc2c7..e510298a6 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java index 268b9ee3c..c7fee6ef9 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java index ecff79e54..8f1f72764 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java index b04ff6958..ef9825fac 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java index fa9305d4a..2a5e25e61 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java index ac33909eb..2dff019ae 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java index 7e978886f..62850d65a 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java index 12eb5dcf9..c9115c54b 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java index 9d5652243..939f64b55 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java index 915df16b2..a56f1e083 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java index 59efc858c..2746b90f2 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java @@ -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; /** diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java index f100b8bec..95ef0ba2e 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java @@ -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; diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls index 2c65aa3ca..942d407e5 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls @@ -3,7 +3,7 @@ associations="true" dependencies="true" nesting-relationships="true" router="FAN"> if the name is null or empty, or the type is null *
  • if a unit or a unit label is provided for a parameter having type text or boolean
    • *
  • if an invalid unit was given (cp. - * https://www.eclipse.org/smarthome/documentation/development/bindings/xml-reference.html for the list + * https://openhab.org/documentation/development/bindings/xml-reference.html for the list * of valid units)
    • * */ diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java index 25483b8f4..9a4ab2dcb 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; /** * The {@link ConfigDescriptionParameterBuilder} class provides a builder for the {@link ConfigDescriptionParameter} diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java index 016aebade..630f81b0a 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java index 4ba2d01ba..a4a831824 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.net.URI; import java.util.Collection; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java index 035bf75c7..53b7d0ae6 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.net.URI; import java.util.ArrayList; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java index 34416a2a4..4ad3089e4 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.net.URI; import java.util.Collection; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java index 3bc41921a..a3a1dbf50 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.math.BigDecimal; import java.util.ArrayList; @@ -24,10 +24,10 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.internal.normalization.Normalizer; -import org.eclipse.smarthome.config.core.internal.normalization.NormalizerFactory; -import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.internal.normalization.Normalizer; +import org.openhab.core.config.core.internal.normalization.NormalizerFactory; +import org.openhab.core.config.core.validation.ConfigDescriptionValidator; import org.slf4j.LoggerFactory; /** diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java index c9ac14460..ae1408d60 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import org.osgi.framework.Constants; import org.osgi.service.component.ComponentConstants; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java index 02c7844a7..7ee971fdd 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import static java.util.Collections.*; -import static org.eclipse.smarthome.config.core.ConfigUtil.normalizeTypes; +import static org.openhab.core.config.core.ConfigUtil.normalizeTypes; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.internal.ConfigMapper; +import org.openhab.core.config.core.internal.ConfigMapper; /** * This class is a wrapper for configuration settings of {@link Thing}s. diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java index 854243105..3d55465f4 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java index e497a9758..3213eafca 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import java.lang.reflect.Type; import java.util.List; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java index 88990ec02..a8a824621 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; /** * The {@link FilterCriteria} specifies a filter for dynamic selection list diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java index 6bba31905..d066eafe8 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; /** * The {@link ParameterOption} specifies one option of a static selection list. diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java index 8021679a8..515d43cdf 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescription; /** * {@link ConfigDescriptionDTO} is a data transfer object for {@link ConfigDescription}. diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java index 382016b81..8ea8665e7 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; import java.net.URI; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; -import org.eclipse.smarthome.config.core.FilterCriteria; -import org.eclipse.smarthome.config.core.ParameterOption; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameterBuilder; +import org.openhab.core.config.core.ConfigDescriptionParameterGroup; +import org.openhab.core.config.core.FilterCriteria; +import org.openhab.core.config.core.ParameterOption; /** * {@link ConfigDescriptionDTOMapper} maps {@link ConfigDescription}s to the data transfer object diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java index 59a04e9ff..28c8c5a42 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; import java.math.BigDecimal; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; /** * This is a data transfer object that is used to serialize parameter of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java index fa2e8b015..fb10f443c 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; /** * This is a data transfer object that is used to serialize options of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java index f887aa572..2f450a7ec 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; /** * This is a data transfer object that is used to serialize filter criteria of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java index 25a7bb944..5108b81de 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.dto; +package org.openhab.core.config.core.dto; /** * This is a data transfer object that is used to serialize options of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java index 659bf7da9..9269c7333 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.i18n; +package org.openhab.core.config.core.i18n; import java.net.URI; import java.util.ArrayList; @@ -19,14 +19,14 @@ import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.config.core.internal.i18n.ConfigDescriptionGroupI18nUtil; -import org.eclipse.smarthome.config.core.internal.i18n.ConfigDescriptionI18nUtil; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameterBuilder; +import org.openhab.core.config.core.ConfigDescriptionParameterGroup; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.config.core.internal.i18n.ConfigDescriptionGroupI18nUtil; +import org.openhab.core.config.core.internal.i18n.ConfigDescriptionI18nUtil; +import org.openhab.core.i18n.TranslationProvider; import org.osgi.framework.Bundle; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java index 9c5d66e77..e30a7c70c 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal; +package org.openhab.core.config.core.internal; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java index b2abf0359..71b625bae 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.i18n; +package org.openhab.core.config.core.internal.i18n; import java.net.URI; import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.i18n.I18nUtil; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.i18n.I18nUtil; +import org.openhab.core.i18n.TranslationProvider; import org.osgi.framework.Bundle; /** diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java index 433c38eb5..b28958e85 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.i18n; +package org.openhab.core.config.core.internal.i18n; import java.net.URI; import java.util.Locale; @@ -18,8 +18,8 @@ import java.util.regex.Pattern; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.i18n.I18nUtil; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.i18n.I18nUtil; +import org.openhab.core.i18n.TranslationProvider; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java index e42be19fc..daa27c151 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.i18n; +package org.openhab.core.config.core.internal.i18n; import java.net.URI; import java.time.ZoneId; @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; -import org.eclipse.smarthome.config.core.ConfigOptionProvider; -import org.eclipse.smarthome.config.core.ParameterOption; +import org.openhab.core.config.core.ConfigOptionProvider; +import org.openhab.core.config.core.ParameterOption; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java index 8b15b1091..8b3d69224 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.metadata; +package org.openhab.core.config.core.internal.metadata; import java.net.URI; import java.util.Collection; @@ -22,13 +22,13 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder; -import org.eclipse.smarthome.config.core.ConfigDescriptionProvider; -import org.eclipse.smarthome.config.core.ParameterOption; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider; +import org.openhab.core.config.core.ConfigDescriptionParameterBuilder; +import org.openhab.core.config.core.ConfigDescriptionProvider; +import org.openhab.core.config.core.ParameterOption; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java index ab392a649..f629296c9 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.net; +package org.openhab.core.config.core.internal.net; import java.net.Inet4Address; import java.net.URI; @@ -21,10 +21,10 @@ import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigOptionProvider; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.core.net.CidrAddress; -import org.eclipse.smarthome.core.net.NetUtil; +import org.openhab.core.config.core.ConfigOptionProvider; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.net.CidrAddress; +import org.openhab.core.net.NetUtil; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java index 0f8c15301..100c5d567 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java index 0b6e5dcda..d5a9e27a8 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * The normalizer for {@link ConfigDescriptionParameter.Type#BOOLEAN}. It tries to convert the given value into a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java index 1be5f0c0e..046af55bd 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import java.math.BigDecimal; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * The normalizer for {@link ConfigDescriptionParameter.Type#DECIMAL}. It converts all number types to BigDecimal, diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java index 0121f218b..d1bb9d292 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import java.math.BigDecimal; import java.math.RoundingMode; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * The normalizer for {@link ConfigDescriptionParameter.Type#INTEGER}. All different number formats will get converted diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java index d4fbafb9a..47eaee813 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java index 009c0661f..330e51398 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * A {@link Normalizer} tries to normalize a given value according to the {@link ConfigDescriptionParameter.Type} diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java index 45816a5de..b1a745cf1 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import java.util.AbstractMap.SimpleEntry; import java.util.Collections; @@ -19,8 +19,8 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; /** * The {@link NormalizerFactory} can be used in order to obtain the {@link Normalizer} for any concrete diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java index 7d7527e00..39c2f8c09 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * The normalizer for the {@link ConfigDescriptionParameter.Type#TEXT}. It basically ensures that the given value will diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java index 1def2d605..f396c353f 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.validation.ConfigValidationMessage; /** * The {@link ConfigDescriptionParameterValidator} can be implemented to provide a specific validation of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java index a892bf801..3319e5425 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; /** * The {@link ConfigDescriptionParameterValidatorFactory} creates the corresponding diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java index c8661bb14..2eb0fde35 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; import java.net.URI; import java.util.ArrayList; @@ -21,14 +21,14 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator; -import org.eclipse.smarthome.config.core.validation.ConfigValidationException; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.core.validation.ConfigDescriptionValidator; +import org.openhab.core.config.core.validation.ConfigValidationException; +import org.openhab.core.config.core.validation.ConfigValidationMessage; +import org.openhab.core.i18n.TranslationProvider; import org.osgi.framework.BundleContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java index 2e07f22cc..301659854 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; /** * Utility class providing the {@link MessageKey}s for config description validation. The {@link MessageKey} diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java index 15e220eac..a98e4933f 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; import java.math.BigDecimal; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.internal.validation.TypeIntrospections.TypeIntrospection; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.internal.validation.TypeIntrospections.TypeIntrospection; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.config.core.validation.ConfigValidationMessage; /** * The {@link ConfigDescriptionParameterValidator} for the minimum and maximum attribute of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java index b7cefac4d..e2f3c2215 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.validation.ConfigValidationMessage; /** * The {@link ConfigDescriptionParameterValidator} for the pattern attribute of a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java index d790d988d..dacb77fe2 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.validation.ConfigValidationMessage; /** * The {@link ConfigDescriptionParameterValidator} for the required attribute of a {@link ConfigDescriptionParameter}. diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java index 83826a1e5..d2a24f012 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; import java.math.BigDecimal; import java.util.AbstractMap.SimpleEntry; @@ -20,7 +20,7 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; /** * The {@link TypeIntrospections} provides a corresponding {@link TypeIntrospection} for each config description diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java index d3580a148..2665ed052 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.internal.validation.TypeIntrospections.TypeIntrospection; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.internal.validation.TypeIntrospections.TypeIntrospection; +import org.openhab.core.config.core.validation.ConfigValidationMessage; /** * The {@link TypeValidator} validates if the given value can be assigned to the config description parameter according diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java index ae930582d..b34a621c3 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.metadata; +package org.openhab.core.config.core.metadata; import java.util.List; import java.util.Locale; 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.ParameterOption; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ParameterOption; /** * A {@link MetadataConfigDescriptionProvider} implementation can be registered as an OSGi service in order to give diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java index 48f192412..47441229d 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; /** * The {@link ConfigStatusCallback} interface is a callback interface to propagate a new configuration status for an diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java index c54a1a609..d2f0dcb20 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type; +import org.openhab.core.config.core.status.ConfigStatusMessage.Type; /** * The {@link ConfigStatusInfo} contains {@link ConfigStatusMessage}s to represent the current configuration status of diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java index 264f767ca..ea1c7aa74 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import java.util.Arrays; import java.util.Objects; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java index cb1042621..e46cbc21b 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import java.util.Collection; import java.util.Locale; 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; /** * The {@link ConfigStatusProvider} can be implemented and registered as an OSGi service to provide status diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java index 16562ea09..c43d001a4 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import java.util.Collection; import java.util.List; @@ -18,12 +18,12 @@ import java.util.Locale; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; -import org.eclipse.smarthome.config.core.status.events.ConfigStatusInfoEvent; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.i18n.LocaleProvider; -import org.eclipse.smarthome.core.i18n.TranslationProvider; -import org.eclipse.smarthome.core.util.BundleResolver; +import org.openhab.core.config.core.status.events.ConfigStatusInfoEvent; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.i18n.LocaleProvider; +import org.openhab.core.i18n.TranslationProvider; +import org.openhab.core.util.BundleResolver; import org.osgi.framework.Bundle; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java index c8aae7256..ae16e1ebc 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import org.eclipse.jdt.annotation.NonNull; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java index b35c27671..a829e14de 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status.events; +package org.openhab.core.config.core.status.events; import java.util.Collections; import java.util.Set; -import org.eclipse.smarthome.config.core.status.ConfigStatusInfo; -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.config.core.status.ConfigStatusInfo; +import org.openhab.core.events.AbstractEventFactory; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventFactory; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java index 97d092906..27d18391c 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status.events; +package org.openhab.core.config.core.status.events; -import org.eclipse.smarthome.config.core.status.ConfigStatusInfo; -import org.eclipse.smarthome.core.events.AbstractEvent; +import org.openhab.core.config.core.status.ConfigStatusInfo; +import org.openhab.core.events.AbstractEvent; import com.google.gson.Gson; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java index 414218f7c..00eff78db 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.validation; +package org.openhab.core.config.core.validation; import java.net.URI; import java.util.Map; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.Configuration; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.Configuration; /** * The {@link ConfigDescriptionValidator} validates a given set of {@link Configuration} parameters against a diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java index 4b99a7abf..970daa54f 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.validation; +package org.openhab.core.config.core.validation; import java.text.MessageFormat; import java.util.Collection; @@ -20,9 +20,9 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.i18n.TranslationProvider; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java index ffeb669d3..25d8afd59 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.validation; +package org.openhab.core.config.core.validation; import java.util.Arrays; import java.util.Collections; import java.util.Objects; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; /** * The {@link ConfigValidationMessage} is the result of a specific {@link ConfigDescriptionParameter} diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java index 200fd82aa..f6a16c8b7 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Arrays; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java index b0e8e6879..24c4490d8 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -18,7 +18,7 @@ import static org.junit.Assert.*; import java.math.BigDecimal; import java.util.Arrays; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java index 8535bc711..9cf05c3b2 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.test.java.JavaTest; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java index e9c34a45a..9939c2b00 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; -import static org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type.*; +import static org.openhab.core.config.core.ConfigDescriptionParameter.Type.*; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java index 9cb543e0a..049549500 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core; +package org.openhab.core.config.core; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.core.IsCollectionContaining.hasItems; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java index ec0c7b002..5578671f5 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.i18n; +package org.openhab.core.config.core.internal.i18n; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertThat; import java.net.URI; import java.util.Locale; -import org.eclipse.smarthome.config.core.ParameterOption; +import org.openhab.core.config.core.ParameterOption; import org.hamcrest.collection.IsEmptyCollection; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java index b3513e4af..06f64e71a 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.metadata; +package org.openhab.core.config.core.internal.metadata; -import static org.eclipse.smarthome.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*; +import static org.openhab.core.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; @@ -23,13 +23,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.Locale; -import org.eclipse.smarthome.config.core.ConfigDescription; -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.config.core.metadata.MetadataConfigDescriptionProvider; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.config.core.ConfigDescription; +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.config.core.metadata.MetadataConfigDescriptionProvider; +import org.openhab.core.test.java.JavaTest; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java index 5342eecba..ee99671a0 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.normalization; +package org.openhab.core.config.core.internal.normalization; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.*; @@ -21,8 +21,8 @@ import java.util.List; import java.util.TreeSet; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java index 520170ff8..e17d71abe 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.is; @@ -28,14 +28,14 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigDescription; -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.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator; -import org.eclipse.smarthome.config.core.validation.ConfigValidationException; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; +import org.openhab.core.config.core.ConfigDescription; +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.ConfigDescriptionRegistry; +import org.openhab.core.config.core.validation.ConfigDescriptionValidator; +import org.openhab.core.config.core.validation.ConfigValidationException; +import org.openhab.core.config.core.validation.ConfigValidationMessage; import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java index 9aaa658ea..0bd997521 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.internal.validation; +package org.openhab.core.config.core.internal.validation; import static java.util.Collections.*; import static java.util.stream.Collectors.toList; @@ -25,9 +25,9 @@ import java.util.Map; import java.util.stream.Stream; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.validation.ConfigValidationException; -import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage; -import org.eclipse.smarthome.core.i18n.TranslationProvider; +import org.openhab.core.config.core.validation.ConfigValidationException; +import org.openhab.core.config.core.validation.ConfigValidationMessage; +import org.openhab.core.i18n.TranslationProvider; import org.junit.Test; import org.mockito.Mockito; import org.osgi.framework.Bundle; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java index bb08929c0..eb65f8c0c 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import static java.util.Collections.*; import static java.util.stream.Collectors.*; @@ -20,7 +20,7 @@ import static org.junit.Assert.assertThat; import java.util.List; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type; +import org.openhab.core.config.core.status.ConfigStatusMessage.Type; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java index ed5054d9b..00883d5b9 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.core.status; +package org.openhab.core.config.core.status; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Locale; -import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.i18n.LocaleProvider; -import org.eclipse.smarthome.core.i18n.TranslationProvider; -import org.eclipse.smarthome.core.util.BundleResolver; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.config.core.status.ConfigStatusMessage.Type; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.i18n.LocaleProvider; +import org.openhab.core.i18n.TranslationProvider; +import org.openhab.core.util.BundleResolver; +import org.openhab.core.test.java.JavaTest; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java index bfae8ea08..e58d019c5 100644 --- a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.mdns; +package org.openhab.core.config.discovery.mdns; import java.util.Set; @@ -18,10 +18,10 @@ import javax.jmdns.ServiceInfo; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.mdns.internal.MDNSDiscoveryService; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.mdns.internal.MDNSDiscoveryService; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * A {@link MDNSDiscoveryParticipant} that is registered as a service is picked up by the {@link MDNSDiscoveryService} diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java index 3d730aec2..297e35e02 100644 --- a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.mdns.internal; +package org.openhab.core.config.discovery.mdns.internal; import java.time.Duration; import java.util.HashSet; @@ -25,13 +25,13 @@ import javax.jmdns.ServiceListener; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.io.transport.mdns.MDNSClient; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.mdns.MDNSDiscoveryParticipant; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.io.transport.mdns.MDNSClient; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Modified; import org.osgi.service.component.annotations.Reference; @@ -55,7 +55,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se private final Logger logger = LoggerFactory.getLogger(MDNSDiscoveryService.class); @Deprecated - private final Set oldParticipants = new CopyOnWriteArraySet<>(); + private final Set oldParticipants = new CopyOnWriteArraySet<>(); private final Set participants = new CopyOnWriteArraySet<>(); @@ -72,7 +72,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se for (MDNSDiscoveryParticipant participant : participants) { mdnsClient.addServiceListener(participant.getServiceType(), this); } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { mdnsClient.addServiceListener(participant.getServiceType(), this); } } @@ -82,7 +82,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se for (MDNSDiscoveryParticipant participant : participants) { mdnsClient.removeServiceListener(participant.getServiceType(), this); } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { mdnsClient.removeServiceListener(participant.getServiceType(), this); } this.mdnsClient = null; @@ -99,7 +99,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se for (MDNSDiscoveryParticipant participant : participants) { mdnsClient.addServiceListener(participant.getServiceType(), this); } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { mdnsClient.addServiceListener(participant.getServiceType(), this); } startScan(true); @@ -110,7 +110,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se for (MDNSDiscoveryParticipant participant : participants) { mdnsClient.removeServiceListener(participant.getServiceType(), this); } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { mdnsClient.removeServiceListener(participant.getServiceType(), this); } } @@ -163,7 +163,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se } } } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { long start = System.currentTimeMillis(); ServiceInfo[] services; if (isBackground) { @@ -200,7 +200,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se @Deprecated @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC) protected void addMDNSDiscoveryParticipant_old( - org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) { + org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) { this.oldParticipants.add(participant); if (mdnsClient != null && isBackgroundDiscoveryEnabled()) { mdnsClient.addServiceListener(participant.getServiceType(), this); @@ -209,7 +209,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se @Deprecated protected void removeMDNSDiscoveryParticipant_old( - org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) { + org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) { this.oldParticipants.remove(participant); if (mdnsClient != null) { mdnsClient.removeServiceListener(participant.getServiceType(), this); @@ -222,7 +222,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se for (MDNSDiscoveryParticipant participant : participants) { supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs()); } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs()); } return supportedThingTypes; @@ -247,7 +247,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se } } } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { if (participant.getServiceType().equals(serviceEvent.getType())) { try { ThingUID thingUID = participant.getThingUID(serviceEvent.getInfo()); @@ -280,7 +280,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se } } } - for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) { if (participant.getServiceType().equals(serviceEvent.getType())) { try { DiscoveryResult result = participant.createResult(serviceEvent.getInfo()); diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java index 65a5befcd..3461dbaa3 100644 --- a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.upnp; +package org.openhab.core.config.discovery.upnp; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.jupnp.model.meta.RemoteDevice; /** diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java index a53b4b365..d0e4b3b89 100644 --- a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.upnp.internal; +package org.openhab.core.config.discovery.upnp.internal; import java.util.Collection; import java.util.HashSet; @@ -19,15 +19,15 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.upnp.UpnpDiscoveryParticipant; -import org.eclipse.smarthome.core.net.CidrAddress; -import org.eclipse.smarthome.core.net.NetworkAddressChangeListener; -import org.eclipse.smarthome.core.net.NetworkAddressService; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant; +import org.openhab.core.net.CidrAddress; +import org.openhab.core.net.NetworkAddressChangeListener; +import org.openhab.core.net.NetworkAddressService; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.jupnp.UpnpService; import org.jupnp.model.meta.LocalDevice; import org.jupnp.model.meta.RemoteDevice; @@ -58,7 +58,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService private final Logger logger = LoggerFactory.getLogger(UpnpDiscoveryService.class); @Deprecated - private final Set oldParticipants = new CopyOnWriteArraySet<>(); + private final Set oldParticipants = new CopyOnWriteArraySet<>(); private final Set participants = new CopyOnWriteArraySet<>(); @@ -120,7 +120,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService @Deprecated @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC) protected void addUpnpDiscoveryParticipant_old( - org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant) { + org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant) { this.oldParticipants.add(participant); if (upnpService != null) { @@ -136,7 +136,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService @Deprecated protected void removeUpnpDiscoveryParticipant_old( - org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant) { + org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant) { this.oldParticipants.remove(participant); } @@ -146,7 +146,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService for (UpnpDiscoveryParticipant participant : participants) { supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs()); } - for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs()); } return supportedThingTypes; @@ -192,7 +192,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService logger.error("Participant '{}' threw an exception", participant.getClass().getName(), e); } } - for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { try { DiscoveryResult result = participant.createResult(device); if (result != null) { @@ -216,7 +216,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService logger.error("Participant '{}' threw an exception", participant.getClass().getName(), e); } } - for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { + for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) { try { ThingUID thingUID = participant.getThingUID(device); if (thingUID != null) { diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java index 97efe23a7..de4a64ee7 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal; +package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal; import java.io.IOException; import java.util.Collections; @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; /** * Permits to perform repeated scans for USB devices with associated serial port. Keeps the last scan result as internal diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java index fc9d81bcc..f72d20c7a 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal; +package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal; import static java.lang.Long.parseLong; @@ -26,11 +26,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryListener; -import org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta; -import org.eclipse.smarthome.core.common.ThreadFactoryBuilder; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener; +import org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta; +import org.openhab.core.common.ThreadFactoryBuilder; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java index cb664af54..cff4b35e5 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal; +package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal; import static java.nio.file.Files.*; @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Modified; diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java index 9e426bdc9..22bce2e61 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal; +package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal; import java.io.IOException; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; /** * Implementations of this interface scan for serial ports provided by USB devices. diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java index f2b24f4c2..d5de1e938 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java +++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial; +package org.openhab.core.config.discovery.usbserial; import static java.util.Objects.requireNonNull; diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java index 51749ef56..519cd320d 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java +++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial; +package org.openhab.core.config.discovery.usbserial; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.usbserial.internal.UsbSerialDiscoveryService; +import org.openhab.core.config.discovery.usbserial.internal.UsbSerialDiscoveryService; /** * Interface for implementations for discovering serial ports provided by a USB device. An implementation of this diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java index ce972e930..1fb808550 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java +++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial; +package org.openhab.core.config.discovery.usbserial; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java index 79e12dfa1..48dd038ab 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java +++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial; +package org.openhab.core.config.discovery.usbserial; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.usbserial.internal.UsbSerialDiscoveryService; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.usbserial.internal.UsbSerialDiscoveryService; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * A {@link UsbSerialDiscoveryParticipant} that is registered as a component is picked up by the diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java index 8ad2b33d3..f565117da 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.usbserial.internal; +package org.openhab.core.config.discovery.usbserial.internal; import static java.util.stream.Collectors.toSet; @@ -22,16 +22,16 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryListener; -import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryParticipant; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener; +import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryParticipant; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java index d4cae64dd..4cd9c0eaa 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.Collection; import java.util.Collections; @@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.i18n.I18nUtil; -import org.eclipse.smarthome.core.i18n.LocaleProvider; -import org.eclipse.smarthome.core.i18n.TranslationProvider; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.internal.DiscoveryResultImpl; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.i18n.I18nUtil; +import org.openhab.core.i18n.LocaleProvider; +import org.openhab.core.i18n.TranslationProvider; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; import org.slf4j.Logger; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java index 51cbd62fb..2ba094529 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * The {@link DiscoveryListener} interface for receiving discovery events. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java index 02705de26..4570450f6 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * The {@link DiscoveryResult} is a container for one result of a discovery process. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java index f806caa3a..1335f3c4b 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.HashMap; import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.internal.DiscoveryResultImpl; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * The {@link DiscoveryResultBuilder} helps creating a {@link DiscoveryResult} through the builder pattern. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java index e52c4a3fd..208fd5800 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; /** * The {@link DiscoveryResultFlag} class specifies a list of flags diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java index add352445..492c185f5 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingTypeUID; /** * The {@link DiscoveryService} is a service interface which each binding can diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java index 4d12cfff7..65b8df24b 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingUID; /** * This interface provides helper methods for {@link DiscoveryService}s in order to access core framework capabilities. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java index 704fb98b9..af8bc7749 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingTypeUID; /** * The {@link DiscoveryServiceRegistry} is a service interface which provides diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java index 073290dff..8e9eda089 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java index 48188a521..4e3f61e3f 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java index 10f3ba2b9..82ad742d3 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery; +package org.openhab.core.config.discovery; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.jupnp.model.meta.RemoteDevice; /** @@ -26,7 +26,7 @@ import org.jupnp.model.meta.RemoteDevice; * UPnP scans. * * @author Kai Kreuzer - Initial contribution - * @deprecated use org.eclipse.smarthome.config.discovery.upnp.UpnpDiscoveryParticipant instead. + * @deprecated use org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant instead. */ @Deprecated @NonNullByDefault diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java index 3ac9f3708..8606ba996 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.dto; +package org.openhab.core.config.discovery.dto; import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.DiscoveryResultFlag; /** * This is a data transfer object that is used to serialize discovery results. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java index 8478cbacb..f09cbd333 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.dto; +package org.openhab.core.config.discovery.dto; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * The {@link DiscoveryResultDTOMapper} is an utility class to map discovery results into discovery result transfer diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java index 32758766c..b18658ea4 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; import java.util.List; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingUID; /** * The {@link Inbox} is a service interface providing a container for discovered {@code Thing}s diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java index 5b29231fc..f0b8abcde 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; import java.util.function.Predicate; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.internal.AutomaticInboxProcessor; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.internal.AutomaticInboxProcessor; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java index b9a84e04f..b328230f1 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * The {@link InboxFilterCriteria} specifies the filter for {@link Inbox} GET requests. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java index 861700659..cce388117 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResult; /** * The {@link InboxListener} interface for receiving {@link Inbox} events. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java index 4e6fad68c..7283e6d73 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; import java.util.function.Predicate; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * Implements static factory methods for {@link Predicate}s to filter in streams of {@link DiscoveryResult}s. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java index f376fa4ff..a5e0ece97 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.core.events.AbstractEvent; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.events.AbstractEvent; /** * Abstract implementation of an inbox event which will be posted by the {@link Inbox} for added, removed diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java index f7725602e..cdc55b9ef 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; /** * An {@link InboxAddedEvent} notifies subscribers that a discovery result has been added to the inbox. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java index d45352328..196a1f6ee 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper; -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.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper; +import org.openhab.core.events.AbstractEventFactory; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventFactory; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java index 055229bdd..b27199353 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; /** * An {@link InboxRemovedEvent} notifies subscribers that a discovery result has been removed from the inbox. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java index 682fffe94..c25a81246 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; /** * An {@link InboxUpdatedEvent} notifies subscribers that a discovery result has been updated in the inbox. diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java index 2b8a38816..246566a13 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; -import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*; +import static org.openhab.core.config.discovery.inbox.InboxPredicates.*; import java.util.List; import java.util.Map; @@ -24,23 +24,23 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigurableService; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.config.discovery.inbox.InboxAutoApprovePredicate; -import org.eclipse.smarthome.config.discovery.inbox.InboxListener; -import org.eclipse.smarthome.core.common.registry.RegistryChangeListener; -import org.eclipse.smarthome.core.events.AbstractTypedEventSubscriber; -import org.eclipse.smarthome.core.events.EventSubscriber; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.config.discovery.inbox.InboxAutoApprovePredicate; +import org.openhab.core.config.discovery.inbox.InboxListener; +import org.openhab.core.common.registry.RegistryChangeListener; +import org.openhab.core.events.AbstractTypedEventSubscriber; +import org.openhab.core.events.EventSubscriber; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.events.ThingStatusInfoChangedEvent; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeRegistry; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -86,8 +86,8 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - added auto-approve functionality * @author Henning Sudbrock - added hook for selectively auto-approving inbox entries */ -@Component(immediate = true, configurationPid = "org.eclipse.smarthome.inbox", service = EventSubscriber.class, property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.inbox", +@Component(immediate = true, configurationPid = "org.openhab.core.inbox", service = EventSubscriber.class, property = { + Constants.SERVICE_PID + "=org.openhab.core.inbox", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Inbox", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" }) diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java index bae92fc38..275fd6c29 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java index 9c9c49292..baa79a9a2 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; import java.security.AccessController; import java.security.PrivilegedAction; @@ -29,16 +29,16 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.discovery.DiscoveryListener; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceCallback; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.config.discovery.ExtendedDiscoveryService; -import org.eclipse.smarthome.config.discovery.ScanListener; -import org.eclipse.smarthome.core.common.SafeCaller; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryListener; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.DiscoveryServiceCallback; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.config.discovery.ExtendedDiscoveryService; +import org.openhab.core.config.discovery.ScanListener; +import org.openhab.core.common.SafeCaller; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java index dd67f0774..b009f033b 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; -import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.forThingUID; +import static org.openhab.core.config.discovery.inbox.InboxPredicates.forThingUID; import java.net.URI; import java.util.ArrayList; @@ -35,35 +35,35 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.ConfigUtil; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.discovery.DiscoveryListener; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.config.discovery.inbox.InboxFilterCriteria; -import org.eclipse.smarthome.config.discovery.inbox.InboxListener; -import org.eclipse.smarthome.config.discovery.inbox.events.InboxEventFactory; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.storage.Storage; -import org.eclipse.smarthome.core.storage.StorageService; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.ManagedThingProvider; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingRegistryChangeListener; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.ThingFactory; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.ConfigUtil; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.discovery.DiscoveryListener; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.config.discovery.inbox.InboxFilterCriteria; +import org.openhab.core.config.discovery.inbox.InboxListener; +import org.openhab.core.config.discovery.inbox.events.InboxEventFactory; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.storage.Storage; +import org.openhab.core.storage.StorageService; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ManagedThingProvider; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingRegistryChangeListener; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.ThingFactory; +import org.openhab.core.thing.binding.ThingHandlerFactory; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java index 733bc5453..6f91387a3 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal.console; +package org.openhab.core.config.discovery.internal.console; import java.io.IOException; import java.util.Arrays; @@ -18,12 +18,12 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.List; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -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.config.discovery.DiscoveryService; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.thing.ThingTypeUID; +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.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java index f4faa911e..418447e56 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal.console; +package org.openhab.core.config.discovery.internal.console; -import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*; +import static org.openhab.core.config.discovery.inbox.InboxPredicates.*; import java.util.Arrays; import java.util.Date; @@ -20,15 +20,15 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.config.discovery.internal.PersistentInbox; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -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.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.config.discovery.internal.PersistentInbox; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +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.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java index a7150949f..482d84fbb 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox; +package org.openhab.core.config.discovery.inbox; -import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*; +import static org.openhab.core.config.discovery.inbox.InboxPredicates.*; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; @@ -25,11 +25,11 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.internal.DiscoveryResultImpl; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java index 59c4ed130..ed018b7ef 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.inbox.events; +package org.openhab.core.config.discovery.inbox.events; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper; -import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper; +import org.openhab.core.config.discovery.internal.DiscoveryResultImpl; +import org.openhab.core.events.Event; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.junit.Test; import com.google.gson.Gson; diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java index afc08acd6..38e13950b 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; -import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.withFlag; +import static org.openhab.core.config.discovery.inbox.InboxPredicates.withFlag; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.*; @@ -27,27 +27,27 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.core.thing.ManagedThingProvider; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder; -import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; -import org.eclipse.smarthome.test.storage.VolatileStorageService; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.thing.ManagedThingProvider; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.ThingHandlerFactory; +import org.openhab.core.thing.binding.builder.ThingBuilder; +import org.openhab.core.thing.events.ThingStatusInfoChangedEvent; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeBuilder; +import org.openhab.core.thing.type.ThingTypeRegistry; +import org.openhab.core.test.storage.VolatileStorageService; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java index c288c2117..dd02a2e80 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; import static org.junit.Assert.*; import java.util.HashMap; import java.util.Map; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java index 50ed2c5ec..41ee7dda2 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.discovery.internal; +package org.openhab.core.config.discovery.internal; import static org.hamcrest.collection.IsMapContaining.hasEntry; import static org.junit.Assert.*; @@ -25,30 +25,30 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.eclipse.smarthome.config.core.ConfigDescription; -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.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.config.discovery.inbox.events.InboxAddedEvent; -import org.eclipse.smarthome.config.discovery.inbox.events.InboxUpdatedEvent; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.storage.Storage; -import org.eclipse.smarthome.core.storage.StorageService; -import org.eclipse.smarthome.core.thing.ManagedThingProvider; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; +import org.openhab.core.config.core.ConfigDescription; +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.ConfigDescriptionRegistry; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.config.discovery.inbox.events.InboxAddedEvent; +import org.openhab.core.config.discovery.inbox.events.InboxUpdatedEvent; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.storage.Storage; +import org.openhab.core.storage.StorageService; +import org.openhab.core.thing.ManagedThingProvider; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.ThingHandlerFactory; +import org.openhab.core.thing.binding.builder.ThingBuilder; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeBuilder; +import org.openhab.core.thing.type.ThingTypeRegistry; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java index f24154b8a..467cb154c 100644 --- a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java +++ b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.dispatch.internal; +package org.openhab.core.config.dispatch.internal; import java.io.File; import java.io.FileInputStream; @@ -33,7 +33,7 @@ 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.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; @@ -68,11 +68,11 @@ import com.google.gson.JsonSyntaxException; * *

    * In case the pid does not contain any ".", the default service pid namespace is prefixed, which can be defined by the - * program argument "smarthome.servicepid" (default is "org.eclipse.smarthome"). + * program argument "smarthome.servicepid" (default is "org.openhab.core"). * *

    * If no pid is defined in the property line, the default pid namespace will be used together with the filename. E.g. if - * you have a file "security.cfg", the pid that will be used is "org.eclipse.smarthome.security". + * you have a file "security.cfg", the pid that will be used is "org.openhab.core.security". * *

    * Last but not least, a pid can be defined in the first line of a cfg file by prefixing it with "pid:", e.g. @@ -113,7 +113,7 @@ public class ConfigDispatcher { public static final String SERVICECFG_PROG_ARGUMENT = "smarthome.servicecfg"; /** The default namespace for service pids */ - public static final String SERVICE_PID_NAMESPACE = "org.eclipse.smarthome"; + public static final String SERVICE_PID_NAMESPACE = "org.openhab.core"; /** The default services configuration filename */ public static final String SERVICE_CFG_FILE = "smarthome.cfg"; diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java index e7b7557ff..b23dbf5d9 100644 --- a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java +++ b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.dispatch.internal; +package org.openhab.core.config.dispatch.internal; import static java.nio.file.StandardWatchEventKinds.*; @@ -19,8 +19,8 @@ import java.nio.file.Path; import java.nio.file.WatchEvent; import java.nio.file.WatchEvent.Kind; -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.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java b/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java index 793c4b312..69430cbd2 100644 --- a/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java +++ b/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.dispatch.internal; +package org.openhab.core.config.dispatch.internal; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java b/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java index 5cdedfe3c..bce52e769 100644 --- a/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java +++ b/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.serial.internal; +package org.openhab.core.config.serial.internal; import java.net.URI; import java.util.ArrayList; @@ -18,9 +18,9 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import org.eclipse.smarthome.config.core.ConfigOptionProvider; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.io.transport.serial.SerialPortManager; +import org.openhab.core.config.core.ConfigOptionProvider; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.io.transport.serial.SerialPortManager; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java index 047d6cd5f..ef0013637 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; import java.util.Collection; import java.util.Collections; @@ -24,8 +24,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.common.registry.Identifiable; -import org.eclipse.smarthome.core.i18n.LocalizedKey; +import org.openhab.core.common.registry.Identifiable; +import org.openhab.core.i18n.LocalizedKey; import org.osgi.framework.Bundle; /** diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java index 14e639592..3c0762420 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; import java.net.URI; import java.util.Collection; import java.util.Locale; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionProvider; -import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionProvider; +import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService; import org.osgi.framework.Bundle; /** diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java index 176b5cc89..3fd20c276 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; import java.net.URI; import java.net.URISyntaxException; @@ -18,13 +18,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; -import org.eclipse.smarthome.config.xml.util.ConverterAssertion; -import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator; -import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller; -import org.eclipse.smarthome.config.xml.util.NodeIterator; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameterGroup; +import org.openhab.core.config.xml.util.ConverterAssertion; +import org.openhab.core.config.xml.util.ConverterAttributeMapValidator; +import org.openhab.core.config.xml.util.GenericUnmarshaller; +import org.openhab.core.config.xml.util.NodeIterator; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java index b7ed0b9aa..f37cea6fe 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java @@ -10,22 +10,22 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; -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.FilterCriteria; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator; -import org.eclipse.smarthome.config.xml.util.ConverterValueMap; -import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller; -import org.eclipse.smarthome.config.xml.util.NodeValue; +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.FilterCriteria; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.config.xml.util.ConverterAttributeMapValidator; +import org.openhab.core.config.xml.util.ConverterValueMap; +import org.openhab.core.config.xml.util.GenericUnmarshaller; +import org.openhab.core.config.xml.util.NodeValue; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java index 09063e5ea..39658c322 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; -import org.eclipse.smarthome.config.xml.util.ConverterValueMap; -import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller; +import org.openhab.core.config.core.ConfigDescriptionParameterGroup; +import org.openhab.core.config.xml.util.ConverterValueMap; +import org.openhab.core.config.xml.util.GenericUnmarshaller; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java index 56d06b468..3e22d5779 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; import java.util.List; import java.util.concurrent.Future; @@ -18,17 +18,17 @@ import java.util.concurrent.ScheduledExecutorService; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionProvider; -import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService; -import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionReader; -import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionXmlProvider; -import org.eclipse.smarthome.config.xml.osgi.XmlDocumentBundleTracker; -import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider; -import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProviderFactory; -import org.eclipse.smarthome.config.xml.util.XmlDocumentReader; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.service.ReadyService; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionProvider; +import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService; +import org.openhab.core.config.xml.internal.ConfigDescriptionReader; +import org.openhab.core.config.xml.internal.ConfigDescriptionXmlProvider; +import org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker; +import org.openhab.core.config.xml.osgi.XmlDocumentProvider; +import org.openhab.core.config.xml.osgi.XmlDocumentProviderFactory; +import org.openhab.core.config.xml.util.XmlDocumentReader; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.service.ReadyService; import org.osgi.framework.Bundle; import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java index f12dd0897..bb6a049d4 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml; +package org.openhab.core.config.xml; -import org.eclipse.smarthome.config.core.FilterCriteria; -import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller; +import org.openhab.core.config.core.FilterCriteria; +import org.openhab.core.config.xml.util.GenericUnmarshaller; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java index 79aa60ec4..638dd2c6b 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java @@ -10,25 +10,25 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.internal; +package org.openhab.core.config.xml.internal; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; -import org.eclipse.smarthome.config.core.FilterCriteria; -import org.eclipse.smarthome.config.xml.ConfigDescriptionConverter; -import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterConverter; -import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterGroupConverter; -import org.eclipse.smarthome.config.xml.FilterCriteriaConverter; -import org.eclipse.smarthome.config.xml.util.NodeAttributes; -import org.eclipse.smarthome.config.xml.util.NodeAttributesConverter; -import org.eclipse.smarthome.config.xml.util.NodeList; -import org.eclipse.smarthome.config.xml.util.NodeListConverter; -import org.eclipse.smarthome.config.xml.util.NodeValue; -import org.eclipse.smarthome.config.xml.util.NodeValueConverter; -import org.eclipse.smarthome.config.xml.util.XmlDocumentReader; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameterGroup; +import org.openhab.core.config.core.FilterCriteria; +import org.openhab.core.config.xml.ConfigDescriptionConverter; +import org.openhab.core.config.xml.ConfigDescriptionParameterConverter; +import org.openhab.core.config.xml.ConfigDescriptionParameterGroupConverter; +import org.openhab.core.config.xml.FilterCriteriaConverter; +import org.openhab.core.config.xml.util.NodeAttributes; +import org.openhab.core.config.xml.util.NodeAttributesConverter; +import org.openhab.core.config.xml.util.NodeList; +import org.openhab.core.config.xml.util.NodeListConverter; +import org.openhab.core.config.xml.util.NodeValue; +import org.openhab.core.config.xml.util.NodeValueConverter; +import org.openhab.core.config.xml.util.XmlDocumentReader; import com.thoughtworks.xstream.XStream; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java index 2dff49cd9..5bc46deea 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.internal; +package org.openhab.core.config.xml.internal; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionProvider; -import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider; -import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionProvider; +import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider; +import org.openhab.core.config.xml.osgi.XmlDocumentProvider; import org.osgi.framework.Bundle; /** diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java index fedd0f7c3..6cee4eb00 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.osgi; +package org.openhab.core.config.xml.osgi; import java.net.URL; import java.util.ArrayList; @@ -32,11 +32,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.eclipse.smarthome.config.xml.util.XmlDocumentReader; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.service.ReadyMarker; -import org.eclipse.smarthome.core.service.ReadyMarkerUtils; -import org.eclipse.smarthome.core.service.ReadyService; +import org.openhab.core.config.xml.util.XmlDocumentReader; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.service.ReadyMarker; +import org.openhab.core.service.ReadyMarkerUtils; +import org.openhab.core.service.ReadyService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java index 1311fb61a..98f28d894 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.osgi; +package org.openhab.core.config.xml.osgi; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionReader; +import org.openhab.core.config.xml.internal.ConfigDescriptionReader; /** * The {@link XmlDocumentProvider} is responsible managing any created objects diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java index e0cf5cc81..2a6ee21f1 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.osgi; +package org.openhab.core.config.xml.osgi; import org.eclipse.jdt.annotation.NonNullByDefault; import org.osgi.framework.Bundle; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java index 4463e9ae0..9fa4ebe49 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.io.HierarchicalStreamReader; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java index c3bdbc0f9..2bf6b72f0 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.HashMap; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java index 165b9760e..1e954778b 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.HashMap; import java.util.List; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java index 875ac1b19..e3fe39054 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java index 213fb7dac..7eec9f028 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java index bca175d4c..60ad6a773 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java index 43ffa7587..f0570f199 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java index d71129859..4f313395b 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java index 63c0b5f4e..e5096986d 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.List; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java index 9ddf9269a..423fb006b 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; /** * The {@link NodeName} interface defines common features for all {@code Node}* classes. diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java index b3ddca832..90569a3eb 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java index 1ce588690..f4585b3d3 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.util.Map; diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java index cd6a92b4f..b042edebd 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.config.xml.util; +package org.openhab.core.config.xml.util; import java.net.URL; diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java index 7217851b7..ab54c858b 100644 --- a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java +++ b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.ephemeris; +package org.openhab.core.ephemeris; import java.io.FileNotFoundException; import java.net.URL; diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java index bd73ea3ca..d3898f368 100644 --- a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java +++ b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.ephemeris.internal; +package org.openhab.core.ephemeris.internal; import java.io.FileNotFoundException; import java.io.IOException; @@ -41,11 +41,11 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -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.ephemeris.EphemerisManager; -import org.eclipse.smarthome.core.i18n.LocaleProvider; +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.ephemeris.EphemerisManager; +import org.openhab.core.i18n.LocaleProvider; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.osgi.framework.FrameworkUtil; diff --git a/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java b/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java index 0375f3f69..92d306fa4 100644 --- a/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java +++ b/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.extension.sample.internal; +package org.openhab.core.extension.sample.internal; import java.net.URI; import java.util.ArrayList; @@ -22,12 +22,12 @@ import java.util.Random; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.extension.Extension; -import org.eclipse.smarthome.core.extension.ExtensionEventFactory; -import org.eclipse.smarthome.core.extension.ExtensionService; -import org.eclipse.smarthome.core.extension.ExtensionType; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.extension.Extension; +import org.openhab.core.extension.ExtensionEventFactory; +import org.openhab.core.extension.ExtensionService; +import org.openhab.core.extension.ExtensionType; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java index 11f91b782..646a5265b 100644 --- a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java +++ b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.id; +package org.openhab.core.id; import java.io.File; import java.io.FileInputStream; @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java index 538320cb0..4902f276d 100644 --- a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java +++ b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.id.internal; +package org.openhab.core.id.internal; import javax.annotation.security.RolesAllowed; import javax.ws.rs.GET; @@ -19,9 +19,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.id.InstanceUUID; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.auth.Role; +import org.openhab.core.id.InstanceUUID; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import io.swagger.annotations.Api; diff --git a/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java b/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java index ec525dbfb..5aab995c4 100644 --- a/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java +++ b/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.id; +package org.openhab.core.id; import static org.junit.Assert.*; @@ -19,7 +19,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.eclipse.smarthome.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigConstants; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java b/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java index ed2cf71d9..94c845c93 100644 --- a/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java +++ b/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.util.HexUtils; +import org.openhab.core.util.HexUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java index c10055dc0..4c6d6971d 100644 --- a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java +++ b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.eclipse.internal; +package org.openhab.core.io.console.eclipse.internal; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +24,9 @@ import java.util.TreeMap; import org.apache.commons.lang.StringUtils; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; -import org.eclipse.smarthome.io.console.Console; -import org.eclipse.smarthome.io.console.ConsoleInterpreter; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.Console; +import org.openhab.core.io.console.ConsoleInterpreter; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java index 0e6979a65..b262f4c44 100644 --- a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java +++ b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.eclipse.internal; +package org.openhab.core.io.console.eclipse.internal; import org.eclipse.osgi.framework.console.CommandInterpreter; -import org.eclipse.smarthome.io.console.Console; +import org.openhab.core.io.console.Console; /** * diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java index 96aab6536..23369c3af 100644 --- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java +++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.karaf.internal; +package org.openhab.core.io.console.karaf.internal; import java.util.Arrays; import java.util.List; @@ -24,9 +24,9 @@ import org.apache.karaf.shell.api.console.Completer; import org.apache.karaf.shell.api.console.Parser; import org.apache.karaf.shell.api.console.Registry; import org.apache.karaf.shell.api.console.Session; -import org.eclipse.smarthome.io.console.Console; -import org.eclipse.smarthome.io.console.ConsoleInterpreter; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.Console; +import org.openhab.core.io.console.ConsoleInterpreter; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; /** * This class wraps ESH ConsoleCommandExtensions to commands for Apache Karaf diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java index cdd2ba198..4998a5c19 100644 --- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java +++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.karaf.internal; +package org.openhab.core.io.console.karaf.internal; import java.util.Collection; import java.util.HashMap; @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.karaf.shell.api.action.lifecycle.Manager; import org.apache.karaf.shell.api.console.Registry; import org.apache.karaf.shell.api.console.SessionFactory; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java index 383db3235..0764066e2 100644 --- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java +++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.karaf.internal; +package org.openhab.core.io.console.karaf.internal; -import org.eclipse.smarthome.io.console.Console; +import org.openhab.core.io.console.Console; /** * diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java index db30b5603..0058a0060 100644 --- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java +++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.rfc147.internal; +package org.openhab.core.io.console.rfc147.internal; import java.util.Arrays; -import org.eclipse.smarthome.io.console.ConsoleInterpreter; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.ConsoleInterpreter; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; /** * diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java index 4cbfcfcfb..3b6ef9a50 100644 --- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java +++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.rfc147.internal; +package org.openhab.core.io.console.rfc147.internal; import java.util.Collection; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; /** * diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java index 2eff022d3..069a1ab09 100644 --- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java +++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.rfc147.internal; +package org.openhab.core.io.console.rfc147.internal; import java.util.Collection; import java.util.Collections; @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; -import org.eclipse.smarthome.io.console.rfc147.internal.extension.HelpConsoleCommandExtension; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.rfc147.internal.extension.HelpConsoleCommandExtension; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java index 4aee5cab4..5cb55b9a1 100644 --- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java +++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.rfc147.internal; +package org.openhab.core.io.console.rfc147.internal; -import org.eclipse.smarthome.io.console.Console; +import org.openhab.core.io.console.Console; /** * diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java index 18f92463a..82d669a20 100644 --- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.rfc147.internal.extension; +package org.openhab.core.io.console.rfc147.internal.extension; import java.util.Collections; import java.util.List; -import org.eclipse.smarthome.io.console.Console; -import org.eclipse.smarthome.io.console.ConsoleInterpreter; -import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension; -import org.eclipse.smarthome.io.console.rfc147.internal.ConsoleCommandsContainer; -import org.eclipse.smarthome.io.console.rfc147.internal.ConsoleSupportRfc147; +import org.openhab.core.io.console.Console; +import org.openhab.core.io.console.ConsoleInterpreter; +import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension; +import org.openhab.core.io.console.rfc147.internal.ConsoleCommandsContainer; +import org.openhab.core.io.console.rfc147.internal.ConsoleSupportRfc147; /** * diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java index 00c3b0cb8..9ce0b809f 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console; +package org.openhab.core.io.console; /** * This interface must be implemented by consoles which want to use the {@link ConsoleInterpreter}. diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java index c875a4347..c78e1682d 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console; +package org.openhab.core.io.console; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension; +import org.openhab.core.io.console.extensions.ConsoleCommandExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java index e450ad573..6f28dce06 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.extensions; +package org.openhab.core.io.console.extensions; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.console.Console; +import org.openhab.core.io.console.Console; /** * A base class that should be used by console command extension for better inclusion. diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java index 241937f0d..2302d9396 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.extensions; +package org.openhab.core.io.console.extensions; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.console.Console; +import org.openhab.core.io.console.Console; /** * Client which provide a console command have to implement this interface diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java index 4a9ebb419..51266f164 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.internal.extension; +package org.openhab.core.io.console.internal.extension; import java.util.Arrays; import java.util.Collection; @@ -19,13 +19,13 @@ import java.util.List; import java.util.function.Consumer; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ManagedItemProvider; -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.items.GenericItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ManagedItemProvider; +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; diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java index 4452dbf45..c0a40c908 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.internal.extension; +package org.openhab.core.io.console.internal.extension; import java.util.Arrays; import java.util.HashMap; @@ -19,14 +19,14 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.Metadata; -import org.eclipse.smarthome.core.items.MetadataKey; -import org.eclipse.smarthome.core.items.MetadataPredicates; -import org.eclipse.smarthome.core.items.MetadataRegistry; -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.items.ItemRegistry; +import org.openhab.core.items.Metadata; +import org.openhab.core.items.MetadataKey; +import org.openhab.core.items.MetadataPredicates; +import org.openhab.core.items.MetadataRegistry; +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; diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java index e2e329d83..f632811d1 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java @@ -10,23 +10,23 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.internal.extension; +package org.openhab.core.io.console.internal.extension; import java.util.Collections; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.items.ItemNotUniqueException; -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.TypeParser; -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.events.EventPublisher; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemNotUniqueException; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.events.ItemEventFactory; +import org.openhab.core.types.Command; +import org.openhab.core.types.TypeParser; +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; diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java index 288b8f978..0cace17fa 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.internal.extension; +package org.openhab.core.io.console.internal.extension; import java.util.Collections; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.items.ItemNotUniqueException; -import org.eclipse.smarthome.core.items.ItemRegistry; -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.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemNotUniqueException; +import org.openhab.core.items.ItemRegistry; +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; diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java index 091534af9..97ed912be 100644 --- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java +++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java @@ -10,23 +10,23 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.console.internal.extension; +package org.openhab.core.io.console.internal.extension; import java.util.Collections; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.items.ItemNotUniqueException; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.events.ItemEventFactory; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.core.types.TypeParser; -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.events.EventPublisher; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemNotUniqueException; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.events.ItemEventFactory; +import org.openhab.core.types.State; +import org.openhab.core.types.TypeParser; +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; diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java index e3c9aa325..6b6f20886 100644 --- a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java +++ b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.auth.basic.internal; +package org.openhab.core.io.http.auth.basic.internal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.HandlerContext; -import org.eclipse.smarthome.io.http.HandlerPriorities; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.HandlerContext; +import org.openhab.core.io.http.HandlerPriorities; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java index 566cdddf2..f90d557b0 100644 --- a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java +++ b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.auth.basic.internal; +package org.openhab.core.io.http.auth.basic.internal; import java.util.Base64; import java.util.Optional; import javax.servlet.http.HttpServletRequest; -import org.eclipse.smarthome.core.auth.Credentials; -import org.eclipse.smarthome.core.auth.UsernamePasswordCredentials; -import org.eclipse.smarthome.io.http.auth.CredentialsExtractor; +import org.openhab.core.auth.Credentials; +import org.openhab.core.auth.UsernamePasswordCredentials; +import org.openhab.core.io.http.auth.CredentialsExtractor; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java index 7581f1a81..290e2168c 100644 --- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java +++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.auth; +package org.openhab.core.io.http.auth; import java.util.Optional; -import org.eclipse.smarthome.core.auth.Credentials; +import org.openhab.core.auth.Credentials; /** * Provider of credentials which works in given context and can provide credentials out of it. diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java index 3bcdb178e..e754ce967 100644 --- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java +++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.auth.internal; +package org.openhab.core.io.http.auth.internal; import java.io.IOException; import java.io.PrintWriter; @@ -22,14 +22,14 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.core.auth.Authentication; -import org.eclipse.smarthome.core.auth.AuthenticationException; -import org.eclipse.smarthome.core.auth.AuthenticationManager; -import org.eclipse.smarthome.core.auth.Credentials; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.HandlerContext; -import org.eclipse.smarthome.io.http.HandlerPriorities; -import org.eclipse.smarthome.io.http.auth.CredentialsExtractor; +import org.openhab.core.auth.Authentication; +import org.openhab.core.auth.AuthenticationException; +import org.openhab.core.auth.AuthenticationManager; +import org.openhab.core.auth.Credentials; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.HandlerContext; +import org.openhab.core.io.http.HandlerPriorities; +import org.openhab.core.io.http.auth.CredentialsExtractor; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Modified; @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * * @author Łukasz Dywicki - Initial contribution. */ -@Component(configurationPid = "org.eclipse.smarthome.auth") +@Component(configurationPid = "org.openhab.core.auth") public class AuthenticationHandler implements Handler { private static final String AUTHENTICATION_ENABLED = "enabled"; diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java index 186677cd7..1a2ffb221 100644 --- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java +++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.auth.internal; +package org.openhab.core.io.http.auth.internal; import java.util.Optional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.core.auth.Authentication; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.HandlerContext; -import org.eclipse.smarthome.io.http.HandlerPriorities; +import org.openhab.core.auth.Authentication; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.HandlerContext; +import org.openhab.core.io.http.HandlerPriorities; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java index 073f7d5ad..453fac37e 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http; +package org.openhab.core.io.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java index af3c8c064..bcf2a4a1a 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http; +package org.openhab.core.io.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java index c4c3e842f..b6a3b9129 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http; +package org.openhab.core.io.http; /** * Constants for making handlers in proper order. diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java index e729810fb..e547f6d1e 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http; +package org.openhab.core.io.http; import org.osgi.framework.Bundle; import org.osgi.service.http.HttpContext; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java index 18ff12d2b..c2238eee7 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http; +package org.openhab.core.io.http; import org.osgi.framework.Bundle; import org.osgi.service.http.HttpContext; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java index 594cd0dfa..749088985 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import java.net.URL; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java index b1e336372..0bd7defd7 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.HandlerContext; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.HandlerContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java index 90067c332..dd9cccfaa 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import java.util.Deque; import java.util.Iterator; @@ -18,8 +18,8 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.HandlerContext; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.HandlerContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java index 98590f5a4..e4f954830 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import java.io.IOException; import java.net.URL; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java index 512896d7d..8259a3def 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; -import org.eclipse.smarthome.io.http.HttpContextFactoryService; -import org.eclipse.smarthome.io.http.WrappingHttpContext; +import org.openhab.core.io.http.HttpContextFactoryService; +import org.openhab.core.io.http.WrappingHttpContext; import org.osgi.framework.Bundle; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java index f04770544..fc7016487 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import java.io.IOException; import java.net.URL; @@ -24,8 +24,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.smarthome.io.http.Handler; -import org.eclipse.smarthome.io.http.WrappingHttpContext; +import org.openhab.core.io.http.Handler; +import org.openhab.core.io.http.WrappingHttpContext; import org.osgi.framework.Bundle; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java index 6d36a8a00..72292c303 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.servlet; +package org.openhab.core.io.http.servlet; import java.util.Hashtable; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java index fe89f2628..068db7a1c 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.servlet; +package org.openhab.core.io.http.servlet; -import org.eclipse.smarthome.io.http.HttpContextFactoryService; +import org.openhab.core.io.http.HttpContextFactoryService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.service.http.HttpContext; diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java index a2f0f6551..4a5c19093 100644 --- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java +++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.servlet; +package org.openhab.core.io.http.servlet; import org.eclipse.jdt.annotation.NonNullByDefault; import org.osgi.service.http.HttpContext; diff --git a/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java b/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java index 7fe21cb4d..acbe5ed04 100644 --- a/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java +++ b/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.http.internal; +package org.openhab.core.io.http.internal; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.smarthome.io.http.WrappingHttpContext; +import org.openhab.core.io.http.WrappingHttpContext; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java index dbdd5df73..02e1607d5 100644 --- a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java +++ b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.monitor.internal; +package org.openhab.core.io.monitor.internal; import java.util.Collections; import java.util.HashMap; 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.openhab.core.events.Event; +import org.openhab.core.events.EventFilter; +import org.openhab.core.events.EventSubscriber; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java index d2bdeb174..b4ac6e9ae 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.exec; +package org.openhab.core.io.net.exec; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java index 7d40ffb5a..85c9b3e67 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import javax.net.ssl.TrustManager; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java index c68d9b983..b3bc90f9f 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java index 4e2dbb824..a69a48488 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; /** * This exception is thrown, if an unexpected error occurs during initialization of the Jetty client diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java index a79057efa..92f06ee20 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java index 29cac658b..c119d5053 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import static org.eclipse.jetty.http.HttpMethod.*; @@ -44,7 +44,7 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.smarthome.core.library.types.RawType; +import org.openhab.core.library.types.RawType; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java index a4432759d..4c02dc3f1 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import java.net.URL; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java index 5be3f347c..72facaf3e 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java index e6b65f41a..09ff11e4e 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java index 68a974244..3ca055436 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import java.net.Socket; import java.security.cert.CertificateException; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java index 092900568..12b1c13ef 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import java.util.stream.Stream; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java index 11c52bf91..59ca6a822 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.websocket.client.WebSocketClient; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java index 4e41386cb..7ef81fb4c 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import java.net.Socket; import java.security.cert.CertificateException; @@ -29,9 +29,9 @@ import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedTrustManager; import javax.security.auth.x500.X500Principal; -import org.eclipse.smarthome.io.net.http.ExtensibleTrustManager; -import org.eclipse.smarthome.io.net.http.TlsCertificateProvider; -import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider; +import org.openhab.core.io.net.http.ExtensibleTrustManager; +import org.openhab.core.io.net.http.TlsCertificateProvider; +import org.openhab.core.io.net.http.TlsTrustManagerProvider; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java index 4d80cf52c..7eb435b52 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import java.io.IOException; import java.io.InputStream; @@ -25,8 +25,8 @@ import java.security.cert.CertificateFactory; import javax.net.ssl.X509ExtendedTrustManager; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.net.http.TlsCertificateProvider; -import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider; +import org.openhab.core.io.net.http.TlsCertificateProvider; +import org.openhab.core.io.net.http.TlsTrustManagerProvider; /** * Adapter to use a {@code TlsCertificateProvider} as a {@code TlsTrustManagerProvider} diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java index 5cd6cff8b..4d962ddf7 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import java.security.KeyStore; import java.security.KeyStoreException; diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java index aa6f2f8e6..27bce6b36 100644 --- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java +++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import java.security.AccessController; import java.security.KeyManagementException; @@ -31,11 +31,11 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.eclipse.smarthome.io.net.http.ExtensibleTrustManager; -import org.eclipse.smarthome.io.net.http.HttpClientFactory; -import org.eclipse.smarthome.io.net.http.HttpClientInitializationException; -import org.eclipse.smarthome.io.net.http.TrustManagerProvider; -import org.eclipse.smarthome.io.net.http.WebSocketFactory; +import org.openhab.core.io.net.http.ExtensibleTrustManager; +import org.openhab.core.io.net.http.HttpClientFactory; +import org.openhab.core.io.net.http.HttpClientInitializationException; +import org.openhab.core.io.net.http.TrustManagerProvider; +import org.openhab.core.io.net.http.WebSocketFactory; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; @@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - added web socket support * @author Martin van Wingerden - Add support for ESHTrustManager */ -@Component(immediate = true, configurationPid = "org.eclipse.smarthome.webclient") +@Component(immediate = true, configurationPid = "org.openhab.core.webclient") @NonNullByDefault public class WebClientFactoryImpl implements HttpClientFactory, WebSocketFactory { diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java index b5bd59a08..6297fa091 100644 --- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java +++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java index d5bced4f4..faa92f083 100644 --- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java +++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java index 8c23873d3..d9b560de5 100644 --- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java +++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http; +package org.openhab.core.io.net.http; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java index 9719595d0..a7b3c69f9 100644 --- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java +++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; @@ -30,7 +30,7 @@ import javax.net.ssl.X509ExtendedTrustManager; import javax.security.auth.x500.X500Principal; import org.apache.commons.lang.reflect.FieldUtils; -import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider; +import org.openhab.core.io.net.http.TlsTrustManagerProvider; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java index 11c910845..b1f878955 100644 --- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java +++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.net.http.internal; +package org.openhab.core.io.net.http.internal; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -37,7 +37,7 @@ import javax.net.ssl.SSLHandshakeException; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.eclipse.smarthome.io.net.http.TrustManagerProvider; +import org.openhab.core.io.net.http.TrustManagerProvider; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java index 08bc532e8..f735ea3aa 100644 --- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java +++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.audio.internal; +package org.openhab.core.io.rest.audio.internal; import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.audio.AudioSink; -import org.eclipse.smarthome.core.audio.AudioSource; +import org.openhab.core.audio.AudioSink; +import org.openhab.core.audio.AudioSource; /** * Mapper class that maps {@link AudioSink} and {@link AudioSource} instanced to their respective DTOs. diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java index 5e0f17493..29cdf1e96 100644 --- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java +++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.audio.internal; +package org.openhab.core.io.rest.audio.internal; import java.util.ArrayList; import java.util.Collection; @@ -29,13 +29,13 @@ import javax.ws.rs.core.Response.Status; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -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.auth.Role; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.audio.AudioManager; +import org.openhab.core.audio.AudioSink; +import org.openhab.core.audio.AudioSource; +import org.openhab.core.auth.Role; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java index d6512c2f7..fbc5e6e4a 100644 --- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java +++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.audio.internal; +package org.openhab.core.io.rest.audio.internal; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.audio.AudioSink; +import org.openhab.core.audio.AudioSink; /** * A DTO that is used on the REST API to provide infos about {@link AudioSink} to UIs. diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java index aa9c4f4ee..955878414 100644 --- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java +++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.audio.internal; +package org.openhab.core.io.rest.audio.internal; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.audio.AudioSource; +import org.openhab.core.audio.AudioSource; /** * A DTO that is used on the REST API to provide infos about {@link AudioSource} to UIs. diff --git a/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java b/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java index b397a6a60..1b3fe3d86 100644 --- a/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java +++ b/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.auth.internal; +package org.openhab.core.io.rest.auth.internal; import java.util.Dictionary; import java.util.Hashtable; diff --git a/bundles/org.openhab.core.io.rest.core/bnd.bnd b/bundles/org.openhab.core.io.rest.core/bnd.bnd index 4913a130f..8dc18c1b8 100644 --- a/bundles/org.openhab.core.io.rest.core/bnd.bnd +++ b/bundles/org.openhab.core.io.rest.core/bnd.bnd @@ -1,2 +1,2 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator \ No newline at end of file +Bundle-Activator: org.openhab.core.io.rest.core.internal.RESTCoreActivator \ No newline at end of file diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java index c13f5e99f..8562f6f83 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.config; +package org.openhab.core.io.rest.core.config; import java.io.IOException; import java.util.Collection; @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.config.core.Configuration; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.config.core.Configuration; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.cm.ConfigurationAdmin; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java index 63558b556..f10e6f053 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.config; +package org.openhab.core.io.rest.core.config; import java.util.ArrayList; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.dto.ConfigDescriptionDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO; /** * The {@link EnrichedConfigDescriptionDTOMapper} is a utility class to map {@link ConfigDescription}s to config diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java index 3a116f762..a9ffb3fec 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.config; +package org.openhab.core.io.rest.core.config; import java.math.BigDecimal; import java.util.Arrays; @@ -21,10 +21,10 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO; -import org.eclipse.smarthome.config.core.dto.FilterCriteriaDTO; -import org.eclipse.smarthome.config.core.dto.ParameterOptionDTO; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO; +import org.openhab.core.config.core.dto.FilterCriteriaDTO; +import org.openhab.core.config.core.dto.ParameterOptionDTO; /** * This is an enriched data transfer object that is used to serialize config descriptions parameters with a list of diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java index ee546cef3..0031b0970 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal; +package org.openhab.core.io.rest.core.internal; import java.io.IOException; import java.io.InputStream; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java index b9c99c696..55a2dcb66 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal; +package org.openhab.core.io.rest.core.internal; -import org.eclipse.smarthome.io.rest.JSONResponse; +import org.openhab.core.io.rest.JSONResponse; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java index 4570ab10e..21a90c87f 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.binding; +package org.openhab.core.io.rest.core.internal.binding; import java.io.IOException; import java.net.URI; @@ -34,18 +34,18 @@ 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.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.ConfigUtil; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.binding.BindingInfo; -import org.eclipse.smarthome.core.binding.BindingInfoRegistry; -import org.eclipse.smarthome.core.binding.dto.BindingInfoDTO; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; -import org.eclipse.smarthome.io.rest.core.config.ConfigurationService; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.ConfigUtil; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.auth.Role; +import org.openhab.core.binding.BindingInfo; +import org.openhab.core.binding.BindingInfoRegistry; +import org.openhab.core.binding.dto.BindingInfoDTO; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; +import org.openhab.core.io.rest.core.config.ConfigurationService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java index 6601b526a..9e83de0b9 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.channel; +package org.openhab.core.io.rest.core.internal.channel; import java.util.ArrayList; import java.util.HashSet; @@ -30,24 +30,24 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.thing.dto.ChannelTypeDTO; -import org.eclipse.smarthome.core.thing.profiles.ProfileType; -import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry; -import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType; -import org.eclipse.smarthome.core.thing.type.ChannelKind; -import org.eclipse.smarthome.core.thing.type.ChannelType; -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ChannelTypeUID; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.dto.ConfigDescriptionDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO; +import org.openhab.core.auth.Role; +import org.openhab.core.thing.dto.ChannelTypeDTO; +import org.openhab.core.thing.profiles.ProfileType; +import org.openhab.core.thing.profiles.ProfileTypeRegistry; +import org.openhab.core.thing.profiles.TriggerProfileType; +import org.openhab.core.thing.type.ChannelKind; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeRegistry; +import org.openhab.core.thing.type.ChannelTypeUID; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java index 990d2d9f7..301ad3dd1 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.config; +package org.openhab.core.io.rest.core.internal.config; import java.net.URI; import java.util.Collection; @@ -30,15 +30,15 @@ import javax.ws.rs.core.UriBuilder; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; -import org.eclipse.smarthome.io.rest.core.config.EnrichedConfigDescriptionDTOMapper; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.dto.ConfigDescriptionDTO; +import org.openhab.core.auth.Role; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; +import org.openhab.core.io.rest.core.config.EnrichedConfigDescriptionDTOMapper; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java index 0b1dcc95d..b533d81d8 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.discovery; +package org.openhab.core.io.rest.core.internal.discovery; import java.util.Collection; import java.util.LinkedHashSet; @@ -26,10 +26,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry; -import org.eclipse.smarthome.config.discovery.ScanListener; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.config.discovery.DiscoveryServiceRegistry; +import org.openhab.core.config.discovery.ScanListener; +import org.openhab.core.auth.Role; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java index b097995f4..360bfda8f 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.discovery; +package org.openhab.core.io.rest.core.internal.discovery; import java.util.stream.Stream; @@ -30,16 +30,16 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO; -import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper; -import org.eclipse.smarthome.config.discovery.inbox.Inbox; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.config.discovery.DiscoveryResultFlag; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTO; +import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper; +import org.openhab.core.config.discovery.inbox.Inbox; +import org.openhab.core.auth.Role; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java index 66dbd8b0d..273f5f5a4 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.extensions; +package org.openhab.core.io.rest.core.internal.extensions; import java.net.URI; import java.net.URISyntaxException; @@ -36,18 +36,18 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.extension.Extension; -import org.eclipse.smarthome.core.extension.ExtensionEventFactory; -import org.eclipse.smarthome.core.extension.ExtensionService; -import org.eclipse.smarthome.core.extension.ExtensionType; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.auth.Role; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.extension.Extension; +import org.openhab.core.extension.ExtensionEventFactory; +import org.openhab.core.extension.ExtensionService; +import org.openhab.core.extension.ExtensionType; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java index b012c8786..77c589665 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.item; +package org.openhab.core.io.rest.core.internal.item; import java.util.ArrayList; import java.util.Collection; @@ -45,37 +45,37 @@ import javax.ws.rs.core.UriInfo; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemBuilderFactory; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ManagedItemProvider; -import org.eclipse.smarthome.core.items.Metadata; -import org.eclipse.smarthome.core.items.MetadataKey; -import org.eclipse.smarthome.core.items.MetadataRegistry; -import org.eclipse.smarthome.core.items.dto.GroupItemDTO; -import org.eclipse.smarthome.core.items.dto.ItemDTOMapper; -import org.eclipse.smarthome.core.items.dto.MetadataDTO; -import org.eclipse.smarthome.core.items.events.ItemEventFactory; -import org.eclipse.smarthome.core.library.items.RollershutterItem; -import org.eclipse.smarthome.core.library.items.SwitchItem; -import org.eclipse.smarthome.core.library.types.OnOffType; -import org.eclipse.smarthome.core.library.types.UpDownType; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.core.types.TypeParser; -import org.eclipse.smarthome.io.rest.DTOMapper; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; -import org.eclipse.smarthome.io.rest.core.item.EnrichedGroupItemDTO; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; +import org.openhab.core.auth.Role; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemBuilderFactory; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ManagedItemProvider; +import org.openhab.core.items.Metadata; +import org.openhab.core.items.MetadataKey; +import org.openhab.core.items.MetadataRegistry; +import org.openhab.core.items.dto.GroupItemDTO; +import org.openhab.core.items.dto.ItemDTOMapper; +import org.openhab.core.items.dto.MetadataDTO; +import org.openhab.core.items.events.ItemEventFactory; +import org.openhab.core.library.items.RollershutterItem; +import org.openhab.core.library.items.SwitchItem; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.UpDownType; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; +import org.openhab.core.types.TypeParser; +import org.openhab.core.io.rest.DTOMapper; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; +import org.openhab.core.io.rest.core.item.EnrichedGroupItemDTO; +import org.openhab.core.io.rest.core.item.EnrichedItemDTO; +import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java index fda659d0f..e2473c3da 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.item; +package org.openhab.core.io.rest.core.internal.item; import static java.util.stream.Collectors.toSet; @@ -25,10 +25,10 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.core.common.AbstractUID; -import org.eclipse.smarthome.core.items.MetadataRegistry; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.common.AbstractUID; +import org.openhab.core.items.MetadataRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java index 4c5de9b0a..594b64704 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.link; +package org.openhab.core.io.rest.core.internal.link; import java.util.List; import java.util.stream.Collectors; @@ -29,17 +29,17 @@ 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.Configuration; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.link.AbstractLink; -import org.eclipse.smarthome.core.thing.link.ItemChannelLink; -import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry; -import org.eclipse.smarthome.core.thing.link.ThingLinkManager; -import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.auth.Role; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.link.AbstractLink; +import org.openhab.core.thing.link.ItemChannelLink; +import org.openhab.core.thing.link.ItemChannelLinkRegistry; +import org.openhab.core.thing.link.ThingLinkManager; +import org.openhab.core.thing.link.dto.ItemChannelLinkDTO; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java index 21314d50e..221e44ed5 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.persistence; +package org.openhab.core.io.rest.core.internal.persistence; import java.time.LocalDateTime; import java.time.ZonedDateTime; @@ -35,28 +35,28 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.i18n.TimeZoneProvider; -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.library.types.DateTimeType; -import org.eclipse.smarthome.core.library.types.OnOffType; -import org.eclipse.smarthome.core.library.types.OpenClosedType; -import org.eclipse.smarthome.core.persistence.FilterCriteria; -import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering; -import org.eclipse.smarthome.core.persistence.HistoricItem; -import org.eclipse.smarthome.core.persistence.ModifiablePersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry; -import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; -import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO; -import org.eclipse.smarthome.core.persistence.dto.PersistenceServiceDTO; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.core.types.TypeParser; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.auth.Role; +import org.openhab.core.i18n.TimeZoneProvider; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.library.types.DateTimeType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.OpenClosedType; +import org.openhab.core.persistence.FilterCriteria; +import org.openhab.core.persistence.FilterCriteria.Ordering; +import org.openhab.core.persistence.HistoricItem; +import org.openhab.core.persistence.ModifiablePersistenceService; +import org.openhab.core.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceRegistry; +import org.openhab.core.persistence.QueryablePersistenceService; +import org.openhab.core.persistence.dto.ItemHistoryDTO; +import org.openhab.core.persistence.dto.PersistenceServiceDTO; +import org.openhab.core.types.State; +import org.openhab.core.types.TypeParser; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java index a077ffd39..3c0324f26 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.profile; +package org.openhab.core.io.rest.core.internal.profile; import java.util.Collection; import java.util.Locale; @@ -28,20 +28,20 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.items.ItemUtil; -import org.eclipse.smarthome.core.thing.profiles.ProfileType; -import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry; -import org.eclipse.smarthome.core.thing.profiles.StateProfileType; -import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType; -import org.eclipse.smarthome.core.thing.profiles.dto.ProfileTypeDTO; -import org.eclipse.smarthome.core.thing.profiles.dto.ProfileTypeDTOMapper; -import org.eclipse.smarthome.core.thing.type.ChannelType; -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ChannelTypeUID; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.auth.Role; +import org.openhab.core.items.ItemUtil; +import org.openhab.core.thing.profiles.ProfileType; +import org.openhab.core.thing.profiles.ProfileTypeRegistry; +import org.openhab.core.thing.profiles.StateProfileType; +import org.openhab.core.thing.profiles.TriggerProfileType; +import org.openhab.core.thing.profiles.dto.ProfileTypeDTO; +import org.openhab.core.thing.profiles.dto.ProfileTypeDTOMapper; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeRegistry; +import org.openhab.core.thing.type.ChannelTypeUID; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java index c993a010b..d94d301ae 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.service; +package org.openhab.core.io.rest.core.internal.service; import java.io.IOException; import java.net.URI; @@ -35,17 +35,17 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.ConfigUtil; -import org.eclipse.smarthome.config.core.ConfigurableService; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.core.config.ConfigurationService; -import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator; -import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceDTO; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.ConfigUtil; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.auth.Role; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.core.config.ConfigurationService; +import org.openhab.core.io.rest.core.internal.RESTCoreActivator; +import org.openhab.core.io.rest.core.service.ConfigurableServiceDTO; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java index 851c42a09..8f9c9dfad 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.thing; +package org.openhab.core.io.rest.core.internal.thing; import java.io.IOException; import java.net.URI; @@ -47,53 +47,53 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.ConfigUtil; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.core.status.ConfigStatusInfo; -import org.eclipse.smarthome.config.core.status.ConfigStatusService; -import org.eclipse.smarthome.config.core.validation.ConfigValidationException; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.items.ItemFactory; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ManagedItemProvider; -import org.eclipse.smarthome.core.thing.Channel; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.ManagedThingProvider; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingManager; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.firmware.Firmware; -import org.eclipse.smarthome.core.thing.dto.ChannelDTO; -import org.eclipse.smarthome.core.thing.dto.ChannelDTOMapper; -import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTO; -import org.eclipse.smarthome.core.thing.dto.ThingDTO; -import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper; -import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry; -import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo; -import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService; -import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareDTO; -import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO; -import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService; -import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry; -import org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider; -import org.eclipse.smarthome.core.thing.type.BridgeType; -import org.eclipse.smarthome.core.thing.type.ChannelType; -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ChannelTypeUID; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; -import org.eclipse.smarthome.core.thing.util.ThingHelper; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; -import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTO; -import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTOMapper; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.ConfigUtil; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.core.status.ConfigStatusInfo; +import org.openhab.core.config.core.status.ConfigStatusService; +import org.openhab.core.config.core.validation.ConfigValidationException; +import org.openhab.core.auth.Role; +import org.openhab.core.items.ItemFactory; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ManagedItemProvider; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ManagedThingProvider; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingManager; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.firmware.Firmware; +import org.openhab.core.thing.dto.ChannelDTO; +import org.openhab.core.thing.dto.ChannelDTOMapper; +import org.openhab.core.thing.dto.StrippedThingTypeDTO; +import org.openhab.core.thing.dto.ThingDTO; +import org.openhab.core.thing.dto.ThingDTOMapper; +import org.openhab.core.thing.firmware.FirmwareRegistry; +import org.openhab.core.thing.firmware.FirmwareStatusInfo; +import org.openhab.core.thing.firmware.FirmwareUpdateService; +import org.openhab.core.thing.firmware.dto.FirmwareDTO; +import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO; +import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService; +import org.openhab.core.thing.link.ItemChannelLinkRegistry; +import org.openhab.core.thing.link.ManagedItemChannelLinkProvider; +import org.openhab.core.thing.type.BridgeType; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeRegistry; +import org.openhab.core.thing.type.ChannelTypeUID; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeRegistry; +import org.openhab.core.thing.util.ThingHelper; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; +import org.openhab.core.io.rest.core.thing.EnrichedThingDTO; +import org.openhab.core.io.rest.core.thing.EnrichedThingDTOMapper; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java index db90b99b6..c5a50819d 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.thing; +package org.openhab.core.io.rest.core.internal.thing; import java.util.ArrayList; import java.util.List; @@ -27,31 +27,31 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.dto.ChannelDefinitionDTO; -import org.eclipse.smarthome.core.thing.dto.ChannelGroupDefinitionDTO; -import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTO; -import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTOMapper; -import org.eclipse.smarthome.core.thing.dto.ThingTypeDTO; -import org.eclipse.smarthome.core.thing.type.BridgeType; -import org.eclipse.smarthome.core.thing.type.ChannelDefinition; -import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition; -import org.eclipse.smarthome.core.thing.type.ChannelGroupType; -import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ChannelType; -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ThingType; -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.Stream2JSONInputStream; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.config.core.dto.ConfigDescriptionDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO; +import org.openhab.core.auth.Role; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.dto.ChannelDefinitionDTO; +import org.openhab.core.thing.dto.ChannelGroupDefinitionDTO; +import org.openhab.core.thing.dto.StrippedThingTypeDTO; +import org.openhab.core.thing.dto.StrippedThingTypeDTOMapper; +import org.openhab.core.thing.dto.ThingTypeDTO; +import org.openhab.core.thing.type.BridgeType; +import org.openhab.core.thing.type.ChannelDefinition; +import org.openhab.core.thing.type.ChannelGroupDefinition; +import org.openhab.core.thing.type.ChannelGroupType; +import org.openhab.core.thing.type.ChannelGroupTypeRegistry; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeRegistry; +import org.openhab.core.thing.type.ThingType; +import org.openhab.core.thing.type.ThingTypeRegistry; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.Stream2JSONInputStream; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java index 950cf1121..9f46d6db3 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.item; +package org.openhab.core.io.rest.core.item; -import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO; -import org.eclipse.smarthome.core.items.dto.GroupItemDTO; -import org.eclipse.smarthome.core.items.dto.ItemDTO; -import org.eclipse.smarthome.core.types.StateDescription; +import org.openhab.core.items.dto.GroupFunctionDTO; +import org.openhab.core.items.dto.GroupItemDTO; +import org.openhab.core.items.dto.ItemDTO; +import org.openhab.core.types.StateDescription; /** * This is an enriched data transfer object that is used to serialize group items. diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java index 0b067fbc0..47512d571 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.item; +package org.openhab.core.io.rest.core.item; import java.util.Map; -import org.eclipse.smarthome.core.items.dto.ItemDTO; -import org.eclipse.smarthome.core.types.CommandDescription; -import org.eclipse.smarthome.core.types.StateDescription; +import org.openhab.core.items.dto.ItemDTO; +import org.openhab.core.types.CommandDescription; +import org.openhab.core.types.StateDescription; /** * This is an enriched data transfer object that is used to serialize items with dynamic data like the state, the state diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java index 0fb2d59ac..c3b09ef64 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.item; +package org.openhab.core.io.rest.core.item; import java.net.URI; import java.util.Collection; @@ -20,16 +20,16 @@ import java.util.function.Predicate; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.dto.ItemDTO; -import org.eclipse.smarthome.core.items.dto.ItemDTOMapper; -import org.eclipse.smarthome.core.transform.TransformationException; -import org.eclipse.smarthome.core.transform.TransformationHelper; -import org.eclipse.smarthome.core.types.StateDescription; -import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder; -import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator; -import org.eclipse.smarthome.io.rest.core.internal.item.ItemResource; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.dto.ItemDTO; +import org.openhab.core.items.dto.ItemDTOMapper; +import org.openhab.core.transform.TransformationException; +import org.openhab.core.transform.TransformationHelper; +import org.openhab.core.types.StateDescription; +import org.openhab.core.types.StateDescriptionFragmentBuilder; +import org.openhab.core.io.rest.core.internal.RESTCoreActivator; +import org.openhab.core.io.rest.core.internal.item.ItemResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java index 6e5bb62a2..ad11f8d3c 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.persistence; +package org.openhab.core.io.rest.core.persistence; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO; +import org.openhab.core.persistence.dto.ItemHistoryDTO; /** * This is a java bean that is used to serialize item lists. diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java index fd9b9333b..e1f006237 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.service; +package org.openhab.core.io.rest.core.service; /** * {@link ConfigurableServiceDTO} is a data transfer object for configurable services. diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java index d032b7bd6..3d7de6999 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.thing; +package org.openhab.core.io.rest.core.thing; import java.util.HashSet; import java.util.Set; -import org.eclipse.smarthome.core.thing.dto.ChannelDTO; +import org.openhab.core.thing.dto.ChannelDTO; /** * This is a data transfer object that is used to serialize channels with dynamic data like linked items. diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java index 3fc098870..2f58a32f4 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.thing; +package org.openhab.core.io.rest.core.thing; import java.util.List; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.dto.ChannelDTO; -import org.eclipse.smarthome.core.thing.dto.ThingDTO; -import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.dto.ChannelDTO; +import org.openhab.core.thing.dto.ThingDTO; +import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO; /** * This is a data transfer object that is used to serialize things with dynamic data like the status. diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java index 16c336488..ba03f69ee 100644 --- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java +++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.thing; +package org.openhab.core.io.rest.core.thing; import java.util.ArrayList; import java.util.Collections; @@ -18,12 +18,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.dto.ChannelDTO; -import org.eclipse.smarthome.core.thing.dto.ThingDTO; -import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper; -import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.dto.ChannelDTO; +import org.openhab.core.thing.dto.ThingDTO; +import org.openhab.core.thing.dto.ThingDTOMapper; +import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO; /** * The {@link EnrichedThingDTOMapper} is an utility class to map things into enriched thing data transfer objects diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java index 3d6cd2a65..c9bcbca4d 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.config; +package org.openhab.core.io.rest.core.config; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -19,12 +19,12 @@ import static org.junit.Assert.assertThat; import java.net.URI; import java.util.Arrays; -import org.eclipse.smarthome.config.core.ConfigDescription; -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.dto.ConfigDescriptionDTO; -import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO; +import org.openhab.core.config.core.ConfigDescription; +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.dto.ConfigDescriptionDTO; +import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO; import org.junit.Test; /** diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java index a6dc8dc83..d36d6081e 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.channel; +package org.openhab.core.io.rest.core.internal.channel; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -26,14 +26,14 @@ import java.util.Set; import javax.ws.rs.core.Response; -import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry; -import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID; -import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType; -import org.eclipse.smarthome.core.thing.type.ChannelKind; -import org.eclipse.smarthome.core.thing.type.ChannelType; -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry; -import org.eclipse.smarthome.core.thing.type.ChannelTypeUID; -import org.eclipse.smarthome.io.rest.LocaleServiceImpl; +import org.openhab.core.thing.profiles.ProfileTypeRegistry; +import org.openhab.core.thing.profiles.ProfileTypeUID; +import org.openhab.core.thing.profiles.TriggerProfileType; +import org.openhab.core.thing.type.ChannelKind; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeRegistry; +import org.openhab.core.thing.type.ChannelTypeUID; +import org.openhab.core.io.rest.LocaleServiceImpl; import org.hamcrest.core.IsCollectionContaining; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java index d803d6545..c47bc9432 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.internal.item; +package org.openhab.core.io.rest.core.internal.item; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -26,10 +26,10 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.eclipse.smarthome.config.core.ConfigDescription; -import org.eclipse.smarthome.config.core.ConfigDescriptionBuilder; -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.core.items.MetadataRegistry; +import org.openhab.core.config.core.ConfigDescription; +import org.openhab.core.config.core.ConfigDescriptionBuilder; +import org.openhab.core.config.core.ConfigDescriptionRegistry; +import org.openhab.core.items.MetadataRegistry; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java index 23d101a78..5a3e5d65d 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.item; +package org.openhab.core.io.rest.core.item; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.net.URI; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupItem; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.test.java.JavaTest; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java index ad3b21083..9b33818ad 100644 --- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java +++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.core.thing; +package org.openhab.core.io.rest.core.thing; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -26,15 +26,15 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.thing.Channel; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder; -import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.builder.ChannelBuilder; +import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO; import org.hamcrest.CoreMatchers; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java index 5ea0046c5..5dd443c4f 100644 --- a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java +++ b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.log.internal; +package org.openhab.core.io.rest.log.internal; /** * The {@link LogConstants} class defines common constants, which are diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java index eae9db080..336b98d18 100644 --- a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java +++ b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.log.internal; +package org.openhab.core.io.rest.log.internal; import java.net.URL; import java.util.ArrayList; @@ -32,7 +32,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java index e9b5ed689..0b17d92dd 100644 --- a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java +++ b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.mdns.internal; +package org.openhab.core.io.rest.mdns.internal; import java.util.Hashtable; import java.util.Map; -import org.eclipse.smarthome.core.net.HttpServiceUtil; -import org.eclipse.smarthome.io.rest.RESTConstants; -import org.eclipse.smarthome.io.transport.mdns.MDNSService; -import org.eclipse.smarthome.io.transport.mdns.ServiceDescription; +import org.openhab.core.net.HttpServiceUtil; +import org.openhab.core.io.rest.RESTConstants; +import org.openhab.core.io.transport.mdns.MDNSService; +import org.openhab.core.io.transport.mdns.ServiceDescription; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; @@ -34,8 +34,8 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Kai Kreuzer - Initial contribution * @author Markus Rathgeb - Use HTTP service utility functions */ -@Component(immediate = true, configurationPid = "org.eclipse.smarthome.mdns", property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.mdns" // +@Component(immediate = true, configurationPid = "org.openhab.core.mdns", property = { + Constants.SERVICE_PID + "=org.openhab.core.mdns" // }) public class MDNSAnnouncer { diff --git a/bundles/org.openhab.core.io.rest.optimize/bnd.bnd b/bundles/org.openhab.core.io.rest.optimize/bnd.bnd index ab247a0d3..6680184b5 100644 --- a/bundles/org.openhab.core.io.rest.optimize/bnd.bnd +++ b/bundles/org.openhab.core.io.rest.optimize/bnd.bnd @@ -1,2 +1,2 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.io.rest.optimize.internal.Activator \ No newline at end of file +Bundle-Activator: org.openhab.core.io.rest.optimize.internal.Activator \ No newline at end of file diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java index 883bc47ec..549a17e32 100644 --- a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java +++ b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.optimize.internal; +package org.openhab.core.io.rest.optimize.internal; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java index b35173f82..490cdbec1 100644 --- a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java +++ b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.optimize.internal; +package org.openhab.core.io.rest.optimize.internal; import static com.eclipsesource.jaxrs.publisher.ServiceProperties.PUBLISH; @@ -36,7 +36,7 @@ import com.eclipsesource.jaxrs.publisher.ResourceFilter; /** * Provides a filter for all classes/interfaces which are relevant in the context of JAX-RS. * - * By default, this filter will allow every service outside of the org.eclipse.smarthome.**-Namespace to be parsed by + * By default, this filter will allow every service outside of the org.openhab.core.**-Namespace to be parsed by * the JAXR-RS implementation. To further optimize this, install a fragment which adds a "/res/whitelist.txt" file, * containing one service interface or class per line like in the following example: * @@ -65,11 +65,11 @@ public class ResourceFilterImpl implements ResourceFilter { // JAX-RS "javax.ws.rs.ext.MessageBodyReader", "javax.ws.rs.ext.MessageBodyWriter", // openHAB - "org.eclipse.smarthome.io.rest.internal.filter.ProxyFilter", - "org.eclipse.smarthome.io.rest.internal.resources.RootResource", - "org.eclipse.smarthome.io.rest.JSONResponse$ExceptionMapper", "org.eclipse.smarthome.io.rest.RESTResource", - "org.eclipse.smarthome.io.rest.sse.internal.async.BlockingAsyncFeature", - "org.eclipse.smarthome.io.rest.sse.SseResource", + "org.openhab.core.io.rest.internal.filter.ProxyFilter", + "org.openhab.core.io.rest.internal.resources.RootResource", + "org.openhab.core.io.rest.JSONResponse$ExceptionMapper", "org.openhab.core.io.rest.RESTResource", + "org.openhab.core.io.rest.sse.internal.async.BlockingAsyncFeature", + "org.openhab.core.io.rest.sse.SseResource", // SSE "org.glassfish.jersey.media.sse.SseFeature", "org.glassfish.jersey.server.monitoring.ApplicationEventListener" }; @@ -97,7 +97,7 @@ public class ResourceFilterImpl implements ResourceFilter { List whitelist = loadWhitelistExtension(); if (whitelist == null) { logger.debug("No /res/whitelist.txt file found - scanning all unknown services"); - builder.append("(!(" + Constants.OBJECTCLASS + "=org.eclipse.smarthome.*))"); + builder.append("(!(" + Constants.OBJECTCLASS + "=org.openhab.core.*))"); } else { logger.debug("Whitelist /res/whitelist.txt file found - restricting scanning of services"); whitelist.forEach(entry -> { diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java index e69446fe8..d0541a313 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap; +package org.openhab.core.io.rest.sitemap; import java.util.ArrayList; import java.util.Collections; @@ -26,21 +26,21 @@ import org.apache.commons.lang.StringUtils; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.annotation.Nullable; -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.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.events.ItemStatePredictedEvent; -import org.eclipse.smarthome.io.rest.sitemap.internal.PageChangeListener; -import org.eclipse.smarthome.io.rest.sitemap.internal.SitemapEvent; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.sitemap.Widget; -import org.eclipse.smarthome.ui.items.ItemUIRegistry; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventFilter; +import org.openhab.core.events.EventSubscriber; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.events.ItemStatePredictedEvent; +import org.openhab.core.io.rest.sitemap.internal.PageChangeListener; +import org.openhab.core.io.rest.sitemap.internal.SitemapEvent; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.sitemap.SitemapProvider; +import org.openhab.core.model.sitemap.sitemap.LinkableWidget; +import org.openhab.core.model.sitemap.sitemap.Sitemap; +import org.openhab.core.model.sitemap.sitemap.Widget; +import org.openhab.core.ui.items.ItemUIRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - Initial contribution */ @Component(service = { SitemapSubscriptionService.class, - EventSubscriber.class }, configurationPid = "org.eclipse.smarthome.sitemapsubscription") + EventSubscriber.class }, configurationPid = "org.openhab.core.sitemapsubscription") public class SitemapSubscriptionService implements ModelRepositoryChangeListener, EventSubscriber { private static final String SITEMAP_PAGE_SEPARATOR = "#"; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java index 470e7f9ca..4b9ea3ad0 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; /** * This is a data transfer object that is used to serialize command mappings. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java index 449def450..ed7625d6a 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import java.util.ArrayList; import java.util.Collections; @@ -22,22 +22,22 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import org.eclipse.emf.common.util.EList; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.items.GenericItem; -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.StateChangeListener; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; -import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; -import org.eclipse.smarthome.model.sitemap.sitemap.Chart; -import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.sitemap.Frame; -import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.sitemap.Widget; -import org.eclipse.smarthome.ui.items.ItemUIRegistry; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.StateChangeListener; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.types.State; +import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper; +import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; +import org.openhab.core.model.sitemap.sitemap.Chart; +import org.openhab.core.model.sitemap.sitemap.ColorArray; +import org.openhab.core.model.sitemap.sitemap.Frame; +import org.openhab.core.model.sitemap.sitemap.VisibilityRule; +import org.openhab.core.model.sitemap.sitemap.Widget; +import org.openhab.core.ui.items.ItemUIRegistry; /** * This is a class that listens on item state change events and creates sitemap events for a dedicated sitemap page. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java index dc4ba6c4b..ac1d358ad 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java index 70359524b..71780891d 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; /** * Event to notify the browser that the sitemap has been changed diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java index d56da4c17..3601eaca1 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; /** * Event to notify the browser that the sitemap has been changed diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java index 1d2c3de22..95c2b89fa 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; /** * This is a data transfer object that is used to serialize sitemaps. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java index 210fc9b7e..0ec2fcdda 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; /** * A general sitemap event, meant to be sub-classed. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java index c8c0768ec..342461cab 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import java.io.IOException; -import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService; +import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService; import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.OutboundEvent; import org.slf4j.Logger; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java index fcb4ed2c3..cbe8a6981 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import java.net.URI; import java.util.ArrayList; @@ -48,39 +48,39 @@ import javax.ws.rs.core.UriInfo; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.items.StateChangeListener; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper; -import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService; -import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; -import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.sitemap.Chart; -import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.sitemap.Frame; -import org.eclipse.smarthome.model.sitemap.sitemap.Image; -import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget; -import org.eclipse.smarthome.model.sitemap.sitemap.List; -import org.eclipse.smarthome.model.sitemap.sitemap.Mapping; -import org.eclipse.smarthome.model.sitemap.sitemap.Mapview; -import org.eclipse.smarthome.model.sitemap.sitemap.Selection; -import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint; -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.sitemap.Slider; -import org.eclipse.smarthome.model.sitemap.sitemap.Switch; -import org.eclipse.smarthome.model.sitemap.sitemap.Video; -import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.sitemap.Webview; -import org.eclipse.smarthome.model.sitemap.sitemap.Widget; -import org.eclipse.smarthome.ui.items.ItemUIRegistry; +import org.openhab.core.auth.Role; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.StateChangeListener; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.types.State; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper; +import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService; +import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback; +import org.openhab.core.model.sitemap.SitemapProvider; +import org.openhab.core.model.sitemap.sitemap.Chart; +import org.openhab.core.model.sitemap.sitemap.ColorArray; +import org.openhab.core.model.sitemap.sitemap.Frame; +import org.openhab.core.model.sitemap.sitemap.Image; +import org.openhab.core.model.sitemap.sitemap.LinkableWidget; +import org.openhab.core.model.sitemap.sitemap.List; +import org.openhab.core.model.sitemap.sitemap.Mapping; +import org.openhab.core.model.sitemap.sitemap.Mapview; +import org.openhab.core.model.sitemap.sitemap.Selection; +import org.openhab.core.model.sitemap.sitemap.Setpoint; +import org.openhab.core.model.sitemap.sitemap.Sitemap; +import org.openhab.core.model.sitemap.sitemap.Slider; +import org.openhab.core.model.sitemap.sitemap.Switch; +import org.openhab.core.model.sitemap.sitemap.Video; +import org.openhab.core.model.sitemap.sitemap.VisibilityRule; +import org.openhab.core.model.sitemap.sitemap.Webview; +import org.openhab.core.model.sitemap.sitemap.Widget; +import org.openhab.core.ui.items.ItemUIRegistry; import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.OutboundEvent; import org.glassfish.jersey.media.sse.SseBroadcaster; diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java index cddf47e0c..28dd1d529 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO; +import org.openhab.core.io.rest.core.item.EnrichedItemDTO; /** * A sitemap event, which provides details about a widget that has changed. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java index e224fb0aa..f0ae885f9 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO; +import org.openhab.core.io.rest.core.item.EnrichedItemDTO; /** * This is a data transfer object that is used to serialize widgets. diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java index 734b49100..be00db2c6 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java +++ b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sitemap.internal; +package org.openhab.core.io.rest.sitemap.internal; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -34,21 +34,21 @@ import javax.ws.rs.core.UriInfo; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.ItemNotFoundException; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.library.types.OnOffType; -import org.eclipse.smarthome.core.library.types.PercentType; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.model.sitemap.SitemapProvider; -import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray; -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule; -import org.eclipse.smarthome.model.sitemap.sitemap.Widget; -import org.eclipse.smarthome.test.java.JavaTest; -import org.eclipse.smarthome.ui.items.ItemUIRegistry; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.model.sitemap.SitemapProvider; +import org.openhab.core.model.sitemap.sitemap.ColorArray; +import org.openhab.core.model.sitemap.sitemap.Sitemap; +import org.openhab.core.model.sitemap.sitemap.VisibilityRule; +import org.openhab.core.model.sitemap.sitemap.Widget; +import org.openhab.core.test.java.JavaTest; +import org.openhab.core.ui.items.ItemUIRegistry; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -311,7 +311,7 @@ public class SitemapResourceTest extends JavaTest { Widget w1 = mock(Widget.class); EClass sliderEClass = mock(EClass.class); when(sliderEClass.getName()).thenReturn("slider"); - when(sliderEClass.getInstanceTypeName()).thenReturn("org.eclipse.smarthome.model.sitemap.Slider"); + when(sliderEClass.getInstanceTypeName()).thenReturn("org.openhab.core.model.sitemap.Slider"); when(w1.eClass()).thenReturn(sliderEClass); when(w1.getLabel()).thenReturn(WIDGET1_LABEL); when(w1.getItem()).thenReturn(ITEM_NAME); @@ -344,7 +344,7 @@ public class SitemapResourceTest extends JavaTest { Widget w2 = mock(Widget.class); EClass switchEClass = mock(EClass.class); when(switchEClass.getName()).thenReturn("switch"); - when(switchEClass.getInstanceTypeName()).thenReturn("org.eclipse.smarthome.model.sitemap.Switch"); + when(switchEClass.getInstanceTypeName()).thenReturn("org.openhab.core.model.sitemap.Switch"); when(w2.eClass()).thenReturn(switchEClass); when(w2.getLabel()).thenReturn(WIDGET2_LABEL); when(w2.getItem()).thenReturn(ITEM_NAME); diff --git a/bundles/org.openhab.core.io.rest.sse/bnd.bnd b/bundles/org.openhab.core.io.rest.sse/bnd.bnd index 808a62403..298cb78b2 100644 --- a/bundles/org.openhab.core.io.rest.sse/bnd.bnd +++ b/bundles/org.openhab.core.io.rest.sse/bnd.bnd @@ -1,2 +1,2 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.io.rest.sse.internal.SseActivator \ No newline at end of file +Bundle-Activator: org.openhab.core.io.rest.sse.internal.SseActivator \ No newline at end of file diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java index 0979c4a33..aaa379be5 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse; +package org.openhab.core.io.rest.sse; import java.io.IOException; import java.util.concurrent.ExecutorService; @@ -30,10 +30,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.io.rest.sse.internal.SseEventOutput; -import org.eclipse.smarthome.io.rest.sse.internal.util.SseUtil; +import org.openhab.core.auth.Role; +import org.openhab.core.events.Event; +import org.openhab.core.io.rest.sse.internal.SseEventOutput; +import org.openhab.core.io.rest.sse.internal.util.SseUtil; import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.SseBroadcaster; import org.glassfish.jersey.media.sse.SseFeature; diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java index 55cea4bbb..67fe84d31 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.beans; +package org.openhab.core.io.rest.sse.beans; /** * Event bean for broadcasted events. diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java index 8bd8ed024..99107ebe3 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.internal; +package org.openhab.core.io.rest.sse.internal; import javax.ws.rs.ext.RuntimeDelegate; diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java index 6aac70d86..9a43ce2dd 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.internal; +package org.openhab.core.io.rest.sse.internal; import java.io.IOException; import java.util.List; -import org.eclipse.smarthome.io.rest.sse.beans.EventBean; -import org.eclipse.smarthome.io.rest.sse.internal.util.SseUtil; +import org.openhab.core.io.rest.sse.beans.EventBean; +import org.openhab.core.io.rest.sse.internal.util.SseUtil; import org.glassfish.jersey.media.sse.EventOutput; import org.glassfish.jersey.media.sse.OutboundEvent; diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java index 8e3608c87..916e55c71 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.internal.listeners; +package org.openhab.core.io.rest.sse.internal.listeners; import java.util.Collections; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -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.io.rest.sse.SseResource; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventFilter; +import org.openhab.core.events.EventSubscriber; +import org.openhab.core.io.rest.sse.SseResource; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java index 0e758df1e..b47222c2e 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.internal.util; +package org.openhab.core.io.rest.sse.internal.util; import java.util.ArrayList; import java.util.List; @@ -19,8 +19,8 @@ import java.util.StringTokenizer; import javax.ws.rs.core.MediaType; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.io.rest.sse.beans.EventBean; +import org.openhab.core.events.Event; +import org.openhab.core.io.rest.sse.beans.EventBean; import org.glassfish.jersey.media.sse.OutboundEvent; /** diff --git a/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java b/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java index add90b632..ead02bc80 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java +++ b/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.sse.internal.util; +package org.openhab.core.io.rest.sse.internal.util; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java index 5e7fed45c..94cfa6e3d 100644 --- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java +++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.voice.internal; +package org.openhab.core.io.rest.voice.internal; import java.util.HashSet; import java.util.Locale; import java.util.Set; -import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter; +import org.openhab.core.voice.text.HumanLanguageInterpreter; /** * Mapper class that maps {@link HumanLanguageInterpreter} instanced to their respective DTOs. diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java index 02a563922..c8c2e9dfa 100644 --- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java +++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.voice.internal; +package org.openhab.core.io.rest.voice.internal; import java.util.Set; -import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter; +import org.openhab.core.voice.text.HumanLanguageInterpreter; /** * A DTO that is used on the REST API to provide infos about {@link HumanLanguageInterpreter} to UIs. diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java index bc8424cb9..bf2fff99e 100644 --- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java +++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.voice.internal; +package org.openhab.core.io.rest.voice.internal; -import org.eclipse.smarthome.core.voice.Voice; +import org.openhab.core.voice.Voice; /** * A DTO that is used on the REST API to provide infos about {@link Voice} to UIs. diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java index c53cf893a..6e25fc56f 100644 --- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java +++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.voice.internal; +package org.openhab.core.io.rest.voice.internal; -import org.eclipse.smarthome.core.voice.Voice; +import org.openhab.core.voice.Voice; /** * Mapper class that maps {@link Voice} instanced to their respective DTOs. diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java index fa876c710..dab0a96e2 100644 --- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java +++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.voice.internal; +package org.openhab.core.io.rest.voice.internal; import java.util.ArrayList; import java.util.Collection; @@ -33,14 +33,14 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.core.auth.Role; -import org.eclipse.smarthome.core.voice.Voice; -import org.eclipse.smarthome.core.voice.VoiceManager; -import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter; -import org.eclipse.smarthome.core.voice.text.InterpretationException; -import org.eclipse.smarthome.io.rest.JSONResponse; -import org.eclipse.smarthome.io.rest.LocaleService; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.auth.Role; +import org.openhab.core.voice.Voice; +import org.openhab.core.voice.VoiceManager; +import org.openhab.core.voice.text.HumanLanguageInterpreter; +import org.openhab.core.voice.text.InterpretationException; +import org.openhab.core.io.rest.JSONResponse; +import org.openhab.core.io.rest.LocaleService; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java index a1904dfe6..ab053d611 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import java.util.stream.Stream; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java index bd3c40421..e1ba57274 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import java.io.BufferedWriter; import java.io.IOException; @@ -25,7 +25,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.ext.Provider; -import org.eclipse.smarthome.core.library.types.DateTimeType; +import org.openhab.core.library.types.DateTimeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java index 57e50c4b6..323dae018 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import java.util.Locale; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java index e610ee7e3..25eb8df42 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.i18n.LocaleProvider; +import org.openhab.core.i18n.LocaleProvider; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferencePolicy; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java index 0d8585ce7..2778798be 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; /** * Public constants for the REST API diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java index 624f0b5ac..629d30ed9 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; /** * This is a marker interface for REST resource implementations diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java index 8d9599066..78ac82b69 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import java.io.IOException; import java.io.InputStream; @@ -18,7 +18,7 @@ import java.util.Iterator; import java.util.stream.Stream; import org.apache.commons.io.IOUtils; -import org.eclipse.smarthome.core.library.types.DateTimeType; +import org.openhab.core.library.types.DateTimeType; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java index 11510d38f..c6e07602e 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal; +package org.openhab.core.io.rest.internal; /** * Utility class for constants. diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java index 76a76e4f8..12d2fa842 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal; +package org.openhab.core.io.rest.internal; import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.io.rest.DTOMapper; +import org.openhab.core.io.rest.DTOMapper; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java index 3b590c3ec..c0d55587a 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; import java.io.IOException; import java.util.Arrays; @@ -26,7 +26,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.io.rest.internal.Constants; +import org.openhab.core.io.rest.internal.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.ConfigurationPolicy; @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; */ @Provider @Component(immediate = true, property = { - "service.pid=org.eclipse.smarthome.cors" }, configurationPid = "org.eclipse.smarthome.cors", configurationPolicy = ConfigurationPolicy.REQUIRE) + "service.pid=org.openhab.core.cors" }, configurationPid = "org.openhab.core.cors", configurationPolicy = ConfigurationPolicy.REQUIRE) public class CorsFilter implements ContainerResponseFilter { static final String HTTP_HEAD_METHOD = "HEAD"; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java index 05fad971e..7b81dd6ef 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; import java.io.IOException; import java.net.URI; @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; */ @Provider @PreMatching -@Component(configurationPid = "org.eclipse.smarthome.io.rest.proxyfilter", immediate = true, service = ProxyFilter.class) +@Component(configurationPid = "org.openhab.core.io.rest.proxyfilter", immediate = true, service = ProxyFilter.class) public class ProxyFilter implements ContainerRequestFilter { static final String PROTO_PROXY_HEADER = "x-forwarded-proto"; diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java index f19c10a21..26bad928c 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; import java.io.IOException; import java.util.List; @@ -22,7 +22,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.Provider; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.io.rest.RESTResource; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java index 224e0e4e4..1ffdf8197 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.resources; +package org.openhab.core.io.rest.internal.resources; import java.io.IOException; import java.util.ArrayList; @@ -27,10 +27,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.io.rest.RESTConstants; -import org.eclipse.smarthome.io.rest.RESTResource; -import org.eclipse.smarthome.io.rest.internal.Constants; -import org.eclipse.smarthome.io.rest.internal.resources.beans.RootBean; +import org.openhab.core.io.rest.RESTConstants; +import org.openhab.core.io.rest.RESTResource; +import org.openhab.core.io.rest.internal.Constants; +import org.openhab.core.io.rest.internal.resources.beans.RootBean; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.annotations.Activate; @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - Initial contribution */ @Path("/") -@Component(service = RootResource.class, configurationPid = "org.eclipse.smarthome.io.rest.root") +@Component(service = RootResource.class, configurationPid = "org.openhab.core.io.rest.root") public class RootResource { private final transient Logger logger = LoggerFactory.getLogger(RootResource.class); diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java index cea76cd1b..8373a740b 100644 --- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java +++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.resources.beans; +package org.openhab.core.io.rest.internal.resources.beans; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java index be348f5fe..9d3b68774 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith; diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java index dbb163a22..63b9f8154 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest; +package org.openhab.core.io.rest; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java index 20e4d3607..054a6da33 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; import static java.util.Collections.*; import static java.util.stream.Collectors.toList; -import static org.eclipse.smarthome.io.rest.internal.filter.CorsFilter.*; +import static org.openhab.core.io.rest.internal.filter.CorsFilter.*; import static org.junit.Assert.*; import static org.mockito.Mockito.when; diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java index fced933c8..0eebd4d94 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; -import static org.eclipse.smarthome.io.rest.internal.filter.ProxyFilter.*; +import static org.openhab.core.io.rest.internal.filter.ProxyFilter.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java index 8f9379d16..ab857177a 100644 --- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java +++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.rest.internal.filter; +package org.openhab.core.io.rest.internal.filter; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; -import org.eclipse.smarthome.io.rest.RESTResource; +import org.openhab.core.io.rest.RESTResource; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/bundles/org.openhab.core.io.transport.mdns/bnd.bnd b/bundles/org.openhab.core.io.transport.mdns/bnd.bnd index 9997614a2..71cf89cd2 100644 --- a/bundles/org.openhab.core.io.transport.mdns/bnd.bnd +++ b/bundles/org.openhab.core.io.transport.mdns/bnd.bnd @@ -1,2 +1,2 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.io.transport.mdns.internal.MDNSActivator \ No newline at end of file +Bundle-Activator: org.openhab.core.io.transport.mdns.internal.MDNSActivator \ No newline at end of file diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java index 4db206f0b..3cc79c164 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns; +package org.openhab.core.io.transport.mdns; import java.io.IOException; import java.time.Duration; diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java index cabf4a64d..578c976fb 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns; +package org.openhab.core.io.transport.mdns; /** * This interface defines how to use JmDNS based service discovery diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java index 3ceda8171..9c9ee2fab 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns; +package org.openhab.core.io.transport.mdns; import java.util.Hashtable; diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java index 5d370828e..bbf6c0137 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns.discovery; +package org.openhab.core.io.transport.mdns.discovery; import java.util.Set; import javax.jmdns.ServiceInfo; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; /** * A {@link MDNSDiscoveryParticipant} that is registered as a service is picked up by the MDNSDiscoveryService @@ -26,7 +26,7 @@ import org.eclipse.smarthome.core.thing.ThingUID; * mDNS scans. * * @author Tobias Bräutigam - Initial contribution - * @deprecated use org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant instead. + * @deprecated use org.openhab.core.config.discovery.mdns.MDNSDiscoveryParticipant instead. */ @Deprecated public interface MDNSDiscoveryParticipant { diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java index 6c8a5447b..0cb1c323c 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns.internal; +package org.openhab.core.io.transport.mdns.internal; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java index 2e9f162ef..4d8092365 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns.internal; +package org.openhab.core.io.transport.mdns.internal; import java.io.IOException; import java.net.Inet4Address; @@ -30,11 +30,11 @@ import javax.jmdns.JmDNS; import javax.jmdns.ServiceInfo; import javax.jmdns.ServiceListener; -import org.eclipse.smarthome.core.net.CidrAddress; -import org.eclipse.smarthome.core.net.NetworkAddressChangeListener; -import org.eclipse.smarthome.core.net.NetworkAddressService; -import org.eclipse.smarthome.io.transport.mdns.MDNSClient; -import org.eclipse.smarthome.io.transport.mdns.ServiceDescription; +import org.openhab.core.net.CidrAddress; +import org.openhab.core.net.NetworkAddressChangeListener; +import org.openhab.core.net.NetworkAddressService; +import org.openhab.core.io.transport.mdns.MDNSClient; +import org.openhab.core.io.transport.mdns.ServiceDescription; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java index 3c5ebb72f..6fb74dae8 100644 --- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java +++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mdns.internal; +package org.openhab.core.io.transport.mdns.internal; import java.io.IOException; import java.util.Set; @@ -18,9 +18,9 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Executors; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mdns.MDNSClient; -import org.eclipse.smarthome.io.transport.mdns.MDNSService; -import org.eclipse.smarthome.io.transport.mdns.ServiceDescription; +import org.openhab.core.io.transport.mdns.MDNSClient; +import org.openhab.core.io.transport.mdns.MDNSService; +import org.openhab.core.io.transport.mdns.ServiceDescription; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java index 860b25e40..54067ce25 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java index 92aad903a..419c98526 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import java.nio.file.Path; import java.util.ArrayList; @@ -26,16 +26,16 @@ import javax.net.ssl.TrustManagerFactory; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback; -import org.eclipse.smarthome.io.transport.mqtt.internal.TopicSubscribers; -import org.eclipse.smarthome.io.transport.mqtt.internal.client.Mqtt3AsyncClientWrapper; -import org.eclipse.smarthome.io.transport.mqtt.internal.client.Mqtt5AsyncClientWrapper; -import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; -import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy; -import org.eclipse.smarthome.io.transport.mqtt.reconnect.PeriodicReconnectStrategy; -import org.eclipse.smarthome.io.transport.mqtt.ssl.CustomTrustManagerFactory; -import org.eclipse.smarthome.io.transport.mqtt.sslcontext.CustomSSLContextProvider; -import org.eclipse.smarthome.io.transport.mqtt.sslcontext.SSLContextProvider; +import org.openhab.core.io.transport.mqtt.internal.ClientCallback; +import org.openhab.core.io.transport.mqtt.internal.TopicSubscribers; +import org.openhab.core.io.transport.mqtt.internal.client.Mqtt3AsyncClientWrapper; +import org.openhab.core.io.transport.mqtt.internal.client.Mqtt5AsyncClientWrapper; +import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; +import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy; +import org.openhab.core.io.transport.mqtt.reconnect.PeriodicReconnectStrategy; +import org.openhab.core.io.transport.mqtt.ssl.CustomTrustManagerFactory; +import org.openhab.core.io.transport.mqtt.sslcontext.CustomSSLContextProvider; +import org.openhab.core.io.transport.mqtt.sslcontext.SSLContextProvider; import org.osgi.service.cm.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java index 041a1e4e3..36466ab2d 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java index aa784961e..f7393bc80 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java index 46381479f..709bec9db 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; /** * The connection state of a {@link MqttBrokerConnection}. diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java index 850e2213a..2a7e7a1f9 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java index 5bca8443b..54e55216a 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java index fe87073d3..a1d302c87 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.internal.MqttBrokerConnectionServiceInstance; +import org.openhab.core.io.transport.mqtt.internal.MqttBrokerConnectionServiceInstance; /** * This service allows you to enumerate system-wide configured Mqtt broker connections. You do not need this service diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java index 56aa87e13..0126877a1 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java index 2ba3dfec1..43867c0ba 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import java.nio.charset.StandardCharsets; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java index ebef68611..61a812320 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import java.util.ArrayList; import java.util.List; @@ -18,12 +18,12 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; -import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionObserver; -import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionState; -import org.eclipse.smarthome.io.transport.mqtt.MqttException; -import org.eclipse.smarthome.io.transport.mqtt.MqttMessageSubscriber; -import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttConnectionObserver; +import org.openhab.core.io.transport.mqtt.MqttConnectionState; +import org.openhab.core.io.transport.mqtt.MqttException; +import org.openhab.core.io.transport.mqtt.MqttMessageSubscriber; +import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java index ccd1bef37..764ce3bf4 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import java.util.Map; import org.apache.commons.lang.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionConfig; -import org.eclipse.smarthome.io.transport.mqtt.MqttException; -import org.eclipse.smarthome.io.transport.mqtt.MqttService; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionConfig; +import org.openhab.core.io.transport.mqtt.MqttException; +import org.openhab.core.io.transport.mqtt.MqttService; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * * @author David Graeff - Initial contribution */ -@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.eclipse.smarthome.mqttbroker") +@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.openhab.core.mqttbroker") @NonNullByDefault public class MqttBrokerConnectionServiceInstance { private final Logger logger = LoggerFactory.getLogger(MqttBrokerConnectionServiceInstance.class); diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java index 6a049d073..85414eea8 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.core.ConfigurableService; +import org.openhab.core.config.core.ConfigurableService; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; @@ -24,7 +24,7 @@ import org.osgi.service.component.annotations.Component; * @author David Graeff - Initial contribution */ @Component(immediate = true, service = MqttBrokerConnectionServiceInstanceMarker.class, property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.mqttbroker", + Constants.SERVICE_PID + "=org.openhab.core.mqttbroker", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MQTT system broker connection", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=MQTT", diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java index 66ebff595..6831cc22e 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import java.util.Collections; import java.util.List; @@ -21,12 +21,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.lang.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionConfig; -import org.eclipse.smarthome.io.transport.mqtt.MqttException; -import org.eclipse.smarthome.io.transport.mqtt.MqttService; -import org.eclipse.smarthome.io.transport.mqtt.MqttServiceObserver; -import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionConfig; +import org.openhab.core.io.transport.mqtt.MqttException; +import org.openhab.core.io.transport.mqtt.MqttService; +import org.openhab.core.io.transport.mqtt.MqttServiceObserver; +import org.openhab.core.io.transport.mqtt.MqttWillAndTestament; import org.osgi.framework.Constants; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.component.annotations.Component; @@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory; * @author David Graeff - Added/Removed observer interface, Add/Remove/Enumerate broker connections. * @author Markus Rathgeb - Synchronize access to broker connections */ -@Component(immediate = true, service = MqttService.class, configurationPid = "org.eclipse.smarthome.mqtt", property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.mqtt" }) +@Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.core.mqtt", property = { + Constants.SERVICE_PID + "=org.openhab.core.mqtt" }) @NonNullByDefault public class MqttServiceImpl implements MqttService { private final Logger logger = LoggerFactory.getLogger(MqttServiceImpl.class); diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java index a770f8b93..bafcf1984 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import java.util.ArrayList; import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.transport.mqtt.MqttMessageSubscriber; +import org.openhab.core.io.transport.mqtt.MqttMessageSubscriber; /** * A list of all subscribers for a given topic. This object also stores a regex pattern for the topic, where diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java index f9e3b979c..2fc010f9a 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal.client; +package org.openhab.core.io.transport.mqtt.internal.client; import java.util.concurrent.CompletableFuture; @@ -19,10 +19,10 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.commons.lang.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.Protocol; -import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament; -import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol; +import org.openhab.core.io.transport.mqtt.MqttWillAndTestament; +import org.openhab.core.io.transport.mqtt.internal.ClientCallback; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java index f1e75b141..9d8038329 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal.client; +package org.openhab.core.io.transport.mqtt.internal.client; import java.util.concurrent.CompletableFuture; @@ -19,10 +19,10 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.commons.lang.StringUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.Protocol; -import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament; -import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol; +import org.openhab.core.io.transport.mqtt.MqttWillAndTestament; +import org.openhab.core.io.transport.mqtt.internal.ClientCallback; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java index e711d1d31..cc9b7e2d5 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal.client; +package org.openhab.core.io.transport.mqtt.internal.client; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -18,8 +18,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament; -import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback; +import org.openhab.core.io.transport.mqtt.MqttWillAndTestament; +import org.openhab.core.io.transport.mqtt.internal.ClientCallback; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.datatypes.MqttQos; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java index eef7d6362..19fbe4363 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.reconnect; +package org.openhab.core.io.transport.mqtt.reconnect; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; -import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionObserver; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttConnectionObserver; /** * Implement this class to provide a strategy for (re)establishing a lost diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java index 028a5166f..6f86cc9c5 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.reconnect; +package org.openhab.core.io.transport.mqtt.reconnect; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java index 27d732f90..8a8c53ac9 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.ssl; +package org.openhab.core.io.transport.mqtt.ssl; import java.lang.reflect.Field; import java.security.KeyStore; @@ -22,7 +22,7 @@ import javax.net.ssl.X509TrustManager; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.sslcontext.SSLContextProvider; +import org.openhab.core.io.transport.mqtt.sslcontext.SSLContextProvider; import org.osgi.service.cm.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java index 196edd911..3e9d2fc58 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.sslcontext; +package org.openhab.core.io.transport.mqtt.sslcontext; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java index 29b7973c2..1d4fbeb45 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.sslcontext; +package org.openhab.core.io.transport.mqtt.sslcontext; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java index 1f158bd7f..e60bd1086 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.sslcontext; +package org.openhab.core.io.transport.mqtt.sslcontext; import javax.net.ssl.SSLContext; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.osgi.service.cm.ConfigurationException; /** diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java index 271bf2079..5c1a78ab4 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; +import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; import com.hivemq.client.mqtt.MqttClientState; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java index 49e25238a..a2f4f38b0 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt; +package org.openhab.core.io.transport.mqtt; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -28,10 +28,10 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; -import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy; -import org.eclipse.smarthome.io.transport.mqtt.reconnect.PeriodicReconnectStrategy; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper; +import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy; +import org.openhab.core.io.transport.mqtt.reconnect.PeriodicReconnectStrategy; +import org.openhab.core.test.java.JavaTest; import org.junit.Test; import org.osgi.service.cm.ConfigurationException; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java index baa7ffc3d..08ea065b5 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection; -import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionEx; -import org.eclipse.smarthome.io.transport.mqtt.MqttService; -import org.eclipse.smarthome.io.transport.mqtt.MqttServiceObserver; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; +import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionEx; +import org.openhab.core.io.transport.mqtt.MqttService; +import org.openhab.core.io.transport.mqtt.MqttServiceObserver; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.osgi.service.cm.ConfigurationException; diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java index 0b057328f..3d59715ca 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.mqtt.internal; +package org.openhab.core.io.transport.mqtt.internal; import static org.junit.Assert.*; diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java index 77f240321..3d62db2da 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.net.URI; import java.util.Enumeration; @@ -24,10 +24,10 @@ import javax.comm.CommPortIdentifier; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.ProtocolType; -import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.SerialPortProvider; +import org.openhab.core.io.transport.serial.ProtocolType; +import org.openhab.core.io.transport.serial.ProtocolType.PathType; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.SerialPortProvider; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java index 5a4149196..9ca3dbccd 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.transport.serial.SerialPortEvent; +import org.openhab.core.io.transport.serial.SerialPortEvent; /** * Specific serial port event implementation. diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java index 0b6127711..fd2292969 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import javax.comm.CommPort; import javax.comm.CommPortIdentifier; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.PortInUseException; -import org.eclipse.smarthome.io.transport.serial.SerialPort; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.PortInUseException; +import org.openhab.core.io.transport.serial.SerialPort; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; /** * Specific serial port identifier implementation. diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java index 955a31762..8f71bdc25 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.io.IOException; import java.io.InputStream; @@ -21,9 +21,9 @@ import javax.comm.SerialPortEvent; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.SerialPort; -import org.eclipse.smarthome.io.transport.serial.SerialPortEventListener; -import org.eclipse.smarthome.io.transport.serial.UnsupportedCommOperationException; +import org.openhab.core.io.transport.serial.SerialPort; +import org.openhab.core.io.transport.serial.SerialPortEventListener; +import org.openhab.core.io.transport.serial.UnsupportedCommOperationException; /** * Specific serial port implementation. diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java index e5878c75f..fe5e87162 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.rxtx.rfc2217.internal; +package org.openhab.core.io.transport.serial.rxtx.rfc2217.internal; import java.net.URI; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.ProtocolType; -import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.SerialPortProvider; +import org.openhab.core.io.transport.serial.ProtocolType; +import org.openhab.core.io.transport.serial.ProtocolType.PathType; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.SerialPortProvider; import org.osgi.service.component.annotations.Component; import gnu.io.rfc2217.TelnetSerialPort; diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java index 678b3ffe0..22a8f518a 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.rxtx.rfc2217.internal; +package org.openhab.core.io.transport.serial.rxtx.rfc2217.internal; import java.net.URI; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.PortInUseException; -import org.eclipse.smarthome.io.transport.serial.SerialPort; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.rxtx.RxTxSerialPort; +import org.openhab.core.io.transport.serial.PortInUseException; +import org.openhab.core.io.transport.serial.SerialPort; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.rxtx.RxTxSerialPort; import gnu.io.rfc2217.TelnetSerialPort; diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java index eace4107b..45a9d7f30 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.net.URI; import java.util.Map; @@ -21,10 +21,10 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.ProtocolType; -import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.SerialPortProvider; +import org.openhab.core.io.transport.serial.ProtocolType; +import org.openhab.core.io.transport.serial.ProtocolType.PathType; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.SerialPortProvider; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java index 75a3405cf..636eb799a 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.transport.serial.SerialPortEvent; +import org.openhab.core.io.transport.serial.SerialPortEvent; /** * Specific serial port event implementation. diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java index 57417b193..7b30ab4fb 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.PortInUseException; -import org.eclipse.smarthome.io.transport.serial.SerialPort; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.rxtx.RxTxSerialPort; +import org.openhab.core.io.transport.serial.PortInUseException; +import org.openhab.core.io.transport.serial.SerialPort; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.rxtx.RxTxSerialPort; import gnu.io.CommPort; import gnu.io.CommPortIdentifier; diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java index 579a11e34..03abf5e12 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.io.File; import java.util.Collections; diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java index 4f1f5bbc7..0fac0ca1a 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.rxtx; +package org.openhab.core.io.transport.serial.rxtx; import java.io.IOException; import java.io.InputStream; @@ -19,10 +19,10 @@ import java.util.TooManyListenersException; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.SerialPort; -import org.eclipse.smarthome.io.transport.serial.SerialPortEventListener; -import org.eclipse.smarthome.io.transport.serial.UnsupportedCommOperationException; -import org.eclipse.smarthome.io.transport.serial.internal.SerialPortEventImpl; +import org.openhab.core.io.transport.serial.SerialPort; +import org.openhab.core.io.transport.serial.SerialPortEventListener; +import org.openhab.core.io.transport.serial.UnsupportedCommOperationException; +import org.openhab.core.io.transport.serial.internal.SerialPortEventImpl; import gnu.io.SerialPortEvent; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java index f1898ed63..68e721dbd 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java index 5fbfe7a86..0bbc6f7c7 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import java.net.URI; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java index b32a12a30..2ebbfc51f 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import java.io.Closeable; import java.io.IOException; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java index c0c75a5a7..bf601c508 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java index ec1f01836..31f56b065 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java index 22c5265db..99ed7625e 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java index 3f7fdf745..f08899e31 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import java.util.Optional; import java.util.stream.Stream; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java index 74a7642e8..456d0e7c2 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import java.net.URI; import java.util.stream.Stream; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java index 70801dc16..9a518c6c1 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial; +package org.openhab.core.io.transport.serial; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java index 7c34d6029..2d63ebe68 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.net.URI; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.SerialPortManager; -import org.eclipse.smarthome.io.transport.serial.SerialPortProvider; +import org.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.SerialPortManager; +import org.openhab.core.io.transport.serial.SerialPortProvider; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java index de29a85a4..91a43a855 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal; +package org.openhab.core.io.transport.serial.internal; import java.net.URI; import java.util.Collection; @@ -20,8 +20,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType; -import org.eclipse.smarthome.io.transport.serial.SerialPortProvider; +import org.openhab.core.io.transport.serial.ProtocolType.PathType; +import org.openhab.core.io.transport.serial.SerialPortProvider; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java index 527da4b2d..359ef5384 100644 --- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java +++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.serial.internal.console; +package org.openhab.core.io.transport.serial.internal.console; import java.util.Arrays; import java.util.Deque; @@ -19,12 +19,12 @@ import java.util.List; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -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.eclipse.smarthome.io.transport.serial.SerialPortIdentifier; -import org.eclipse.smarthome.io.transport.serial.SerialPortManager; -import org.eclipse.smarthome.io.transport.serial.internal.SerialPortRegistry; +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.openhab.core.io.transport.serial.SerialPortIdentifier; +import org.openhab.core.io.transport.serial.SerialPortManager; +import org.openhab.core.io.transport.serial.internal.SerialPortRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java index 68c0b8184..0e21d77ad 100644 --- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java +++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.upnp; +package org.openhab.core.io.transport.upnp; /** * The {@link UpnpIOParticipant} is an interface that needs to diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java index 930b3e776..7ec2307a6 100644 --- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java +++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.upnp; +package org.openhab.core.io.transport.upnp; import java.net.URL; import java.util.Map; diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java index 746ac3c04..2d678711b 100644 --- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java +++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.upnp.internal; +package org.openhab.core.io.transport.upnp.internal; import java.net.URL; import java.util.HashMap; @@ -23,9 +23,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.io.transport.upnp.UpnpIOParticipant; -import org.eclipse.smarthome.io.transport.upnp.UpnpIOService; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.io.transport.upnp.UpnpIOParticipant; +import org.openhab.core.io.transport.upnp.UpnpIOService; import org.jupnp.UpnpService; import org.jupnp.controlpoint.ActionCallback; import org.jupnp.controlpoint.ControlPoint; diff --git a/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java index a9d79abb2..4ff9efed3 100644 --- a/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java +++ b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.io.transport.upnp.internal; +package org.openhab.core.io.transport.upnp.internal; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.smarthome.io.transport.upnp.UpnpIOParticipant; +import org.openhab.core.io.transport.upnp.UpnpIOParticipant; import org.junit.Before; import org.junit.Test; import org.jupnp.UpnpService; diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java index de8388f04..ec124050b 100644 --- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java +++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java @@ -38,11 +38,11 @@ import java.util.stream.Collectors; import org.apache.commons.lang.StringUtils; import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeaturesService; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.config.core.ConfigurableService; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.extension.ExtensionEventFactory; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.extension.ExtensionEventFactory; import org.openhab.core.OpenHAB; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java index 50d92d897..219b2caee 100644 --- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java +++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java @@ -24,9 +24,9 @@ import java.util.Locale; import org.apache.commons.lang.StringUtils; import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeaturesService; -import org.eclipse.smarthome.core.extension.Extension; -import org.eclipse.smarthome.core.extension.ExtensionService; -import org.eclipse.smarthome.core.extension.ExtensionType; +import org.openhab.core.extension.Extension; +import org.openhab.core.extension.ExtensionService; +import org.openhab.core.extension.ExtensionType; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch b/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch index a032eea5b..33daeeed6 100644 --- a/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch +++ b/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch @@ -1,8 +1,8 @@ - + - + @@ -10,7 +10,7 @@ - - + + diff --git a/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch b/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch index 24a72fcc9..9c52a0bd8 100644 --- a/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch +++ b/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch @@ -1,8 +1,8 @@ - + - + @@ -10,7 +10,7 @@ - - + + diff --git a/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch b/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch index 55fc80d7a..835b7bf31 100644 --- a/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch +++ b/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch @@ -1,8 +1,8 @@ - + - + @@ -10,7 +10,7 @@ - - + + diff --git a/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch b/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch index 0f96aea7c..7827b441e 100644 --- a/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch +++ b/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch @@ -1,8 +1,8 @@ - + - + @@ -10,7 +10,7 @@ - - + + diff --git a/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch b/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch index 2ef94feca..bbb535bad 100644 --- a/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch +++ b/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch @@ -1,8 +1,8 @@ - + - + @@ -10,6 +10,6 @@ - - + + diff --git a/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch b/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch index ad2c56786..c9a4af0ab 100644 --- a/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch +++ b/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch @@ -1,9 +1,9 @@ - - + + - + @@ -11,7 +11,7 @@ - - + + diff --git a/bundles/org.openhab.core.model.core/bnd.bnd b/bundles/org.openhab.core.model.core/bnd.bnd index 76a40d922..416ab2045 100644 --- a/bundles/org.openhab.core.model.core/bnd.bnd +++ b/bundles/org.openhab.core.model.core/bnd.bnd @@ -1,2 +1,2 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.model.core.internal.ModelCoreActivator \ No newline at end of file +Bundle-Activator: org.openhab.core.model.core.internal.ModelCoreActivator \ No newline at end of file diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java index 5bb6f9f5f..57b1dc85c 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; /** * These are the event types that can occur as model repository changes diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java index 8321f763e..dc282f3d8 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; /** * This class holds all important constants relevant for this bundle. @@ -19,6 +19,6 @@ package org.eclipse.smarthome.model.core; */ public class ModelCoreConstants { - /** The service pid used for the managed service (without the "org.eclipse.smarthome" prefix */ + /** The service pid used for the managed service (without the "org.openhab.core" prefix */ public static final String SERVICE_PID = "folder"; } diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java index a5522799c..ca11ad9fc 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; /** * This interface has to be implemented by services that register an EMF model parser diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java index 802ef932a..523200560 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; import java.io.InputStream; import java.util.Set; diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java index 98a446899..f363fa255 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java index 058594e16..63933d60d 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core; +package org.openhab.core.model.core; import java.util.function.Supplier; diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java index a1ba67090..a19da80b8 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.internal; +package org.openhab.core.model.core.internal; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java index 6ddac7ec2..9476fe3dc 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.internal; +package org.openhab.core.model.core.internal; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -35,10 +35,10 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.Diagnostician; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.core.SafeEMF; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.core.SafeEMF; import org.eclipse.xtext.resource.SynchronizedXtextResourceSet; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java index 954cf1a09..2cce46836 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.internal; +package org.openhab.core.model.core.internal; import java.util.function.Supplier; -import org.eclipse.smarthome.model.core.SafeEMF; +import org.openhab.core.model.core.SafeEMF; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java index 8ad9e37b6..13bb6e2e1 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.internal.folder; +package org.openhab.core.model.core.internal.folder; import static java.nio.file.StandardWatchEventKinds.*; @@ -35,10 +35,10 @@ import java.util.stream.Collectors; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.core.service.AbstractWatchService; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.core.ModelRepository; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.service.AbstractWatchService; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.core.ModelRepository; import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -56,7 +56,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Fabio Marini - Refactoring to use WatchService * @author Ana Dimova - reduce to a single watch thread for all class instances */ -@Component(name = "org.eclipse.smarthome.folder", immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE) +@Component(name = "org.openhab.core.folder", immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE) public class FolderObserver extends AbstractWatchService { public FolderObserver() { diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java index 2923ade8a..d28f12bea 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.internal.util; +package org.openhab.core.model.core.internal.util; /** * This class provides a few mathematical helper functions that are required by diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java index bbc01153d..91418eba2 100644 --- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java +++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.core.valueconverter; +package org.openhab.core.model.core.valueconverter; import java.math.BigDecimal; diff --git a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend index 24eb51100..14c29a5b2 100644 --- a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend +++ b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.ide +package org.openhab.core.model.ide /** diff --git a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend index dcc300240..67c904d27 100644 --- a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend +++ b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend @@ -13,11 +13,11 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.ide +package org.openhab.core.model.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.ItemsRuntimeModule -import org.eclipse.smarthome.model.ItemsStandaloneSetup +import org.openhab.core.model.ItemsRuntimeModule +import org.openhab.core.model.ItemsStandaloneSetup import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java b/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java index f64f845d7..ab2db5126 100644 --- a/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java +++ b/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.item.runtime.internal; +package org.openhab.core.model.item.runtime.internal; -import org.eclipse.smarthome.model.ItemsStandaloneSetup; -import org.eclipse.smarthome.model.core.ModelParser; +import org.openhab.core.model.ItemsStandaloneSetup; +import org.openhab.core.model.core.ModelParser; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd index cbe06521d..f69851a9b 100644 --- a/bundles/org.openhab.core.model.item/bnd.bnd +++ b/bundles/org.openhab.core.model.item/bnd.bnd @@ -1,33 +1,33 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model,\ - org.eclipse.smarthome.model.formatting,\ - org.eclipse.smarthome.model.generator,\ - org.eclipse.smarthome.model.item,\ - org.eclipse.smarthome.model.items,\ - org.eclipse.smarthome.model.items.impl,\ - org.eclipse.smarthome.model.items.util,\ - org.eclipse.smarthome.model.parser.antlr,\ - org.eclipse.smarthome.model.parser.antlr.internal,\ - org.eclipse.smarthome.model.scoping,\ - org.eclipse.smarthome.model.serializer,\ - org.eclipse.smarthome.model.services,\ - org.eclipse.smarthome.model.validation +Export-Package: org.openhab.core.model,\ + org.openhab.core.model.formatting,\ + org.openhab.core.model.generator,\ + org.openhab.core.model.item,\ + org.openhab.core.model.items,\ + org.openhab.core.model.items.impl,\ + org.openhab.core.model.items.util,\ + org.openhab.core.model.parser.antlr,\ + org.openhab.core.model.parser.antlr.internal,\ + org.openhab.core.model.scoping,\ + org.openhab.core.model.serializer,\ + org.openhab.core.model.services,\ + org.openhab.core.model.validation Import-Package: javax.measure,\ javax.measure.quantity,\ org.apache.log4j,\ org.eclipse.jdt.annotation;resolution:=optional,\ - org.eclipse.smarthome.config.core,\ - org.eclipse.smarthome.core.common.registry,\ - org.eclipse.smarthome.core.i18n,\ - org.eclipse.smarthome.core.items,\ - org.eclipse.smarthome.core.items.dto,\ - org.eclipse.smarthome.core.library.items,\ - org.eclipse.smarthome.core.library.types,\ - org.eclipse.smarthome.core.thing.util,\ - org.eclipse.smarthome.core.types,\ - org.eclipse.smarthome.core.types.util,\ - org.eclipse.smarthome.model.core,\ - org.eclipse.smarthome.model.core.valueconverter,\ + org.openhab.core.config.core,\ + org.openhab.core.common.registry,\ + org.openhab.core.i18n,\ + org.openhab.core.items,\ + org.openhab.core.items.dto,\ + org.openhab.core.library.items,\ + org.openhab.core.library.types,\ + org.openhab.core.thing.util,\ + org.openhab.core.types,\ + org.openhab.core.types.util,\ + org.openhab.core.model.core,\ + org.openhab.core.model.core.valueconverter,\ org.eclipse.xtext.xbase.lib,\ org.osgi.framework,\ org.slf4j diff --git a/bundles/org.openhab.core.model.item/plugin.xml b/bundles/org.openhab.core.model.item/plugin.xml index 4cdc8b1b2..f27808fea 100644 --- a/bundles/org.openhab.core.model.item/plugin.xml +++ b/bundles/org.openhab.core.model.item/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.item/plugin.xml_gen b/bundles/org.openhab.core.model.item/plugin.xml_gen index e56a604d3..5d54f6215 100644 --- a/bundles/org.openhab.core.model.item/plugin.xml_gen +++ b/bundles/org.openhab.core.model.item/plugin.xml_gen @@ -3,8 +3,8 @@ diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml index beaee9ce3..8c1fc4edf 100644 --- a/bundles/org.openhab.core.model.item/pom.xml +++ b/bundles/org.openhab.core.model.item/pom.xml @@ -51,7 +51,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/GenerateItems.mwe2 + file://${project.basedir}/src/org/openhab/core/model/GenerateItems.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2 b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2 index a754808d7..971f21536 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2 +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2 @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.GenerateItems +module org.openhab.core.model.GenerateItems import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* @@ -19,7 +19,7 @@ var rootPath = ".." var fileExtensions = "items" var projectName = "org.openhab.core.model.item" -var languageName = "org.eclipse.smarthome.model.Items" +var languageName = "org.openhab.core.model.Items" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext index 347d1c907..492bac740 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext @@ -1,4 +1,4 @@ -grammar org.eclipse.smarthome.model.Items +grammar org.openhab.core.model.Items // disabled due to conflicts between the custom ID rule and the common INT rule // with org.eclipse.xtext.common.Terminals @@ -7,7 +7,7 @@ hidden(WS, ML_COMMENT, SL_COMMENT) import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate items "http://www.eclipse.org/smarthome/model/Items" +generate items "https://openhab.org/model/Items" ItemModel : {ItemModel} (items+=ModelItem)* diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend index 0dea5d3ee..7bcd906a3 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend @@ -14,11 +14,11 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model +org.openhab.core.model import com.google.inject.Binder import com.google.inject.name.Names -import org.eclipse.smarthome.model.internal.valueconverter.ItemValueConverters +import org.openhab.core.model.internal.valueconverter.ItemValueConverters import org.eclipse.xtext.conversion.IValueConverterService import org.eclipse.xtext.linking.lazy.LazyURIEncoder diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend index 90afa1a9d..5c5876c09 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model +package org.openhab.core.model import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource @@ -26,7 +26,7 @@ class ItemsStandaloneSetup extends ItemsStandaloneSetupGenerated { } def static void unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Items"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Items"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("items"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("items"); } diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend index cb3cae7d7..615d828f9 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.formatting +package org.openhab.core.model.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig import com.google.inject.Inject -import org.eclipse.smarthome.model.services.ItemsGrammarAccess +import org.openhab.core.model.services.ItemsGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend index 851e20b5f..0b6013e13 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.generator +package org.openhab.core.model.generator import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.AbstractGenerator diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java index dc3989309..58af9e271 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.internal.valueconverter; +package org.openhab.core.model.internal.valueconverter; -import org.eclipse.smarthome.model.core.valueconverter.ValueTypeToStringConverter; +import org.openhab.core.model.core.valueconverter.ValueTypeToStringConverter; import org.eclipse.xtext.common.services.DefaultTerminalConverters; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java index 3d04f7838..e799c9efe 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.item; +package org.openhab.core.model.item; /** * This exception is used by {@link BindingConfigReader} instances if parsing configurations fails diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java index ea4bc1a0b..78b8b1a13 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.item; +package org.openhab.core.model.item; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.model.item.internal.GenericItemProvider; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.model.item.internal.GenericItemProvider; /** * This interface must be implemented by services, which can parse the generic diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java index 04d2af058..5f241780e 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.item.internal; +package org.openhab.core.model.item.internal; import java.util.ArrayList; import java.util.Arrays; @@ -27,31 +27,31 @@ import java.util.concurrent.ConcurrentHashMap; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.common.registry.AbstractProvider; -import org.eclipse.smarthome.core.items.ActiveItem; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.GroupFunction; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemFactory; -import org.eclipse.smarthome.core.items.ItemProvider; -import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO; -import org.eclipse.smarthome.core.items.dto.ItemDTOMapper; -import org.eclipse.smarthome.core.types.StateDescriptionFragment; -import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder; -import org.eclipse.smarthome.core.types.StateDescriptionFragmentProvider; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.item.BindingConfigParseException; -import org.eclipse.smarthome.model.item.BindingConfigReader; -import org.eclipse.smarthome.model.items.ItemModel; -import org.eclipse.smarthome.model.items.ModelBinding; -import org.eclipse.smarthome.model.items.ModelGroupFunction; -import org.eclipse.smarthome.model.items.ModelGroupItem; -import org.eclipse.smarthome.model.items.ModelItem; -import org.eclipse.smarthome.model.items.ModelNormalItem; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.common.registry.AbstractProvider; +import org.openhab.core.items.ActiveItem; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupFunction; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemFactory; +import org.openhab.core.items.ItemProvider; +import org.openhab.core.items.dto.GroupFunctionDTO; +import org.openhab.core.items.dto.ItemDTOMapper; +import org.openhab.core.types.StateDescriptionFragment; +import org.openhab.core.types.StateDescriptionFragmentBuilder; +import org.openhab.core.types.StateDescriptionFragmentProvider; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.item.BindingConfigParseException; +import org.openhab.core.model.item.BindingConfigReader; +import org.openhab.core.model.items.ItemModel; +import org.openhab.core.model.items.ModelBinding; +import org.openhab.core.model.items.ModelGroupFunction; +import org.openhab.core.model.items.ModelGroupItem; +import org.openhab.core.model.items.ModelItem; +import org.openhab.core.model.items.ModelNormalItem; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java index 10ebf8106..ebf865d4c 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.item.internal; +package org.openhab.core.model.item.internal; import static java.util.stream.Collectors.toSet; @@ -25,11 +25,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.eclipse.emf.codegen.ecore.templates.edit.ItemProvider; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.common.registry.AbstractProvider; -import org.eclipse.smarthome.core.items.Metadata; -import org.eclipse.smarthome.core.items.MetadataKey; -import org.eclipse.smarthome.core.items.MetadataPredicates; -import org.eclipse.smarthome.core.items.MetadataProvider; +import org.openhab.core.common.registry.AbstractProvider; +import org.openhab.core.items.Metadata; +import org.openhab.core.items.MetadataKey; +import org.openhab.core.items.MetadataPredicates; +import org.openhab.core.items.MetadataProvider; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend index e8ab00814..727905796 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.scoping +package org.openhab.core.model.scoping /** * This class contains custom scoping description. diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend index 5ca657e36..b2e11f883 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.serializer +package org.openhab.core.model.serializer class ItemsSemanticSequencer extends AbstractItemsSemanticSequencer { diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend index 9da0c266e..c302985f4 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.serializer +package org.openhab.core.model.serializer class ItemsSyntacticSequencer extends AbstractItemsSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend index f8f99bec7..943ee70a2 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.validation +package org.openhab.core.model.validation -import org.eclipse.smarthome.model.items.ModelItem +import org.openhab.core.model.items.ModelItem import org.eclipse.xtext.validation.Check -import org.eclipse.smarthome.model.items.ItemsPackage -import org.eclipse.smarthome.core.types.util.UnitUtils +import org.openhab.core.model.items.ItemsPackage +import org.openhab.core.types.util.UnitUtils /** * Custom validation rules. diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java index 63c6d7c4a..0a1d06337 100644 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java +++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lazygen; +package org.openhab.core.model.lazygen; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.xtext.resource.XtextResourceSet; diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java index 28d4a6f5e..e5eda8631 100644 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java +++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lazygen; +package org.openhab.core.model.lazygen; import org.eclipse.emf.mwe.core.WorkflowContext; import org.eclipse.emf.mwe.core.issues.Issues; diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java index 253a2549b..f8557797b 100644 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java +++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lazygen; +package org.openhab.core.model.lazygen; import static org.eclipse.xtext.util.Strings.equal; diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java index 2e1be78f6..a1a7fce3e 100644 --- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java +++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lazygen; +package org.openhab.core.model.lazygen; import java.io.File; import java.io.IOException; diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java index 173dc7db3..29c92694a 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lsp.internal; +package org.openhab.core.model.lsp.internal; import java.io.File; import java.io.UnsupportedEncodingException; diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java index 2cc36db64..aa501277e 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lsp.internal; +package org.openhab.core.model.lsp.internal; import java.io.IOException; import java.net.ServerSocket; @@ -23,10 +23,10 @@ import java.util.concurrent.Future; import org.eclipse.lsp4j.jsonrpc.Launcher; import org.eclipse.lsp4j.launch.LSPLauncher; import org.eclipse.lsp4j.services.LanguageClient; -import org.eclipse.smarthome.config.core.ConfigurableService; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.ScriptEngine; import org.eclipse.xtext.ide.server.LanguageServerImpl; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; @@ -51,7 +51,7 @@ import com.google.inject.Injector; ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" }) public class ModelServer { - static final String CONFIG_PID = "org.eclipse.smarthome.lsp"; + static final String CONFIG_PID = "org.openhab.core.lsp"; private static final String KEY_PORT = "port"; private static final int DEFAULT_PORT = 5007; private final ExecutorService pool = ThreadPoolManager.getPool("lsp"); diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java index bfee755ba..0f1de734b 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lsp.internal; +package org.openhab.core.model.lsp.internal; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; -import org.eclipse.smarthome.model.ide.ItemsIdeSetup; -import org.eclipse.smarthome.model.persistence.ide.PersistenceIdeSetup; -import org.eclipse.smarthome.model.rule.ide.RulesIdeSetup; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.ide.ScriptIdeSetup; -import org.eclipse.smarthome.model.sitemap.ide.SitemapIdeSetup; -import org.eclipse.smarthome.model.thing.ide.ThingIdeSetup; +import org.openhab.core.model.ide.ItemsIdeSetup; +import org.openhab.core.model.persistence.ide.PersistenceIdeSetup; +import org.openhab.core.model.rule.ide.RulesIdeSetup; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.ide.ScriptIdeSetup; +import org.openhab.core.model.sitemap.ide.SitemapIdeSetup; +import org.openhab.core.model.thing.ide.ThingIdeSetup; import org.eclipse.xtext.XtextPackage; import org.eclipse.xtext.resource.FileExtensionProvider; import org.eclipse.xtext.resource.IResourceFactory; diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java index 5254ca142..9f11ced58 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lsp.internal; +package org.openhab.core.model.lsp.internal; import java.util.concurrent.ExecutorService; import org.eclipse.lsp4j.services.LanguageServer; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.ScriptEngine; import org.eclipse.xtext.ide.ExecutorServiceProvider; import org.eclipse.xtext.ide.server.DefaultProjectDescriptionFactory; import org.eclipse.xtext.ide.server.ILanguageServerShutdownAndExitHandler; diff --git a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java index 8efd66592..f9fd3706d 100644 --- a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java +++ b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.lsp.internal; +package org.openhab.core.model.lsp.internal; import static org.junit.Assert.assertEquals; diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend index 9fce910d5..276b2a58d 100644 --- a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend +++ b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.persistence.ide +package org.openhab.core.model.persistence.ide /** diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend index c9f110cdc..9fda2ba91 100644 --- a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend +++ b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend @@ -13,11 +13,11 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.persistence.ide +package org.openhab.core.model.persistence.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.persistence.PersistenceRuntimeModule -import org.eclipse.smarthome.model.persistence.PersistenceStandaloneSetup +import org.openhab.core.model.persistence.PersistenceRuntimeModule +import org.openhab.core.model.persistence.PersistenceStandaloneSetup import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java b/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java index dd055eab4..bb2b04a74 100644 --- a/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java +++ b/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence.runtime.internal; +package org.openhab.core.model.persistence.runtime.internal; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.persistence.PersistenceStandaloneSetup; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.persistence.PersistenceStandaloneSetup; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd index 72d9b372a..11af558ad 100644 --- a/bundles/org.openhab.core.model.persistence/bnd.bnd +++ b/bundles/org.openhab.core.model.persistence/bnd.bnd @@ -1,28 +1,28 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model.persistence,\ - org.eclipse.smarthome.model.persistence.extensions,\ - org.eclipse.smarthome.model.persistence.formatting,\ - org.eclipse.smarthome.model.persistence.generator,\ - org.eclipse.smarthome.model.persistence.parser.antlr,\ - org.eclipse.smarthome.model.persistence.parser.antlr.internal,\ - org.eclipse.smarthome.model.persistence.persistence,\ - org.eclipse.smarthome.model.persistence.persistence.impl,\ - org.eclipse.smarthome.model.persistence.persistence.util,\ - org.eclipse.smarthome.model.persistence.scoping,\ - org.eclipse.smarthome.model.persistence.serializer,\ - org.eclipse.smarthome.model.persistence.services,\ - org.eclipse.smarthome.model.persistence.validation +Export-Package: org.openhab.core.model.persistence,\ + org.openhab.core.model.persistence.extensions,\ + org.openhab.core.model.persistence.formatting,\ + org.openhab.core.model.persistence.generator,\ + org.openhab.core.model.persistence.parser.antlr,\ + org.openhab.core.model.persistence.parser.antlr.internal,\ + org.openhab.core.model.persistence.persistence,\ + org.openhab.core.model.persistence.persistence.impl,\ + org.openhab.core.model.persistence.persistence.util,\ + org.openhab.core.model.persistence.scoping,\ + org.openhab.core.model.persistence.serializer,\ + org.openhab.core.model.persistence.services,\ + org.openhab.core.model.persistence.validation Import-Package: \ - org.eclipse.smarthome.core.common.registry,\ - org.eclipse.smarthome.core.events,\ - org.eclipse.smarthome.core.i18n,\ - org.eclipse.smarthome.core.items,\ - org.eclipse.smarthome.core.library.types,\ - org.eclipse.smarthome.core.persistence,\ - org.eclipse.smarthome.core.persistence.config,\ - org.eclipse.smarthome.core.persistence.strategy,\ - org.eclipse.smarthome.core.types,\ - org.eclipse.smarthome.model.core,\ + org.openhab.core.common.registry,\ + org.openhab.core.events,\ + org.openhab.core.i18n,\ + org.openhab.core.items,\ + org.openhab.core.library.types,\ + org.openhab.core.persistence,\ + org.openhab.core.persistence.config,\ + org.openhab.core.persistence.strategy,\ + org.openhab.core.types,\ + org.openhab.core.model.core,\ com.google.common.*;version="14",\ org.apache.*,\ org.eclipse.jdt.annotation;resolution:=optional,\ diff --git a/bundles/org.openhab.core.model.persistence/plugin.xml b/bundles/org.openhab.core.model.persistence/plugin.xml index e4803220f..e5616dc84 100644 --- a/bundles/org.openhab.core.model.persistence/plugin.xml +++ b/bundles/org.openhab.core.model.persistence/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index 9ab0920e6..5befe6d3c 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -56,7 +56,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/persistence/GeneratePersistence.mwe2 + file://${project.basedir}/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 index 5b1917432..eaa25c6d2 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.persistence.GeneratePersistence +module org.openhab.core.model.persistence.GeneratePersistence import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var projectName = "org.openhab.core.model.persistence" -var languageName = "org.eclipse.smarthome.model.persistence.Persistence" +var languageName = "org.openhab.core.model.persistence.Persistence" var fileExtensions = "persist" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext index 627363058..9bdb11e11 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext @@ -1,8 +1,8 @@ -grammar org.eclipse.smarthome.model.persistence.Persistence with org.eclipse.xtext.common.Terminals +grammar org.openhab.core.model.persistence.Persistence with org.eclipse.xtext.common.Terminals import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate persistence "http://www.eclipse.org/smarthome/model/Persistence" +generate persistence "https://openhab.org/model/Persistence" PersistenceModel: {PersistenceModel} diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend index ec3dbaeba..a3cd9ffd2 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend @@ -14,11 +14,11 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model.persistence +org.openhab.core.model.persistence import com.google.inject.Binder import com.google.inject.name.Names -import org.eclipse.smarthome.model.persistence.scoping.PersistenceGlobalScopeProvider +import org.openhab.core.model.persistence.scoping.PersistenceGlobalScopeProvider import org.eclipse.xtext.linking.lazy.LazyURIEncoder import org.eclipse.xtext.scoping.IGlobalScopeProvider diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend index 893ed1caa..1578d3b1b 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence +package org.openhab.core.model.persistence import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource @@ -26,7 +26,7 @@ class PersistenceStandaloneSetup extends PersistenceStandaloneSetupGenerated { } def static void unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Persistence"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Persistence"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("persist"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("persist"); } diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java index 6c4fe5a67..3afc31062 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence.extensions; +package org.openhab.core.model.persistence.extensions; import java.math.BigDecimal; import java.math.MathContext; @@ -20,16 +20,16 @@ import java.util.Collections; import java.util.Date; import java.util.Iterator; -import org.eclipse.smarthome.core.i18n.TimeZoneProvider; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.persistence.FilterCriteria; -import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering; -import org.eclipse.smarthome.core.persistence.HistoricItem; -import org.eclipse.smarthome.core.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry; -import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.i18n.TimeZoneProvider; +import org.openhab.core.items.Item; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.persistence.FilterCriteria; +import org.openhab.core.persistence.FilterCriteria.Ordering; +import org.openhab.core.persistence.HistoricItem; +import org.openhab.core.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceRegistry; +import org.openhab.core.persistence.QueryablePersistenceService; +import org.openhab.core.types.State; import org.joda.time.DateTime; import org.joda.time.base.AbstractInstant; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend index 763e47cdb..4cbe8485a 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.persistence.formatting +package org.openhab.core.model.persistence.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig // import com.google.inject.Inject; -// import org.eclipse.smarthome.model.persistence.services.PersistenceGrammarAccess +// import org.openhab.core.model.persistence.services.PersistenceGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend index 0e679983a..d2b5cea58 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.persistence.generator +package org.openhab.core.model.persistence.generator import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.AbstractGenerator diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java index d2360a46c..e33807d12 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java @@ -10,34 +10,34 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence.internal; +package org.openhab.core.model.persistence.internal; import java.util.LinkedList; import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.eclipse.smarthome.core.persistence.PersistenceManager; -import org.eclipse.smarthome.core.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration; -import org.eclipse.smarthome.core.persistence.SimpleFilter; -import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration; -import org.eclipse.smarthome.core.persistence.config.SimpleAllConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleGroupConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleItemConfig; -import org.eclipse.smarthome.core.persistence.strategy.SimpleCronStrategy; -import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.persistence.persistence.AllConfig; -import org.eclipse.smarthome.model.persistence.persistence.CronStrategy; -import org.eclipse.smarthome.model.persistence.persistence.Filter; -import org.eclipse.smarthome.model.persistence.persistence.GroupConfig; -import org.eclipse.smarthome.model.persistence.persistence.ItemConfig; -import org.eclipse.smarthome.model.persistence.persistence.PersistenceConfiguration; -import org.eclipse.smarthome.model.persistence.persistence.PersistenceModel; -import org.eclipse.smarthome.model.persistence.persistence.Strategy; +import org.openhab.core.persistence.PersistenceManager; +import org.openhab.core.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceConfiguration; +import org.openhab.core.persistence.SimpleFilter; +import org.openhab.core.persistence.SimpleItemConfiguration; +import org.openhab.core.persistence.config.SimpleAllConfig; +import org.openhab.core.persistence.config.SimpleConfig; +import org.openhab.core.persistence.config.SimpleGroupConfig; +import org.openhab.core.persistence.config.SimpleItemConfig; +import org.openhab.core.persistence.strategy.SimpleCronStrategy; +import org.openhab.core.persistence.strategy.SimpleStrategy; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.persistence.persistence.AllConfig; +import org.openhab.core.model.persistence.persistence.CronStrategy; +import org.openhab.core.model.persistence.persistence.Filter; +import org.openhab.core.model.persistence.persistence.GroupConfig; +import org.openhab.core.model.persistence.persistence.ItemConfig; +import org.openhab.core.model.persistence.persistence.PersistenceConfiguration; +import org.openhab.core.model.persistence.persistence.PersistenceModel; +import org.openhab.core.model.persistence.persistence.Strategy; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java index cb5ec1241..c85d83bd5 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence.scoping; +package org.openhab.core.model.persistence.scoping; -import org.eclipse.smarthome.model.persistence.persistence.Strategy; -import org.eclipse.smarthome.model.persistence.persistence.impl.StrategyImpl; +import org.openhab.core.model.persistence.persistence.Strategy; +import org.openhab.core.model.persistence.persistence.impl.StrategyImpl; /** * This class defines a few persistence strategies that are globally available to diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java index 37c5a8839..8da134f42 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.persistence.scoping; +package org.openhab.core.model.persistence.scoping; import java.util.ArrayList; import java.util.List; @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; -import org.eclipse.smarthome.model.persistence.persistence.Strategy; +import org.openhab.core.model.persistence.persistence.Strategy; import org.eclipse.xtext.resource.EObjectDescription; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.scoping.IScope; @@ -34,7 +34,7 @@ public class PersistenceGlobalScopeProvider extends AbstractGlobalScopeProvider static protected Resource res = new ResourceImpl(); static { - res.setURI(URI.createURI("virtual://eclipse.org/smarthome/persistence/strategy.global")); + res.setURI(URI.createURI("virtual://openhab.org/persistence/strategy.global")); res.getContents().add(GlobalStrategies.UPDATE); res.getContents().add(GlobalStrategies.CHANGE); res.getContents().add(GlobalStrategies.RESTORE); diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend index d2b675573..92bc589b7 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.persistence.scoping +package org.openhab.core.model.persistence.scoping /** * This class contains custom scoping description. diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend index bcc33897e..b8a645184 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.persistence.serializer +package org.openhab.core.model.persistence.serializer class PersistenceSemanticSequencer extends AbstractPersistenceSemanticSequencer { diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend index d907c0e54..296183784 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.persistence.serializer +package org.openhab.core.model.persistence.serializer class PersistenceSyntacticSequencer extends AbstractPersistenceSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend index 8ad095b3c..ebb23ac36 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.persistence.validation +package org.openhab.core.model.persistence.validation //import org.eclipse.xtext.validation.Check /** diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend index bf51b1baf..eefeb170b 100644 --- a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend +++ b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend @@ -13,10 +13,10 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.rule.ide +package org.openhab.core.model.rule.ide import org.eclipse.xtext.xbase.typesystem.internal.IFeatureScopeTracker -import org.eclipse.smarthome.model.script.OptimizingFeatureScopeTrackerProvider2 +import org.openhab.core.model.script.OptimizingFeatureScopeTrackerProvider2 /** * Use this class to register ide components. diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend index 24c5ff288..367372074 100644 --- a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend +++ b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.rule.ide +package org.openhab.core.model.rule.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.rule.RulesRuntimeModule -import org.eclipse.smarthome.model.rule.RulesStandaloneSetup -import org.eclipse.smarthome.model.script.ServiceModule +import org.openhab.core.model.rule.RulesRuntimeModule +import org.openhab.core.model.rule.RulesStandaloneSetup +import org.openhab.core.model.script.ServiceModule import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java index e1d76dd49..1f53b9ed0 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime; +package org.openhab.core.model.rule.runtime; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java index 265fe36da..4a401ccf3 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal; +package org.openhab.core.model.rule.runtime.internal; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.rule.RulesStandaloneSetup; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.rule.RulesStandaloneSetup; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.ScriptEngine; import org.osgi.framework.BundleContext; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java index fad8bedc0..1c005f978 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; import org.eclipse.emf.ecore.EObject; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.rule.rules.Rule; -import org.eclipse.smarthome.model.rule.rules.RuleModel; -import org.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.rule.rules.Rule; +import org.openhab.core.model.rule.rules.RuleModel; +import org.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java index 39c99bad9..dcba9c6ad 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; import org.quartz.Job; import org.quartz.Scheduler; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java index ffcd4bf73..fd2948325 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.ecore.util.EContentAdapter; -import org.eclipse.smarthome.model.rule.rules.Rule; -import org.eclipse.smarthome.model.rule.rules.RuleModel; -import org.eclipse.smarthome.model.rule.rules.VariableDeclaration; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.rule.rules.Rule; +import org.openhab.core.model.rule.rules.RuleModel; +import org.openhab.core.model.rule.rules.VariableDeclaration; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.xbase.interpreter.IEvaluationContext; import org.slf4j.Logger; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java index 2e65b75cc..4dd79485c 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; -import static org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*; +import static org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*; import java.util.Collection; import java.util.Set; @@ -23,35 +23,35 @@ import java.util.concurrent.TimeUnit; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -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.items.GenericItem; -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.ItemRegistryChangeListener; -import org.eclipse.smarthome.core.items.StateChangeListener; -import org.eclipse.smarthome.core.items.events.ItemCommandEvent; -import org.eclipse.smarthome.core.items.events.ItemStateEvent; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent; -import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.rule.RulesStandaloneSetup; -import org.eclipse.smarthome.model.rule.jvmmodel.RulesJvmModelInferrer; -import org.eclipse.smarthome.model.rule.rules.Rule; -import org.eclipse.smarthome.model.rule.rules.RuleModel; -import org.eclipse.smarthome.model.rule.runtime.RuleEngine; -import org.eclipse.smarthome.model.rule.runtime.internal.RuleRuntimeActivator; -import org.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventFilter; +import org.openhab.core.events.EventSubscriber; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemNotFoundException; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ItemRegistryChangeListener; +import org.openhab.core.items.StateChangeListener; +import org.openhab.core.items.events.ItemCommandEvent; +import org.openhab.core.items.events.ItemStateEvent; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.events.ChannelTriggeredEvent; +import org.openhab.core.thing.events.ThingStatusInfoChangedEvent; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.rule.RulesStandaloneSetup; +import org.openhab.core.model.rule.jvmmodel.RulesJvmModelInferrer; +import org.openhab.core.model.rule.rules.Rule; +import org.openhab.core.model.rule.rules.RuleModel; +import org.openhab.core.model.rule.runtime.RuleEngine; +import org.openhab.core.model.rule.runtime.internal.RuleRuntimeActivator; +import org.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; import org.eclipse.xtext.naming.QualifiedName; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java index 03f0b1c5e..fa0b13e25 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.xbase.interpreter.IEvaluationContext; diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java index a589048a7..edd58ca02 100644 --- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java +++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.runtime.internal.engine; +package org.openhab.core.model.rule.runtime.internal.engine; -import static org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*; +import static org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*; import static org.quartz.JobBuilder.newJob; import static org.quartz.TriggerBuilder.newTrigger; @@ -28,27 +28,27 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Collectors; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.core.types.Type; -import org.eclipse.smarthome.core.types.TypeParser; -import org.eclipse.smarthome.model.rule.rules.ChangedEventTrigger; -import org.eclipse.smarthome.model.rule.rules.CommandEventTrigger; -import org.eclipse.smarthome.model.rule.rules.EventEmittedTrigger; -import org.eclipse.smarthome.model.rule.rules.EventTrigger; -import org.eclipse.smarthome.model.rule.rules.GroupMemberChangedEventTrigger; -import org.eclipse.smarthome.model.rule.rules.GroupMemberCommandEventTrigger; -import org.eclipse.smarthome.model.rule.rules.GroupMemberUpdateEventTrigger; -import org.eclipse.smarthome.model.rule.rules.Rule; -import org.eclipse.smarthome.model.rule.rules.RuleModel; -import org.eclipse.smarthome.model.rule.rules.SystemOnShutdownTrigger; -import org.eclipse.smarthome.model.rule.rules.SystemOnStartupTrigger; -import org.eclipse.smarthome.model.rule.rules.ThingStateChangedEventTrigger; -import org.eclipse.smarthome.model.rule.rules.ThingStateUpdateEventTrigger; -import org.eclipse.smarthome.model.rule.rules.TimerTrigger; -import org.eclipse.smarthome.model.rule.rules.UpdateEventTrigger; +import org.openhab.core.items.Item; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; +import org.openhab.core.types.Type; +import org.openhab.core.types.TypeParser; +import org.openhab.core.model.rule.rules.ChangedEventTrigger; +import org.openhab.core.model.rule.rules.CommandEventTrigger; +import org.openhab.core.model.rule.rules.EventEmittedTrigger; +import org.openhab.core.model.rule.rules.EventTrigger; +import org.openhab.core.model.rule.rules.GroupMemberChangedEventTrigger; +import org.openhab.core.model.rule.rules.GroupMemberCommandEventTrigger; +import org.openhab.core.model.rule.rules.GroupMemberUpdateEventTrigger; +import org.openhab.core.model.rule.rules.Rule; +import org.openhab.core.model.rule.rules.RuleModel; +import org.openhab.core.model.rule.rules.SystemOnShutdownTrigger; +import org.openhab.core.model.rule.rules.SystemOnStartupTrigger; +import org.openhab.core.model.rule.rules.ThingStateChangedEventTrigger; +import org.openhab.core.model.rule.rules.ThingStateUpdateEventTrigger; +import org.openhab.core.model.rule.rules.TimerTrigger; +import org.openhab.core.model.rule.rules.UpdateEventTrigger; import org.quartz.CronScheduleBuilder; import org.quartz.Job; import org.quartz.JobDetail; diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd index 73b3740ae..ca4564ba3 100644 --- a/bundles/org.openhab.core.model.rule/bnd.bnd +++ b/bundles/org.openhab.core.model.rule/bnd.bnd @@ -1,34 +1,34 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model.rule,\ - org.eclipse.smarthome.model.rule.formatting,\ - org.eclipse.smarthome.model.rule.jvmmodel,\ - org.eclipse.smarthome.model.rule.parser.antlr,\ - org.eclipse.smarthome.model.rule.parser.antlr.internal,\ - org.eclipse.smarthome.model.rule.rules,\ - org.eclipse.smarthome.model.rule.rules.impl,\ - org.eclipse.smarthome.model.rule.rules.util,\ - org.eclipse.smarthome.model.rule.scoping,\ - org.eclipse.smarthome.model.rule.serializer,\ - org.eclipse.smarthome.model.rule.services,\ - org.eclipse.smarthome.model.rule.validation +Export-Package: org.openhab.core.model.rule,\ + org.openhab.core.model.rule.formatting,\ + org.openhab.core.model.rule.jvmmodel,\ + org.openhab.core.model.rule.parser.antlr,\ + org.openhab.core.model.rule.parser.antlr.internal,\ + org.openhab.core.model.rule.rules,\ + org.openhab.core.model.rule.rules.impl,\ + org.openhab.core.model.rule.rules.util,\ + org.openhab.core.model.rule.scoping,\ + org.openhab.core.model.rule.serializer,\ + org.openhab.core.model.rule.services,\ + org.openhab.core.model.rule.validation Import-Package: \ - org.eclipse.smarthome.core.common.registry,\ - org.eclipse.smarthome.core.events,\ - org.eclipse.smarthome.core.items,\ - org.eclipse.smarthome.core.library.items,\ - org.eclipse.smarthome.core.library.types,\ - org.eclipse.smarthome.core.library.unit,\ - org.eclipse.smarthome.core.persistence,\ - org.eclipse.smarthome.core.service,\ - org.eclipse.smarthome.core.thing,\ - org.eclipse.smarthome.core.thing.binding,\ - org.eclipse.smarthome.core.thing.events,\ - org.eclipse.smarthome.core.types,\ - org.eclipse.smarthome.model.core,\ - org.eclipse.smarthome.model.items,\ - org.eclipse.smarthome.model.persistence.extensions,\ - org.eclipse.smarthome.model.script,\ - org.eclipse.smarthome.model.script.engine.action,\ + org.openhab.core.common.registry,\ + org.openhab.core.events,\ + org.openhab.core.items,\ + org.openhab.core.library.items,\ + org.openhab.core.library.types,\ + org.openhab.core.library.unit,\ + org.openhab.core.persistence,\ + org.openhab.core.service,\ + org.openhab.core.thing,\ + org.openhab.core.thing.binding,\ + org.openhab.core.thing.events,\ + org.openhab.core.types,\ + org.openhab.core.model.core,\ + org.openhab.core.model.items,\ + org.openhab.core.model.persistence.extensions,\ + org.openhab.core.model.script,\ + org.openhab.core.model.script.engine.action,\ com.google.common.base;version="14",\ javax.measure,\ org.apache.commons.io,\ diff --git a/bundles/org.openhab.core.model.rule/plugin.xml b/bundles/org.openhab.core.model.rule/plugin.xml index f2193240b..8ebfd2b2c 100644 --- a/bundles/org.openhab.core.model.rule/plugin.xml +++ b/bundles/org.openhab.core.model.rule/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml index c2c04465f..55ee774cf 100644 --- a/bundles/org.openhab.core.model.rule/pom.xml +++ b/bundles/org.openhab.core.model.rule/pom.xml @@ -51,7 +51,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/rule/GenerateRules.mwe2 + file://${project.basedir}/src/org/openhab/core/model/rule/GenerateRules.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2 b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2 index 374b0b44d..08dd77abe 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2 +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2 @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.rule.GenerateRules +module org.openhab.core.model.rule.GenerateRules import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* @@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var fileExtensions = "rules" var projectName = "org.openhab.core.model.rule" -var languageName = "org.eclipse.smarthome.model.rule.Rules" +var languageName = "org.openhab.core.model.rule.Rules" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext index f7aaeaf91..271788eae 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext @@ -1,10 +1,10 @@ -grammar org.eclipse.smarthome.model.rule.Rules with org.eclipse.smarthome.model.script.Script +grammar org.openhab.core.model.rule.Rules with org.openhab.core.model.script.Script import "http://www.eclipse.org/xtext/xbase/Xbase" as xbase import "http://www.eclipse.org/xtext/common/JavaVMTypes" as types import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate rules "http://www.eclipse.org/smarthome/model/Rules" +generate rules "https://openhab.org/model/Rules" RuleModel: importSection = XImportSection? diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend index fd49a3dbe..9838bea2f 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend @@ -14,16 +14,16 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model.rule +org.openhab.core.model.rule import com.google.inject.Binder import com.google.inject.name.Names -import org.eclipse.smarthome.model.rule.scoping.RulesImplicitlyImportedTypes -import org.eclipse.smarthome.model.script.interpreter.ScriptInterpreter -import org.eclipse.smarthome.model.script.jvmmodel.ScriptTypeComputer -import org.eclipse.smarthome.model.script.scoping.ActionClassLoader -import org.eclipse.smarthome.model.script.scoping.ScriptImportSectionNamespaceScopeProvider -import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider +import org.openhab.core.model.rule.scoping.RulesImplicitlyImportedTypes +import org.openhab.core.model.script.interpreter.ScriptInterpreter +import org.openhab.core.model.script.jvmmodel.ScriptTypeComputer +import org.openhab.core.model.script.scoping.ActionClassLoader +import org.openhab.core.model.script.scoping.ScriptImportSectionNamespaceScopeProvider +import org.openhab.core.model.script.scoping.StateAndCommandProvider import org.eclipse.xtext.common.types.access.IJvmTypeProvider import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeProviderFactory import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeScopeProvider diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend index 0d4ab6398..5efdf0abc 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule +package org.openhab.core.model.rule import com.google.inject.Guice import com.google.inject.Injector import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.smarthome.model.script.ScriptServiceUtil -import org.eclipse.smarthome.model.script.ScriptStandaloneSetup -import org.eclipse.smarthome.model.script.ServiceModule +import org.openhab.core.model.script.ScriptServiceUtil +import org.openhab.core.model.script.ScriptStandaloneSetup +import org.openhab.core.model.script.ServiceModule import org.eclipse.xtext.resource.IResourceServiceProvider -import org.eclipse.smarthome.model.script.engine.ScriptEngine +import org.openhab.core.model.script.engine.ScriptEngine /** * Initialization support for running Xtext languages @@ -74,7 +74,7 @@ class RulesStandaloneSetup extends RulesStandaloneSetupGenerated { } def static unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Rules"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Rules"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("rules"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("rules"); diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend index 7c520caf7..a30553c3c 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.rule.formatting +package org.openhab.core.model.rule.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig // import com.google.inject.Inject; -// import org.eclipse.smarthome.model.rule.services.RulesGrammarAccess +// import org.openhab.core.model.rule.services.RulesGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java index 31bae9f65..f3794e5ad 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.jvmmodel; +package org.openhab.core.model.rule.jvmmodel; import java.util.Collection; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ItemRegistryChangeListener; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ItemRegistryChangeListener; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend index f8ef24567..59f17ebb0 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend @@ -10,29 +10,29 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.jvmmodel +package org.openhab.core.model.rule.jvmmodel import com.google.inject.Inject import java.util.Set -import org.eclipse.smarthome.core.items.Item -import org.eclipse.smarthome.core.items.ItemRegistry -import org.eclipse.smarthome.core.thing.ThingRegistry -import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent -import org.eclipse.smarthome.core.types.Command -import org.eclipse.smarthome.core.types.State -import org.eclipse.smarthome.model.rule.rules.ChangedEventTrigger -import org.eclipse.smarthome.model.rule.rules.CommandEventTrigger -import org.eclipse.smarthome.model.rule.rules.EventEmittedTrigger -import org.eclipse.smarthome.model.rule.rules.EventTrigger -import org.eclipse.smarthome.model.rule.rules.GroupMemberChangedEventTrigger -import org.eclipse.smarthome.model.rule.rules.GroupMemberCommandEventTrigger -import org.eclipse.smarthome.model.rule.rules.GroupMemberUpdateEventTrigger -import org.eclipse.smarthome.model.rule.rules.Rule -import org.eclipse.smarthome.model.rule.rules.RuleModel -import org.eclipse.smarthome.model.rule.rules.ThingStateChangedEventTrigger -import org.eclipse.smarthome.model.rule.rules.UpdateEventTrigger -import org.eclipse.smarthome.model.script.jvmmodel.ScriptJvmModelInferrer -import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider +import org.openhab.core.items.Item +import org.openhab.core.items.ItemRegistry +import org.openhab.core.thing.ThingRegistry +import org.openhab.core.thing.events.ChannelTriggeredEvent +import org.openhab.core.types.Command +import org.openhab.core.types.State +import org.openhab.core.model.rule.rules.ChangedEventTrigger +import org.openhab.core.model.rule.rules.CommandEventTrigger +import org.openhab.core.model.rule.rules.EventEmittedTrigger +import org.openhab.core.model.rule.rules.EventTrigger +import org.openhab.core.model.rule.rules.GroupMemberChangedEventTrigger +import org.openhab.core.model.rule.rules.GroupMemberCommandEventTrigger +import org.openhab.core.model.rule.rules.GroupMemberUpdateEventTrigger +import org.openhab.core.model.rule.rules.Rule +import org.openhab.core.model.rule.rules.RuleModel +import org.openhab.core.model.rule.rules.ThingStateChangedEventTrigger +import org.openhab.core.model.rule.rules.UpdateEventTrigger +import org.openhab.core.model.script.jvmmodel.ScriptJvmModelInferrer +import org.openhab.core.model.script.scoping.StateAndCommandProvider import org.eclipse.xtext.naming.IQualifiedNameProvider import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java index d5fb16d9e..b196bcdb4 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.jvmmodel; +package org.openhab.core.model.rule.jvmmodel; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.action.ActionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java index bca9873bd..addf29ba9 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.jvmmodel; +package org.openhab.core.model.rule.jvmmodel; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.ThingRegistryChangeListener; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingRegistryChangeListener; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java index 099cfde70..7297c6d5d 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.rule.scoping; +package org.openhab.core.model.rule.scoping; -import org.eclipse.smarthome.model.script.scoping.ScriptImplicitlyImportedTypes; +import org.openhab.core.model.script.scoping.ScriptImplicitlyImportedTypes; import com.google.inject.Singleton; diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend index a6b949eda..bfd28bc77 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.rule.scoping +package org.openhab.core.model.rule.scoping /** diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend index b6b6f31f6..0b712de0c 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.rule.serializer +package org.openhab.core.model.rule.serializer class RulesSemanticSequencer extends AbstractRulesSemanticSequencer { diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend index 5df5952dd..9c6486ef3 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.rule.serializer +package org.openhab.core.model.rule.serializer class RulesSyntacticSequencer extends AbstractRulesSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend index 7bef66da6..4f9eba1dd 100644 --- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend +++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.rule.validation +package org.openhab.core.model.rule.validation //import org.eclipse.xtext.validation.Check /** diff --git a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend index 13275c8a6..fea745d41 100644 --- a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend +++ b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend @@ -13,9 +13,9 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.script.ide +package org.openhab.core.model.script.ide -import org.eclipse.smarthome.model.script.OptimizingFeatureScopeTrackerProvider2 +import org.openhab.core.model.script.OptimizingFeatureScopeTrackerProvider2 import org.eclipse.xtext.xbase.typesystem.internal.IFeatureScopeTracker /** diff --git a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend index 2b81921a9..e4ebc4cc8 100644 --- a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend +++ b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.script.ide +package org.openhab.core.model.script.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.script.ScriptRuntimeModule -import org.eclipse.smarthome.model.script.ScriptStandaloneSetup -import org.eclipse.smarthome.model.script.ServiceModule +import org.openhab.core.model.script.ScriptRuntimeModule +import org.openhab.core.model.script.ScriptStandaloneSetup +import org.openhab.core.model.script.ServiceModule import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java index f1f402e36..34b09683b 100644 --- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java +++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.runtime; +package org.openhab.core.model.script.runtime; /** * This is a marker interface for Script Runtimes. diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java index d424e9062..aff7b7b07 100644 --- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java +++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.runtime.internal.engine; +package org.openhab.core.model.script.runtime.internal.engine; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.ScriptStandaloneSetup; -import org.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; -import org.eclipse.smarthome.model.script.engine.ScriptParsingException; -import org.eclipse.smarthome.model.script.runtime.ScriptRuntime; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.ScriptStandaloneSetup; +import org.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.script.engine.ScriptParsingException; +import org.openhab.core.model.script.runtime.ScriptRuntime; import org.eclipse.xtext.diagnostics.Severity; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java index c760d07b4..b3ac6485b 100644 --- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java +++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.runtime.internal.engine; +package org.openhab.core.model.script.runtime.internal.engine; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptExecutionException; import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.CancelIndicator; diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd index 8d05e0112..59d25b970 100644 --- a/bundles/org.openhab.core.model.script/bnd.bnd +++ b/bundles/org.openhab.core.model.script/bnd.bnd @@ -1,46 +1,46 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model.script,\ - org.eclipse.smarthome.model.script.actions,\ - org.eclipse.smarthome.model.script.engine,\ - org.eclipse.smarthome.model.script.engine.action,\ - org.eclipse.smarthome.model.script.extension,\ - org.eclipse.smarthome.model.script.formatting,\ - org.eclipse.smarthome.model.script.interpreter,\ - org.eclipse.smarthome.model.script.jvmmodel,\ - org.eclipse.smarthome.model.script.lib,\ - org.eclipse.smarthome.model.script.parser.antlr,\ - org.eclipse.smarthome.model.script.parser.antlr.internal,\ - org.eclipse.smarthome.model.script.scoping,\ - org.eclipse.smarthome.model.script.script,\ - org.eclipse.smarthome.model.script.script.impl,\ - org.eclipse.smarthome.model.script.script.util,\ - org.eclipse.smarthome.model.script.serializer,\ - org.eclipse.smarthome.model.script.services,\ - org.eclipse.smarthome.model.script.validation +Export-Package: org.openhab.core.model.script,\ + org.openhab.core.model.script.actions,\ + org.openhab.core.model.script.engine,\ + org.openhab.core.model.script.engine.action,\ + org.openhab.core.model.script.extension,\ + org.openhab.core.model.script.formatting,\ + org.openhab.core.model.script.interpreter,\ + org.openhab.core.model.script.jvmmodel,\ + org.openhab.core.model.script.lib,\ + org.openhab.core.model.script.parser.antlr,\ + org.openhab.core.model.script.parser.antlr.internal,\ + org.openhab.core.model.script.scoping,\ + org.openhab.core.model.script.script,\ + org.openhab.core.model.script.script.impl,\ + org.openhab.core.model.script.script.util,\ + org.openhab.core.model.script.serializer,\ + org.openhab.core.model.script.services,\ + org.openhab.core.model.script.validation Import-Package: \ - org.eclipse.smarthome.core.audio,\ - org.eclipse.smarthome.core.common.registry,\ - org.eclipse.smarthome.core.ephemeris,\ - org.eclipse.smarthome.core.events,\ - org.eclipse.smarthome.core.items,\ - org.eclipse.smarthome.core.items.events,\ - org.eclipse.smarthome.core.library.items,\ - org.eclipse.smarthome.core.library.types,\ - org.eclipse.smarthome.core.library.unit,\ - org.eclipse.smarthome.core.persistence,\ - org.eclipse.smarthome.core.thing,\ - org.eclipse.smarthome.core.thing.binding,\ - org.eclipse.smarthome.core.transform.actions,\ - org.eclipse.smarthome.core.types,\ - org.eclipse.smarthome.core.voice,\ - org.eclipse.smarthome.core.voice.text,\ - org.eclipse.smarthome.io.console,\ - org.eclipse.smarthome.io.console.extensions,\ - org.eclipse.smarthome.io.net.exec,\ - org.eclipse.smarthome.io.net.http,\ - org.eclipse.smarthome.model.core,\ - org.eclipse.smarthome.model.persistence.extensions,\ - org.eclipse.smarthome.model.script.engine.action,\ + org.openhab.core.audio,\ + org.openhab.core.common.registry,\ + org.openhab.core.ephemeris,\ + org.openhab.core.events,\ + org.openhab.core.items,\ + org.openhab.core.items.events,\ + org.openhab.core.library.items,\ + org.openhab.core.library.types,\ + org.openhab.core.library.unit,\ + org.openhab.core.persistence,\ + org.openhab.core.thing,\ + org.openhab.core.thing.binding,\ + org.openhab.core.transform.actions,\ + org.openhab.core.types,\ + org.openhab.core.voice,\ + org.openhab.core.voice.text,\ + org.openhab.core.io.console,\ + org.openhab.core.io.console.extensions,\ + org.openhab.core.io.net.exec,\ + org.openhab.core.io.net.http,\ + org.openhab.core.model.core,\ + org.openhab.core.model.persistence.extensions,\ + org.openhab.core.model.script.engine.action,\ com.google.common.*;version="14",\ javax.measure.*,\ org.apache.*,\ diff --git a/bundles/org.openhab.core.model.script/plugin.xml b/bundles/org.openhab.core.model.script/plugin.xml index cf1f2de46..cf16866d8 100644 --- a/bundles/org.openhab.core.model.script/plugin.xml +++ b/bundles/org.openhab.core.model.script/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml index 1f6a7bf3a..1c2fd023f 100644 --- a/bundles/org.openhab.core.model.script/pom.xml +++ b/bundles/org.openhab.core.model.script/pom.xml @@ -77,7 +77,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/script/GenerateScript.mwe2 + file://${project.basedir}/src/org/openhab/core/model/script/GenerateScript.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2 b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2 index 05d724ba3..8a8ce9497 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2 +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2 @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.script.GenerateScript +module org.openhab.core.model.script.GenerateScript import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* @@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var fileExtensions = "script" var projectName = "org.openhab.core.model.script" -var languageName = "org.eclipse.smarthome.model.script.Script" +var languageName = "org.openhab.core.model.script.Script" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java index a6a39fecf..f8e0dfde2 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script; +package org.openhab.core.model.script; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.xbase.typesystem.internal.FeatureScopeTracker; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext index f9b4070b8..46ea8346d 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext @@ -1,10 +1,10 @@ -grammar org.eclipse.smarthome.model.script.Script with org.eclipse.xtext.xbase.Xbase +grammar org.openhab.core.model.script.Script with org.eclipse.xtext.xbase.Xbase import "http://www.eclipse.org/xtext/xbase/Xbase" import "http://www.eclipse.org/xtext/common/JavaVMTypes" as types import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate script "http://www.eclipse.org/smarthome/model/Script" +generate script "https://openhab.org/model/Script" Script returns XBlockExpression: {Script} diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend index c7e9e7673..fdbb7f440 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend @@ -14,12 +14,12 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model.script +org.openhab.core.model.script -import org.eclipse.smarthome.model.script.interpreter.ScriptInterpreter -import org.eclipse.smarthome.model.script.scoping.ActionClassLoader -import org.eclipse.smarthome.model.script.scoping.ScriptImplicitlyImportedTypes -import org.eclipse.smarthome.model.script.scoping.ScriptImportSectionNamespaceScopeProvider +import org.openhab.core.model.script.interpreter.ScriptInterpreter +import org.openhab.core.model.script.scoping.ActionClassLoader +import org.openhab.core.model.script.scoping.ScriptImplicitlyImportedTypes +import org.openhab.core.model.script.scoping.ScriptImportSectionNamespaceScopeProvider import org.eclipse.xtext.common.types.access.IJvmTypeProvider import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeProviderFactory import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeScopeProvider @@ -34,16 +34,16 @@ import org.eclipse.xtext.xbase.scoping.batch.ImplicitlyImportedFeatures import com.google.inject.Binder import com.google.inject.name.Names import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputer -import org.eclipse.smarthome.model.script.jvmmodel.ScriptTypeComputer +import org.openhab.core.model.script.jvmmodel.ScriptTypeComputer import org.eclipse.xtext.parser.IEncodingProvider -import org.eclipse.smarthome.model.script.internal.ScriptEncodingProvider +import org.openhab.core.model.script.internal.ScriptEncodingProvider import org.eclipse.xtext.service.DispatchingProvider /** * Use this class to register components to be used at runtime / without the Equinox extension registry. * @author Oliver Libutzki - Initial contribution */ -@SuppressWarnings("restriction") class ScriptRuntimeModule extends org.eclipse.smarthome.model.script.AbstractScriptRuntimeModule { +@SuppressWarnings("restriction") class ScriptRuntimeModule extends org.openhab.core.model.script.AbstractScriptRuntimeModule { def Class bindImplicitlyImportedTypes() { return ScriptImplicitlyImportedTypes } diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java index 8a9af6f2a..4ae7eec03 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script; +package org.openhab.core.model.script; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.core.thing.binding.ThingActions; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.binding.ThingActions; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend index 28f8c78ab..0643d063d 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script +package org.openhab.core.model.script import com.google.inject.Guice import com.google.inject.Injector -import org.eclipse.smarthome.model.script.engine.ScriptEngine +import org.openhab.core.model.script.engine.ScriptEngine import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.EPackage import org.eclipse.xtext.resource.IResourceServiceProvider @@ -67,7 +67,7 @@ class ScriptStandaloneSetup extends ScriptStandaloneSetupGenerated { } def static void unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Script"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Script"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("script"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("script"); diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java index a00f078d3..bdc61e48a 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script; +package org.openhab.core.model.script; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.thing.ThingRegistry; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.IActionServiceProvider; -import org.eclipse.smarthome.model.script.engine.IThingActionsProvider; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.internal.engine.ServiceTrackerActionServiceProvider; -import org.eclipse.smarthome.model.script.internal.engine.ServiceTrackerThingActionsProvider; -import org.eclipse.smarthome.model.script.script.Script; -import org.eclipse.smarthome.model.script.script.impl.ScriptImpl; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.IActionServiceProvider; +import org.openhab.core.model.script.engine.IThingActionsProvider; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.internal.engine.ServiceTrackerActionServiceProvider; +import org.openhab.core.model.script.internal.engine.ServiceTrackerThingActionsProvider; +import org.openhab.core.model.script.script.Script; +import org.openhab.core.model.script.script.impl.ScriptImpl; import com.google.inject.Binder; import com.google.inject.Module; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java index a06405a28..b64f370ea 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.io.IOException; import java.math.BigDecimal; -import org.eclipse.smarthome.core.audio.AudioException; -import org.eclipse.smarthome.core.library.types.PercentType; -import org.eclipse.smarthome.model.script.engine.action.ActionDoc; -import org.eclipse.smarthome.model.script.engine.action.ParamDoc; -import org.eclipse.smarthome.model.script.internal.engine.action.AudioActionService; +import org.openhab.core.audio.AudioException; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.model.script.engine.action.ActionDoc; +import org.openhab.core.model.script.engine.action.ParamDoc; +import org.openhab.core.model.script.internal.engine.action.AudioActionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java index face5849e..8b1f3bce4 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.util.HashMap; import java.util.List; @@ -18,16 +18,16 @@ import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; -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.eclipse.smarthome.model.script.ScriptServiceUtil; +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.openhab.core.model.script.ScriptServiceUtil; import org.slf4j.LoggerFactory; /** diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java index a7a42698d..7fbe45361 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.io.FileNotFoundException; import java.time.ZonedDateTime; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.model.script.engine.action.ActionDoc; -import org.eclipse.smarthome.model.script.internal.engine.action.EphemerisActionService; +import org.openhab.core.model.script.engine.action.ActionDoc; +import org.openhab.core.model.script.internal.engine.action.EphemerisActionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java index dd0dbb056..7c5b3f385 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.io.IOException; -import org.eclipse.smarthome.io.net.exec.ExecUtil; +import org.openhab.core.io.net.exec.ExecUtil; /** * This class provides static methods that can be used in automation rules for diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java index d8b08d9b4..d8ab06df6 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.io.IOException; import java.util.Properties; @@ -18,7 +18,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.http.HttpMethod; -import org.eclipse.smarthome.io.net.http.HttpUtil; +import org.openhab.core.io.net.http.HttpUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java index 5f447b935..3bbba6156 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,13 +23,13 @@ import org.slf4j.LoggerFactory; */ public class LogAction { - private static final String LOGGER_NAME_PREFIX = "org.eclipse.smarthome.model.script."; + private static final String LOGGER_NAME_PREFIX = "org.openhab.core.model.script."; /** * Creates the Log-Entry format with level DEBUG and logs under the loggers name - * org.eclipse.smarthome.model.script.<loggerName> + * org.openhab.core.model.script.<loggerName> * - * @param loggerName the name of the Logger which is prefixed with org.eclipse.smarthome.model.script. + * @param loggerName the name of the Logger which is prefixed with org.openhab.core.model.script. * @param format the Log-Statement which can contain placeholders '{}' * @param args the arguments to replace the placeholders contained in format * @@ -41,9 +41,9 @@ public class LogAction { /** * Creates the Log-Entry format with level INFO and logs under the loggers name - * org.eclipse.smarthome.model.script.<loggerName> + * org.openhab.core.model.script.<loggerName> * - * @param loggerName the name of the Logger which is prefixed with org.eclipse.smarthome.model.script. + * @param loggerName the name of the Logger which is prefixed with org.openhab.core.model.script. * @param format the Log-Statement which can contain placeholders '{}' * @param args the arguments to replace the placeholders contained in format * @@ -55,9 +55,9 @@ public class LogAction { /** * Creates the Log-Entry format with level WARN and logs under the loggers name - * org.eclipse.smarthome.model.script.<loggerName> + * org.openhab.core.model.script.<loggerName> * - * @param loggerName the name of the Logger which is prefixed with org.eclipse.smarthome.model.script. + * @param loggerName the name of the Logger which is prefixed with org.openhab.core.model.script. * @param format the Log-Statement which can contain placeholders '{}' * @param args the arguments to replace the placeholders contained in format * @@ -69,9 +69,9 @@ public class LogAction { /** * Creates the Log-Entry format with level ERROR and logs under the loggers name - * org.eclipse.smarthome.model.script.<loggerName> + * org.openhab.core.model.script.<loggerName> * - * @param loggerName the name of the Logger which is prefixed with org.eclipse.smarthome.model.script. + * @param loggerName the name of the Logger which is prefixed with org.openhab.core.model.script. * @param format the Log-Statement which can contain placeholders '{}' * @param args the arguments to replace the placeholders contained in format * diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java index 0a8b90143..86dfa7b5e 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import java.io.IOException; import java.net.InetAddress; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java index 69fe18d84..e6644ae26 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import static org.quartz.JobBuilder.newJob; import static org.quartz.TriggerBuilder.newTrigger; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; -import org.eclipse.smarthome.model.script.internal.actions.TimerExecutionJob; -import org.eclipse.smarthome.model.script.internal.actions.TimerImpl; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.script.internal.actions.TimerExecutionJob; +import org.openhab.core.model.script.internal.actions.TimerImpl; import org.eclipse.xtext.xbase.XExpression; import org.eclipse.xtext.xbase.lib.Procedures.Procedure0; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java index 24f951040..9738a4bb7 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.binding.ThingActions; -import org.eclipse.smarthome.model.script.internal.engine.action.ThingActionService; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.binding.ThingActions; +import org.openhab.core.model.script.internal.engine.action.ThingActionService; /** * This class provides static methods that can be used in automation rules for diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java index 4c3d281b1..4a1fd3066 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import org.joda.time.base.AbstractInstant; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java index 4ffb26005..1b7bce2d8 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.actions; +package org.openhab.core.model.script.actions; import org.apache.commons.lang.StringUtils; -import org.eclipse.smarthome.core.library.types.PercentType; -import org.eclipse.smarthome.core.voice.text.InterpretationException; -import org.eclipse.smarthome.model.script.engine.action.ActionDoc; -import org.eclipse.smarthome.model.script.engine.action.ParamDoc; -import org.eclipse.smarthome.model.script.internal.engine.action.VoiceActionService; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.voice.text.InterpretationException; +import org.openhab.core.model.script.engine.action.ActionDoc; +import org.openhab.core.model.script.engine.action.ParamDoc; +import org.openhab.core.model.script.internal.engine.action.VoiceActionService; /** * The static methods of this class are made available as functions in the scripts. diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java index 2748b7d6a..d58eb62ce 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import java.util.List; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.model.script.engine.action.ActionService; public interface IActionServiceProvider { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java index b0e7c59a3..552466d36 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import java.util.List; -import org.eclipse.smarthome.core.thing.binding.ThingActions; +import org.openhab.core.thing.binding.ThingActions; public interface IThingActionsProvider { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java index 022733a4e..532ad4dae 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import org.eclipse.xtext.xbase.interpreter.IEvaluationContext; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java index f7cce659e..520be309e 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import org.eclipse.xtext.xbase.XExpression; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java index fece5bdb3..914ce84f3 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.nodemodel.INode; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java index d11f5782b..93cc2e1df 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import java.util.ArrayList; import java.util.LinkedList; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java index 13515b4d0..c50565e1d 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; /** * Exception that is thrown on errors during script execution. diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java index 9c2978e8e..5ae8a567b 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine; +package org.openhab.core.model.script.engine; import java.util.List; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java index 84eb98f15..07fe78a2f 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine.action; +package org.openhab.core.model.script.engine.action; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java index 2d74688d9..7e31bdd5a 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine.action; +package org.openhab.core.model.script.engine.action; /** * This interface must be implemented by services that want to contribute script actions. diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java index 5ec58e22c..f10cd7b2d 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.engine.action; +package org.openhab.core.model.script.engine.action; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java index 35556239f..db66f8d89 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.extension; +package org.openhab.core.model.script.extension; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -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.eclipse.smarthome.model.script.engine.Script; -import org.eclipse.smarthome.model.script.engine.ScriptEngine; -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException; -import org.eclipse.smarthome.model.script.engine.ScriptParsingException; +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.openhab.core.model.script.engine.Script; +import org.openhab.core.model.script.engine.ScriptEngine; +import org.openhab.core.model.script.engine.ScriptExecutionException; +import org.openhab.core.model.script.engine.ScriptParsingException; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferencePolicy; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend index 3a84436af..9f81e40af 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.script.formatting +package org.openhab.core.model.script.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig // import com.google.inject.Inject; -// import org.eclipse.smarthome.model.script.services.ScriptGrammarAccess +// import org.openhab.core.model.script.services.ScriptGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java index a98649034..a832c86fd 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java @@ -10,21 +10,21 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal; +package org.openhab.core.model.script.internal; import java.util.Collections; import java.util.Locale; import java.util.Map; import java.util.Set; -import org.eclipse.smarthome.config.core.ConfigurableService; -import org.eclipse.smarthome.core.events.Event; -import org.eclipse.smarthome.core.events.EventPublisher; -import org.eclipse.smarthome.core.items.ItemUtil; -import org.eclipse.smarthome.core.items.events.ItemEventFactory; -import org.eclipse.smarthome.core.library.types.StringType; -import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter; -import org.eclipse.smarthome.core.voice.text.InterpretationException; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.events.Event; +import org.openhab.core.events.EventPublisher; +import org.openhab.core.items.ItemUtil; +import org.openhab.core.items.events.ItemEventFactory; +import org.openhab.core.library.types.StringType; +import org.openhab.core.voice.text.HumanLanguageInterpreter; +import org.openhab.core.voice.text.InterpretationException; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -42,8 +42,8 @@ import org.slf4j.LoggerFactory; * * @author Kai Kreuzer - Initial contribution */ -@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.eclipse.smarthome.rulehli", property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.rulehli", +@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.core.rulehli", property = { + Constants.SERVICE_PID + "=org.openhab.core.rulehli", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Rule Voice Interpreter", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI }) diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java index 26e9eaedf..bbbbd870f 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal; +package org.openhab.core.model.script.internal; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java index 1f8fb0ae0..08548f2bf 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.actions; +package org.openhab.core.model.script.internal.actions; import org.eclipse.xtext.xbase.lib.Procedures.Procedure0; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java index cd41b4cad..762dd0890 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.actions; +package org.openhab.core.model.script.internal.actions; import static org.quartz.JobBuilder.newJob; import static org.quartz.TriggerBuilder.newTrigger; import java.util.Date; -import org.eclipse.smarthome.model.script.actions.Timer; +import org.openhab.core.model.script.actions.Timer; import org.joda.time.DateTime; import org.joda.time.base.AbstractInstant; import org.quartz.JobDataMap; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend index ee80973fb..011571512 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine; +package org.openhab.core.model.script.internal.engine; import com.google.inject.Singleton -import org.eclipse.smarthome.model.script.ScriptServiceUtil -import org.eclipse.smarthome.model.script.engine.IActionServiceProvider +import org.openhab.core.model.script.ScriptServiceUtil +import org.openhab.core.model.script.engine.IActionServiceProvider @Singleton class ServiceTrackerActionServiceProvider implements IActionServiceProvider { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend index daac8c092..30bd0febb 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine; +package org.openhab.core.model.script.internal.engine; import com.google.inject.Singleton -import org.eclipse.smarthome.model.script.ScriptServiceUtil -import org.eclipse.smarthome.model.script.engine.IThingActionsProvider +import org.openhab.core.model.script.ScriptServiceUtil +import org.openhab.core.model.script.engine.IThingActionsProvider @Singleton class ServiceTrackerThingActionsProvider implements IThingActionsProvider { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java index 0e0cae50c..d034d067c 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; -import org.eclipse.smarthome.core.audio.AudioManager; -import org.eclipse.smarthome.model.script.actions.Audio; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.audio.AudioManager; +import org.openhab.core.model.script.actions.Audio; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java index 3c9ed3600..c56e4abee 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; -import org.eclipse.smarthome.core.ephemeris.EphemerisManager; -import org.eclipse.smarthome.model.script.actions.Ephemeris; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.ephemeris.EphemerisManager; +import org.openhab.core.model.script.actions.Ephemeris; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java index 03c3a06ff..9cd31c675 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; -import org.eclipse.smarthome.model.persistence.extensions.PersistenceExtensions; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.model.persistence.extensions.PersistenceExtensions; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java index 41a082072..b3cb9bf01 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; 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.ThingStatusInfo; -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.eclipse.smarthome.model.script.actions.Things; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingRegistry; +import org.openhab.core.thing.ThingStatusInfo; +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.openhab.core.model.script.actions.Things; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java index fac35f620..004ff77e2 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; -import org.eclipse.smarthome.core.transform.actions.Transformation; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.transform.actions.Transformation; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java index f9f8e119c..21a5de2db 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.internal.engine.action; +package org.openhab.core.model.script.internal.engine.action; -import org.eclipse.smarthome.core.voice.VoiceManager; -import org.eclipse.smarthome.model.script.actions.Voice; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.voice.VoiceManager; +import org.openhab.core.model.script.actions.Voice; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend index 70ff299d3..4e49538a5 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.interpreter; +package org.openhab.core.model.script.interpreter; import com.google.inject.Inject -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.library.types.QuantityType -import org.eclipse.smarthome.core.types.Type -import org.eclipse.smarthome.model.script.engine.ScriptError -import org.eclipse.smarthome.model.script.engine.ScriptExecutionException -import org.eclipse.smarthome.model.script.lib.NumberExtensions -import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider -import org.eclipse.smarthome.model.script.script.QuantityLiteral +import org.openhab.core.items.Item +import org.openhab.core.items.ItemNotFoundException +import org.openhab.core.items.ItemRegistry +import org.openhab.core.library.types.QuantityType +import org.openhab.core.types.Type +import org.openhab.core.model.script.engine.ScriptError +import org.openhab.core.model.script.engine.ScriptExecutionException +import org.openhab.core.model.script.lib.NumberExtensions +import org.openhab.core.model.script.scoping.StateAndCommandProvider +import org.openhab.core.model.script.script.QuantityLiteral import org.eclipse.xtext.common.types.JvmField import org.eclipse.xtext.common.types.JvmIdentifiableElement import org.eclipse.xtext.naming.QualifiedName diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java index b4a01ca5a..c296e9bce 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.jvmmodel; +package org.openhab.core.model.script.jvmmodel; import java.util.Collection; import java.util.concurrent.Executors; @@ -18,11 +18,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ItemRegistryChangeListener; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ItemRegistryChangeListener; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.script.engine.action.ActionService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferenceCardinality; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend index 9ec3ef98c..7dd67ec66 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.jvmmodel +package org.openhab.core.model.script.jvmmodel import com.google.inject.Inject import java.util.Set -import org.eclipse.smarthome.core.items.ItemRegistry -import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider -import org.eclipse.smarthome.model.script.script.Script +import org.openhab.core.items.ItemRegistry +import org.openhab.core.model.script.scoping.StateAndCommandProvider +import org.openhab.core.model.script.script.Script import org.eclipse.xtext.xbase.jvmmodel.AbstractModelInferrer import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java index 6c33352e8..b44377d99 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.jvmmodel; +package org.openhab.core.model.script.jvmmodel; -import org.eclipse.smarthome.core.library.types.QuantityType; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.model.script.script.QuantityLiteral; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; +import org.openhab.core.model.script.script.QuantityLiteral; import org.eclipse.xtext.xbase.XExpression; import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputationState; import org.eclipse.xtext.xbase.typesystem.computation.ITypeExpectation; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java index 8a447e19f..863206bbc 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.lib; +package org.openhab.core.model.script.lib; import java.math.BigDecimal; import java.math.RoundingMode; import javax.measure.quantity.Dimensionless; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.library.types.QuantityType; -import org.eclipse.smarthome.core.library.unit.SmartHomeUnits; -import org.eclipse.smarthome.core.types.Type; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.unit.SmartHomeUnits; +import org.openhab.core.types.Type; /** * This class contains all kinds of extensions to be used by scripts and not diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java index 98b987d57..64f0ca491 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.scoping; +package org.openhab.core.model.script.scoping; -import org.eclipse.smarthome.core.thing.binding.ThingActions; -import org.eclipse.smarthome.model.script.ScriptServiceUtil; -import org.eclipse.smarthome.model.script.engine.action.ActionService; +import org.openhab.core.thing.binding.ThingActions; +import org.openhab.core.model.script.ScriptServiceUtil; +import org.openhab.core.model.script.engine.action.ActionService; /** * This is a special class loader that tries to resolve classes from available {@link ActionService}s, diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java index d9b1d1a8e..0a1bdbba7 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.scoping; +package org.openhab.core.model.script.scoping; import java.math.BigDecimal; import java.math.BigInteger; @@ -19,26 +19,26 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -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.binding.ThingActions; -import org.eclipse.smarthome.model.persistence.extensions.PersistenceExtensions; -import org.eclipse.smarthome.model.script.actions.Audio; -import org.eclipse.smarthome.model.script.actions.BusEvent; -import org.eclipse.smarthome.model.script.actions.Exec; -import org.eclipse.smarthome.model.script.actions.HTTP; -import org.eclipse.smarthome.model.script.actions.LogAction; -import org.eclipse.smarthome.model.script.actions.Ping; -import org.eclipse.smarthome.model.script.actions.ScriptExecution; -import org.eclipse.smarthome.model.script.actions.Things; -import org.eclipse.smarthome.model.script.actions.Voice; -import org.eclipse.smarthome.model.script.engine.IActionServiceProvider; -import org.eclipse.smarthome.model.script.engine.IThingActionsProvider; -import org.eclipse.smarthome.model.script.engine.action.ActionService; -import org.eclipse.smarthome.model.script.lib.NumberExtensions; +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.binding.ThingActions; +import org.openhab.core.model.persistence.extensions.PersistenceExtensions; +import org.openhab.core.model.script.actions.Audio; +import org.openhab.core.model.script.actions.BusEvent; +import org.openhab.core.model.script.actions.Exec; +import org.openhab.core.model.script.actions.HTTP; +import org.openhab.core.model.script.actions.LogAction; +import org.openhab.core.model.script.actions.Ping; +import org.openhab.core.model.script.actions.ScriptExecution; +import org.openhab.core.model.script.actions.Things; +import org.openhab.core.model.script.actions.Voice; +import org.openhab.core.model.script.engine.IActionServiceProvider; +import org.openhab.core.model.script.engine.IThingActionsProvider; +import org.openhab.core.model.script.engine.action.ActionService; +import org.openhab.core.model.script.lib.NumberExtensions; import org.eclipse.xtext.xbase.scoping.batch.ImplicitlyImportedFeatures; import org.joda.time.DateTime; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java index 7e9e3e379..77457602b 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.scoping; +package org.openhab.core.model.script.scoping; import java.util.List; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend index 052654d42..2c72ed3f4 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.script.scoping +package org.openhab.core.model.script.scoping /** diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java index 5b1f37845..c154c4dd1 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java @@ -10,24 +10,24 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.script.scoping; +package org.openhab.core.model.script.scoping; import java.util.HashSet; import java.util.Set; -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.PlayPauseType; -import org.eclipse.smarthome.core.library.types.RewindFastforwardType; -import org.eclipse.smarthome.core.library.types.StopMoveType; -import org.eclipse.smarthome.core.library.types.UpDownType; -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.Type; -import org.eclipse.smarthome.core.types.UnDefType; +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.PlayPauseType; +import org.openhab.core.library.types.RewindFastforwardType; +import org.openhab.core.library.types.StopMoveType; +import org.openhab.core.library.types.UpDownType; +import org.openhab.core.types.Command; +import org.openhab.core.types.RefreshType; +import org.openhab.core.types.State; +import org.openhab.core.types.Type; +import org.openhab.core.types.UnDefType; import com.google.inject.Singleton; diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend index e17f726ce..fdc786554 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.script.serializer +package org.openhab.core.model.script.serializer class ScriptSemanticSequencer extends AbstractScriptSemanticSequencer { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend index a74f83818..3740b5632 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.script.serializer +package org.openhab.core.model.script.serializer class ScriptSyntacticSequencer extends AbstractScriptSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend index 457ad3ccb..523eb4022 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.script.validation +package org.openhab.core.model.script.validation //import org.eclipse.xtext.validation.Check /** diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend index 30546e022..4e5fa8c93 100644 --- a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend +++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.19.0 */ -package org.eclipse.smarthome.model.sitemap.ide +package org.openhab.core.model.sitemap.ide /** diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend index c7af07183..5c8bcf591 100644 --- a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend +++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend @@ -13,11 +13,11 @@ /* * generated by Xtext 2.19.0 */ -package org.eclipse.smarthome.model.sitemap.ide +package org.openhab.core.model.sitemap.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.sitemap.SitemapRuntimeModule -import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup +import org.openhab.core.model.sitemap.SitemapRuntimeModule +import org.openhab.core.model.sitemap.SitemapStandaloneSetup import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd b/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd index e7ee00d1b..b340bf0ea 100644 --- a/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd +++ b/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd @@ -2,6 +2,6 @@ Bundle-SymbolicName: ${project.artifactId} Require-Bundle: org.openhab.core.model.sitemap Import-Package: \ org.eclipse.jdt.annotation;resolution:=optional,\ - org.eclipse.smarthome.model.core,\ + org.openhab.core.model.core,\ org.osgi.framework,\ org.slf4j diff --git a/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java b/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java index 829222c92..e92de6729 100644 --- a/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java +++ b/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.sitemap.runtime.internal; +package org.openhab.core.model.sitemap.runtime.internal; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.sitemap.SitemapStandaloneSetup; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd index 0f8beebd0..3b1399c26 100644 --- a/bundles/org.openhab.core.model.sitemap/bnd.bnd +++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd @@ -1,21 +1,21 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model.sitemap,\ - org.eclipse.smarthome.model.sitemap.formatting,\ - org.eclipse.smarthome.model.sitemap.generator,\ - org.eclipse.smarthome.model.sitemap.parser.antlr,\ - org.eclipse.smarthome.model.sitemap.parser.antlr.internal,\ - org.eclipse.smarthome.model.sitemap.scoping,\ - org.eclipse.smarthome.model.sitemap.serializer,\ - org.eclipse.smarthome.model.sitemap.services,\ - org.eclipse.smarthome.model.sitemap.sitemap,\ - org.eclipse.smarthome.model.sitemap.sitemap.impl,\ - org.eclipse.smarthome.model.sitemap.sitemap.util,\ - org.eclipse.smarthome.model.sitemap.validation +Export-Package: org.openhab.core.model.sitemap,\ + org.openhab.core.model.sitemap.formatting,\ + org.openhab.core.model.sitemap.generator,\ + org.openhab.core.model.sitemap.parser.antlr,\ + org.openhab.core.model.sitemap.parser.antlr.internal,\ + org.openhab.core.model.sitemap.scoping,\ + org.openhab.core.model.sitemap.serializer,\ + org.openhab.core.model.sitemap.services,\ + org.openhab.core.model.sitemap.sitemap,\ + org.openhab.core.model.sitemap.sitemap.impl,\ + org.openhab.core.model.sitemap.sitemap.util,\ + org.openhab.core.model.sitemap.validation Import-Package: org.apache.commons.lang,\ org.apache.log4j,\ org.eclipse.jdt.annotation;resolution:=optional,\ - org.eclipse.smarthome.core.items.dto,\ - org.eclipse.smarthome.model.core,\ + org.openhab.core.items.dto,\ + org.openhab.core.model.core,\ org.eclipse.xtext.xbase.lib,\ org.osgi.framework,\ org.osgi.service.cm,\ diff --git a/bundles/org.openhab.core.model.sitemap/plugin.xml b/bundles/org.openhab.core.model.sitemap/plugin.xml index 97e86ccb1..190e561df 100644 --- a/bundles/org.openhab.core.model.sitemap/plugin.xml +++ b/bundles/org.openhab.core.model.sitemap/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index 55b762b85..1f8ccdc07 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -51,7 +51,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 + file://${project.basedir}/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2 b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2 index e6be9976f..fce13b740 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2 +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2 @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.sitemap.GenerateSitemap +module org.openhab.core.model.sitemap.GenerateSitemap import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var projectName = "org.openhab.core.model.sitemap" -var languageName = "org.eclipse.smarthome.model.sitemap.Sitemap" +var languageName = "org.openhab.core.model.sitemap.Sitemap" var fileExtensions = "sitemap" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties index ce789b8c3..8bcda501c 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties @@ -1,3 +1,3 @@ grammarURI=classpath:/org/openhab/model/sitemap/Sitemap.xtext file.extensions=sitemap -projectName=org.eclipse.smarthome.model.sitemap +projectName=org.openhab.core.model.sitemap diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext index 5ec683692..f83add362 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext @@ -1,7 +1,7 @@ -grammar org.eclipse.smarthome.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals +grammar org.openhab.core.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate sitemap "http://www.eclipse.org/smarthome/model/Sitemap" +generate sitemap "https://openhab.org/model/Sitemap" SitemapModel: 'sitemap' Sitemap; diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java index aab431bc2..ed84f2a93 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.sitemap; +package org.openhab.core.model.sitemap; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.sitemap.sitemap.Sitemap; @NonNullByDefault public interface SitemapProvider { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend index b5a14670a..fd80371c7 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend @@ -14,9 +14,9 @@ package /* * generated by Xtext */ -org.eclipse.smarthome.model.sitemap +org.openhab.core.model.sitemap -import org.eclipse.smarthome.model.sitemap.valueconverter.SitemapConverters +import org.openhab.core.model.sitemap.valueconverter.SitemapConverters import org.eclipse.xtext.conversion.IValueConverterService import org.eclipse.xtext.linking.lazy.LazyURIEncoder import com.google.inject.Binder @@ -25,7 +25,7 @@ import com.google.inject.name.Names /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ -class SitemapRuntimeModule extends org.eclipse.smarthome.model.sitemap.AbstractSitemapRuntimeModule { +class SitemapRuntimeModule extends org.openhab.core.model.sitemap.AbstractSitemapRuntimeModule { override Class bindIValueConverterService() { return SitemapConverters } diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend index b733a6057..7d8667253 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.sitemap +package org.openhab.core.model.sitemap import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource @@ -26,7 +26,7 @@ class SitemapStandaloneSetup extends SitemapStandaloneSetupGenerated { } def static void unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Sitemap"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Sitemap"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("sitemap"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("sitemap"); } diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend index f400b9c19..8d1f5783b 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.sitemap.formatting +package org.openhab.core.model.sitemap.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig // import com.google.inject.Inject; -// import org.eclipse.smarthome.model.services.SitemapGrammarAccess +// import org.openhab.core.model.services.SitemapGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend index 3a9b40be7..36afee212 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.sitemap.generator +package org.openhab.core.model.sitemap.generator import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.AbstractGenerator diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java index 8506e30e2..b8a581627 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.sitemap.internal; +package org.openhab.core.model.sitemap.internal; import java.util.Map; import java.util.Set; @@ -22,11 +22,11 @@ import org.apache.commons.lang.StringUtils; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener; -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap; -import org.eclipse.smarthome.model.sitemap.SitemapProvider; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.core.ModelRepositoryChangeListener; +import org.openhab.core.model.sitemap.sitemap.Sitemap; +import org.openhab.core.model.sitemap.SitemapProvider; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend index fa6eda10e..c4dbbf94e 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.sitemap.scoping +package org.openhab.core.model.sitemap.scoping /** * This class contains custom scoping description. diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend index 99f844740..08dceb218 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.sitemap.serializer +package org.openhab.core.model.sitemap.serializer class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend index 7c14985f9..1abc41ef6 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.sitemap.serializer +package org.openhab.core.model.sitemap.serializer class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend index 363b9ccb3..2fef8b0f8 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend @@ -13,14 +13,14 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.sitemap.validation +package org.openhab.core.model.sitemap.validation -import org.eclipse.smarthome.model.sitemap.sitemap.Frame -import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget -import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint -import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap -import org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage -import org.eclipse.smarthome.model.sitemap.sitemap.Widget +import org.openhab.core.model.sitemap.sitemap.Frame +import org.openhab.core.model.sitemap.sitemap.LinkableWidget +import org.openhab.core.model.sitemap.sitemap.Setpoint +import org.openhab.core.model.sitemap.sitemap.Sitemap +import org.openhab.core.model.sitemap.sitemap.SitemapPackage +import org.openhab.core.model.sitemap.sitemap.Widget import org.eclipse.xtext.validation.Check import java.math.BigDecimal diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java index bdc36a63b..a98c7699a 100644 --- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java +++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.sitemap.valueconverter; +package org.openhab.core.model.sitemap.valueconverter; import java.util.regex.Pattern; diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend index 647f343ad..c9cc170a1 100644 --- a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend +++ b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.thing.ide +package org.openhab.core.model.thing.ide /** diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend index fb59d12a4..12daa1a40 100644 --- a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend +++ b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend @@ -13,11 +13,11 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.thing.ide +package org.openhab.core.model.thing.ide import com.google.inject.Guice -import org.eclipse.smarthome.model.thing.ThingRuntimeModule -import org.eclipse.smarthome.model.thing.ThingStandaloneSetup +import org.openhab.core.model.thing.ThingRuntimeModule +import org.openhab.core.model.thing.ThingStandaloneSetup import org.eclipse.xtext.util.Modules2 /** diff --git a/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java b/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java index ccbfc2843..cc8e08aa4 100644 --- a/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java +++ b/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.runtime.internal; +package org.openhab.core.model.thing.runtime.internal; -import org.eclipse.smarthome.model.core.ModelParser; -import org.eclipse.smarthome.model.thing.ThingStandaloneSetup; +import org.openhab.core.model.core.ModelParser; +import org.openhab.core.model.thing.ThingStandaloneSetup; import org.osgi.service.component.annotations.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd index 46c3bc834..7992be157 100644 --- a/bundles/org.openhab.core.model.thing/bnd.bnd +++ b/bundles/org.openhab.core.model.thing/bnd.bnd @@ -1,34 +1,34 @@ Bundle-SymbolicName: ${project.artifactId} -Export-Package: org.eclipse.smarthome.model.thing,\ - org.eclipse.smarthome.model.thing.formatting,\ - org.eclipse.smarthome.model.thing.generator,\ - org.eclipse.smarthome.model.thing.parser.antlr,\ - org.eclipse.smarthome.model.thing.parser.antlr.internal,\ - org.eclipse.smarthome.model.thing.scoping,\ - org.eclipse.smarthome.model.thing.serializer,\ - org.eclipse.smarthome.model.thing.services,\ - org.eclipse.smarthome.model.thing.thing,\ - org.eclipse.smarthome.model.thing.thing.impl,\ - org.eclipse.smarthome.model.thing.thing.util,\ - org.eclipse.smarthome.model.thing.validation +Export-Package: org.openhab.core.model.thing,\ + org.openhab.core.model.thing.formatting,\ + org.openhab.core.model.thing.generator,\ + org.openhab.core.model.thing.parser.antlr,\ + org.openhab.core.model.thing.parser.antlr.internal,\ + org.openhab.core.model.thing.scoping,\ + org.openhab.core.model.thing.serializer,\ + org.openhab.core.model.thing.services,\ + org.openhab.core.model.thing.thing,\ + org.openhab.core.model.thing.thing.impl,\ + org.openhab.core.model.thing.thing.util,\ + org.openhab.core.model.thing.validation Import-Package: org.apache.log4j,\ org.eclipse.jdt.annotation;resolution:=optional,\ - org.eclipse.smarthome.config.core,\ - org.eclipse.smarthome.core.common.registry,\ - org.eclipse.smarthome.core.i18n,\ - org.eclipse.smarthome.core.items,\ - org.eclipse.smarthome.core.service,\ - org.eclipse.smarthome.core.thing,\ - org.eclipse.smarthome.core.thing.binding,\ - org.eclipse.smarthome.core.thing.binding.builder,\ - org.eclipse.smarthome.core.thing.link,\ - org.eclipse.smarthome.core.thing.type,\ - org.eclipse.smarthome.core.thing.util,\ - org.eclipse.smarthome.core.types.util,\ - org.eclipse.smarthome.core.util,\ - org.eclipse.smarthome.model.core,\ - org.eclipse.smarthome.model.core.valueconverter,\ - org.eclipse.smarthome.model.item,\ + org.openhab.core.config.core,\ + org.openhab.core.common.registry,\ + org.openhab.core.i18n,\ + org.openhab.core.items,\ + org.openhab.core.service,\ + org.openhab.core.thing,\ + org.openhab.core.thing.binding,\ + org.openhab.core.thing.binding.builder,\ + org.openhab.core.thing.link,\ + org.openhab.core.thing.type,\ + org.openhab.core.thing.util,\ + org.openhab.core.types.util,\ + org.openhab.core.util,\ + org.openhab.core.model.core,\ + org.openhab.core.model.core.valueconverter,\ + org.openhab.core.model.item,\ org.eclipse.xtext.xbase.lib,\ org.osgi.framework,\ org.osgi.service.component,\ diff --git a/bundles/org.openhab.core.model.thing/plugin.xml b/bundles/org.openhab.core.model.thing/plugin.xml index 6f9bc5314..d374704d7 100644 --- a/bundles/org.openhab.core.model.thing/plugin.xml +++ b/bundles/org.openhab.core.model.thing/plugin.xml @@ -5,8 +5,8 @@ diff --git a/bundles/org.openhab.core.model.thing/plugin.xml_gen b/bundles/org.openhab.core.model.thing/plugin.xml_gen index dd629c4b7..f1981ab8b 100644 --- a/bundles/org.openhab.core.model.thing/plugin.xml_gen +++ b/bundles/org.openhab.core.model.thing/plugin.xml_gen @@ -3,8 +3,8 @@ diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml index 9bb7b08aa..58c1b42ae 100644 --- a/bundles/org.openhab.core.model.thing/pom.xml +++ b/bundles/org.openhab.core.model.thing/pom.xml @@ -56,7 +56,7 @@ org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher false - file://${project.basedir}/src/org/eclipse/smarthome/model/thing/GenerateThing.mwe2 + file://${project.basedir}/src/org/openhab/core/model/thing/GenerateThing.mwe2 -p rootPath=/${project.basedir}/.. diff --git a/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java b/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java index 5f326858c..1902e78dd 100644 --- a/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java +++ b/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java @@ -10,26 +10,26 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.internal; +package org.openhab.core.model.thing.internal; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.service.ReadyMarker; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.ThingUID; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder; -import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder; -import org.eclipse.smarthome.core.util.BundleResolver; -import org.eclipse.smarthome.model.core.EventType; -import org.eclipse.smarthome.model.core.ModelRepository; -import org.eclipse.smarthome.model.thing.thing.ModelBridge; -import org.eclipse.smarthome.model.thing.thing.ModelThing; -import org.eclipse.smarthome.model.thing.thing.ThingModel; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.service.ReadyMarker; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; +import org.openhab.core.thing.binding.ThingHandlerFactory; +import org.openhab.core.thing.binding.builder.BridgeBuilder; +import org.openhab.core.thing.binding.builder.ThingBuilder; +import org.openhab.core.util.BundleResolver; +import org.openhab.core.model.core.EventType; +import org.openhab.core.model.core.ModelRepository; +import org.openhab.core.model.thing.thing.ModelBridge; +import org.openhab.core.model.thing.thing.ModelThing; +import org.openhab.core.model.thing.thing.ThingModel; import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2 b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2 index 03f88d828..8701a76f8 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2 +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2 @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -module org.eclipse.smarthome.model.thing.GenerateThing +module org.openhab.core.model.thing.GenerateThing import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* @@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.* var rootPath = ".." var fileExtensions = "things" var projectName = "org.openhab.core.model.thing" -var languageName = "org.eclipse.smarthome.model.thing.Thing" +var languageName = "org.openhab.core.model.thing.Thing" var generateXtendStub = true var encoding = "UTF-8" diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext index 775b9b347..5c8c1975f 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext @@ -1,4 +1,4 @@ -grammar org.eclipse.smarthome.model.thing.Thing +grammar org.openhab.core.model.thing.Thing // disabled due to conflicts between the custom ID rule and the common INT rule // with org.eclipse.xtext.common.Terminals @@ -7,7 +7,7 @@ hidden(WS, ML_COMMENT, SL_COMMENT) import "http://www.eclipse.org/emf/2002/Ecore" as ecore -generate thing "http://www.eclipse.org/smarthome/model/Thing" +generate thing "https://openhab.org/model/Thing" ThingModel: things+=(ModelThing|ModelBridge)*; diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend index ddbffd232..aefc1f5c4 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing +package org.openhab.core.model.thing -import org.eclipse.smarthome.model.thing.valueconverter.ThingValueConverters +import org.openhab.core.model.thing.valueconverter.ThingValueConverters import org.eclipse.xtext.conversion.IValueConverterService import org.eclipse.xtext.linking.lazy.LazyURIEncoder import com.google.inject.Binder @@ -21,13 +21,13 @@ import com.google.inject.name.Names /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ -@SuppressWarnings("restriction") class ThingRuntimeModule extends org.eclipse.smarthome.model.thing.AbstractThingRuntimeModule { +@SuppressWarnings("restriction") class ThingRuntimeModule extends org.openhab.core.model.thing.AbstractThingRuntimeModule { override Class bindIValueConverterService() { return ThingValueConverters } override Class bindISyntacticSequencer() { - return org.eclipse.smarthome.model.thing.serializer.ThingSyntacticSequencerExtension + return org.openhab.core.model.thing.serializer.ThingSyntacticSequencerExtension } override void configureUseIndexFragmentsForLazyLinking(Binder binder) { diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend index b0a4ac423..ef8b408fa 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing +package org.openhab.core.model.thing import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource @@ -26,7 +26,7 @@ class ThingStandaloneSetup extends ThingStandaloneSetupGenerated { } def static void unregister() { - EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Thing"); + EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Thing"); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("things"); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("things"); } diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend index a37f7ff9a..241ba3edd 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend @@ -13,12 +13,12 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.thing.formatting +package org.openhab.core.model.thing.formatting import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter import org.eclipse.xtext.formatting.impl.FormattingConfig // import com.google.inject.Inject; -// import org.eclipse.smarthome.model.thing.services.ThingGrammarAccess +// import org.openhab.core.model.thing.services.ThingGrammarAccess /** * This class contains custom formatting description. diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend index c4896d3c3..99cfde70e 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.thing.generator +package org.openhab.core.model.thing.generator import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.AbstractGenerator diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java index 9720e9de1..aec075e64 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.internal; +package org.openhab.core.model.thing.internal; import java.util.Collection; import java.util.Collections; @@ -20,13 +20,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.common.registry.AbstractProvider; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.link.ItemChannelLink; -import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider; -import org.eclipse.smarthome.model.item.BindingConfigParseException; -import org.eclipse.smarthome.model.item.BindingConfigReader; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.common.registry.AbstractProvider; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.link.ItemChannelLink; +import org.openhab.core.thing.link.ItemChannelLinkProvider; +import org.openhab.core.model.item.BindingConfigParseException; +import org.openhab.core.model.item.BindingConfigReader; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend index 616ce7faa..38c23d447 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.internal +package org.openhab.core.model.thing.internal import java.util.ArrayList import java.util.Collection @@ -21,39 +21,39 @@ import java.util.Set import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CopyOnWriteArraySet -import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry -import org.eclipse.smarthome.config.core.ConfigUtil -import org.eclipse.smarthome.config.core.Configuration -import org.eclipse.smarthome.core.common.registry.AbstractProvider -import org.eclipse.smarthome.core.i18n.LocaleProvider -import org.eclipse.smarthome.core.service.ReadyMarker -import org.eclipse.smarthome.core.service.ReadyMarkerFilter -import org.eclipse.smarthome.core.service.ReadyService -import org.eclipse.smarthome.core.thing.Channel -import org.eclipse.smarthome.core.thing.ChannelUID -import org.eclipse.smarthome.core.thing.Thing -import org.eclipse.smarthome.core.thing.ThingProvider -import org.eclipse.smarthome.core.thing.ThingTypeUID -import org.eclipse.smarthome.core.thing.ThingUID -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory -import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder -import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder -import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder -import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy -import org.eclipse.smarthome.core.thing.type.ChannelDefinition -import org.eclipse.smarthome.core.thing.type.ChannelKind -import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry -import org.eclipse.smarthome.core.thing.type.ChannelTypeUID -import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry -import org.eclipse.smarthome.core.thing.util.ThingHelper -import org.eclipse.smarthome.core.util.BundleResolver -import org.eclipse.smarthome.model.core.ModelRepository -import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener -import org.eclipse.smarthome.model.thing.thing.ModelBridge -import org.eclipse.smarthome.model.thing.thing.ModelChannel -import org.eclipse.smarthome.model.thing.thing.ModelPropertyContainer -import org.eclipse.smarthome.model.thing.thing.ModelThing -import org.eclipse.smarthome.model.thing.thing.ThingModel +import org.openhab.core.config.core.ConfigDescriptionRegistry +import org.openhab.core.config.core.ConfigUtil +import org.openhab.core.config.core.Configuration +import org.openhab.core.common.registry.AbstractProvider +import org.openhab.core.i18n.LocaleProvider +import org.openhab.core.service.ReadyMarker +import org.openhab.core.service.ReadyMarkerFilter +import org.openhab.core.service.ReadyService +import org.openhab.core.thing.Channel +import org.openhab.core.thing.ChannelUID +import org.openhab.core.thing.Thing +import org.openhab.core.thing.ThingProvider +import org.openhab.core.thing.ThingTypeUID +import org.openhab.core.thing.ThingUID +import org.openhab.core.thing.binding.ThingHandlerFactory +import org.openhab.core.thing.binding.builder.BridgeBuilder +import org.openhab.core.thing.binding.builder.ChannelBuilder +import org.openhab.core.thing.binding.builder.ThingBuilder +import org.openhab.core.thing.type.AutoUpdatePolicy +import org.openhab.core.thing.type.ChannelDefinition +import org.openhab.core.thing.type.ChannelKind +import org.openhab.core.thing.type.ChannelTypeRegistry +import org.openhab.core.thing.type.ChannelTypeUID +import org.openhab.core.thing.type.ThingTypeRegistry +import org.openhab.core.thing.util.ThingHelper +import org.openhab.core.util.BundleResolver +import org.openhab.core.model.core.ModelRepository +import org.openhab.core.model.core.ModelRepositoryChangeListener +import org.openhab.core.model.thing.thing.ModelBridge +import org.openhab.core.model.thing.thing.ModelChannel +import org.openhab.core.model.thing.thing.ModelPropertyContainer +import org.openhab.core.model.thing.thing.ModelThing +import org.openhab.core.model.thing.thing.ThingModel import org.eclipse.xtend.lib.annotations.Data import org.osgi.service.component.annotations.Component import org.osgi.service.component.annotations.Reference @@ -437,13 +437,13 @@ class GenericThingProvider extends AbstractProvider implements ThingProvi this.bundleResolver = null; } - override void modelChanged(String modelName, org.eclipse.smarthome.model.core.EventType type) { + override void modelChanged(String modelName, org.openhab.core.model.core.EventType type) { if (modelName.endsWith("things")) { switch type { - case org.eclipse.smarthome.model.core.EventType.ADDED: { + case org.openhab.core.model.core.EventType.ADDED: { createThingsFromModel(modelName) } - case org.eclipse.smarthome.model.core.EventType.MODIFIED: { + case org.openhab.core.model.core.EventType.MODIFIED: { val oldThings = thingsMap.get(modelName) ?: newArrayList val model = modelRepository.getModel(modelName) as ThingModel if (model !== null) { @@ -457,7 +457,7 @@ class GenericThingProvider extends AbstractProvider implements ThingProvi thingsMap.get(modelName).removeAll(removedThings) } } - case org.eclipse.smarthome.model.core.EventType.REMOVED: { + case org.openhab.core.model.core.EventType.REMOVED: { logger.debug("Removing all things from model '{}'.", modelName) val things = thingsMap.remove(modelName) ?: newArrayList things.forEach [ diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend index a6c983210..3a3d07c0d 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.thing.scoping +package org.openhab.core.model.thing.scoping /** * This class contains custom scoping description. diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend index 096e55d4c..fa36c6705 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.thing.serializer +package org.openhab.core.model.thing.serializer class ThingSemanticSequencer extends AbstractThingSemanticSequencer { diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend index cddea3a3d..8998c7b33 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend @@ -13,7 +13,7 @@ /* * generated by Xtext 2.12.0 */ -package org.eclipse.smarthome.model.thing.serializer +package org.openhab.core.model.thing.serializer class ThingSyntacticSequencer extends AbstractThingSyntacticSequencer { diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java index a4053a02b..c58eebf5f 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.serializer; +package org.openhab.core.model.thing.serializer; import java.util.List; diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend index b25e4cbf2..d239a6256 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend @@ -13,13 +13,13 @@ /* * generated by Xtext */ -package org.eclipse.smarthome.model.thing.validation +package org.openhab.core.model.thing.validation -import org.eclipse.smarthome.model.thing.thing.ModelThing +import org.openhab.core.model.thing.thing.ModelThing import org.eclipse.xtext.validation.Check -import org.eclipse.smarthome.model.thing.thing.ThingPackage +import org.openhab.core.model.thing.thing.ThingPackage import org.eclipse.xtext.nodemodel.util.NodeModelUtils -import org.eclipse.smarthome.core.thing.ThingUID +import org.openhab.core.thing.ThingUID /** * Custom validation rules. diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java index 5750e52ee..66fd21e58 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.valueconverter; +package org.openhab.core.model.thing.valueconverter; -import org.eclipse.smarthome.model.core.valueconverter.ValueTypeToStringConverter; +import org.openhab.core.model.core.valueconverter.ValueTypeToStringConverter; import org.eclipse.xtext.common.services.DefaultTerminalConverters; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java index e8c10ec92..d6dc40184 100644 --- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java +++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.model.thing.valueconverter; +package org.openhab.core.model.thing.valueconverter; import java.util.Arrays; import java.util.stream.Collectors; -import org.eclipse.smarthome.core.thing.UID; +import org.openhab.core.thing.UID; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; import org.eclipse.xtext.nodemodel.INode; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java index f234f2b3f..186853d67 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.time.ZonedDateTime; import java.util.Date; import java.util.TimeZone; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.types.State; /** * This class is used to define a filter for queries to a {@link PersistenceService}. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java index 3a1f08855..d200959da 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Date; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.items.Item; +import org.openhab.core.types.State; /** * This interface is used by persistence services to represent an item diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java index 917517047..31e7937e3 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Date; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.items.Item; +import org.openhab.core.types.State; /** * This class provides an interface to the a {@link PersistenceService} to allow data to be stored diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java index f48f9cd89..1ad91d8b8 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Date; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java index 49cb0462e..6fd786468 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java index 6569e5729..c0498c3ed 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.items.Item; +import org.openhab.core.items.Item; /** * A persistence service which can be used to store data from openHAB. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java index 0d86d7211..429eef9c6 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy; +import org.openhab.core.persistence.strategy.SimpleStrategy; /** * This class represents the configuration for a persistence service. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java index 693276aae..32c457ffe 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Set; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java index 312808a5f..9d2de8c05 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.Item; +import org.openhab.core.items.Item; /** * A queryable persistence service which can be used to store and retrieve diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java index a284ed011..6e7e3d449 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; /** * diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java index 45d87b978..0d8804842 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence; +package org.openhab.core.persistence; import java.util.Arrays; import java.util.List; -import org.eclipse.smarthome.core.persistence.config.SimpleConfig; -import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy; +import org.openhab.core.persistence.config.SimpleConfig; +import org.openhab.core.persistence.strategy.SimpleStrategy; /** * This class holds the configuration of a persistence strategy for specific items. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java index 9c044f904..71d5bc535 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.config; +package org.openhab.core.persistence.config; /** * This class represents the configuration that stand for "using all items". diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java index 3a64973bc..e58c30527 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.config; +package org.openhab.core.persistence.config; /** * This class is a base class that needs to be used by every item configuration. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java index 8c55e1940..302feaed0 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.config; +package org.openhab.core.persistence.config; /** * This class represents the configuration that is used for group items. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java index 06ab13c4e..18c645c1c 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.config; +package org.openhab.core.persistence.config; /** * This class represents the configuration that identify item(s) by name. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java index ce55764cb..1f8757db1 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.dto; +package org.openhab.core.persistence.dto; import java.util.ArrayList; import java.util.List; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.types.State; /** * This is a java bean that is used to serialize items to JSON. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java index a8329bf92..dc63a02df 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.dto; +package org.openhab.core.persistence.dto; /** * This is a java bean that is used to serialize services to JSON. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java index 1be167251..fc02da7a5 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.internal; +package org.openhab.core.persistence.internal; import java.util.List; import java.util.concurrent.TimeUnit; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration; -import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration; -import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy; -import org.eclipse.smarthome.core.scheduler.SchedulerRunnable; +import org.openhab.core.items.Item; +import org.openhab.core.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceConfiguration; +import org.openhab.core.persistence.SimpleItemConfiguration; +import org.openhab.core.persistence.strategy.SimpleStrategy; +import org.openhab.core.scheduler.SchedulerRunnable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java index b2b628a71..67daf68c6 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.internal; +package org.openhab.core.persistence.internal; import java.text.DateFormat; import java.util.Collection; @@ -24,31 +24,31 @@ import java.util.Map.Entry; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.common.SafeCaller; -import org.eclipse.smarthome.core.items.GenericItem; -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.ItemRegistryChangeListener; -import org.eclipse.smarthome.core.items.StateChangeListener; -import org.eclipse.smarthome.core.persistence.FilterCriteria; -import org.eclipse.smarthome.core.persistence.HistoricItem; -import org.eclipse.smarthome.core.persistence.PersistenceManager; -import org.eclipse.smarthome.core.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration; -import org.eclipse.smarthome.core.persistence.QueryablePersistenceService; -import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration; -import org.eclipse.smarthome.core.persistence.config.SimpleAllConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleGroupConfig; -import org.eclipse.smarthome.core.persistence.config.SimpleItemConfig; -import org.eclipse.smarthome.core.persistence.strategy.SimpleCronStrategy; -import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy; -import org.eclipse.smarthome.core.scheduler.CronScheduler; -import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture; -import org.eclipse.smarthome.core.types.State; -import org.eclipse.smarthome.core.types.UnDefType; +import org.openhab.core.common.SafeCaller; +import org.openhab.core.items.GenericItem; +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.ItemRegistryChangeListener; +import org.openhab.core.items.StateChangeListener; +import org.openhab.core.persistence.FilterCriteria; +import org.openhab.core.persistence.HistoricItem; +import org.openhab.core.persistence.PersistenceManager; +import org.openhab.core.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceConfiguration; +import org.openhab.core.persistence.QueryablePersistenceService; +import org.openhab.core.persistence.SimpleItemConfiguration; +import org.openhab.core.persistence.config.SimpleAllConfig; +import org.openhab.core.persistence.config.SimpleConfig; +import org.openhab.core.persistence.config.SimpleGroupConfig; +import org.openhab.core.persistence.config.SimpleItemConfig; +import org.openhab.core.persistence.strategy.SimpleCronStrategy; +import org.openhab.core.persistence.strategy.SimpleStrategy; +import org.openhab.core.scheduler.CronScheduler; +import org.openhab.core.scheduler.ScheduledCompletableFuture; +import org.openhab.core.types.State; +import org.openhab.core.types.UnDefType; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java index fbd9b14f2..cfb85e6a6 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.internal; +package org.openhab.core.persistence.internal; import java.net.URI; import java.util.Collection; @@ -22,11 +22,11 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -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.persistence.PersistenceService; -import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry; +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.persistence.PersistenceService; +import org.openhab.core.persistence.PersistenceServiceRegistry; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -41,8 +41,8 @@ import org.osgi.service.component.annotations.ReferencePolicy; * * @author Kai Kreuzer - Initial contribution */ -@Component(immediate = true, configurationPid = "org.eclipse.smarthome.persistence", property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.persistence", +@Component(immediate = true, configurationPid = "org.openhab.core.persistence", property = { + Constants.SERVICE_PID + "=org.openhab.core.persistence", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + PersistenceServiceRegistryImpl.CONFIG_URI }) diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java index 32d9cf359..e4bc0e432 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.strategy; +package org.openhab.core.persistence.strategy; /** * This class holds a cron expression based strategy to persist items. diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java index 36b4a2b04..0e92dd161 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.persistence.strategy; +package org.openhab.core.persistence.strategy; import java.util.Objects; diff --git a/bundles/org.openhab.core.scheduler/bnd.bnd b/bundles/org.openhab.core.scheduler/bnd.bnd index 3e8326a09..f31abaa89 100644 --- a/bundles/org.openhab.core.scheduler/bnd.bnd +++ b/bundles/org.openhab.core.scheduler/bnd.bnd @@ -1,5 +1,5 @@ Bundle-SymbolicName: ${project.artifactId} -Bundle-Activator: org.eclipse.smarthome.core.scheduler.internal.SchedulerActivator +Bundle-Activator: org.openhab.core.scheduler.internal.SchedulerActivator Import-Package: \ com.mchange.v2.c3p0;resolution:=optional,\ commonj.work;resolution:=optional,\ diff --git a/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java b/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java index ead4ce0b5..4e11ff435 100644 --- a/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java +++ b/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.scheduler.internal; +package org.openhab.core.scheduler.internal; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy index 245684cf0..bd2c7dbf6 100755 --- a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy +++ b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy @@ -61,14 +61,14 @@ def createTagSetClass(def line, String tagSet) { def parent = line.Parent def parentClass = parent ? parent : type def pkg = type.toLowerCase() - def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/" + pkg + "/" + tag + ".java") + def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/" + pkg + "/" + tag + ".java") file.write(header()) - file.write("package org.eclipse.smarthome.core.semantics.model." + pkg + ";\n\n") + file.write("package org.openhab.core.semantics.model." + pkg + ";\n\n") file.write("import org.eclipse.jdt.annotation.NonNullByDefault;\n") if(!parent) { - file.write("import org.eclipse.smarthome.core.semantics.model." + type + ";\n") + file.write("import org.openhab.core.semantics.model." + type + ";\n") } - file.write("""import org.eclipse.smarthome.core.semantics.model.TagInfo; + file.write("""import org.openhab.core.semantics.model.TagInfo; /** * This class defines a ${label}. @@ -92,16 +92,16 @@ def appendLabelsFile(FileWriter file, def line, String tagSet) { } def createLocationsFile(Set locations) { - def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/location/Locations.java") + def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/location/Locations.java") file.write(header()) - file.write("""package org.eclipse.smarthome.core.semantics.model.location; + file.write("""package org.openhab.core.semantics.model.location; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Location; +import org.openhab.core.semantics.model.Location; /** * This class provides a stream of all defined locations. @@ -132,16 +132,16 @@ public class Locations { } def createEquipmentsFile(Set equipments) { - def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Equipments.java") + def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java") file.write(header()) - file.write("""package org.eclipse.smarthome.core.semantics.model.equipment; + file.write("""package org.openhab.core.semantics.model.equipment; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.Equipment; /** * This class provides a stream of all defined equipments. @@ -172,16 +172,16 @@ public class Equipments { } def createPointsFile(Set points) { - def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/point/Points.java") + def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/point/Points.java") file.write(header()) - file.write("""package org.eclipse.smarthome.core.semantics.model.point; + file.write("""package org.openhab.core.semantics.model.point; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; +import org.openhab.core.semantics.model.Point; /** * This class provides a stream of all defined points. @@ -212,16 +212,16 @@ public class Points { } def createPropertiesFile(Set properties) { - def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/property/Properties.java") + def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/property/Properties.java") file.write(header()) - file.write("""package org.eclipse.smarthome.core.semantics.model.property; + file.write("""package org.openhab.core.semantics.model.property; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; +import org.openhab.core.semantics.model.Property; /** * This class provides a stream of all defined properties. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java index 460a3bc7e..ea0092c2c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics; +package org.openhab.core.semantics; import java.util.Arrays; import java.util.Collections; @@ -27,16 +27,16 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.Tag; -import org.eclipse.smarthome.core.semantics.model.TagInfo; -import org.eclipse.smarthome.core.semantics.model.equipment.Equipments; -import org.eclipse.smarthome.core.semantics.model.location.Locations; -import org.eclipse.smarthome.core.semantics.model.point.Measurement; -import org.eclipse.smarthome.core.semantics.model.point.Points; -import org.eclipse.smarthome.core.semantics.model.property.Properties; -import org.eclipse.smarthome.core.types.StateDescription; +import org.openhab.core.items.Item; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.Tag; +import org.openhab.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.equipment.Equipments; +import org.openhab.core.semantics.model.location.Locations; +import org.openhab.core.semantics.model.point.Measurement; +import org.openhab.core.semantics.model.point.Points; +import org.openhab.core.semantics.model.property.Properties; +import org.openhab.core.types.StateDescription; /** * This is a class that gives static access to the semantic tag library. @@ -128,7 +128,7 @@ public class SemanticTags { if (stateDescription != null && stateDescription.isReadOnly()) { return Measurement.class; } else { - return org.eclipse.smarthome.core.semantics.model.point.Control.class; + return org.openhab.core.semantics.model.point.Control.class; } } else { return null; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java index 34892b7d6..faed3457f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics; +package org.openhab.core.semantics; import java.util.function.Predicate; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.Tag; +import org.openhab.core.items.Item; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.Tag; /** * This class provides predicates that allow filtering item streams with regards to their semantics. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java index ebdd3effa..10d1d3826 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics; +package org.openhab.core.semantics; import java.util.Locale; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.semantics.model.Location; +import org.openhab.core.items.Item; +import org.openhab.core.semantics.model.Location; /** * This interface defines a service, which offers functionality regarding semantic tags. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java index cf9daeebd..e51537bee 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.internal; +package org.openhab.core.semantics.internal; import java.util.Arrays; import java.util.Collection; @@ -22,21 +22,21 @@ import java.util.Map.Entry; import java.util.TreeMap; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.common.registry.AbstractProvider; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.ItemRegistryChangeListener; -import org.eclipse.smarthome.core.items.Metadata; -import org.eclipse.smarthome.core.items.MetadataKey; -import org.eclipse.smarthome.core.items.MetadataProvider; -import org.eclipse.smarthome.core.semantics.SemanticTags; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.Tag; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.common.registry.AbstractProvider; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.ItemRegistryChangeListener; +import org.openhab.core.items.Metadata; +import org.openhab.core.items.MetadataKey; +import org.openhab.core.items.MetadataProvider; +import org.openhab.core.semantics.SemanticTags; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.Tag; +import org.openhab.core.semantics.model.TagInfo; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java index 8c2047d86..efef7f042 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.internal; +package org.openhab.core.semantics.internal; import java.util.HashSet; import java.util.List; @@ -20,20 +20,20 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemPredicates; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.Metadata; -import org.eclipse.smarthome.core.items.MetadataKey; -import org.eclipse.smarthome.core.items.MetadataRegistry; -import org.eclipse.smarthome.core.semantics.SemanticTags; -import org.eclipse.smarthome.core.semantics.SemanticsPredicates; -import org.eclipse.smarthome.core.semantics.SemanticsService; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.Tag; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemPredicates; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.Metadata; +import org.openhab.core.items.MetadataKey; +import org.openhab.core.items.MetadataRegistry; +import org.openhab.core.semantics.SemanticTags; +import org.openhab.core.semantics.SemanticsPredicates; +import org.openhab.core.semantics.SemanticsService; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.Tag; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java index 4a5c05599..e5e100a1a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java index 406889b21..cfa5eac2b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java index 00688a60f..43f8951db 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java index f41d439dd..5c9a4e588 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java index c29418fa1..c695e3d18 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java index 0bdb87ab0..8431bd7b6 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model; +package org.openhab.core.semantics.model; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java index e6637a53f..0a08dfb29 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Battery. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java index 0294a5bfd..9e3ea2958 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Blinds. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java index b24ac68b3..c38b374c8 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Camera. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java index 053989f13..794fdd15f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Car. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java index 71746f13b..a3189b2e6 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Cleaning Robot. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java index dff017eef..7f1c24056 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java index c65c90a04..9bef9f023 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.Equipment; /** * This class provides a stream of all defined equipments. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java index ee229644b..bf34c1b6f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Front Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java index 2229c1bd8..21221cf7f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Garage Door. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java index f77808cbf..554cba3f5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a HVAC. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java index a4a48c7ac..1702ef84c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Inverter. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java index 6fa99a707..5ce766d8f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Lawn Mower. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java index 59a7c3032..0a926314f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Lightbulb. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java index 7bced8356..6f64d4f50 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Lock. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java index a60ba583c..5f70074b9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Motion Detector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java index 2124368fe..a3843e26b 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Network Appliance. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java index a083b627b..ba80ee158 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Power Outlet. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java index d7682f85d..d1ddfe0a5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Projector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java index cfca48572..9a88dbbf5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Radiator Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java index fbf46a3c9..22b1de703 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Receiver. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java index fded4427d..1a614b32a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Remote Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java index 7362b734c..19c175586 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Screen. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java index 5b6d2ade6..a85699636 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Siren. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java index 71d818d0d..6e985f265 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Smoke Detector. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java index c862778a0..45e954448 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Speaker. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java index c2b731599..71f4ec0c2 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Valve. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java index 8fef8b034..d7a0377fe 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Wall Switch. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java index f3ad0b466..da3faec95 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Web Service. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java index 4a599463d..5e83d9498 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a White Good. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java index 62354b8c2..f17a3e609 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.equipment; +package org.openhab.core.semantics.model.equipment; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Equipment; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Equipment; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Window. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java index d9bd2c463..3fc9284fa 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Attic. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java index 066e95ab0..aa29fbd2d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Basement. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java index 0c2287d74..c8501d462 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Bathroom. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java index 3c967144d..1e833c1af 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Bedroom. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java index 877cfe5d6..0eaaeac65 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Building. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java index 874100eaa..9eb4f6c51 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Carport. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java index 80dec3ed2..138f10fd5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Corridor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java index 09520446a..3eb557779 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a First Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java index 0d3a98d69..878744272 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java index dfbb1ff9e..c2a881dae 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Garage. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java index bf708aae6..90a874f74 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Garden. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java index 16133de55..41c0cfc7e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Ground Floor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java index 739c6e24b..f19a9ac4e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Indoor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java index 5eda54178..b68f48094 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Kitchen. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java index 8bf7f6cbf..ffa9eba40 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Living Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java index 15fbad2a5..176be98c9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Location; +import org.openhab.core.semantics.model.Location; /** * This class provides a stream of all defined locations. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java index 8d5fd4805..54d6b8172 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Outdoor. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java index 6f9f7e400..2738d9d47 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Room. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java index 65326f9ee..1e130602d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.location; +package org.openhab.core.semantics.model.location; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Terrace. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java index 63e2031cb..ccfa57514 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Alarm. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java index f347a825b..4dcc775ca 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Control. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java index bd4717ae4..ef49f59e5 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a LowBattery. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java index a2ce34f93..4422399d9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Measurement. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java index dd99aef93..65c72a1ac 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a OpenLevel. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java index 8640f48ce..3ff1dacee 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a OpenState. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java index 7292221c6..ddf0a3a65 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; +import org.openhab.core.semantics.model.Point; /** * This class provides a stream of all defined points. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java index a0acd2901..fcc996256 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Setpoint. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java index b2998ac45..b0f0aa010 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Point; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Point; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Status. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java index 4955003a4..4794430f4 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Switch. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java index 0cac54105..e1a187a92 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Tampered. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java index 11c12637f..a6a41b254 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.point; +package org.openhab.core.semantics.model.point; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Tilt. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java index fec055deb..1c9548727 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a CO. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java index fd17d21d6..506e29d44 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a CO2. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java index fb07536d3..d50b49875 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Color Temperature. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java index 7fc4e43c8..e5c16da71 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Current. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java index 7deb1f89a..c72cbdc4e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Energy. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java index e6e193fa0..b1ca738c9 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Frequency. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java index b8e2f141c..4a87ce051 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Gas. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java index ff498a327..dc7b7d1e1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Humidity. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java index 5e8784e12..a5ecba960 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Light. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java index 67598e4ce..9d901c8c1 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Noise. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java index 02c441d00..6a1f6417e 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Oil. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java index de2362b65..14edf0dc0 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Power. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java index 50de593e4..fddf83d0f 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Presence. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java index a4689eb86..42eddae2d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Pressure. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java index ea74316d9..7b5ec4326 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import java.util.Set; import java.util.HashSet; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; +import org.openhab.core.semantics.model.Property; /** * This class provides a stream of all defined properties. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java index d1c1070d8..cd70302cc 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Rain. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java index ee835d3fc..eb1252e80 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Smoke. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java index 721b25117..8dca83537 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Sound Volume. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java index 9bbbd6dc4..ac490c22a 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Temperature. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java index deb9c7fbd..160445e99 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Voltage. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java index 69196046c..dafb67e9d 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Water. diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java index e85083ae1..b11ada39c 100644 --- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java +++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.model.property; +package org.openhab.core.semantics.model.property; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.semantics.model.Property; -import org.eclipse.smarthome.core.semantics.model.TagInfo; +import org.openhab.core.semantics.model.Property; +import org.openhab.core.semantics.model.TagInfo; /** * This class defines a Wind. diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java index 76b9216b8..bdac8f86f 100644 --- a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java +++ b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java @@ -10,22 +10,22 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics; +package org.openhab.core.semantics; import static org.junit.Assert.*; import java.util.Locale; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.core.semantics.model.Location; -import org.eclipse.smarthome.core.semantics.model.equipment.CleaningRobot; -import org.eclipse.smarthome.core.semantics.model.location.Bathroom; -import org.eclipse.smarthome.core.semantics.model.location.Kitchen; -import org.eclipse.smarthome.core.semantics.model.location.Room; -import org.eclipse.smarthome.core.semantics.model.point.Measurement; -import org.eclipse.smarthome.core.semantics.model.property.Temperature; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupItem; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.semantics.model.Location; +import org.openhab.core.semantics.model.equipment.CleaningRobot; +import org.openhab.core.semantics.model.location.Bathroom; +import org.openhab.core.semantics.model.location.Kitchen; +import org.openhab.core.semantics.model.location.Room; +import org.openhab.core.semantics.model.point.Measurement; +import org.openhab.core.semantics.model.property.Temperature; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java index 87b7fefad..14eda0a5d 100644 --- a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java +++ b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.core.semantics.internal; +package org.openhab.core.semantics.internal; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -21,14 +21,14 @@ import java.util.Locale; import java.util.Set; import java.util.stream.Stream; -import org.eclipse.smarthome.core.items.GenericItem; -import org.eclipse.smarthome.core.items.GroupItem; -import org.eclipse.smarthome.core.items.Item; -import org.eclipse.smarthome.core.items.ItemRegistry; -import org.eclipse.smarthome.core.items.MetadataRegistry; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.core.semantics.model.location.Bathroom; -import org.eclipse.smarthome.core.semantics.model.location.LivingRoom; +import org.openhab.core.items.GenericItem; +import org.openhab.core.items.GroupItem; +import org.openhab.core.items.Item; +import org.openhab.core.items.ItemRegistry; +import org.openhab.core.items.MetadataRegistry; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.semantics.model.location.Bathroom; +import org.openhab.core.semantics.model.location.LivingRoom; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java index becd581a5..cf6bba7ad 100644 --- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java +++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.json.internal; +package org.openhab.core.storage.json.internal; import java.io.File; import java.io.FileNotFoundException; @@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.core.ConfigurationDeserializer; -import org.eclipse.smarthome.core.storage.Storage; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.core.ConfigurationDeserializer; +import org.openhab.core.storage.Storage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java index b0e35b8cb..11b994b65 100644 --- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java +++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.json.internal; +package org.openhab.core.storage.json.internal; import java.io.File; import java.io.UnsupportedEncodingException; @@ -21,10 +21,10 @@ import java.util.Map; 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.ConfigurableService; -import org.eclipse.smarthome.core.storage.Storage; -import org.eclipse.smarthome.core.storage.StorageService; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.config.core.ConfigurableService; +import org.openhab.core.storage.Storage; +import org.openhab.core.storage.StorageService; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -38,8 +38,8 @@ import org.slf4j.LoggerFactory; * * @author Chris Jackson - Initial contribution */ -@Component(name = "org.eclipse.smarthome.storage.json", property = { // - Constants.SERVICE_PID + "=org.eclipse.smarthome.storage.json", // +@Component(name = "org.openhab.core.storage.json", property = { // + Constants.SERVICE_PID + "=org.openhab.core.storage.json", // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Json Storage", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:json_storage", // diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java index 1db71184d..2cadf7f34 100644 --- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java +++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.json.internal; +package org.openhab.core.storage.json.internal; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java index a5fde5ef3..0a37fae78 100644 --- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java +++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.json.internal; +package org.openhab.core.storage.json.internal; import java.lang.reflect.Type; import java.util.Map; diff --git a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java index a8ca1dbda..15e330a38 100644 --- a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java +++ b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.json.internal; +package org.openhab.core.storage.json.internal; import static org.junit.Assert.*; @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.io.FileUtils; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.test.java.JavaTest; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.test.java.JavaTest; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java index 391ba9f6b..64824fce1 100644 --- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java +++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.mapdb.internal; +package org.openhab.core.storage.mapdb.internal; import java.util.ArrayList; import java.util.Collection; @@ -20,10 +20,10 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItem; -import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItemInstanceCreator; -import org.eclipse.smarthome.core.storage.DeletableStorage; -import org.eclipse.smarthome.core.storage.Storage; +import org.openhab.core.items.ManagedItemProvider.PersistedItem; +import org.openhab.core.items.ManagedItemProvider.PersistedItemInstanceCreator; +import org.openhab.core.storage.DeletableStorage; +import org.openhab.core.storage.Storage; import org.mapdb.DB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java index 16fcd0ae9..0f3c9cf7a 100644 --- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java +++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.mapdb.internal; +package org.openhab.core.storage.mapdb.internal; import java.io.File; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.core.storage.DeletableStorage; -import org.eclipse.smarthome.core.storage.DeletableStorageService; -import org.eclipse.smarthome.core.storage.StorageService; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.storage.DeletableStorage; +import org.openhab.core.storage.DeletableStorageService; +import org.openhab.core.storage.StorageService; import org.mapdb.DB; import org.mapdb.DBMaker; import org.osgi.service.component.annotations.Activate; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * @author Alex Tugarev - Added getStorage for name only * @author Markus Rathgeb - Use {@link DeletableStorageService} */ -@Component(name = "org.eclipse.smarthome.storage.mapdb", immediate = true, service = { StorageService.class, +@Component(name = "org.openhab.core.storage.mapdb", immediate = true, service = { StorageService.class, DeletableStorageService.class }, property = "storage.format=mapdb") @NonNullByDefault public class MapDbStorageService implements DeletableStorageService { diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java index 0888ba4a5..2e38f1fa1 100644 --- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java +++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.mapdb.internal; +package org.openhab.core.storage.mapdb.internal; import java.io.IOException; import java.lang.reflect.Type; diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java index 785a79576..45ee1b544 100644 --- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java +++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.mapdb.internal; +package org.openhab.core.storage.mapdb.internal; import java.lang.reflect.Type; diff --git a/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java index 92f2531a6..77852c670 100644 --- a/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java +++ b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.storage.mapdb.internal; +package org.openhab.core.storage.mapdb.internal; import java.io.File; import java.io.IOException; @@ -25,10 +25,10 @@ import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.ConfigConstants; -import org.eclipse.smarthome.core.library.CoreItemFactory; -import org.eclipse.smarthome.core.storage.DeletableStorage; -import org.eclipse.smarthome.core.storage.Storage; +import org.openhab.core.config.core.ConfigConstants; +import org.openhab.core.library.CoreItemFactory; +import org.openhab.core.storage.DeletableStorage; +import org.openhab.core.storage.Storage; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java index 4af5775b2..07fc0266c 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding; +package org.openhab.core.magic.binding; -import org.eclipse.smarthome.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingTypeUID; /** * The {@link MagicBindingConstants} class defines common constants, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java index 552e38199..ac0deeb84 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java @@ -10,11 +10,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding; +package org.openhab.core.magic.binding; import java.net.URI; -import org.eclipse.smarthome.config.core.ConfigOptionProvider; +import org.openhab.core.config.core.ConfigOptionProvider; /** * A public interface for a service from this virtual bundle which is also a {@link ConfigOptionProvider}. diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java index 29ea69844..199b54b43 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java @@ -10,19 +10,19 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import java.util.Collection; import java.util.Collections; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerService; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.magic.binding.internal.automation.modules.MagicThingActionsService; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.thing.binding.ThingHandlerService; +import org.openhab.core.types.Command; +import org.openhab.core.magic.binding.internal.automation.modules.MagicThingActionsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java index e6d261827..ba92d8db2 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseBridgeHandler; +import org.openhab.core.types.Command; /** * The {@link MagicBridgeHandler} serves as a handler for magic bridges. diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java index 70dbbfe7f..8db47ec76 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicBridgedThingHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java index f33d694dd..fa431300a 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import java.math.BigDecimal; import java.util.HashSet; @@ -23,17 +23,17 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.library.types.QuantityType; -import org.eclipse.smarthome.core.library.types.StringType; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.State; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; +import org.openhab.core.types.State; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java index 9b78b8ba2..67397ba96 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicColorLightHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java index ce7975a93..ded2b0fe2 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * Handler for thing with a configuration parameter diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java index c32cb08fd..94fc26dd9 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicContactHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java index 4e3397a45..2fc36e514 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * ThingHandler for a thing that goes online after 15 seconds diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java index 5483928e2..5e22efa2e 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicDimmableLightHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java index 336ce4b80..689c9f5ea 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*; +import static org.openhab.core.magic.binding.MagicBindingConstants.*; import java.util.Arrays; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.StateOption; -import org.eclipse.smarthome.magic.binding.internal.MagicDynamicStateDescriptionProvider; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; +import org.openhab.core.types.StateOption; +import org.openhab.core.magic.binding.internal.MagicDynamicStateDescriptionProvider; /** * ThingHandler which provides channels with dynamic state descriptions. diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java index 79fa72964..253f215fb 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * A handler for an extensible thing. diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java index aca845284..0b8fecfcb 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.thing.binding.firmware.Firmware; -import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler; -import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback; -import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.magic.binding.MagicBindingConstants; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.thing.binding.firmware.Firmware; +import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler; +import org.openhab.core.thing.binding.firmware.ProgressCallback; +import org.openhab.core.thing.binding.firmware.ProgressStep; +import org.openhab.core.types.Command; +import org.openhab.core.magic.binding.MagicBindingConstants; /** * Handler for firmware updatable magic things. Defines full progress sequence and simulates firmware update with small diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java index f13ddf92d..94286dccf 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.library.types.RawType; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusDetail; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; -import org.eclipse.smarthome.core.types.RefreshType; -import org.eclipse.smarthome.io.net.http.HttpUtil; +import org.openhab.core.library.types.RawType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; +import org.openhab.core.types.RefreshType; +import org.openhab.core.io.net.http.HttpUtil; /** * The {@link MagicImageHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java index 8adaee4c5..07a1e92e3 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicLocationThingHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java index 492777c49..882f9fa64 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicOnOffLightHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java index c4ab4efc1..25e270f65 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java @@ -10,17 +10,17 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import java.math.BigDecimal; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicOnlineOfflineHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java index c0c1965f6..93c0a5de3 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicPlayerHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java index 7f82eae7a..f1c64c1f7 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * The {@link MagicRolllershutterHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java index 7cd209e0d..e50dd7a63 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; -import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*; +import static org.openhab.core.magic.binding.MagicBindingConstants.*; import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.smarthome.core.library.types.DecimalType; -import org.eclipse.smarthome.core.library.types.QuantityType; -import org.eclipse.smarthome.core.thing.ChannelUID; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandler; -import org.eclipse.smarthome.core.types.Command; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.binding.BaseThingHandler; +import org.openhab.core.types.Command; /** * A handler for a thermostat thing. diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java index 67599c96e..7a551b219 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java @@ -10,20 +10,20 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; -import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.THING_TYPE_CONFIG_THING; +import static org.openhab.core.magic.binding.MagicBindingConstants.THING_TYPE_CONFIG_THING; import java.util.Collections; import java.util.UUID; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService; -import org.eclipse.smarthome.config.discovery.DiscoveryResult; -import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder; -import org.eclipse.smarthome.config.discovery.DiscoveryService; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingUID; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResult; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryService; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingUID; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java index 92df4ca40..56019a314 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.smarthome.core.thing.binding.BaseDynamicStateDescriptionProvider; -import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService; -import org.eclipse.smarthome.core.thing.type.DynamicStateDescriptionProvider; +import org.openhab.core.thing.binding.BaseDynamicStateDescriptionProvider; +import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService; +import org.openhab.core.thing.type.DynamicStateDescriptionProvider; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java index d9b216294..e0a722ce2 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java @@ -10,40 +10,40 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; -import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*; +import static org.openhab.core.magic.binding.MagicBindingConstants.*; import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.core.thing.Bridge; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory; -import org.eclipse.smarthome.magic.binding.handler.MagicActionModuleThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicBridgeHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicBridgedThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicChattyThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicColorLightHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicConfigurableThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicContactHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicDelayedOnlineHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicDimmableLightHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicDynamicStateDescriptionThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicExtensibleThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicFirmwareUpdateThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicImageHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicLocationThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicOnOffLightHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicOnlineOfflineHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicPlayerHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicRolllershutterHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicThermostatThingHandler; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.binding.BaseThingHandlerFactory; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.ThingHandlerFactory; +import org.openhab.core.magic.binding.handler.MagicActionModuleThingHandler; +import org.openhab.core.magic.binding.handler.MagicBridgeHandler; +import org.openhab.core.magic.binding.handler.MagicBridgedThingHandler; +import org.openhab.core.magic.binding.handler.MagicChattyThingHandler; +import org.openhab.core.magic.binding.handler.MagicColorLightHandler; +import org.openhab.core.magic.binding.handler.MagicConfigurableThingHandler; +import org.openhab.core.magic.binding.handler.MagicContactHandler; +import org.openhab.core.magic.binding.handler.MagicDelayedOnlineHandler; +import org.openhab.core.magic.binding.handler.MagicDimmableLightHandler; +import org.openhab.core.magic.binding.handler.MagicDynamicStateDescriptionThingHandler; +import org.openhab.core.magic.binding.handler.MagicExtensibleThingHandler; +import org.openhab.core.magic.binding.handler.MagicFirmwareUpdateThingHandler; +import org.openhab.core.magic.binding.handler.MagicImageHandler; +import org.openhab.core.magic.binding.handler.MagicLocationThingHandler; +import org.openhab.core.magic.binding.handler.MagicOnOffLightHandler; +import org.openhab.core.magic.binding.handler.MagicOnlineOfflineHandler; +import org.openhab.core.magic.binding.handler.MagicPlayerHandler; +import org.openhab.core.magic.binding.handler.MagicRolllershutterHandler; +import org.openhab.core.magic.binding.handler.MagicThermostatThingHandler; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java index 5ede02caf..d5f49f607 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java @@ -10,13 +10,13 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.List; -import org.eclipse.smarthome.magic.binding.MagicService; +import org.openhab.core.magic.binding.MagicService; /** * Configuration holder object for {@link MagicService} diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java index af90c14b5..ca93af0b6 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; import java.math.BigDecimal; import java.net.URI; @@ -19,10 +19,10 @@ import java.util.Collection; import java.util.Locale; import java.util.Map; -import org.eclipse.smarthome.config.core.ConfigOptionProvider; -import org.eclipse.smarthome.config.core.Configuration; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.magic.binding.MagicService; +import org.openhab.core.config.core.ConfigOptionProvider; +import org.openhab.core.config.core.Configuration; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.magic.binding.MagicService; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Modified; @@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory; * * @author Henning Treu - Initial contribution */ -@Component(configurationPid = "org.eclipse.smarthome.magic", service = ConfigOptionProvider.class, immediate = true, property = { - "service.pid=org.eclipse.smarthome.magic", "service.config.description.uri=test:magic", +@Component(configurationPid = "org.openhab.core.magic", service = ConfigOptionProvider.class, immediate = true, property = { + "service.pid=org.openhab.core.magic", "service.config.description.uri=test:magic", "service.config.label=Magic", "service.config.category=test" }) public class MagicServiceImpl implements MagicService { private final Logger logger = LoggerFactory.getLogger(MagicServiceImpl.class); diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java index 140bfbe30..6d190988d 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.automation.modules; +package org.openhab.core.magic.binding.internal.automation.modules; -import org.eclipse.smarthome.config.core.ConfigurableService; +import org.openhab.core.config.core.ConfigurableService; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; @@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component; * @author Stefan Triller - Initial contribution */ @Component(immediate = true, service = MagicMultiActionMarker.class, property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.MagicMultiAction", + Constants.SERVICE_PID + "=org.openhab.core.MagicMultiAction", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiActionsService", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions", diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java index 27b81ec87..defa7b3a7 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.automation.modules; +package org.openhab.core.magic.binding.internal.automation.modules; import java.util.HashMap; import java.util.Map; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * * @author Stefan Triller - Initial contribution */ -@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.eclipse.smarthome.MagicMultiAction") +@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.openhab.core.MagicMultiAction") @ActionScope(name = "binding.magic") public class MagicMultiServiceMultiActions implements AnnotatedActions { diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java index 19a50d40a..7a221d772 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.automation.modules; +package org.openhab.core.magic.binding.internal.automation.modules; import java.util.HashMap; import java.util.Map; -import org.eclipse.smarthome.config.core.ConfigurableService; +import org.openhab.core.config.core.ConfigurableService; import org.openhab.core.automation.AnnotatedActions; import org.openhab.core.automation.annotation.ActionInput; import org.openhab.core.automation.annotation.ActionOutput; @@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory; * * @author Stefan Triller - Initial contribution */ -@Component(configurationPid = "org.eclipse.smarthome.automation.action.magicSingleActionService", property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.automation.action.magicSingleActionService", +@Component(configurationPid = "org.openhab.core.automation.action.magicSingleActionService", property = { + Constants.SERVICE_PID + "=org.openhab.core.automation.action.magicSingleActionService", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=automationAction:magicSingleAction", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions" }) diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java index 3315b5240..9a9b1d49b 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.automation.modules; +package org.openhab.core.magic.binding.internal.automation.modules; import java.util.HashMap; import java.util.Map; -import org.eclipse.smarthome.core.thing.binding.ThingActions; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicActionModuleThingHandler; +import org.openhab.core.thing.binding.ThingActions; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.magic.binding.handler.MagicActionModuleThingHandler; import org.openhab.core.automation.annotation.ActionInput; import org.openhab.core.automation.annotation.ActionOutput; import org.openhab.core.automation.annotation.ActionScope; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java index c98948c90..86b0a5290 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.firmware; +package org.openhab.core.magic.binding.internal.firmware; import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.binding.firmware.Firmware; -import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder; -import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider; -import org.eclipse.smarthome.magic.binding.MagicBindingConstants; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.binding.firmware.Firmware; +import org.openhab.core.thing.binding.firmware.FirmwareBuilder; +import org.openhab.core.thing.firmware.FirmwareProvider; +import org.openhab.core.magic.binding.MagicBindingConstants; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java index d83b6549f..92c19394d 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal.http; +package org.openhab.core.magic.binding.internal.http; import java.io.IOException; import java.net.URL; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java index 5965890e1..a32e932c3 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.internal.metadata; +package org.openhab.core.magic.internal.metadata; import static java.util.stream.Collectors.toList; -import static org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder.create; +import static org.openhab.core.config.core.ConfigDescriptionParameterBuilder.create; import java.util.List; import java.util.Locale; @@ -21,10 +21,10 @@ import java.util.stream.Stream; 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.ParameterOption; -import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ConfigDescriptionParameter.Type; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java index e839d5a8d..4e8a6be26 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java @@ -10,16 +10,16 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.internal.metadata; +package org.openhab.core.magic.internal.metadata; import java.util.List; import java.util.Locale; 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.ParameterOption; -import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider; +import org.openhab.core.config.core.ConfigDescriptionParameter; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider; import org.osgi.service.component.annotations.Component; /** diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java index 65e5f0472..5300f1eac 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.internal.metadata; +package org.openhab.core.magic.internal.metadata; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; @@ -18,9 +18,9 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.smarthome.core.common.ThreadPoolManager; -import org.eclipse.smarthome.core.items.MetadataPredicates; -import org.eclipse.smarthome.core.items.MetadataRegistry; +import org.openhab.core.common.ThreadPoolManager; +import org.openhab.core.items.MetadataPredicates; +import org.openhab.core.items.MetadataRegistry; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java index 37a611877..758b19e72 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.service; +package org.openhab.core.magic.service; import java.util.Map; import java.util.Map.Entry; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; * * @author Stefan Triller - Initial contribution */ -@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.eclipse.smarthome.magicMultiInstance") +@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.openhab.core.magicMultiInstance") public class MagicMultiInstanceService { private final Logger logger = LoggerFactory.getLogger(MagicMultiInstanceService.class); diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java index cd167a29a..99e9ea140 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.service; +package org.openhab.core.magic.service; -import org.eclipse.smarthome.config.core.ConfigurableService; +import org.openhab.core.config.core.ConfigurableService; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; @@ -22,12 +22,12 @@ import org.osgi.service.component.annotations.Component; */ @Component(immediate = true, service = MagicMultiInstanceServiceMarker.class, property = { - Constants.SERVICE_PID + "=org.eclipse.smarthome.magicMultiInstance", + Constants.SERVICE_PID + "=org.openhab.core.magicMultiInstance", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiInstanceService", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=test", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=test:multipleMagic" }) public class MagicMultiInstanceServiceMarker { // this is a marker service and represents a service factory so multiple configuration instances of type - // "org.eclipse.smarthome.magicMultiInstance" can be created. + // "org.openhab.core.magicMultiInstance" can be created. } diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml index 69230cd60..51a74a1cd 100644 --- a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml +++ b/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml @@ -128,7 +128,7 @@ A decimal parameter with options provided by the backend. true - + diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java index 8b8b0f7e9..5736c2664 100644 --- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java +++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import static org.hamcrest.CoreMatchers.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.ThingHandlerCallback; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java index 82bc7b2a5..d4a8beefc 100644 --- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java +++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import static org.hamcrest.CoreMatchers.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.ThingHandlerCallback; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java index 85e45e478..16278da14 100644 --- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java +++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.handler; +package org.openhab.core.magic.binding.handler; import static org.hamcrest.CoreMatchers.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingStatus; -import org.eclipse.smarthome.core.thing.ThingStatusInfo; -import org.eclipse.smarthome.core.thing.binding.ThingHandler; -import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.binding.ThingHandler; +import org.openhab.core.thing.binding.ThingHandlerCallback; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java index 5e480dd1d..216e9bfb8 100644 --- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java +++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java @@ -10,18 +10,18 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.*; -import org.eclipse.smarthome.core.thing.Thing; -import org.eclipse.smarthome.core.thing.ThingTypeUID; -import org.eclipse.smarthome.magic.binding.MagicBindingConstants; -import org.eclipse.smarthome.magic.binding.handler.MagicColorLightHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicDimmableLightHandler; -import org.eclipse.smarthome.magic.binding.handler.MagicOnOffLightHandler; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.magic.binding.MagicBindingConstants; +import org.openhab.core.magic.binding.handler.MagicColorLightHandler; +import org.openhab.core.magic.binding.handler.MagicDimmableLightHandler; +import org.openhab.core.magic.binding.handler.MagicOnOffLightHandler; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java index f95567f91..cf0db27a6 100644 --- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java +++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.smarthome.magic.binding.internal; +package org.openhab.core.magic.binding.internal; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.junit.Assert.*; @@ -18,8 +18,8 @@ import static org.junit.Assert.*; import java.net.URI; import java.util.Collection; -import org.eclipse.smarthome.config.core.ParameterOption; -import org.eclipse.smarthome.magic.binding.MagicService; +import org.openhab.core.config.core.ParameterOption; +import org.openhab.core.magic.binding.MagicService; import org.junit.Before; import org.junit.Test; diff --git a/bundles/org.openhab.core.test.magic/web/index.html b/bundles/org.openhab.core.test.magic/web/index.html index 59bb4ffa0..a21fa0d4d 100644 --- a/bundles/org.openhab.core.test.magic/web/index.html +++ b/bundles/org.openhab.core.test.magic/web/index.html @@ -24,13 +24,13 @@