From 74edbe6332ddec79843e9bbc64af0a0bad2fc50a Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Wed, 27 Apr 2016 14:08:41 +0200 Subject: [PATCH] Watcher: Refactoring, move to org.elasticsearch.xpack This refactors the org.elasticsearch.watcher over to org.elasticsearch.xpack.watcher This also adds all watcher actions to the KnownActionsTests, as watcher actions had not been taken care of until here. Original commit: elastic/x-pack-elasticsearch@a046dc7c6af8549859ecce268e93d40a72d78fcb --- .../messy/tests/ExecutionVarsIT.java | 26 +-- .../messy/tests/GroovyManualExecutionIT.java | 38 ++-- .../messy/tests/GroovyScriptConditionIT.java | 16 +- .../HistoryTemplateTransformMappingsIT.java | 20 +- .../messy/tests/IndexActionIT.java | 26 +-- .../messy/tests/MessyTestUtils.java | 2 +- .../messy/tests/ScriptConditionSearchIT.java | 16 +- .../messy/tests/ScriptConditionTests.java | 20 +- .../messy/tests/TransformIT.java | 28 +-- .../messy/tests/HipChatServiceIT.java | 18 +- .../messy/tests/NoMasterNodeIT.java | 38 ++-- .../messy/tests/PagerDutyServiceIT.java | 20 +- .../messy/tests/SearchInputIT.java | 42 ++-- .../messy/tests/SearchTransformIT.java | 52 ++--- .../messy/tests/SlackServiceIT.java | 18 +- .../elasticsearch/messy/tests/WatchAckIT.java | 44 ++-- .../scripts/test_disk_template.mustache | 0 .../scripts/test_disk_template.mustache | 0 .../test/watcher_groovy/10_basic.yaml | 4 +- .../test/watcher_groovy/20_minimal_body.yaml | 4 +- .../test/watcher_groovy/30_inline_watch.yaml | 2 +- .../smoketest/WatcherTemplateTests.java | 10 +- .../test/watcher_mustache/10_webhook.yaml | 6 +- .../watcher_mustache/20_array_access.yaml | 6 +- .../test/watcher_groovy/10_basic.yaml | 4 +- .../test/watcher_groovy/20_minimal_body.yaml | 4 +- .../test/watcher_groovy/30_inline_watch.yaml | 2 +- .../10_insufficient_shield_privs.yaml | 4 +- .../graph/action/Connection.java | 2 +- .../elasticsearch/graph/action/Vertex.java | 2 +- .../graph/action/VertexRequest.java | 2 +- .../elasticsearch/graph/test/GraphTests.java | 4 +- .../license/plugin/LicensingModule.java | 2 +- .../action/delete/DeleteLicenseAction.java | 2 +- .../action/delete/DeleteLicenseRequest.java | 2 +- .../delete/DeleteLicenseRequestBuilder.java | 2 +- .../plugin/action/get/GetLicenseAction.java | 2 +- .../plugin/action/get/GetLicenseRequest.java | 2 +- .../action/get/GetLicenseRequestBuilder.java | 2 +- .../plugin/action/get/GetLicenseResponse.java | 2 +- .../action/get/TransportGetLicenseAction.java | 2 +- .../license/plugin/core/LicensesMetaData.java | 2 +- .../AbstractLicensesIntegrationTestCase.java | 2 +- .../shield/authz/AuthorizationUtilsTests.java | 2 +- .../resolver/node/NodeStatsResolverTests.java | 2 +- .../marvel/test/MarvelIntegTestCase.java | 4 +- .../authc/file/FileUserRolesStoreTests.java | 2 +- .../LdapUserSearchSessionFactoryTests.java | 2 +- .../test/ShieldSettingsSource.java | 2 +- .../transport/KnownActionsTests.java | 3 +- .../org/elasticsearch/transport/actions | 10 + .../org/elasticsearch/xpack/XPackBuild.java | 2 +- .../org/elasticsearch/xpack/XPackClient.java | 2 +- .../org/elasticsearch/xpack/XPackPlugin.java | 2 +- .../xpack/notification/email/Account.java | 2 +- .../xpack/notification/email/Accounts.java | 2 +- .../notification/email/Authentication.java | 2 +- .../notification/email/DataAttachment.java | 4 +- .../xpack/notification/email/Email.java | 2 +- .../notification/email/EmailTemplate.java | 4 +- .../email/InternalEmailService.java | 2 +- .../attachment/DataAttachmentParser.java | 6 +- .../attachment/EmailAttachmentParser.java | 4 +- .../HttpEmailAttachementParser.java | 16 +- .../attachment/HttpRequestAttachment.java | 2 +- .../notification/hipchat/HipChatAccount.java | 4 +- .../notification/hipchat/HipChatAccounts.java | 2 +- .../notification/hipchat/HipChatMessage.java | 4 +- .../notification/hipchat/HipChatServer.java | 2 +- .../hipchat/IntegrationAccount.java | 14 +- .../hipchat/InternalHipChatService.java | 2 +- .../notification/hipchat/SentMessages.java | 4 +- .../notification/hipchat/UserAccount.java | 14 +- .../xpack/notification/hipchat/V1Account.java | 14 +- .../notification/pagerduty/IncidentEvent.java | 12 +- .../pagerduty/IncidentEventContext.java | 4 +- .../pagerduty/InternalPagerDutyService.java | 2 +- .../pagerduty/PagerDutyAccount.java | 8 +- .../pagerduty/PagerDutyAccounts.java | 2 +- .../notification/pagerduty/SentEvent.java | 6 +- .../slack/InternalSlackService.java | 2 +- .../notification/slack/SentMessages.java | 4 +- .../notification/slack/SlackAccount.java | 8 +- .../notification/slack/SlackAccounts.java | 2 +- .../slack/message/Attachment.java | 4 +- .../slack/message/DynamicAttachments.java | 4 +- .../notification/slack/message/Field.java | 4 +- .../slack/message/SlackMessage.java | 4 +- .../xpack/TimeWarpedXPackPlugin.java | 2 +- .../extensions/XPackExtensionInfoTests.java | 2 +- .../notification/email/AccountTests.java | 4 +- .../notification/email/AccountsTests.java | 2 +- .../email/EmailSecretsIntegrationTests.java | 32 +-- .../email/EmailTemplateTests.java | 4 +- .../email/InternalEmailServiceTests.java | 4 +- .../email/ManualPublicSmtpServersTester.java | 2 +- .../EmailAttachmentParsersTests.java | 8 +- .../HttpEmailAttachementParserTests.java | 18 +- .../hipchat/HipChatAccountsTests.java | 2 +- .../hipchat/HipChatMessageTests.java | 2 +- .../hipchat/IntegrationAccountTests.java | 10 +- .../hipchat/InternalHipChatServiceTests.java | 2 +- .../hipchat/UserAccountTests.java | 14 +- .../notification/hipchat/V1AccountTests.java | 10 +- .../pagerduty/PagerDutyAccountsTests.java | 2 +- .../slack/SlackAccountsTests.java | 2 +- .../message/SlackMessageDefaultsTests.java | 0 .../slack/message/SlackMessageTests.java | 6 +- .../x-pack/watcher/bin/x-pack/croneval | 2 +- .../x-pack/watcher/bin/x-pack/croneval.bat | 4 +- .../{ => xpack}/watcher/Watcher.java | 100 +++++----- .../{ => xpack}/watcher/WatcherBuild.java | 2 +- .../watcher/WatcherFeatureSet.java | 2 +- .../{ => xpack}/watcher/WatcherLicensee.java | 2 +- .../watcher/WatcherLifeCycleService.java | 2 +- .../{ => xpack}/watcher/WatcherMetaData.java | 2 +- .../{ => xpack}/watcher/WatcherModule.java | 6 +- .../{ => xpack}/watcher/WatcherService.java | 24 +-- .../{ => xpack}/watcher/WatcherState.java | 2 +- .../{ => xpack}/watcher/actions/Action.java | 2 +- .../watcher/actions/ActionBuilders.java | 20 +- .../watcher/actions/ActionFactory.java | 2 +- .../watcher/actions/ActionRegistry.java | 10 +- .../watcher/actions/ActionStatus.java | 6 +- .../watcher/actions/ActionWrapper.java | 22 +- .../watcher/actions/ExecutableAction.java | 6 +- .../watcher/actions/ExecutableActions.java | 2 +- .../watcher/actions/WatcherActionModule.java | 30 +-- .../watcher/actions/email/EmailAction.java | 10 +- .../actions/email/EmailActionFactory.java | 6 +- .../actions/email/ExecutableEmailAction.java | 14 +- .../hipchat/ExecutableHipChatAction.java | 14 +- .../actions/hipchat/HipChatAction.java | 6 +- .../actions/hipchat/HipChatActionFactory.java | 6 +- .../actions/index/ExecutableIndexAction.java | 20 +- .../watcher/actions/index/IndexAction.java | 8 +- .../actions/index/IndexActionFactory.java | 8 +- .../logging/ExecutableLoggingAction.java | 14 +- .../actions/logging/LoggingAction.java | 6 +- .../actions/logging/LoggingActionFactory.java | 6 +- .../watcher/actions/logging/LoggingLevel.java | 2 +- .../pagerduty/ExecutablePagerDutyAction.java | 14 +- .../actions/pagerduty/PagerDutyAction.java | 4 +- .../pagerduty/PagerDutyActionFactory.java | 8 +- .../actions/slack/ExecutableSlackAction.java | 14 +- .../watcher/actions/slack/SlackAction.java | 4 +- .../actions/slack/SlackActionFactory.java | 8 +- .../actions/throttler/AckThrottler.java | 10 +- .../actions/throttler/ActionThrottler.java | 8 +- .../actions/throttler/PeriodThrottler.java | 8 +- .../watcher/actions/throttler/Throttler.java | 4 +- .../webhook/ExecutableWebhookAction.java | 20 +- .../actions/webhook/WebhookAction.java | 10 +- .../actions/webhook/WebhookActionFactory.java | 10 +- .../watcher/client/WatchSourceBuilder.java | 24 +-- .../watcher/client/WatchSourceBuilders.java | 2 +- .../watcher/client/WatcherClient.java | 66 +++--- .../watcher/client/WatcherClientModule.java | 2 +- .../watcher/condition/Condition.java | 2 +- .../watcher/condition/ConditionBuilders.java | 14 +- .../watcher/condition/ConditionFactory.java | 2 +- .../watcher/condition/ConditionModule.java | 22 +- .../watcher/condition/ConditionRegistry.java | 2 +- .../condition/ExecutableCondition.java | 4 +- .../condition/always/AlwaysCondition.java | 4 +- .../always/AlwaysConditionFactory.java | 4 +- .../always/ExecutableAlwaysCondition.java | 6 +- .../AbstractExecutableCompareCondition.java | 16 +- .../condition/compare/CompareCondition.java | 4 +- .../compare/CompareConditionFactory.java | 6 +- .../compare/ExecutableCompareCondition.java | 6 +- .../condition/compare/LenientCompare.java | 4 +- .../compare/array/ArrayCompareCondition.java | 6 +- .../array/ArrayCompareConditionFactory.java | 6 +- .../ExecutableArrayCompareCondition.java | 8 +- .../never/ExecutableNeverCondition.java | 6 +- .../condition/never/NeverCondition.java | 4 +- .../never/NeverConditionFactory.java | 4 +- .../script/ExecutableScriptCondition.java | 12 +- .../condition/script/ScriptCondition.java | 6 +- .../script/ScriptConditionFactory.java | 6 +- .../execution/ActionExecutionMode.java | 4 +- .../execution/AsyncTriggerListener.java | 8 +- .../watcher/execution/CurrentExecutions.java | 4 +- .../watcher/execution/ExecutionModule.java | 4 +- .../watcher/execution/ExecutionPhase.java | 2 +- .../watcher/execution/ExecutionService.java | 26 +-- .../watcher/execution/ExecutionState.java | 2 +- .../execution/InternalWatchExecutor.java | 8 +- .../execution/ManualExecutionContext.java | 14 +- .../watcher/execution/QueuedWatch.java | 2 +- .../execution/SyncTriggerListener.java | 8 +- .../execution/TriggeredExecutionContext.java | 6 +- .../watcher/execution/TriggeredWatch.java | 6 +- .../execution/TriggeredWatchStore.java | 8 +- .../execution/WatchExecutionContext.java | 20 +- .../execution/WatchExecutionResult.java | 12 +- .../execution/WatchExecutionSnapshot.java | 6 +- .../watcher/execution/WatchExecutor.java | 4 +- .../{ => xpack}/watcher/execution/Wid.java | 4 +- .../watcher/history/HistoryModule.java | 4 +- .../watcher/history/HistoryStore.java | 12 +- .../watcher/history/WatchRecord.java | 20 +- .../watcher/input/ExecutableInput.java | 6 +- .../{ => xpack}/watcher/input/Input.java | 4 +- .../watcher/input/InputBuilders.java | 16 +- .../watcher/input/InputFactory.java | 2 +- .../watcher/input/InputModule.java | 22 +- .../watcher/input/InputRegistry.java | 2 +- .../watcher/input/chain/ChainInput.java | 8 +- .../input/chain/ChainInputFactory.java | 10 +- .../input/chain/ExecutableChainInput.java | 10 +- .../input/http/ExecutableHttpInput.java | 20 +- .../watcher/input/http/HttpInput.java | 12 +- .../watcher/input/http/HttpInputFactory.java | 10 +- .../input/none/ExecutableNoneInput.java | 8 +- .../watcher/input/none/NoneInput.java | 6 +- .../watcher/input/none/NoneInputFactory.java | 4 +- .../input/search/ExecutableSearchInput.java | 14 +- .../watcher/input/search/SearchInput.java | 12 +- .../input/search/SearchInputFactory.java | 8 +- .../input/simple/ExecutableSimpleInput.java | 8 +- .../watcher/input/simple/SimpleInput.java | 6 +- .../input/simple/SimpleInputFactory.java | 4 +- .../watcher/rest/WatcherRestHandler.java | 4 +- .../rest/action/RestAckWatchAction.java | 14 +- .../rest/action/RestActivateWatchAction.java | 14 +- .../rest/action/RestDeleteWatchAction.java | 10 +- .../rest/action/RestExecuteWatchAction.java | 22 +- .../rest/action/RestGetWatchAction.java | 16 +- .../action/RestHijackOperationAction.java | 8 +- .../rest/action/RestPutWatchAction.java | 10 +- .../rest/action/RestWatchServiceAction.java | 10 +- .../rest/action/RestWatcherStatsAction.java | 10 +- .../watcher/support/ArrayObjectIterator.java | 2 +- .../watcher/support/Exceptions.java | 2 +- .../{ => xpack}/watcher/support/Integers.java | 2 +- .../{ => xpack}/watcher/support/Script.java | 2 +- .../watcher/support/ScriptServiceProxy.java | 2 +- .../support/SearchRequestEquivalence.java | 4 +- .../{ => xpack}/watcher/support/Strings.java | 2 +- .../support/ThreadPoolSettingsBuilder.java | 2 +- .../watcher/support/Variables.java | 6 +- .../watcher/support/WatcherDateTimeUtils.java | 4 +- .../support/WatcherIndexTemplateRegistry.java | 4 +- .../watcher/support/WatcherUtils.java | 8 +- .../support/XContentFilterKeysUtils.java | 2 +- .../watcher/support/clock/Clock.java | 2 +- .../watcher/support/clock/ClockModule.java | 2 +- .../watcher/support/clock/HaltedClock.java | 2 +- .../watcher/support/clock/SystemClock.java | 2 +- .../support/concurrent/FairKeyedLock.java | 2 +- .../watcher/support/http/HttpClient.java | 6 +- .../support/http/HttpClientModule.java | 10 +- .../watcher/support/http/HttpContentType.java | 4 +- .../watcher/support/http/HttpMethod.java | 2 +- .../watcher/support/http/HttpProxy.java | 2 +- .../watcher/support/http/HttpRequest.java | 10 +- .../support/http/HttpRequestTemplate.java | 14 +- .../watcher/support/http/HttpResponse.java | 2 +- .../watcher/support/http/Scheme.java | 2 +- .../support/http/auth/ApplicableHttpAuth.java | 2 +- .../watcher/support/http/auth/HttpAuth.java | 2 +- .../support/http/auth/HttpAuthFactory.java | 2 +- .../support/http/auth/HttpAuthRegistry.java | 4 +- .../http/auth/basic/ApplicableBasicAuth.java | 6 +- .../support/http/auth/basic/BasicAuth.java | 10 +- .../http/auth/basic/BasicAuthFactory.java | 6 +- .../init/proxy/WatcherClientProxy.java | 2 +- .../watcher/support/secret/Secret.java | 2 +- .../watcher/support/secret/SecretModule.java | 2 +- .../watcher/support/secret/SecretService.java | 2 +- .../text/DefaultTextTemplateEngine.java | 4 +- .../watcher/support/text/TextTemplate.java | 2 +- .../support/text/TextTemplateEngine.java | 2 +- .../support/text/TextTemplateModule.java | 2 +- .../support/validation/Validation.java | 2 +- .../validation/WatcherSettingsValidation.java | 4 +- .../watcher/support/xcontent/ObjectPath.java | 2 +- .../support/xcontent/WatcherParams.java | 2 +- .../xcontent/WatcherXContentParser.java | 10 +- .../support/xcontent/XContentSource.java | 2 +- .../transform/ExecutableTransform.java | 6 +- .../watcher/transform/Transform.java | 4 +- .../watcher/transform/TransformBuilders.java | 10 +- .../watcher/transform/TransformFactory.java | 2 +- .../watcher/transform/TransformModule.java | 14 +- .../watcher/transform/TransformRegistry.java | 2 +- .../transform/chain/ChainTransform.java | 8 +- .../chain/ChainTransformFactory.java | 10 +- .../chain/ExecutableChainTransform.java | 10 +- .../script/ExecutableScriptTransform.java | 16 +- .../transform/script/ScriptTransform.java | 8 +- .../script/ScriptTransformFactory.java | 6 +- .../search/ExecutableSearchTransform.java | 12 +- .../transform/search/SearchTransform.java | 12 +- .../search/SearchTransformFactory.java | 6 +- .../actions/WatcherTransportAction.java | 4 +- .../transport/actions/ack/AckWatchAction.java | 2 +- .../actions/ack/AckWatchRequest.java | 4 +- .../actions/ack/AckWatchRequestBuilder.java | 2 +- .../actions/ack/AckWatchResponse.java | 4 +- .../actions/ack/TransportAckWatchAction.java | 12 +- .../actions/activate/ActivateWatchAction.java | 2 +- .../activate/ActivateWatchRequest.java | 4 +- .../activate/ActivateWatchRequestBuilder.java | 2 +- .../activate/ActivateWatchResponse.java | 4 +- .../TransportActivateWatchAction.java | 12 +- .../actions/delete/DeleteWatchAction.java | 2 +- .../actions/delete/DeleteWatchRequest.java | 4 +- .../delete/DeleteWatchRequestBuilder.java | 2 +- .../actions/delete/DeleteWatchResponse.java | 2 +- .../delete/TransportDeleteWatchAction.java | 10 +- .../actions/execute/ExecuteWatchAction.java | 2 +- .../actions/execute/ExecuteWatchRequest.java | 10 +- .../execute/ExecuteWatchRequestBuilder.java | 8 +- .../actions/execute/ExecuteWatchResponse.java | 4 +- .../execute/TransportExecuteWatchAction.java | 36 ++-- .../transport/actions/get/GetWatchAction.java | 2 +- .../actions/get/GetWatchRequest.java | 4 +- .../actions/get/GetWatchRequestBuilder.java | 2 +- .../actions/get/GetWatchResponse.java | 6 +- .../actions/get/TransportGetWatchAction.java | 14 +- .../transport/actions/put/PutWatchAction.java | 2 +- .../actions/put/PutWatchRequest.java | 6 +- .../actions/put/PutWatchRequestBuilder.java | 4 +- .../actions/put/PutWatchResponse.java | 2 +- .../actions/put/TransportPutWatchAction.java | 10 +- .../TransportWatcherServiceAction.java | 8 +- .../actions/service/WatcherServiceAction.java | 2 +- .../service/WatcherServiceRequest.java | 2 +- .../service/WatcherServiceRequestBuilder.java | 2 +- .../service/WatcherServiceResponse.java | 2 +- .../stats/TransportWatcherStatsAction.java | 14 +- .../actions/stats/WatcherStatsAction.java | 2 +- .../actions/stats/WatcherStatsRequest.java | 2 +- .../stats/WatcherStatsRequestBuilder.java | 2 +- .../actions/stats/WatcherStatsResponse.java | 12 +- .../trigger/AbstractTriggerEngine.java | 2 +- .../{ => xpack}/watcher/trigger/Trigger.java | 2 +- .../watcher/trigger/TriggerBuilders.java | 6 +- .../watcher/trigger/TriggerEngine.java | 2 +- .../watcher/trigger/TriggerEvent.java | 4 +- .../watcher/trigger/TriggerModule.java | 6 +- .../watcher/trigger/TriggerService.java | 4 +- .../watcher/trigger/manual/ManualTrigger.java | 4 +- .../trigger/manual/ManualTriggerEngine.java | 8 +- .../trigger/manual/ManualTriggerEvent.java | 6 +- .../watcher/trigger/schedule/Cron.java | 4 +- .../trigger/schedule/CronSchedule.java | 2 +- .../trigger/schedule/CronnableSchedule.java | 2 +- .../trigger/schedule/DailySchedule.java | 4 +- .../trigger/schedule/HourlySchedule.java | 6 +- .../trigger/schedule/IntervalSchedule.java | 4 +- .../trigger/schedule/MonthlySchedule.java | 4 +- .../watcher/trigger/schedule/Schedule.java | 2 +- .../trigger/schedule/ScheduleModule.java | 8 +- .../trigger/schedule/ScheduleRegistry.java | 2 +- .../trigger/schedule/ScheduleTrigger.java | 4 +- .../schedule/ScheduleTriggerEngine.java | 12 +- .../schedule/ScheduleTriggerEvent.java | 8 +- .../watcher/trigger/schedule/Schedules.java | 2 +- .../trigger/schedule/WeeklySchedule.java | 4 +- .../trigger/schedule/YearlySchedule.java | 4 +- .../SchedulerScheduleTriggerEngine.java | 16 +- .../engine/TickerScheduleTriggerEngine.java | 16 +- .../trigger/schedule/support/DayOfWeek.java | 2 +- .../trigger/schedule/support/DayTimes.java | 6 +- .../trigger/schedule/support/Month.java | 2 +- .../trigger/schedule/support/MonthTimes.java | 6 +- .../trigger/schedule/support/Times.java | 2 +- .../trigger/schedule/support/WeekTimes.java | 4 +- .../trigger/schedule/support/YearTimes.java | 6 +- .../trigger/schedule/tool/CronEvalTool.java | 4 +- .../{ => xpack}/watcher/watch/Payload.java | 4 +- .../{ => xpack}/watcher/watch/Watch.java | 50 ++--- .../watcher/watch/WatchLockService.java | 6 +- .../watcher/watch/WatchModule.java | 6 +- .../watcher/watch/WatchStatus.java | 28 +-- .../{ => xpack}/watcher/watch/WatchStore.java | 6 +- .../trigger/schedule/tool/croneval-eval.help | 27 --- .../script/MockMustacheScriptEngine.java | 2 +- .../script/SleepScriptEngine.java | 4 +- .../{ => xpack}/watcher/WatcherF.java | 2 +- .../watcher/WatcherLifeCycleServiceTests.java | 2 +- .../watcher/WatcherPluginDisableTests.java | 4 +- .../watcher/WatcherPluginTests.java | 2 +- .../watcher/WatcherServiceTests.java | 24 +-- .../actions/ActionErrorIntegrationTests.java | 20 +- .../actions/TimeThrottleIntegrationTests.java | 32 +-- .../actions/email/EmailActionTests.java | 38 ++-- .../actions/email/EmailAttachmentTests.java | 30 +-- .../hipchat/HipChatActionFactoryTests.java | 8 +- .../actions/hipchat/HipChatActionTests.java | 20 +- .../index/IndexActionIntegrationTests.java | 28 +-- .../actions/index/IndexActionTests.java | 18 +- .../actions/logging/LoggingActionTests.java | 16 +- .../PagerDutyActionFactoryTests.java | 6 +- .../pagerduty/PagerDutyActionTests.java | 22 +- .../slack/SlackActionFactoryTests.java | 6 +- .../actions/slack/SlackActionTests.java | 20 +- .../actions/throttler/AckThrottlerTests.java | 18 +- .../throttler/ActionThrottleTests.java | 60 +++--- .../throttler/PeriodThrottlerTests.java | 14 +- .../throttler/WatchThrottlerTests.java | 6 +- .../actions/webhook/WebhookActionTests.java | 46 ++--- .../webhook/WebhookHttpsIntegrationTests.java | 32 +-- .../webhook/WebhookIntegrationTests.java | 28 +-- .../always/AlwaysConditionTests.java | 6 +- .../compare/CompareConditionSearchTests.java | 12 +- .../compare/CompareConditionTests.java | 14 +- .../ArrayCompareConditionSearchTests.java | 12 +- .../array/ArrayCompareConditionTests.java | 14 +- .../condition/never/NeverConditionTests.java | 8 +- .../script/ScriptConditionSearchTests.java | 16 +- .../script/ScriptConditionTests.java | 18 +- .../execution/ExecutionServiceTests.java | 54 ++--- .../execution/ManualExecutionTests.java | 62 +++--- .../TriggeredWatchStoreLifeCycleTests.java | 14 +- .../execution/TriggeredWatchStoreTests.java | 4 +- .../execution/TriggeredWatchTests.java | 10 +- .../history/HistoryStoreSettingsTests.java | 6 +- .../watcher/history/HistoryStoreTests.java | 16 +- .../HistoryTemplateEmailMappingsTests.java | 20 +- .../HistoryTemplateHttpMappingsTests.java | 22 +- ...storyTemplateIndexActionMappingsTests.java | 16 +- ...storyTemplateSearchInputMappingsTests.java | 20 +- .../HistoryTemplateTimeMappingsTests.java | 20 +- ...HistoryTemplateTransformMappingsTests.java | 22 +- .../watcher/input/InputRegistryTests.java | 2 +- .../watcher/input/chain/ChainInputTests.java | 56 +++--- .../input/chain/ChainIntegrationTests.java | 26 +-- .../input/http/HttpInputIntegrationTests.java | 36 ++-- .../watcher/input/http/HttpInputTests.java | 58 +++--- .../input/simple/SimpleInputTests.java | 10 +- .../watcher/license/LicenseTests.java | 4 +- .../action/RestExecuteWatchActionTests.java | 10 +- .../watcher/shield/BasicShieldTests.java | 28 +-- .../DynamicIndexNameIntegrationTests.java | 28 +-- .../watcher/support/FilterXContentTests.java | 2 +- .../watcher/support/VariablesTests.java | 16 +- .../support/WatcherDateTimeUtilsTests.java | 4 +- .../WatcherIndexTemplateRegistryTests.java | 6 +- .../watcher/support/WatcherUtilsTests.java | 16 +- .../watcher/support/clock/ClockMock.java | 2 +- .../watcher/support/clock/ClockTests.java | 2 +- .../concurrent/FairKeyedLockTests.java | 2 +- .../watcher/support/http/HttpClientTests.java | 10 +- .../http/HttpConnectionTimeoutTests.java | 4 +- .../support/http/HttpReadTimeoutTests.java | 4 +- .../http/HttpRequestTemplateTests.java | 14 +- .../support/http/HttpRequestTests.java | 4 +- .../support/http/HttpResponseTests.java | 4 +- .../support/text/TextTemplateTests.java | 6 +- .../support/xcontent/MapPathTests.java | 2 +- .../support/xcontent/XContentSourceTests.java | 2 +- .../AbstractWatcherIntegrationTestCase.java | 42 ++-- .../watcher/test/MockTextTemplateEngine.java | 6 +- .../watcher/test/TimeWarpedWatcher.java | 22 +- .../WatchExecutionContextMockBuilder.java | 14 +- .../watcher/test/WatcherMatchers.java | 2 +- .../watcher/test/WatcherTestUtils.java | 66 +++--- .../bench/ScheduleEngineTriggerBenchmark.java | 26 +-- .../WatcherExecutorServiceBenchmark.java | 28 +-- .../bench/WatcherScheduleEngineBenchmark.java | 26 +-- .../test/integration/BasicWatcherTests.java | 64 +++--- .../test/integration/BootStrapTests.java | 48 ++--- .../ExecutionVarsIntegrationTests.java | 28 +-- .../HttpSecretsIntegrationTests.java | 44 ++-- .../test/integration/WatchMetadataTests.java | 40 ++-- .../WatcherSettingsFilterTests.java | 8 +- .../transform/TransformIntegrationTests.java | 30 +-- .../transform/chain/ChainTransformTests.java | 18 +- .../script/ScriptTransformTests.java | 24 +-- .../action/activate/ActivateWatchTests.java | 30 +-- .../action/delete/DeleteWatchTests.java | 22 +- .../action/delete/ForceDeleteWatchTests.java | 20 +- .../action/execute/ExecuteWatchTests.java | 48 ++--- .../ExecuteWatchWithDateMathTests.java | 28 +-- .../transport/action/get/GetWatchTests.java | 24 +-- .../transport/action/put/PutWatchTests.java | 20 +- .../action/stats/SlowWatchStatsTests.java | 24 +-- .../action/stats/WatcherStatsTests.java | 30 +-- .../trigger/ScheduleTriggerEngineMock.java | 14 +- .../trigger/schedule/CronScheduleTests.java | 2 +- .../trigger/schedule/DailyScheduleTests.java | 6 +- .../trigger/schedule/HourlyScheduleTests.java | 8 +- .../schedule/IntervalScheduleTests.java | 2 +- .../schedule/MonthlyScheduleTests.java | 8 +- .../schedule/ScheduleRegistryTests.java | 2 +- .../trigger/schedule/ScheduleTestCase.java | 24 +-- .../schedule/ScheduleTriggerEventTests.java | 4 +- .../trigger/schedule/WeeklyScheduleTests.java | 10 +- .../trigger/schedule/YearlyScheduleTests.java | 8 +- .../engine/BaseTriggerEngineTestCase.java | 26 +-- .../engine/SchedulerScheduleEngineTests.java | 8 +- .../engine/TickerScheduleEngineTests.java | 8 +- .../schedule/tool/CronEvalToolTests.java | 2 +- .../trigger/schedule/tool/EvalCron.java | 2 +- .../watcher/watch/WatchLockServiceTests.java | 2 +- .../watcher/watch/WatchStoreTests.java | 4 +- .../{ => xpack}/watcher/watch/WatchTests.java | 188 +++++++++--------- .../watcher/actions/email/service/logo.png | Bin .../rest-api-spec/api/watcher.ack_watch.json | 2 +- .../api/watcher.activate_watch.json | 2 +- .../api/watcher.deactivate_watch.json | 2 +- .../api/watcher.delete_watch.json | 2 +- .../api/watcher.execute_watch.json | 2 +- .../rest-api-spec/api/watcher.get_watch.json | 2 +- .../rest-api-spec/api/watcher.put_watch.json | 2 +- .../rest-api-spec/api/watcher.restart.json | 2 +- .../rest-api-spec/api/watcher.start.json | 2 +- .../rest-api-spec/api/watcher.stats.json | 2 +- .../rest-api-spec/api/watcher.stop.json | 2 +- .../watcher/ack_watch/10_basic.yaml | 6 +- .../ack_watch/20_ack_individual_action.yaml | 6 +- .../watcher/activate_watch/10_basic.yaml | 14 +- .../watcher/array_compare_watch/10_basic.yaml | 10 +- .../watcher/delete_watch/10_basic.yaml | 4 +- .../watcher/get_watch/10_basic.yaml | 4 +- .../watcher/get_watch/20_missing.yaml | 2 +- .../10_monitor_cluster_health.yaml | 10 +- .../{ => xpack}/watcher/hijack/10_basic.yaml | 0 .../watcher/put_watch/10_basic.yaml | 2 +- .../20_put_watch_with_throttle_period.yaml | 4 +- ...put_watch_with_action_throttle_period.yaml | 4 +- .../put_watch/40_put_watch_as_inactive.yaml | 4 +- .../50_email_attachment_validation.yaml | 4 +- .../watcher/restart_watcher/10_basic.yaml | 2 +- .../watcher/start_watcher/10_basic.yaml | 2 +- .../{ => xpack}/watcher/stats/10_basic.yaml | 2 +- .../watcher/stop_watcher/10_basic.yaml | 4 +- 532 files changed, 2680 insertions(+), 2696 deletions(-) rename elasticsearch/{x-pack/watcher/src/test/resources/org/elasticsearch => qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack}/watcher/input/search/config/scripts/test_disk_template.mustache (100%) rename elasticsearch/{x-pack/watcher/src/test/resources/org/elasticsearch => qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack}/watcher/transform/search/config/scripts/test_disk_template.mustache (100%) rename elasticsearch/x-pack/{watcher => }/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java (100%) rename elasticsearch/x-pack/{watcher => }/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/Watcher.java (78%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherBuild.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherFeatureSet.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherLicensee.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherLifeCycleService.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherMetaData.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherModule.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherService.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/WatcherState.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/Action.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionBuilders.java (83%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionFactory.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionRegistry.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionStatus.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionWrapper.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ExecutableAction.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/ExecutableActions.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/WatcherActionModule.java (80%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/email/EmailAction.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/email/EmailActionFactory.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/email/ExecutableEmailAction.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/hipchat/ExecutableHipChatAction.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/hipchat/HipChatAction.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/hipchat/HipChatActionFactory.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/index/ExecutableIndexAction.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/index/IndexAction.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/index/IndexActionFactory.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/logging/ExecutableLoggingAction.java (80%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/logging/LoggingAction.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/logging/LoggingActionFactory.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/logging/LoggingLevel.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/pagerduty/ExecutablePagerDutyAction.java (83%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/pagerduty/PagerDutyAction.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/pagerduty/PagerDutyActionFactory.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/slack/ExecutableSlackAction.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/slack/SlackAction.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/slack/SlackActionFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/AckThrottler.java (68%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/ActionThrottler.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/PeriodThrottler.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/Throttler.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/ExecutableWebhookAction.java (71%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/WebhookAction.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/WebhookActionFactory.java (83%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/client/WatchSourceBuilder.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/client/WatchSourceBuilders.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/client/WatcherClient.java (78%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/client/WatcherClientModule.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/Condition.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/ConditionBuilders.java (75%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/ConditionFactory.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/ConditionModule.java (70%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/ConditionRegistry.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/ExecutableCondition.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/always/AlwaysCondition.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/always/AlwaysConditionFactory.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/always/ExecutableAlwaysCondition.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/AbstractExecutableCompareCondition.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/CompareCondition.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/CompareConditionFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/ExecutableCompareCondition.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/LenientCompare.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/array/ArrayCompareCondition.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/array/ArrayCompareConditionFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/array/ExecutableArrayCompareCondition.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/never/ExecutableNeverCondition.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/never/NeverCondition.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/never/NeverConditionFactory.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/script/ExecutableScriptCondition.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/script/ScriptCondition.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/condition/script/ScriptConditionFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ActionExecutionMode.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/AsyncTriggerListener.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/CurrentExecutions.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ExecutionModule.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ExecutionPhase.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ExecutionService.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ExecutionState.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/InternalWatchExecutor.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/ManualExecutionContext.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/QueuedWatch.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/SyncTriggerListener.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredExecutionContext.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredWatch.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredWatchStore.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/WatchExecutionContext.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/WatchExecutionResult.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/WatchExecutionSnapshot.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/WatchExecutor.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/execution/Wid.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryModule.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryStore.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/history/WatchRecord.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/ExecutableInput.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/Input.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/InputBuilders.java (78%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/InputFactory.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/InputModule.java (72%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/InputRegistry.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/chain/ChainInput.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/chain/ChainInputFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/chain/ExecutableChainInput.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/http/ExecutableHttpInput.java (85%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/http/HttpInput.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/http/HttpInputFactory.java (83%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/none/ExecutableNoneInput.java (72%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/none/NoneInput.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/none/NoneInputFactory.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/search/ExecutableSearchInput.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/search/SearchInput.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/search/SearchInputFactory.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/simple/ExecutableSimpleInput.java (75%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/simple/SimpleInput.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/input/simple/SimpleInputFactory.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/WatcherRestHandler.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestAckWatchAction.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestActivateWatchAction.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestDeleteWatchAction.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestExecuteWatchAction.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestGetWatchAction.java (84%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestHijackOperationAction.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestPutWatchAction.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestWatchServiceAction.java (86%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestWatcherStatsAction.java (86%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/ArrayObjectIterator.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/Exceptions.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/Integers.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/Script.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/ScriptServiceProxy.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/SearchRequestEquivalence.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/Strings.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/ThreadPoolSettingsBuilder.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/Variables.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherDateTimeUtils.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherIndexTemplateRegistry.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherUtils.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/XContentFilterKeysUtils.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/clock/Clock.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/clock/ClockModule.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/clock/HaltedClock.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/clock/SystemClock.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/concurrent/FairKeyedLock.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpClient.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpClientModule.java (73%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpContentType.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpMethod.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpProxy.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpRequest.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpRequestTemplate.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpResponse.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/Scheme.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/ApplicableHttpAuth.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/HttpAuth.java (86%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/HttpAuthFactory.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/HttpAuthRegistry.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/basic/ApplicableBasicAuth.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/basic/BasicAuth.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/http/auth/basic/BasicAuthFactory.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/init/proxy/WatcherClientProxy.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/secret/Secret.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/secret/SecretModule.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/secret/SecretService.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/text/DefaultTextTemplateEngine.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/text/TextTemplate.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/text/TextTemplateEngine.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/text/TextTemplateModule.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/validation/Validation.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/validation/WatcherSettingsValidation.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/ObjectPath.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/WatcherParams.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/WatcherXContentParser.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/XContentSource.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/ExecutableTransform.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/Transform.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/TransformBuilders.java (81%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/TransformFactory.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/TransformModule.java (75%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/TransformRegistry.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/chain/ChainTransform.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/chain/ChainTransformFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/chain/ExecutableChainTransform.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/script/ExecutableScriptTransform.java (81%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/script/ScriptTransform.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/script/ScriptTransformFactory.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/search/ExecutableSearchTransform.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/search/SearchTransform.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transform/search/SearchTransformFactory.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/WatcherTransportAction.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/ack/AckWatchAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/ack/AckWatchRequest.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/ack/AckWatchRequestBuilder.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/ack/AckWatchResponse.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/ack/TransportAckWatchAction.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/activate/ActivateWatchAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/activate/ActivateWatchRequest.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/activate/ActivateWatchResponse.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/activate/TransportActivateWatchAction.java (88%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/delete/DeleteWatchAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/delete/DeleteWatchRequest.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/delete/DeleteWatchResponse.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/delete/TransportDeleteWatchAction.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/execute/ExecuteWatchAction.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/execute/ExecuteWatchRequest.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/execute/ExecuteWatchResponse.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/execute/TransportExecuteWatchAction.java (82%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/get/GetWatchAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/get/GetWatchRequest.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/get/GetWatchRequestBuilder.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/get/GetWatchResponse.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/get/TransportGetWatchAction.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/put/PutWatchAction.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/put/PutWatchRequest.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/put/PutWatchRequestBuilder.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/put/PutWatchResponse.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/put/TransportPutWatchAction.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/service/TransportWatcherServiceAction.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/service/WatcherServiceAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/service/WatcherServiceRequest.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/service/WatcherServiceRequestBuilder.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/service/WatcherServiceResponse.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/stats/TransportWatcherStatsAction.java (89%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/stats/WatcherStatsAction.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/stats/WatcherStatsRequest.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/transport/actions/stats/WatcherStatsResponse.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/AbstractTriggerEngine.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/Trigger.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/TriggerBuilders.java (71%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/TriggerEngine.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/TriggerEvent.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/TriggerModule.java (87%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/TriggerService.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/manual/ManualTrigger.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/manual/ManualTriggerEngine.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/manual/ManualTriggerEvent.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/Cron.java (99%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/CronSchedule.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/CronnableSchedule.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/DailySchedule.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/HourlySchedule.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/IntervalSchedule.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/MonthlySchedule.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/Schedule.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleModule.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleRegistry.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleTrigger.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleTriggerEngine.java (86%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleTriggerEvent.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/Schedules.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/WeeklySchedule.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/YearlySchedule.java (96%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java (93%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/DayOfWeek.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/DayTimes.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/Month.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/MonthTimes.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/Times.java (91%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/WeekTimes.java (98%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/support/YearTimes.java (97%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/tool/CronEvalTool.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/Payload.java (94%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/Watch.java (90%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchLockService.java (95%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchModule.java (80%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchStatus.java (92%) rename elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchStore.java (98%) delete mode 100644 elasticsearch/x-pack/watcher/src/main/resources/org/elasticsearch/watcher/trigger/schedule/tool/croneval-eval.help rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/WatcherF.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/WatcherLifeCycleServiceTests.java (99%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/WatcherPluginDisableTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/WatcherPluginTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/WatcherServiceTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/ActionErrorIntegrationTests.java (90%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/TimeThrottleIntegrationTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/email/EmailActionTests.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/email/EmailAttachmentTests.java (88%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/hipchat/HipChatActionFactoryTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/hipchat/HipChatActionTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/index/IndexActionIntegrationTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/index/IndexActionTests.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/logging/LoggingActionTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/pagerduty/PagerDutyActionTests.java (93%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/slack/SlackActionFactoryTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/slack/SlackActionTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/AckThrottlerTests.java (83%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/ActionThrottleTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/PeriodThrottlerTests.java (85%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/throttler/WatchThrottlerTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/WebhookActionTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/WebhookHttpsIntegrationTests.java (83%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/actions/webhook/WebhookIntegrationTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/always/AlwaysConditionTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/CompareConditionSearchTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/CompareConditionTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/compare/array/ArrayCompareConditionTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/never/NeverConditionTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/script/ScriptConditionSearchTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/condition/script/ScriptConditionTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/execution/ExecutionServiceTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/execution/ManualExecutionTests.java (86%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredWatchStoreLifeCycleTests.java (87%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredWatchStoreTests.java (99%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/execution/TriggeredWatchTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryStoreSettingsTests.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryStoreTests.java (86%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateEmailMappingsTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateHttpMappingsTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateIndexActionMappingsTests.java (83%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateSearchInputMappingsTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateTimeMappingsTests.java (82%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/history/HistoryTemplateTransformMappingsTests.java (84%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/InputRegistryTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/chain/ChainInputTests.java (78%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/chain/ChainIntegrationTests.java (75%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/http/HttpInputIntegrationTests.java (82%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/http/HttpInputTests.java (85%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/input/simple/SimpleInputTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/license/LicenseTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/rest/action/RestExecuteWatchActionTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/shield/BasicShieldTests.java (87%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/DynamicIndexNameIntegrationTests.java (81%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/FilterXContentTests.java (99%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/VariablesTests.java (79%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherDateTimeUtilsTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherIndexTemplateRegistryTests.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/WatcherUtilsTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/clock/ClockMock.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/clock/ClockTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/concurrent/FairKeyedLockTests.java (99%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpClientTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpConnectionTimeoutTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpReadTimeoutTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpRequestTemplateTests.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpRequestTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/http/HttpResponseTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/text/TextTemplateTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/MapPathTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/support/xcontent/XContentSourceTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/AbstractWatcherIntegrationTestCase.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/MockTextTemplateEngine.java (74%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/TimeWarpedWatcher.java (82%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/WatchExecutionContextMockBuilder.java (86%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/WatcherMatchers.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/WatcherTestUtils.java (83%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/bench/ScheduleEngineTriggerBenchmark.java (88%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/bench/WatcherExecutorServiceBenchmark.java (90%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/bench/WatcherScheduleEngineBenchmark.java (95%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/BasicWatcherTests.java (88%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/BootStrapTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/ExecutionVarsIntegrationTests.java (87%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/HttpSecretsIntegrationTests.java (87%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/WatchMetadataTests.java (73%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/test/integration/WatcherSettingsFilterTests.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transform/TransformIntegrationTests.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transform/chain/ChainTransformTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transform/script/ScriptTransformTests.java (92%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/activate/ActivateWatchTests.java (83%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/delete/DeleteWatchTests.java (71%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/delete/ForceDeleteWatchTests.java (75%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/execute/ExecuteWatchTests.java (90%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java (75%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/get/GetWatchTests.java (74%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/put/PutWatchTests.java (79%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/stats/SlowWatchStatsTests.java (85%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/transport/action/stats/WatcherStatsTests.java (74%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/ScheduleTriggerEngineMock.java (87%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/CronScheduleTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/DailyScheduleTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/HourlyScheduleTests.java (97%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/IntervalScheduleTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/MonthlyScheduleTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleRegistryTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleTestCase.java (93%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/ScheduleTriggerEventTests.java (93%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/WeeklyScheduleTests.java (94%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/YearlyScheduleTests.java (96%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java (91%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java (74%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java (74%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/tool/CronEvalToolTests.java (93%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/trigger/schedule/tool/EvalCron.java (89%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchLockServiceTests.java (98%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchStoreTests.java (99%) rename elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/{ => xpack}/watcher/watch/WatchTests.java (76%) rename elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/{ => xpack}/watcher/actions/email/service/logo.png (100%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/ack_watch/10_basic.yaml (91%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/ack_watch/20_ack_individual_action.yaml (91%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/activate_watch/10_basic.yaml (86%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/array_compare_watch/10_basic.yaml (95%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/delete_watch/10_basic.yaml (93%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/get_watch/10_basic.yaml (94%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/get_watch/20_missing.yaml (88%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/getting_started/10_monitor_cluster_health.yaml (93%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/hijack/10_basic.yaml (100%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/put_watch/10_basic.yaml (96%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/put_watch/20_put_watch_with_throttle_period.yaml (94%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml (94%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/put_watch/40_put_watch_as_inactive.yaml (94%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/put_watch/50_email_attachment_validation.yaml (97%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/restart_watcher/10_basic.yaml (78%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/start_watcher/10_basic.yaml (79%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/stats/10_basic.yaml (77%) rename elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/{ => xpack}/watcher/stop_watcher/10_basic.yaml (70%) diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ExecutionVarsIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ExecutionVarsIT.java index fed801a1958..dfe469fb446 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ExecutionVarsIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ExecutionVarsIT.java @@ -10,23 +10,23 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.util.Callback; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.List; import java.util.Map; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyManualExecutionIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyManualExecutionIT.java index 13320c7175a..cd3f3b864cb 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyManualExecutionIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyManualExecutionIT.java @@ -9,20 +9,20 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.execution.ManualExecutionContext; -import org.elasticsearch.watcher.execution.ManualExecutionTests.ExecutionRunner; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.execution.ManualExecutionContext; +import org.elasticsearch.xpack.watcher.execution.ManualExecutionTests.ExecutionRunner; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -31,11 +31,11 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyScriptConditionIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyScriptConditionIT.java index 404ae21382c..a14e5a554de 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyScriptConditionIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/GroovyScriptConditionIT.java @@ -12,13 +12,13 @@ import org.elasticsearch.script.groovy.GroovyPlugin; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.condition.script.ExecutableScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.condition.script.ExecutableScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; import static org.elasticsearch.messy.tests.MessyTestUtils.getScriptServiceProxy; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; public class GroovyScriptConditionIT extends AbstractWatcherIntegrationTestCase { diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateTransformMappingsIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateTransformMappingsIT.java index 7bd46be6616..ac70e85f308 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateTransformMappingsIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateTransformMappingsIT.java @@ -9,20 +9,20 @@ import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRespon import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.List; import java.util.Map; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIT.java index fd1cc494fb8..6cb442b82ca 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIT.java @@ -13,12 +13,12 @@ import org.elasticsearch.script.groovy.GroovyPlugin; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -28,13 +28,13 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.dateHistogram; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/MessyTestUtils.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/MessyTestUtils.java index 80d629674b8..d7d2bc70686 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/MessyTestUtils.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/MessyTestUtils.java @@ -20,7 +20,7 @@ import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; import org.junit.Ignore; import org.mockito.Mockito; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionSearchIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionSearchIT.java index 456a5ee62fb..5f6a361eb51 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionSearchIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionSearchIT.java @@ -19,19 +19,19 @@ import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.condition.script.ExecutableScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.condition.script.ExecutableScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.junit.After; import org.junit.Before; import java.util.List; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionTests.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionTests.java index 0bbbafcfdc7..cdbb0516a7d 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionTests.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/ScriptConditionTests.java @@ -18,14 +18,14 @@ import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.script.ExecutableScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptConditionFactory; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.script.ExecutableScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptConditionFactory; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.After; @@ -36,8 +36,8 @@ import java.io.IOException; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.messy.tests.MessyTestUtils.getScriptServiceProxy; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIT.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIT.java index e48017531ec..937b8c9e3e3 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIT.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIT.java @@ -13,10 +13,10 @@ import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.io.IOException; import java.io.InputStream; @@ -28,16 +28,16 @@ import java.util.List; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.chainTransform; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.transform.TransformBuilders.searchTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.chainTransform; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.searchTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HipChatServiceIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HipChatServiceIT.java index 5246e3c30a1..bc889ded99d 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HipChatServiceIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HipChatServiceIT.java @@ -12,13 +12,13 @@ import org.elasticsearch.script.MockMustacheScriptEngine; import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.test.junit.annotations.Network; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.HipChatService; import org.elasticsearch.xpack.notification.hipchat.SentMessages; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.Collection; import java.util.List; @@ -26,12 +26,12 @@ import java.util.List; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.hipchatAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.hipchatAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/NoMasterNodeIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/NoMasterNodeIT.java index 2048bf3bdb7..2c382165c40 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/NoMasterNodeIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/NoMasterNodeIT.java @@ -25,16 +25,16 @@ import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.SuppressLocalMode; import org.elasticsearch.test.discovery.ClusterDiscoveryConfiguration; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.client.WatchSourceBuilders; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilders; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import java.util.ArrayList; import java.util.Collection; @@ -45,15 +45,15 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.core.Is.is; diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/PagerDutyServiceIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/PagerDutyServiceIT.java index 8ad5c808502..a60d8c9f81f 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/PagerDutyServiceIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/PagerDutyServiceIT.java @@ -11,15 +11,15 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.MockMustacheScriptEngine; import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.test.junit.annotations.Network; -import org.elasticsearch.watcher.actions.pagerduty.PagerDutyAction; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent; import org.elasticsearch.xpack.notification.pagerduty.IncidentEventContext; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; import org.elasticsearch.xpack.notification.pagerduty.SentEvent; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Collection; import java.util.List; @@ -28,12 +28,12 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.watcher.actions.ActionBuilders.pagerDutyAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.pagerDutyAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputIT.java index d941ac4f802..4d71c7f5d4d 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputIT.java @@ -25,24 +25,24 @@ import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.execution.TriggeredExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.search.ExecutableSearchInput; -import org.elasticsearch.watcher.input.search.SearchInput; -import org.elasticsearch.watcher.input.search.SearchInputFactory; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.TriggeredExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInputFactory; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; @@ -64,7 +64,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; -import static org.elasticsearch.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -99,8 +99,8 @@ public class SearchInputIT extends ESIntegTestCase { throw new RuntimeException("failed to create config dir"); } - String path = "/org/elasticsearch/watcher/input/search/config/scripts/test_disk_template.mustache"; - try (InputStream stream = SearchInputIT.class.getResourceAsStream("/org/elasticsearch/watcher/input/search/config/scripts" + + String path = "/org/elasticsearch/xpack/watcher/input/search/config/scripts/test_disk_template.mustache"; + try (InputStream stream = SearchInputIT.class.getResourceAsStream("/org/elasticsearch/xpack/watcher/input/search/config/scripts" + "/test_disk_template.mustache"); OutputStream out = Files.newOutputStream(scriptPath.resolve("test_disk_template.mustache"))) { Streams.copy(stream, out); diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformIT.java index 5d66aa009dc..8c9b961684c 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformIT.java @@ -31,26 +31,26 @@ import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.execution.TriggeredExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.transform.TransformBuilders; -import org.elasticsearch.watcher.transform.search.ExecutableSearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransformFactory; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.TriggeredExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.transform.TransformBuilders; +import org.elasticsearch.xpack.watcher.transform.search.ExecutableSearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransformFactory; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; @@ -75,11 +75,11 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.parseDate; -import static org.elasticsearch.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; -import static org.elasticsearch.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; -import static org.elasticsearch.watcher.test.WatcherTestUtils.simplePayload; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.parseDate; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.simplePayload; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -114,7 +114,7 @@ public class SearchTransformIT extends ESIntegTestCase { throw new RuntimeException("failed to create config dir"); } - String path = "/org/elasticsearch/watcher/transform/search/config/scripts/test_disk_template.mustache"; + String path = "/org/elasticsearch/xpack/watcher/transform/search/config/scripts/test_disk_template.mustache"; try (InputStream stream = SearchTransformIT.class.getResourceAsStream(path); OutputStream out = Files.newOutputStream(scriptPath.resolve("test_disk_template.mustache"))) { Streams.copy(stream, out); diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SlackServiceIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SlackServiceIT.java index 423e638b5fb..59e2468b866 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SlackServiceIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SlackServiceIT.java @@ -11,14 +11,14 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.MockMustacheScriptEngine; import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.test.junit.annotations.Network; -import org.elasticsearch.watcher.actions.slack.SlackAction; +import org.elasticsearch.xpack.watcher.actions.slack.SlackAction; import org.elasticsearch.xpack.notification.slack.SentMessages; import org.elasticsearch.xpack.notification.slack.SlackAccount; import org.elasticsearch.xpack.notification.slack.SlackService; import org.elasticsearch.xpack.notification.slack.message.Attachment; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.Collection; import java.util.List; @@ -26,12 +26,12 @@ import java.util.List; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.slackAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.slackAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/WatchAckIT.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/WatchAckIT.java index 56323f4bffd..77774111be4 100644 --- a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/WatchAckIT.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/WatchAckIT.java @@ -16,20 +16,20 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.MockMustacheScriptEngine; import org.elasticsearch.script.mustache.MustachePlugin; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.hamcrest.Matchers; import java.util.ArrayList; @@ -40,14 +40,14 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.matchAllRequest; -import static org.elasticsearch.watcher.transform.TransformBuilders.searchTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.matchAllRequest; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.searchTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/input/search/config/scripts/test_disk_template.mustache b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack/watcher/input/search/config/scripts/test_disk_template.mustache similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/input/search/config/scripts/test_disk_template.mustache rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack/watcher/input/search/config/scripts/test_disk_template.mustache diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/transform/search/config/scripts/test_disk_template.mustache b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack/watcher/transform/search/config/scripts/test_disk_template.mustache similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/transform/search/config/scripts/test_disk_template.mustache rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/resources/org/elasticsearch/xpack/watcher/transform/search/config/scripts/test_disk_template.mustache diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml index 884369fac23..2a5ea88d5d8 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_exe_watch" body: > { @@ -55,7 +55,7 @@ - match: { _id: "my_exe_watch" } - do: - watcher.execute_watch: + xpack.watcher.execute_watch: id: "my_exe_watch" body: > { diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml index cb7a0c8e52e..3026c7dbf27 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_logging_watch" body: > { @@ -31,7 +31,7 @@ - match: { _id: "my_logging_watch" } - do: - watcher.execute_watch: + xpack.watcher.execute_watch: id: "my_logging_watch" - match: { "watch_record.watch_id": "my_logging_watch" } diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml index 36826ce1ac1..a54ab176b62 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.execute_watch: + xpack.watcher.execute_watch: body: > { "trigger_data" : { diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java index e6b418e7dc2..848a4e0a87c 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java +++ b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java @@ -21,10 +21,10 @@ import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.script.mustache.MustacheScriptEngineService; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.watcher.ResourceWatcherService; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.support.text.DefaultTextTemplateEngine; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.text.DefaultTextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.junit.Before; import org.mockito.Mockito; @@ -34,9 +34,9 @@ import java.io.Writer; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.Locale; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml index 38363c35f71..b770ed31968 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/10_webhook.yaml @@ -5,12 +5,12 @@ wait_for_status: yellow - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watcher_state": "started" } - match: { "watch_count": 0 } - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "test_watch" body: > { @@ -47,7 +47,7 @@ - match: { _id: "test_watch" } - match: { created: true } - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 1 } # Simulate a Thread.sleep() diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml index 606d5c2baff..153d0334d42 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/20_array_access.yaml @@ -5,12 +5,12 @@ wait_for_status: yellow - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watcher_state": "started" } - match: { "watch_count": 0 } - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "test_watch" body: > { @@ -45,7 +45,7 @@ - match: { _id: "test_watch" } - match: { created: true } - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 1 } # Simulate a Thread.sleep() diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml index 3742f5f0d34..e265528b6d9 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_exe_watch" body: > { @@ -56,7 +56,7 @@ - match: { _id: "my_exe_watch" } - do: - watcher.execute_watch: + xpack.watcher.execute_watch: id: "my_exe_watch" body: > { diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml index c08f3a69460..a25ba087103 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_logging_watch" body: > { @@ -34,7 +34,7 @@ - match: { _id: "my_logging_watch" } - do: - watcher.execute_watch: + xpack.watcher.execute_watch: id: "my_logging_watch" - match: { "watch_record.watch_id": "my_logging_watch" } diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml index 3bbb59de7cb..1bf7380991b 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-painless/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml @@ -5,7 +5,7 @@ wait_for_status: green - do: - watcher.execute_watch: + xpack.watcher.execute_watch: body: > { "trigger_data" : { diff --git a/elasticsearch/qa/smoke-test-watcher-with-shield/src/test/resources/rest-api-spec/test/watcher/watcher_and_shield/10_insufficient_shield_privs.yaml b/elasticsearch/qa/smoke-test-watcher-with-shield/src/test/resources/rest-api-spec/test/watcher/watcher_and_shield/10_insufficient_shield_privs.yaml index 668900466e1..287a3b27cc6 100644 --- a/elasticsearch/qa/smoke-test-watcher-with-shield/src/test/resources/rest-api-spec/test/watcher/watcher_and_shield/10_insufficient_shield_privs.yaml +++ b/elasticsearch/qa/smoke-test-watcher-with-shield/src/test/resources/rest-api-spec/test/watcher/watcher_and_shield/10_insufficient_shield_privs.yaml @@ -3,10 +3,10 @@ - do: headers: { es-shield-runas-user: powerless_user } catch: forbidden - watcher.stats: {} + xpack.watcher.stats: {} # there seems to be a bug in the yaml parser we use, where a single element list # has the END_LIST token skipped...so here we just rerun the same request without # the impersonation to show it works - do: - watcher.stats: {} + xpack.watcher.stats: {} - match: { watcher_state: started } diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Connection.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Connection.java index af7efc6d8ca..0b3d44ab287 100644 --- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Connection.java +++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Connection.java @@ -138,4 +138,4 @@ public class Connection { return getSource() + "->" + getTarget(); } } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Vertex.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Vertex.java index e9c4d5b77d5..002483223a8 100644 --- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Vertex.java +++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Vertex.java @@ -177,4 +177,4 @@ public class Vertex implements ToXContent { } } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/VertexRequest.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/VertexRequest.java index 95033887e93..78e09152eca 100644 --- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/VertexRequest.java +++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/VertexRequest.java @@ -195,4 +195,4 @@ public class VertexRequest { return this; } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/graph/test/GraphTests.java b/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/graph/test/GraphTests.java index 0b37232c633..c4fd6576c07 100644 --- a/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/graph/test/GraphTests.java +++ b/elasticsearch/x-pack/graph/src/test/java/org/elasticsearch/graph/test/GraphTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.shield.Security; import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.watcher.Watcher; +import org.elasticsearch.xpack.watcher.Watcher; import org.elasticsearch.xpack.XPackPlugin; import java.util.Collection; @@ -390,4 +390,4 @@ public class GraphTests extends ESSingleNodeTestCase { } } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/LicensingModule.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/LicensingModule.java index c56dbc16567..ab37ca62c3e 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/LicensingModule.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/LicensingModule.java @@ -21,4 +21,4 @@ public class LicensingModule extends AbstractModule { bind(LicensesManagerService.class).to(LicensesService.class); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java index 9e0fbb462d0..9bb72c3da4a 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java @@ -26,4 +26,4 @@ public class DeleteLicenseAction extends Action public ActionRequestValidationException validate() { return null; } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequestBuilder.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequestBuilder.java index 1574bbb638e..5b89c6a619c 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequestBuilder.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequestBuilder.java @@ -23,4 +23,4 @@ public class GetLicenseRequestBuilder extends MasterNodeReadOperationRequestBuil public GetLicenseRequestBuilder(ElasticsearchClient client, GetLicenseAction action) { super(client, action, new GetLicenseRequest()); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseResponse.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseResponse.java index 95f4799e618..1d5b9a67cdf 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseResponse.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseResponse.java @@ -46,4 +46,4 @@ public class GetLicenseResponse extends ActionResponse { } } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/TransportGetLicenseAction.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/TransportGetLicenseAction.java index 421189ef4d3..5028e9eb51e 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/TransportGetLicenseAction.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/action/get/TransportGetLicenseAction.java @@ -53,4 +53,4 @@ public class TransportGetLicenseAction extends TransportMasterNodeReadAction implemen private static final String TRIAL_LICENSES = "trial_licenses"; private static final String LICENSE = "license"; } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTestCase.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTestCase.java index be32fbb528f..b4c8abb20c2 100644 --- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTestCase.java +++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTestCase.java @@ -29,7 +29,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.Security; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.watcher.Watcher; +import org.elasticsearch.xpack.watcher.Watcher; import org.elasticsearch.xpack.XPackPlugin; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java index add099da47a..a27290ca161 100644 --- a/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java +++ b/elasticsearch/x-pack/license-plugin/src/test/java/org/elasticsearch/shield/authz/AuthorizationUtilsTests.java @@ -51,4 +51,4 @@ public class AuthorizationUtilsTests extends ESTestCase { threadContext.putTransient(InternalAuthorizationService.ORIGINATING_ACTION_KEY, randomFrom("internal:foo/bar")); assertThat(AuthorizationUtils.shouldReplaceUserWithSystem(threadContext, "internal:something"), is(false)); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java index f4257969523..330547355ce 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.monitor.os.OsProbe; import org.elasticsearch.monitor.process.ProcessProbe; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolStats; -import org.elasticsearch.watcher.execution.InternalWatchExecutor; +import org.elasticsearch.xpack.watcher.execution.InternalWatchExecutor; import java.io.IOException; import java.nio.file.Path; diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/test/MarvelIntegTestCase.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/test/MarvelIntegTestCase.java index f0d86963560..c8dd4ec0070 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/test/MarvelIntegTestCase.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/test/MarvelIntegTestCase.java @@ -17,8 +17,8 @@ import org.elasticsearch.common.util.concurrent.CountDown; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.marvel.MonitoringSettings; import org.elasticsearch.marvel.MonitoredSystem; +import org.elasticsearch.marvel.MonitoringSettings; import org.elasticsearch.marvel.agent.AgentService; import org.elasticsearch.marvel.agent.exporter.MonitoringDoc; import org.elasticsearch.marvel.agent.resolver.MonitoringIndexNameResolver; @@ -36,9 +36,9 @@ import org.elasticsearch.test.TestCluster; import org.elasticsearch.test.store.MockFSIndexStore; import org.elasticsearch.test.transport.AssertingLocalTransport; import org.elasticsearch.test.transport.MockTransportService; -import org.elasticsearch.watcher.Watcher; import org.elasticsearch.xpack.XPackClient; import org.elasticsearch.xpack.XPackPlugin; +import org.elasticsearch.xpack.watcher.Watcher; import org.hamcrest.Matcher; import org.jboss.netty.util.internal.SystemPropertyUtil; import org.junit.After; diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/file/FileUserRolesStoreTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/file/FileUserRolesStoreTests.java index 4d07b10a932..e74569c7eb0 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/file/FileUserRolesStoreTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/file/FileUserRolesStoreTests.java @@ -17,8 +17,8 @@ import org.elasticsearch.shield.authc.support.RefreshListener; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; -import org.elasticsearch.watcher.Watcher; import org.elasticsearch.xpack.XPackPlugin; +import org.elasticsearch.xpack.watcher.Watcher; import org.junit.After; import org.junit.Before; diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java index 40a3c339ee1..6a6f4e1fcf8 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.shield.ssl.ClientSSLService; import org.elasticsearch.shield.ssl.SSLConfiguration.Global; import org.elasticsearch.shield.support.NoOpLogger; import org.elasticsearch.test.junit.annotations.Network; -import org.elasticsearch.watcher.Watcher; +import org.elasticsearch.xpack.watcher.Watcher; import org.elasticsearch.xpack.XPackPlugin; import org.junit.Before; diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/test/ShieldSettingsSource.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/test/ShieldSettingsSource.java index 024144131e5..f0eaa5c86a8 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/test/ShieldSettingsSource.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/test/ShieldSettingsSource.java @@ -25,7 +25,7 @@ import org.elasticsearch.shield.test.ShieldTestUtils; import org.elasticsearch.shield.transport.netty.ShieldNettyHttpServerTransport; import org.elasticsearch.shield.transport.netty.ShieldNettyTransport; import org.elasticsearch.test.discovery.ClusterDiscoveryConfiguration; -import org.elasticsearch.watcher.Watcher; +import org.elasticsearch.xpack.watcher.Watcher; import org.elasticsearch.xpack.XPackPlugin; import java.net.URISyntaxException; diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/transport/KnownActionsTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/transport/KnownActionsTests.java index 81b8d1ec058..d1bb8285252 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/transport/KnownActionsTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/transport/KnownActionsTests.java @@ -9,12 +9,13 @@ import org.apache.lucene.util.IOUtils; import org.elasticsearch.action.Action; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.Streams; -import org.elasticsearch.license.plugin.Licensing; import org.elasticsearch.graph.Graph; +import org.elasticsearch.license.plugin.Licensing; import org.elasticsearch.shield.action.ShieldActionModule; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ShieldIntegTestCase; import org.elasticsearch.xpack.XPackPlugin; +import org.elasticsearch.xpack.watcher.Watcher; import org.junit.BeforeClass; import java.io.IOException; diff --git a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions index d2d08bf1977..12e13193733 100644 --- a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions +++ b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions @@ -21,6 +21,7 @@ cluster:monitor/state cluster:monitor/stats cluster:monitor/task cluster:monitor/tasks/lists +cluster:monitor/xpack/watcher/stats indices:admin/aliases indices:admin/aliases/exists indices:admin/aliases/get @@ -87,6 +88,15 @@ cluster:admin/xpack/security/user/get cluster:admin/xpack/security/role/put cluster:admin/xpack/security/role/delete cluster:admin/xpack/security/role/get +cluster:admin/xpack/watcher/service +cluster:admin/xpack/watcher/watch/delete +cluster:admin/xpack/watcher/watch/execute +cluster:admin/xpack/watcher/watch/put +cluster:admin/xpack/watcher/watch/ack +cluster:admin/xpack/watcher/service +cluster:admin/xpack/watcher/watch/activate +cluster:monitor/xpack/watcher/watch/get +cluster:monitor/xpack/watcher/stats internal:indices/admin/upgrade cluster:admin/ingest/pipeline/delete cluster:admin/ingest/pipeline/get diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java index 1f38e7e4a85..082fd7a91a5 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackBuild.java @@ -75,4 +75,4 @@ public class XPackBuild { public String date() { return date; } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java index 60708212110..2625b0b4291 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackClient.java @@ -11,7 +11,7 @@ import org.elasticsearch.license.plugin.LicensingClient; import org.elasticsearch.marvel.client.MonitoringClient; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.shield.client.SecurityClient; -import org.elasticsearch.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.client.WatcherClient; import org.elasticsearch.xpack.action.XPackInfoAction; import org.elasticsearch.xpack.action.XPackInfoRequest; import org.elasticsearch.xpack.action.XPackInfoRequestBuilder; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java index 98a9fc04d04..3ba0e35d888 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java @@ -26,7 +26,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptModule; import org.elasticsearch.shield.Security; import org.elasticsearch.shield.authc.AuthenticationModule; -import org.elasticsearch.watcher.Watcher; +import org.elasticsearch.xpack.watcher.Watcher; import org.elasticsearch.xpack.action.TransportXPackInfoAction; import org.elasticsearch.xpack.action.XPackInfoAction; import org.elasticsearch.xpack.common.init.LazyInitializationModule; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java index 8a0ff47b39a..5fd84897161 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Account.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import javax.activation.CommandMap; import javax.activation.MailcapCommandMap; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java index bbab963e6e4..702c26e575d 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Accounts.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.email; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java index 72835c675bb..5021c0eed6f 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Authentication.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.xpack.notification.email; -import org.elasticsearch.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.secret.Secret; import java.util.Objects; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java index e90339f8083..a3c1d1a6619 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/DataAttachment.java @@ -12,13 +12,13 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java index 2be6fc3c071..99e8f33cd7d 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/Email.java @@ -626,4 +626,4 @@ public class Email implements ToXContent { ParseField BODY_HTML = new ParseField("html"); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java index 75c3befd0e7..2e2381ee423 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/EmailTemplate.java @@ -10,8 +10,8 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import javax.mail.internet.AddressException; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/InternalEmailService.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/InternalEmailService.java index 7d5acbb20af..809022c604e 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/InternalEmailService.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/InternalEmailService.java @@ -12,7 +12,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import javax.mail.MessagingException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java index b7866e1d411..205eb36e9aa 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/DataAttachmentParser.java @@ -10,9 +10,9 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java index f43bd8a1aa6..a8ab0b1be38 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParser.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.notification.email.attachment; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java index 7332fd44224..fa096a7b425 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParser.java @@ -14,14 +14,14 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java index 3e8b8eca33e..300c2b3e7a1 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/email/attachment/HttpRequestAttachment.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.email.attachment; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; import java.io.IOException; import java.util.Objects; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java index 6703167469f..e2fe73fb2ca 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccount.java @@ -11,8 +11,8 @@ import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.Locale; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java index aad8dcb35e8..53c756da25d 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccounts.java @@ -9,7 +9,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount.Profile; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java index c078bd7bf8c..29c365a6a45 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessage.java @@ -13,8 +13,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java index b1b752ee422..6a921e9e884 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/HipChatServer.java @@ -6,7 +6,7 @@ package org.elasticsearch.xpack.notification.hipchat; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; /** * diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java index e339b882e42..ca6e80e1a1c 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java @@ -14,15 +14,15 @@ import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatService.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatService.java index 9ff41e22418..80fb5ccc378 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatService.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatService.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; /** * diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java index c01df2cadfc..346c7d35228 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/SentMessages.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.notification.hipchat; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; import java.io.IOException; import java.util.Collections; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java index acd32cca279..a758fa98d7e 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java @@ -14,15 +14,15 @@ import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java index 9c33cd0592e..e21720105e9 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java @@ -10,15 +10,15 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.util.ArrayList; import java.util.List; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java index 222072739ed..45649c3db10 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEvent.java @@ -13,12 +13,12 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java index 4977e5e5405..1252e595217 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventContext.java @@ -13,8 +13,8 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.Locale; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/InternalPagerDutyService.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/InternalPagerDutyService.java index 874463497fb..0d7e82ac6ad 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/InternalPagerDutyService.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/InternalPagerDutyService.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; /** * diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java index 50612911990..cde651ef45a 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccount.java @@ -8,10 +8,10 @@ package org.elasticsearch.xpack.notification.pagerduty; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java index d1617355c39..dd5a00ce633 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccounts.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.pagerduty; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java index b8dd2857c50..2d654346b7a 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/pagerduty/SentEvent.java @@ -13,9 +13,9 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.actions.pagerduty.PagerDutyAction; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/InternalSlackService.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/InternalSlackService.java index b431b6e7c8c..e89dd59ed43 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/InternalSlackService.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/InternalSlackService.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; /** * diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java index 2efa2030ee9..bf17d13fde4 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SentMessages.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.notification.slack; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java index af6de3b1524..458cebc894e 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccount.java @@ -11,10 +11,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; import org.elasticsearch.xpack.notification.slack.message.Attachment; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; import org.elasticsearch.xpack.notification.slack.message.SlackMessageDefaults; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java index 36d4cd29fd0..ea5aeacaccb 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/SlackAccounts.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.slack; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java index 599ffadf160..c279c2673c8 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java @@ -11,8 +11,8 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java index 7928be571e0..009898e610a 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/DynamicAttachments.java @@ -10,8 +10,8 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java index 298acfc7d08..69c22785e03 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java @@ -11,8 +11,8 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.Map; diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java index 19c81210f3c..5497569d5c2 100644 --- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java +++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessage.java @@ -11,8 +11,8 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java index fba934ffacf..c871e4005c9 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java @@ -6,7 +6,7 @@ package org.elasticsearch.xpack; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.test.TimeWarpedWatcher; +import org.elasticsearch.xpack.watcher.test.TimeWarpedWatcher; public class TimeWarpedXPackPlugin extends XPackPlugin { diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java index 63c289d3592..8851e0787d7 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/extensions/XPackExtensionInfoTests.java @@ -158,4 +158,4 @@ public class XPackExtensionInfoTests extends ESTestCase { }); assertTrue(e.getMessage().contains("Property [classname] is missing")); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java index 30bd05cdc4f..91a3f8ad9e1 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountTests.java @@ -10,8 +10,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.notification.email.support.EmailServer; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import org.junit.After; import org.junit.Before; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java index 5be57c0ae5a..810f5708c7b 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/AccountsTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.email; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java index 7d24bd69bc2..314d1529176 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailSecretsIntegrationTests.java @@ -8,16 +8,16 @@ package org.elasticsearch.xpack.notification.email; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.elasticsearch.xpack.notification.email.support.EmailServer; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -28,12 +28,12 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.watcher.actions.ActionBuilders.emailAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.emailAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java index ff8ac258434..92d8ab1d8a3 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/EmailTemplateTests.java @@ -11,8 +11,8 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.util.ArrayList; import java.util.HashMap; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/InternalEmailServiceTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/InternalEmailServiceTests.java index c5836897853..e3cdbe7e99c 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/InternalEmailServiceTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/InternalEmailServiceTests.java @@ -9,8 +9,8 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import org.junit.After; import org.junit.Before; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java index 59e134242c6..ca4a8cea574 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/ManualPublicSmtpServersTester.java @@ -11,7 +11,7 @@ import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import java.io.IOException; import java.util.Collections; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java index 2d751fefa77..2cbbd12660e 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/EmailAttachmentParsersTests.java @@ -13,10 +13,10 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java index 96db0438cd9..336182cfb9b 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/email/attachment/HttpEmailAttachementParserTests.java @@ -10,15 +10,15 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; import org.junit.Before; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java index 529a9172d45..9ece1bedba7 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatAccountsTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.hipchat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import org.junit.Before; import static org.hamcrest.Matchers.equalTo; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java index 816d1d4bb30..7b625156ee1 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/HipChatMessageTests.java @@ -11,7 +11,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; import org.elasticsearch.xpack.common.xcontent.XContentUtils; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java index 9d722187ca7..56fcf7aa179 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccountTests.java @@ -12,11 +12,11 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; import java.io.IOException; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatServiceTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatServiceTests.java index 50b1c73ad56..a85c3f0a6f2 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatServiceTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/InternalHipChatServiceTests.java @@ -9,7 +9,7 @@ import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import org.junit.Before; import java.util.Collections; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java index e046cc6b829..347053db080 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/UserAccountTests.java @@ -12,13 +12,13 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; import java.io.IOException; import java.util.HashMap; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java index 913247857d1..947faf2e470 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/hipchat/V1AccountTests.java @@ -9,11 +9,11 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.arrayContaining; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java index 15406eb798a..cdbd6ed06e0 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/pagerduty/PagerDutyAccountsTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.pagerduty; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import org.elasticsearch.xpack.notification.slack.message.SlackMessageDefaultsTests; import org.junit.Before; diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java index 61ddceb2efd..58c56709ba8 100644 --- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/SlackAccountsTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.notification.slack; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; import org.elasticsearch.xpack.notification.slack.message.SlackMessageDefaultsTests; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaultsTests.java diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java index 20209b00db2..bfa1ce75523 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java +++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageTests.java @@ -11,9 +11,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/bin/x-pack/croneval b/elasticsearch/x-pack/watcher/bin/x-pack/croneval index 1a13b517e5e..d1caefe2a7c 100755 --- a/elasticsearch/x-pack/watcher/bin/x-pack/croneval +++ b/elasticsearch/x-pack/watcher/bin/x-pack/croneval @@ -113,7 +113,7 @@ if [ ! -z "$CONF_FILE" ]; then fi cd "$ES_HOME" > /dev/null -"$JAVA" $ES_JAVA_OPTS -cp "$ES_CLASSPATH" -Des.path.home="$ES_HOME" org.elasticsearch.watcher.trigger.schedule.tool.CronEvalTool "$@" $properties +"$JAVA" $ES_JAVA_OPTS -cp "$ES_CLASSPATH" -Des.path.home="$ES_HOME" org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool "$@" $properties status=$? cd - > /dev/null exit $status diff --git a/elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat b/elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat index c78e7feca38..71b63ad8ed0 100644 --- a/elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat +++ b/elasticsearch/x-pack/watcher/bin/x-pack/croneval.bat @@ -5,5 +5,5 @@ rem or more contributor license agreements. Licensed under the Elastic License; rem you may not use this file except in compliance with the Elastic License. PUSHD "%~dp0" -CALL "%~dp0.in.bat" org.elasticsearch.watcher.trigger.schedule.tool.CronEvalTool %* -POPD \ No newline at end of file +CALL "%~dp0.in.bat" org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool %* +POPD diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java similarity index 78% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java index 8f504fb0f2e..5c0a4a9b1f0 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.action.ActionModule; import org.elasticsearch.client.Client; @@ -21,55 +21,55 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.watcher.actions.WatcherActionModule; -import org.elasticsearch.watcher.client.WatcherClientModule; -import org.elasticsearch.watcher.condition.ConditionModule; -import org.elasticsearch.watcher.execution.ExecutionModule; -import org.elasticsearch.watcher.history.HistoryModule; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.input.InputModule; -import org.elasticsearch.watcher.input.chain.ChainInputFactory; -import org.elasticsearch.watcher.rest.action.RestAckWatchAction; -import org.elasticsearch.watcher.rest.action.RestActivateWatchAction; -import org.elasticsearch.watcher.rest.action.RestDeleteWatchAction; -import org.elasticsearch.watcher.rest.action.RestExecuteWatchAction; -import org.elasticsearch.watcher.rest.action.RestGetWatchAction; -import org.elasticsearch.watcher.rest.action.RestHijackOperationAction; -import org.elasticsearch.watcher.rest.action.RestPutWatchAction; -import org.elasticsearch.watcher.rest.action.RestWatchServiceAction; -import org.elasticsearch.watcher.rest.action.RestWatcherStatsAction; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry.TemplateConfig; -import org.elasticsearch.watcher.support.clock.ClockModule; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpClientModule; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.secret.SecretModule; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplateModule; -import org.elasticsearch.watcher.support.validation.WatcherSettingsValidation; -import org.elasticsearch.watcher.transform.TransformModule; -import org.elasticsearch.watcher.transform.chain.ChainTransformFactory; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchAction; -import org.elasticsearch.watcher.transport.actions.ack.TransportAckWatchAction; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchAction; -import org.elasticsearch.watcher.transport.actions.activate.TransportActivateWatchAction; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchAction; -import org.elasticsearch.watcher.transport.actions.delete.TransportDeleteWatchAction; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchAction; -import org.elasticsearch.watcher.transport.actions.execute.TransportExecuteWatchAction; -import org.elasticsearch.watcher.transport.actions.get.GetWatchAction; -import org.elasticsearch.watcher.transport.actions.get.TransportGetWatchAction; -import org.elasticsearch.watcher.transport.actions.put.PutWatchAction; -import org.elasticsearch.watcher.transport.actions.put.TransportPutWatchAction; -import org.elasticsearch.watcher.transport.actions.service.TransportWatcherServiceAction; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceAction; -import org.elasticsearch.watcher.transport.actions.stats.TransportWatcherStatsAction; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsAction; -import org.elasticsearch.watcher.trigger.TriggerModule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleModule; -import org.elasticsearch.watcher.watch.WatchModule; +import org.elasticsearch.xpack.watcher.actions.WatcherActionModule; +import org.elasticsearch.xpack.watcher.client.WatcherClientModule; +import org.elasticsearch.xpack.watcher.condition.ConditionModule; +import org.elasticsearch.xpack.watcher.execution.ExecutionModule; +import org.elasticsearch.xpack.watcher.history.HistoryModule; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.input.InputModule; +import org.elasticsearch.xpack.watcher.input.chain.ChainInputFactory; +import org.elasticsearch.xpack.watcher.rest.action.RestAckWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestActivateWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestDeleteWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestGetWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestHijackOperationAction; +import org.elasticsearch.xpack.watcher.rest.action.RestPutWatchAction; +import org.elasticsearch.xpack.watcher.rest.action.RestWatchServiceAction; +import org.elasticsearch.xpack.watcher.rest.action.RestWatcherStatsAction; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry.TemplateConfig; +import org.elasticsearch.xpack.watcher.support.clock.ClockModule; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpClientModule; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.secret.SecretModule; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateModule; +import org.elasticsearch.xpack.watcher.support.validation.WatcherSettingsValidation; +import org.elasticsearch.xpack.watcher.transform.TransformModule; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransformFactory; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.ack.TransportAckWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.activate.TransportActivateWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.delete.TransportDeleteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.execute.TransportExecuteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.get.TransportGetWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.put.TransportPutWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.service.TransportWatcherServiceAction; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceAction; +import org.elasticsearch.xpack.watcher.transport.actions.stats.TransportWatcherStatsAction; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsAction; +import org.elasticsearch.xpack.watcher.trigger.TriggerModule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleModule; +import org.elasticsearch.xpack.watcher.watch.WatchModule; import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.common.init.LazyInitializationModule; import org.elasticsearch.xpack.notification.email.EmailService; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherBuild.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherBuild.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java index bff9666c1a8..82a09468788 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherBuild.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherBuild.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherFeatureSet.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherFeatureSet.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java index ba8814182f0..959a2c26331 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherFeatureSet.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherFeatureSet.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLicensee.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLicensee.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLicensee.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLicensee.java index d4796d30b36..d00d4b4bf66 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLicensee.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLicensee.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLifeCycleService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLifeCycleService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java index aeb13bf00d0..5c96c3a3daa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherLifeCycleService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherMetaData.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherMetaData.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java index b0148f5c990..1229238e2d2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherMetaData.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherMetaData.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.cluster.metadata.MetaData; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java index bcfb6c5d07c..a51e4a7bffe 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherModule.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.util.Providers; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.validation.WatcherSettingsValidation; import org.elasticsearch.xpack.XPackPlugin; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.validation.WatcherSettingsValidation; public class WatcherModule extends AbstractModule { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java index 4070d0eae9a..bcbb7560590 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.ElasticsearchTimeoutException; @@ -15,14 +15,14 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.trigger.TriggerService; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchLockService; -import org.elasticsearch.watcher.watch.WatchStatus; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchLockService; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.PeriodType; @@ -30,9 +30,9 @@ import org.joda.time.PeriodType; import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; -import static org.elasticsearch.watcher.support.Exceptions.ioException; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; public class WatcherService extends AbstractComponent { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherState.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherState.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java index b37b4bd4aee..39896519bb8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherState.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherState.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; /** * Encapsulates the state of the watcher plugin. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java index 8fdc640f341..f8d9aa90ecc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/Action.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.logging.LoggerMessageFormat; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java index d6f5eb2de6d..66cf1968d4d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionBuilders.java @@ -3,20 +3,20 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; -import org.elasticsearch.watcher.actions.email.EmailAction; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; -import org.elasticsearch.watcher.actions.index.IndexAction; -import org.elasticsearch.watcher.actions.logging.LoggingAction; -import org.elasticsearch.watcher.actions.pagerduty.PagerDutyAction; +import org.elasticsearch.xpack.watcher.actions.email.EmailAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.index.IndexAction; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; import org.elasticsearch.xpack.notification.email.EmailTemplate; import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent; -import org.elasticsearch.watcher.actions.slack.SlackAction; +import org.elasticsearch.xpack.watcher.actions.slack.SlackAction; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; -import org.elasticsearch.watcher.actions.webhook.WebhookAction; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookAction; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java index 50ca1cafed5..819c93eec01 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java index 9065e7a7b1a..5e138fb1f75 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionRegistry.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.validation.Validation; -import org.elasticsearch.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionStatus.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionStatus.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java index e7a1f015aac..1e6bc061dce 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionStatus.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionStatus.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -21,8 +21,8 @@ import java.io.IOException; import java.util.Locale; import java.util.Objects; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.dateTimeFormatter; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.dateTimeFormatter; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionWrapper.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionWrapper.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java index 6d9b3779223..262a3fe948e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ActionWrapper.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ActionWrapper.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; @@ -14,16 +14,16 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.throttler.ActionThrottler; -import org.elasticsearch.watcher.actions.throttler.Throttler; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.transform.TransformRegistry; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.throttler.ActionThrottler; +import org.elasticsearch.xpack.watcher.actions.throttler.Throttler; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java index 9312a540187..b8207e44765 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableAction.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableActions.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableActions.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java index 04e9a588b28..c73550313e3 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/ExecutableActions.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/ExecutableActions.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/WatcherActionModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java similarity index 80% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/WatcherActionModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java index 2f634627899..23eea30b73b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/WatcherActionModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/WatcherActionModule.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.watcher.actions.email.EmailAction; -import org.elasticsearch.watcher.actions.email.EmailActionFactory; -import org.elasticsearch.watcher.actions.hipchat.HipChatAction; -import org.elasticsearch.watcher.actions.hipchat.HipChatActionFactory; +import org.elasticsearch.xpack.watcher.actions.email.EmailAction; +import org.elasticsearch.xpack.watcher.actions.email.EmailActionFactory; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction; +import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatActionFactory; import org.elasticsearch.xpack.notification.email.EmailService; import org.elasticsearch.xpack.notification.email.HtmlSanitizer; import org.elasticsearch.xpack.notification.email.InternalEmailService; @@ -20,20 +20,20 @@ import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsPar import org.elasticsearch.xpack.notification.email.attachment.HttpEmailAttachementParser; import org.elasticsearch.xpack.notification.hipchat.HipChatService; import org.elasticsearch.xpack.notification.hipchat.InternalHipChatService; -import org.elasticsearch.watcher.actions.index.IndexAction; -import org.elasticsearch.watcher.actions.index.IndexActionFactory; -import org.elasticsearch.watcher.actions.logging.LoggingAction; -import org.elasticsearch.watcher.actions.logging.LoggingActionFactory; -import org.elasticsearch.watcher.actions.pagerduty.PagerDutyAction; -import org.elasticsearch.watcher.actions.pagerduty.PagerDutyActionFactory; +import org.elasticsearch.xpack.watcher.actions.index.IndexAction; +import org.elasticsearch.xpack.watcher.actions.index.IndexActionFactory; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingActionFactory; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction; +import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyActionFactory; import org.elasticsearch.xpack.notification.pagerduty.InternalPagerDutyService; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; -import org.elasticsearch.watcher.actions.slack.SlackAction; -import org.elasticsearch.watcher.actions.slack.SlackActionFactory; +import org.elasticsearch.xpack.watcher.actions.slack.SlackAction; +import org.elasticsearch.xpack.watcher.actions.slack.SlackActionFactory; import org.elasticsearch.xpack.notification.slack.InternalSlackService; import org.elasticsearch.xpack.notification.slack.SlackService; -import org.elasticsearch.watcher.actions.webhook.WebhookAction; -import org.elasticsearch.watcher.actions.webhook.WebhookActionFactory; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookAction; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookActionFactory; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java index f34f7f2d6c3..9600c0565bc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.xpack.watcher.actions.email; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -11,10 +11,10 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.support.xcontent.WatcherXContentParser; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; import org.elasticsearch.xpack.notification.email.Authentication; import org.elasticsearch.xpack.notification.email.DataAttachment; import org.elasticsearch.xpack.notification.email.Email; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java index 8832d833ea8..7046c8aa31b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/EmailActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.xpack.watcher.actions.email; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.elasticsearch.xpack.notification.email.EmailService; import org.elasticsearch.xpack.notification.email.HtmlSanitizer; import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/ExecutableEmailAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/ExecutableEmailAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java index 0b7a1dc1351..91c494bbbd8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/email/ExecutableEmailAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.xpack.watcher.actions.email; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import org.elasticsearch.xpack.notification.email.DataAttachment; import org.elasticsearch.xpack.notification.email.Email; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/ExecutableHipChatAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/ExecutableHipChatAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java index bebb7ac4152..a81f88a848b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/ExecutableHipChatAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/ExecutableHipChatAction.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.hipchat; +package org.elasticsearch.xpack.watcher.actions.hipchat; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.HipChatService; import org.elasticsearch.xpack.notification.hipchat.SentMessages; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java index c4516b36b77..12886598432 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.hipchat; +package org.elasticsearch.xpack.watcher.actions.hipchat; import org.elasticsearch.ElasticsearchParseException; @@ -12,10 +12,10 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.SentMessages; -import org.elasticsearch.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java index 6cd74ee9766..e7094d66efa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactory.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.hipchat; +package org.elasticsearch.xpack.watcher.actions.hipchat; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatService; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/ExecutableIndexAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/ExecutableIndexAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java index c81979989ad..1b90a7d10b6 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/ExecutableIndexAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.index; +package org.elasticsearch.xpack.watcher.actions.index; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequest; @@ -16,21 +16,21 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.ArrayObjectIterator; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.ArrayObjectIterator; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.HashMap; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; public class ExecutableIndexAction extends ExecutableAction { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java index acdac8f2061..df402b63c6e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.index; +package org.elasticsearch.xpack.watcher.actions.index; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -12,9 +12,9 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; import org.joda.time.DateTimeZone; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java index bb07297d247..afc14658bb2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/index/IndexActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionFactory.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.index; +package org.elasticsearch.xpack.watcher.actions.index; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.actions.email.ExecutableEmailAction; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.actions.email.ExecutableEmailAction; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/ExecutableLoggingAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java similarity index 80% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/ExecutableLoggingAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java index 7c42e22dcde..ac27b7de3a0 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/ExecutableLoggingAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/ExecutableLoggingAction.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.logging; +package org.elasticsearch.xpack.watcher.actions.logging; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java index ca624de344c..d32cc66c080 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.logging; +package org.elasticsearch.xpack.watcher.actions.logging; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -11,8 +11,8 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; import java.io.IOException; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java index 4c1dbe80f1c..d7445b4a683 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.logging; +package org.elasticsearch.xpack.watcher.actions.logging; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingLevel.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingLevel.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java index 8e4e18b8508..6524f7ff257 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/logging/LoggingLevel.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingLevel.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.logging; +package org.elasticsearch.xpack.watcher.actions.logging; import org.elasticsearch.common.SuppressLoggerChecks; import org.elasticsearch.common.logging.ESLogger; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/ExecutablePagerDutyAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/ExecutablePagerDutyAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java index b8230dbbf0b..b86fd243d58 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/ExecutablePagerDutyAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/ExecutablePagerDutyAction.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.pagerduty; +package org.elasticsearch.xpack.watcher.actions.pagerduty; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; import org.elasticsearch.xpack.notification.pagerduty.SentEvent; import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java index d2d86d1da16..fdb537d407e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyAction.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.pagerduty; +package org.elasticsearch.xpack.watcher.actions.pagerduty; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent; import org.elasticsearch.xpack.notification.pagerduty.SentEvent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java index 009c880214d..34b68f8da00 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactory.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.pagerduty; +package org.elasticsearch.xpack.watcher.actions.pagerduty; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.actions.hipchat.ExecutableHipChatAction; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.actions.hipchat.ExecutableHipChatAction; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/ExecutableSlackAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/ExecutableSlackAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java index 213dd4c4f51..d85daf682fa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/ExecutableSlackAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/ExecutableSlackAction.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.slack; +package org.elasticsearch.xpack.watcher.actions.slack; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; import org.elasticsearch.xpack.notification.slack.SentMessages; import org.elasticsearch.xpack.notification.slack.SlackAccount; import org.elasticsearch.xpack.notification.slack.SlackService; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java index f63778bead5..46ce78d6cd3 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.slack; +package org.elasticsearch.xpack.watcher.actions.slack; import org.elasticsearch.ElasticsearchParseException; @@ -12,7 +12,7 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.slack.SentMessages; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java index da1ea0c4309..ec7a9d7938c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactory.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.slack; +package org.elasticsearch.xpack.watcher.actions.slack; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.actions.hipchat.ExecutableHipChatAction; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.actions.hipchat.ExecutableHipChatAction; import org.elasticsearch.xpack.notification.slack.SlackAccount; import org.elasticsearch.xpack.notification.slack.SlackService; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/AckThrottler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java similarity index 68% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/AckThrottler.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java index 9ccc13b3138..bb78e8ec111 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/AckThrottler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottler.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.ActionStatus.AckStatus; -import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.ActionStatus.AckStatus; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.formatDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.formatDate; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/ActionThrottler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/ActionThrottler.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java index 22130006863..c5a8e638bef 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/ActionThrottler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottler.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.clock.Clock; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottler.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java index 961f85e91b8..460fda4059f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottler.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.Clock; import org.joda.time.PeriodType; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java index d8cf37b3836..c3e1b5c02d1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/throttler/Throttler.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.logging.LoggerMessageFormat; -import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/ExecutableWebhookAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java similarity index 71% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/ExecutableWebhookAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java index e76738b06df..5c5157fac09 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/ExecutableWebhookAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/ExecutableWebhookAction.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ExecutableAction; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java index 86a5f195625..2aa4f1e2008 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookAction.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookActionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookActionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java index c447f3c90f2..e775b94ed91 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/webhook/WebhookActionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionFactory.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java index bf3c8968f99..f2e7758383e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.client; +package org.elasticsearch.xpack.watcher.client; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.Nullable; @@ -13,17 +13,17 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.throttler.Throttler; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.input.none.NoneInput; -import org.elasticsearch.watcher.support.Exceptions; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.throttler.Throttler; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.input.none.NoneInput; +import org.elasticsearch.xpack.watcher.support.Exceptions; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.watch.Watch; import java.io.IOException; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java index a8c9647d5c6..7b3434bddb9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatchSourceBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilders.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.client; +package org.elasticsearch.xpack.watcher.client; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClient.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java similarity index 78% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClient.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java index 91b16fd2667..080f1d85cde 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClient.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClient.java @@ -3,44 +3,44 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.client; +package org.elasticsearch.xpack.watcher.client; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchAction; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchRequest; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchResponse; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchAction; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchRequest; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchResponse; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchAction; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchRequest; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchAction; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequest; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchAction; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchAction; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceAction; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceRequest; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceRequestBuilder; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceResponse; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsAction; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsRequest; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsRequestBuilder; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchAction; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceAction; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceRequest; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceResponse; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsAction; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRequest; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClientModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClientModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java index bd82a8369b1..f917db59d3c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/client/WatcherClientModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/client/WatcherClientModule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.client; +package org.elasticsearch.xpack.watcher.client; import org.elasticsearch.common.inject.AbstractModule; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/Condition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/Condition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java index 6218d09cdfc..ff65136b176 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/Condition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/Condition.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java index 740b80c4133..e21f50b0fd1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionBuilders.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.condition.compare.array.ArrayCompareCondition; -import org.elasticsearch.watcher.condition.never.NeverCondition; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.support.Script; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.array.ArrayCompareCondition; +import org.elasticsearch.xpack.watcher.condition.never.NeverCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.support.Script; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java index ad57937cc60..c16c74c11d9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java similarity index 70% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java index adcebe726df..b3056edabff 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionModule.java @@ -3,20 +3,20 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.always.AlwaysConditionFactory; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.condition.compare.CompareConditionFactory; -import org.elasticsearch.watcher.condition.compare.array.ArrayCompareCondition; -import org.elasticsearch.watcher.condition.compare.array.ArrayCompareConditionFactory; -import org.elasticsearch.watcher.condition.never.NeverCondition; -import org.elasticsearch.watcher.condition.never.NeverConditionFactory; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptConditionFactory; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysConditionFactory; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareConditionFactory; +import org.elasticsearch.xpack.watcher.condition.compare.array.ArrayCompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.array.ArrayCompareConditionFactory; +import org.elasticsearch.xpack.watcher.condition.never.NeverCondition; +import org.elasticsearch.xpack.watcher.condition.never.NeverConditionFactory; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptConditionFactory; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java index 0d6fc12664d..b10894daff8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ConditionRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ConditionRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ExecutableCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ExecutableCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java index 10636635c13..eb871596825 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/ExecutableCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/ExecutableCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition; +package org.elasticsearch.xpack.watcher.condition; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java index 0c78d27c9da..492a08fc045 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.always; +package org.elasticsearch.xpack.watcher.condition.always; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.Condition; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java index ebd7c0cb366..73001a21839 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/AlwaysConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionFactory.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.always; +package org.elasticsearch.xpack.watcher.condition.always; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java index 0d46fbdeb6d..6d4e71995c8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/always/ExecutableAlwaysCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.always; +package org.elasticsearch.xpack.watcher.condition.always; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/AbstractExecutableCompareCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/AbstractExecutableCompareCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java index 1a0579eefb8..9cfd0e7db3a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/AbstractExecutableCompareCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/AbstractExecutableCompareCondition.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java index 25de4a32b3e..191b10adcfb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareCondition.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.Condition; import org.elasticsearch.xpack.common.xcontent.XContentUtils; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java index 7db6dd57047..354ad385ec8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/CompareConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.support.clock.Clock; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/ExecutableCompareCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/ExecutableCompareCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java index 90fd7a4a57c..4c2be393809 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/ExecutableCompareCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/ExecutableCompareCondition.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/LenientCompare.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/LenientCompare.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java index 9419eeb865c..efa50a017ad 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/LenientCompare.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/LenientCompare.java @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java index 2b02f150100..271618bca23 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareCondition.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare.array; +package org.elasticsearch.xpack.watcher.condition.compare.array; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -11,8 +11,8 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.compare.LenientCompare; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.compare.LenientCompare; import org.elasticsearch.xpack.common.xcontent.XContentUtils; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java index 23c5badcb42..3277ee5c800 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare.array; +package org.elasticsearch.xpack.watcher.condition.compare.array; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.support.clock.Clock; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ExecutableArrayCompareCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ExecutableArrayCompareCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java index 53ec397bc5c..beb3ef555b0 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/compare/array/ExecutableArrayCompareCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/compare/array/ExecutableArrayCompareCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare.array; +package org.elasticsearch.xpack.watcher.condition.compare.array; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.condition.compare.AbstractExecutableCompareCondition; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.condition.compare.AbstractExecutableCompareCondition; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; import java.util.ArrayList; import java.util.Collections; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java index 912c6b12d94..a304c847315 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/ExecutableNeverCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.never; +package org.elasticsearch.xpack.watcher.condition.never; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java index f30bb99c003..b313076f57d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverCondition.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.never; +package org.elasticsearch.xpack.watcher.condition.never; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.Condition; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java index 70b437f1609..1318a3897c7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/NeverConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionFactory.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.never; +package org.elasticsearch.xpack.watcher.condition.never; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ExecutableScriptCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ExecutableScriptCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java index 5bac6a2ba9e..17aefcc202d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ExecutableScriptCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ExecutableScriptCondition.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.script; +package org.elasticsearch.xpack.watcher.condition.script; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.invalidScript; +import static org.elasticsearch.xpack.watcher.support.Exceptions.invalidScript; /** * This class executes a script against the ctx payload and returns a boolean diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptCondition.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java index e3ebff51ed6..20d47c508ee 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptCondition.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptCondition.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.script; +package org.elasticsearch.xpack.watcher.condition.script; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.support.Script; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.support.Script; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptConditionFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptConditionFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java index 6173ada4a8c..db78d441bad 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/script/ScriptConditionFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.script; +package org.elasticsearch.xpack.watcher.condition.script; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ActionExecutionMode.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ActionExecutionMode.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java index fbd73b0e27b..156d07a182f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ActionExecutionMode.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ActionExecutionMode.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import java.util.Locale; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/AsyncTriggerListener.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/AsyncTriggerListener.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java index 2d9dd248302..7129b00348b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/AsyncTriggerListener.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/AsyncTriggerListener.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.util.stream.StreamSupport; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/CurrentExecutions.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/CurrentExecutions.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java index 8337c0869aa..84532fe9201 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/CurrentExecutions.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/CurrentExecutions.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.unit.TimeValue; @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; public class CurrentExecutions implements Iterable { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java index 5c8521eb227..7a9c70113e4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionModule.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.inject.AbstractModule; -import org.elasticsearch.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionPhase.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionPhase.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java index 3d773a0c9fc..75f423c8f9e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionPhase.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionPhase.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java index 84d8f946d6a..b0a3024cb5f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; @@ -13,18 +13,18 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.validation.WatcherSettingsValidation; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchLockService; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.validation.WatcherSettingsValidation; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchLockService; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionState.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionState.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java index 2e17151a257..e53863eb5d5 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionState.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionState.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/InternalWatchExecutor.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/InternalWatchExecutor.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java index 73c0cee026c..4d270496c08 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/InternalWatchExecutor.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/InternalWatchExecutor.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.Watcher; -import org.elasticsearch.watcher.support.ThreadPoolSettingsBuilder; +import org.elasticsearch.xpack.watcher.Watcher; +import org.elasticsearch.xpack.watcher.support.ThreadPoolSettingsBuilder; import java.util.concurrent.BlockingQueue; import java.util.stream.Stream; @@ -67,4 +67,4 @@ public class InternalWatchExecutor implements WatchExecutor { private EsThreadPoolExecutor executor() { return (EsThreadPoolExecutor) threadPool.executor(THREAD_POOL_NAME); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ManualExecutionContext.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ManualExecutionContext.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java index fe35749aae3..d424c4e105f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ManualExecutionContext.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/QueuedWatch.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/QueuedWatch.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java index 4614188e86a..d4557f05477 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/QueuedWatch.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/QueuedWatch.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/SyncTriggerListener.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/SyncTriggerListener.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java index d77e8f2bc88..36c28fc142e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/SyncTriggerListener.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/SyncTriggerListener.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.util.stream.StreamSupport; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredExecutionContext.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredExecutionContext.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java index 9464cf866c5..b3d7ee82030 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredExecutionContext.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredExecutionContext.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatch.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatch.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java index 9ce605aee42..715735dfa7b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatch.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatch.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.ParseField; @@ -16,8 +16,8 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatchStore.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatchStore.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java index 002f5593e81..5a4f6dd15bd 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatchStore.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import java.io.IOException; import java.util.ArrayList; @@ -38,8 +38,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; -import static org.elasticsearch.watcher.support.Exceptions.ioException; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; public class TriggeredWatchStore extends AbstractComponent { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionContext.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionContext.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java index b6cf607c728..350056316c1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionContext.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionContext.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionResult.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionResult.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java index c41fea66a6a..dc1abe0a297 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionResult.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionResult.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.transform.Transform; import org.joda.time.DateTime; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionSnapshot.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionSnapshot.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java index 8ad2d9f2762..31a0ed9388e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutionSnapshot.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutionSnapshot.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutor.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutor.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java index 06a9818dcf8..a3fb5cf00a9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/WatchExecutor.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/WatchExecutor.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import java.util.concurrent.BlockingQueue; import java.util.stream.Stream; @@ -21,4 +21,4 @@ public interface WatchExecutor { void execute(Runnable runnable); -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/Wid.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/Wid.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java index 78699250e40..9ccedf58014 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/Wid.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/Wid.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java index 73c3726f8be..e9e65252e7d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryModule.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.execution.InternalWatchExecutor; +import org.elasticsearch.xpack.watcher.execution.InternalWatchExecutor; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryStore.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryStore.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java index 12f4785812b..72ac3d09f88 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/HistoryStore.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/HistoryStore.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.common.component.AbstractComponent; @@ -12,10 +12,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.watcher.WatcherModule; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.WatcherModule; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -26,7 +26,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static org.elasticsearch.watcher.support.Exceptions.ioException; +import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/WatchRecord.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/WatchRecord.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java index b4fce9e153e..bf8bdd57e57 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/history/WatchRecord.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/history/WatchRecord.java @@ -3,22 +3,22 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionResult; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionResult; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import java.io.IOException; import java.util.Collections; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/ExecutableInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/ExecutableInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java index 4cdcc3d8314..080497b30a7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/ExecutableInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/ExecutableInput.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/Input.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/Input.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java index 2a9ead0c301..8f56c915669 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/Input.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/Input.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java similarity index 78% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java index e8ee893e4c6..b3b7650d9e9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputBuilders.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.common.collect.MapBuilder; -import org.elasticsearch.watcher.input.chain.ChainInput; -import org.elasticsearch.watcher.input.http.HttpInput; -import org.elasticsearch.watcher.input.none.NoneInput; -import org.elasticsearch.watcher.input.search.SearchInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.chain.ChainInput; +import org.elasticsearch.xpack.watcher.input.http.HttpInput; +import org.elasticsearch.xpack.watcher.input.none.NoneInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java index 5e0c89bac75..0734a3f8a68 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java similarity index 72% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java index 587fdc5b042..0a7ab55fbf9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputModule.java @@ -3,20 +3,20 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.watcher.input.chain.ChainInput; -import org.elasticsearch.watcher.input.chain.ChainInputFactory; -import org.elasticsearch.watcher.input.http.HttpInput; -import org.elasticsearch.watcher.input.http.HttpInputFactory; -import org.elasticsearch.watcher.input.none.NoneInput; -import org.elasticsearch.watcher.input.none.NoneInputFactory; -import org.elasticsearch.watcher.input.search.SearchInput; -import org.elasticsearch.watcher.input.search.SearchInputFactory; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInputFactory; +import org.elasticsearch.xpack.watcher.input.chain.ChainInput; +import org.elasticsearch.xpack.watcher.input.chain.ChainInputFactory; +import org.elasticsearch.xpack.watcher.input.http.HttpInput; +import org.elasticsearch.xpack.watcher.input.http.HttpInputFactory; +import org.elasticsearch.xpack.watcher.input.none.NoneInput; +import org.elasticsearch.xpack.watcher.input.none.NoneInputFactory; +import org.elasticsearch.xpack.watcher.input.search.SearchInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInputFactory; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInputFactory; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java index 16bef3e65c3..eaf14b4f74a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/InputRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/InputRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java index 8c888dfa27f..b4fdcb2e494 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInput.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.chain; +package org.elasticsearch.xpack.watcher.input.chain; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.input.InputRegistry; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.input.InputRegistry; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java index 87ecc372e53..ca22975dd5a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ChainInputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.chain; +package org.elasticsearch.xpack.watcher.input.chain; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.inject.Inject; @@ -11,10 +11,10 @@ import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.input.InputRegistry; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.InputRegistry; import org.elasticsearch.xpack.common.init.LazyInitializable; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ExecutableChainInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ExecutableChainInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java index 56c8b2cad48..8c595e4e2bc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/chain/ExecutableChainInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/chain/ExecutableChainInput.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.chain; +package org.elasticsearch.xpack.watcher.input.chain; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.ArrayList; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/ExecutableHttpInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/ExecutableHttpInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java index 5e5ffa2443e..fe7b8b1045a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/ExecutableHttpInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/ExecutableHttpInput.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.http; +package org.elasticsearch.xpack.watcher.input.http; import org.elasticsearch.ElasticsearchParseException; @@ -11,15 +11,15 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.XContentFilterKeysUtils; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.XContentFilterKeysUtils; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java index 58f278a0be1..b8c9c71b74f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInput.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.http; +package org.elasticsearch.xpack.watcher.input.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -11,11 +11,11 @@ import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.support.http.HttpContentType; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.support.http.HttpContentType; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Collection; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java index 5d06025a488..4243ce55d6c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/http/HttpInputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/http/HttpInputFactory.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.http; +package org.elasticsearch.xpack.watcher.input.http; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/ExecutableNoneInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java similarity index 72% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/ExecutableNoneInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java index cd63a11064b..0613b87c7e1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/ExecutableNoneInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/ExecutableNoneInput.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.none; +package org.elasticsearch.xpack.watcher.input.none; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.watch.Payload; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java index e9dc02b3cf9..8ff31624efb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInput.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.none; +package org.elasticsearch.xpack.watcher.input.none; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java index 3f3e3d21d0c..87c6c6b0eff 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/none/NoneInputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/none/NoneInputFactory.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.none; +package org.elasticsearch.xpack.watcher.input.none; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.InputFactory; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/ExecutableSearchInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/ExecutableSearchInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java index 201dc0cf2cc..b4983110b95 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/ExecutableSearchInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/ExecutableSearchInput.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.search; +package org.elasticsearch.xpack.watcher.input.search; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -16,12 +16,12 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.XContentFilterKeysUtils; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.XContentFilterKeysUtils; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java index fbc247eaba1..71e9fff136e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInput.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.search; +package org.elasticsearch.xpack.watcher.input.search; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.search.SearchRequest; @@ -16,11 +16,11 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.search.aggregations.AggregatorParsers; import org.elasticsearch.search.suggest.Suggesters; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.support.SearchRequestEquivalence; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.support.SearchRequestEquivalence; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTimeZone; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java index 2ced5f9e5f2..acfbd7246ae 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/search/SearchInputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/search/SearchInputFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.search; +package org.elasticsearch.xpack.watcher.input.search; import java.io.IOException; @@ -17,9 +17,9 @@ import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.indices.query.IndicesQueriesRegistry; import org.elasticsearch.search.aggregations.AggregatorParsers; import org.elasticsearch.search.suggest.Suggesters; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/ExecutableSimpleInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/ExecutableSimpleInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java index ec7d8af1b90..4c0f2075382 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/ExecutableSimpleInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/ExecutableSimpleInput.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.simple; +package org.elasticsearch.xpack.watcher.input.simple; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.watch.Payload; /** * This class just defines a simple xcontent map as an input diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInput.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInput.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java index 23c1188694e..bc2b26e60cb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInput.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInput.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.simple; +package org.elasticsearch.xpack.watcher.input.simple; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInputFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInputFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java index e539dd64a3c..4afa085a5dc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/input/simple/SimpleInputFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputFactory.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.simple; +package org.elasticsearch.xpack.watcher.input.simple; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.InputFactory; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/WatcherRestHandler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/WatcherRestHandler.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java index 8ab90ffc56b..81feeebf66a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/WatcherRestHandler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/WatcherRestHandler.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest; +package org.elasticsearch.xpack.watcher.rest; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.Settings; @@ -11,7 +11,7 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestChannel; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; -import org.elasticsearch.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.client.WatcherClient; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestAckWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestAckWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java index a3c6a382054..3b617c3f32e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestAckWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -16,12 +16,12 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchRequest; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchResponse; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchResponse; +import org.elasticsearch.xpack.watcher.watch.Watch; /** * The rest action to ack a watch diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestActivateWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestActivateWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java index 7bfbf61afae..12bc184d9f9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestActivateWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -16,12 +16,12 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchRequest; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchResponse; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchResponse; +import org.elasticsearch.xpack.watcher.watch.Watch; /** * The rest action to de/activate a watch diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestDeleteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestDeleteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java index fdf71c46e01..7db6412a25c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestDeleteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -16,10 +16,10 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchRequest; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; import static org.elasticsearch.rest.RestRequest.Method.DELETE; import static org.elasticsearch.rest.RestStatus.NOT_FOUND; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java index 5a9008d2aee..770ab071d9f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.client.Client; @@ -21,19 +21,19 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequest; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.io.IOException; -import static org.elasticsearch.watcher.rest.action.RestExecuteWatchAction.Field.IGNORE_CONDITION; -import static org.elasticsearch.watcher.rest.action.RestExecuteWatchAction.Field.RECORD_EXECUTION; +import static org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction.Field.IGNORE_CONDITION; +import static org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction.Field.RECORD_EXECUTION; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestGetWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestGetWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java index d752ab77d46..dc50669bb83 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestGetWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -16,12 +16,12 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestStatus.NOT_FOUND; @@ -58,4 +58,4 @@ public class RestGetWatchAction extends WatcherRestHandler { } }); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestHijackOperationAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestHijackOperationAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java index 31f8d4d9866..56225293e21 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestHijackOperationAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -15,9 +15,9 @@ import org.elasticsearch.rest.RestChannel; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.watch.WatchStore; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestPutWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestPutWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java index 1af012a78fa..f31e7e33631 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestPutWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -16,10 +16,10 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.PUT; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatchServiceAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatchServiceAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java index b38d992adc4..ec4c12ecc86 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatchServiceAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; @@ -12,10 +12,10 @@ import org.elasticsearch.rest.RestChannel; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.support.AcknowledgedRestListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceRequest; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceRequest; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceResponse; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatcherStatsAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatcherStatsAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java index 655d1b3274e..1f7b87b93fa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/rest/action/RestWatcherStatsAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import org.elasticsearch.client.Client; import org.elasticsearch.common.Strings; @@ -16,10 +16,10 @@ import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.action.support.RestBuilderListener; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.rest.WatcherRestHandler; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsRequest; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRequest; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import java.util.Set; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ArrayObjectIterator.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ArrayObjectIterator.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java index e5a10e5ff2e..9b1b09f727d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ArrayObjectIterator.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ArrayObjectIterator.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import java.lang.reflect.Array; import java.util.Iterator; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java index 93d5d7aa191..bb682fa7d30 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Exceptions.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.script.ScriptException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Integers.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Integers.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java index 88b4bf98eba..e1834fc6201 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Integers.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Integers.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import java.util.Arrays; import java.util.Iterator; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Script.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Script.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Script.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Script.java index 811ace3c28b..bf907ea3677 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Script.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Script.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ScriptServiceProxy.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ScriptServiceProxy.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ScriptServiceProxy.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ScriptServiceProxy.java index b9b0ae27976..3b4418e914c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ScriptServiceProxy.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ScriptServiceProxy.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/SearchRequestEquivalence.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/SearchRequestEquivalence.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java index e5d6dc58850..9b7a76a3356 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/SearchRequestEquivalence.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/SearchRequestEquivalence.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.Nullable; @@ -11,7 +11,7 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import java.util.Arrays; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Strings.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Strings.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java index 90e5cf348f0..b55ae3298a1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Strings.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Strings.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import java.util.Objects; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ThreadPoolSettingsBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ThreadPoolSettingsBuilder.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ThreadPoolSettingsBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ThreadPoolSettingsBuilder.java index 11fb214f4d9..b477be19c25 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/ThreadPoolSettingsBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/ThreadPoolSettingsBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.common.settings.Settings; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Variables.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Variables.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java index a7e3561bb1d..20436778f70 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Variables.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/Variables.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherDateTimeUtils.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherDateTimeUtils.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java index 5a6c27d09eb..161bcdd8585 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherDateTimeUtils.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtils.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.io.stream.StreamInput; @@ -14,7 +14,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.core.DateFieldMapper; -import org.elasticsearch.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.Clock; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java index 6a88ca174dc..1c60e27627c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import com.google.common.base.Charsets; import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest; @@ -20,7 +20,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.gateway.GatewayService; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import org.elasticsearch.xpack.template.TemplateUtils; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherUtils.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherUtils.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java index 86f3067c83d..5d895c0a45c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/WatcherUtils.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/WatcherUtils.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.formatDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.formatDate; import java.io.IOException; import java.lang.reflect.Array; @@ -34,8 +34,8 @@ import org.elasticsearch.script.Template; import org.elasticsearch.search.aggregations.AggregatorParsers; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.suggest.Suggesters; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/XContentFilterKeysUtils.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/XContentFilterKeysUtils.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java index b188b10981e..7acad5bd080 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/XContentFilterKeysUtils.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/XContentFilterKeysUtils.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/Clock.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/Clock.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/Clock.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/Clock.java index 439140386aa..888be631f16 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/Clock.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/Clock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/ClockModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/ClockModule.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/ClockModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/ClockModule.java index 9d529a61e11..7234c570624 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/ClockModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/ClockModule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.common.inject.AbstractModule; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/HaltedClock.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/HaltedClock.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/HaltedClock.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/HaltedClock.java index cd52818c38e..c2bd3dda9ad 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/HaltedClock.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/HaltedClock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/SystemClock.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/SystemClock.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/SystemClock.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/SystemClock.java index 6a8538abb2b..b2ef5e1c7cb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/clock/SystemClock.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/clock/SystemClock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLock.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLock.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLock.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLock.java index 21c18d95e1a..d1d30134c0e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLock.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.concurrent; +package org.elasticsearch.xpack.watcher.support.concurrent; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClient.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClient.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClient.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClient.java index 3b63c874a3a..a9515de21a9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClient.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClient.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchTimeoutException; @@ -15,8 +15,8 @@ import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; -import org.elasticsearch.watcher.support.http.auth.ApplicableHttpAuth; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.ApplicableHttpAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManager; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClientModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClientModule.java similarity index 73% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClientModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClientModule.java index c97d5f45996..327b24fa3b9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpClientModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpClientModule.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.watcher.support.http.auth.HttpAuthFactory; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthFactory; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpContentType.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpContentType.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpContentType.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpContentType.java index 25bfb8af563..b411d87c810 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpContentType.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpContentType.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -12,7 +12,7 @@ import org.elasticsearch.common.xcontent.XContentType; import java.io.IOException; import java.util.Locale; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpMethod.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpMethod.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpMethod.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpMethod.java index c31957878c6..3d053e2d48b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpMethod.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpMethod.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpProxy.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpProxy.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpProxy.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpProxy.java index 0ecdbeac816..987b5755d39 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpProxy.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpProxy.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequest.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequest.java index 22a4ac47f13..ee783908fe4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -18,10 +18,10 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.rest.support.RestUtils; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.http.auth.HttpAuth; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequestTemplate.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplate.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequestTemplate.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplate.java index 9f90661ddee..26f1aeaadcf 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpRequestTemplate.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplate.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -16,12 +16,12 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.rest.support.RestUtils; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.http.HttpRequest.Field; -import org.elasticsearch.watcher.support.http.auth.HttpAuth; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest.Field; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.jboss.netty.handler.codec.http.HttpHeaders; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpResponse.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpResponse.java index d5e383c8c1f..c872347c16a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/HttpResponse.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/Scheme.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/Scheme.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/Scheme.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/Scheme.java index c845845bd61..d533036acb8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/Scheme.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/Scheme.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/ApplicableHttpAuth.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/ApplicableHttpAuth.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/ApplicableHttpAuth.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/ApplicableHttpAuth.java index 286799a767f..73c6ee243d3 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/ApplicableHttpAuth.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/ApplicableHttpAuth.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth; +package org.elasticsearch.xpack.watcher.support.http.auth; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuth.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuth.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuth.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuth.java index 297c3360be1..23896ba1404 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuth.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuth.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth; +package org.elasticsearch.xpack.watcher.support.http.auth; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthFactory.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthFactory.java index eb2c41702be..3a69b9eab4a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth; +package org.elasticsearch.xpack.watcher.support.http.auth; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthRegistry.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthRegistry.java index 74573dcd8e9..2930c28c2b2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/HttpAuthRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/HttpAuthRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth; +package org.elasticsearch.xpack.watcher.support.http.auth; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; @@ -12,7 +12,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/ApplicableBasicAuth.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/ApplicableBasicAuth.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/ApplicableBasicAuth.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/ApplicableBasicAuth.java index fea32976f5a..0ef92d0c33f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/ApplicableBasicAuth.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/ApplicableBasicAuth.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth.basic; +package org.elasticsearch.xpack.watcher.support.http.auth.basic; import org.elasticsearch.common.Base64; -import org.elasticsearch.watcher.support.http.auth.ApplicableHttpAuth; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.http.auth.ApplicableHttpAuth; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuth.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuth.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuth.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuth.java index c4e0f809d38..2d66930a5fa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuth.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuth.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth.basic; +package org.elasticsearch.xpack.watcher.support.http.auth.basic; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.http.auth.HttpAuth; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.support.xcontent.WatcherXContentParser; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuth; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuthFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuthFactory.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuthFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuthFactory.java index 485faa8ddf2..8abdbcfeb13 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/http/auth/basic/BasicAuthFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/http/auth/basic/BasicAuthFactory.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http.auth.basic; +package org.elasticsearch.xpack.watcher.support.http.auth.basic; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.http.auth.HttpAuthFactory; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/init/proxy/WatcherClientProxy.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/init/proxy/WatcherClientProxy.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java index 57fb99c3564..c772d66ab1d 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/init/proxy/WatcherClientProxy.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/init/proxy/WatcherClientProxy.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.init.proxy; +package org.elasticsearch.xpack.watcher.support.init.proxy; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/Secret.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/Secret.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/Secret.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/Secret.java index 0cc8365dd76..8abea06f4e8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/Secret.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/Secret.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.secret; +package org.elasticsearch.xpack.watcher.support.secret; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretModule.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretModule.java index ced761b293c..4387832bc04 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretModule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.secret; +package org.elasticsearch.xpack.watcher.support.secret; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.settings.Settings; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretService.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretService.java index 0dbbf59c702..71c1bc5581a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/secret/SecretService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/secret/SecretService.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.secret; +package org.elasticsearch.xpack.watcher.support.secret; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/DefaultTextTemplateEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/DefaultTextTemplateEngine.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/DefaultTextTemplateEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/DefaultTextTemplateEngine.java index 680c6b72053..a4531e9d306 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/DefaultTextTemplateEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/DefaultTextTemplateEngine.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.text; +package org.elasticsearch.xpack.watcher.support.text; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.component.AbstractComponent; @@ -13,7 +13,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.Template; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; import java.util.Collections; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplate.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplate.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplate.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplate.java index d8159f67283..786e4cd09bd 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplate.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplate.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.text; +package org.elasticsearch.xpack.watcher.support.text; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateEngine.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateEngine.java index b0e67c743b7..61ae213b152 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateEngine.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.text; +package org.elasticsearch.xpack.watcher.support.text; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateModule.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateModule.java index 45d4336c4aa..8e0f413c9f9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/text/TextTemplateModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateModule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.text; +package org.elasticsearch.xpack.watcher.support.text; import org.elasticsearch.common.inject.AbstractModule; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java index ca1ee574b29..5625b622094 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/Validation.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.validation; +package org.elasticsearch.xpack.watcher.support.validation; import org.elasticsearch.common.logging.LoggerMessageFormat; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/WatcherSettingsValidation.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/WatcherSettingsValidation.java index 14fae2a9b3e..f87eb233891 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/validation/WatcherSettingsValidation.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.validation; +package org.elasticsearch.xpack.watcher.support.validation; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.Exceptions; +import org.elasticsearch.xpack.watcher.support.Exceptions; import java.util.ArrayList; import java.util.List; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/ObjectPath.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/ObjectPath.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java index 8c8ccdd13c6..e36de6c7fb0 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/ObjectPath.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/ObjectPath.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import org.elasticsearch.common.Strings; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherParams.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherParams.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java index f2ace14f278..130982de75c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherParams.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherParams.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java index 0674b4820a9..6181e407dcd 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import java.io.IOException; import java.util.List; @@ -15,10 +15,10 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; /** * A xcontent parser that is used by watcher. This is a special parser that is diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/XContentSource.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/XContentSource.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java index 70963c73a7a..bcd69abf85c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/XContentSource.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSource.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchParseException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/ExecutableTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/ExecutableTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java index 2f77080e328..dd4aab7bb19 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/ExecutableTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/ExecutableTransform.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/Transform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/Transform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java index 6ce8caaf665..0729dd6fe8c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/Transform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/Transform.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java similarity index 81% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java index 4fd154d3ea5..2892516919b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.transform.chain.ChainTransform; -import org.elasticsearch.watcher.transform.script.ScriptTransform; -import org.elasticsearch.watcher.transform.search.SearchTransform; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransform; +import org.elasticsearch.xpack.watcher.transform.script.ScriptTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransform; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java index b23117eb8e4..762b381623f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java index 3efe73ccbc2..17e3af8b6fc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformModule.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.watcher.transform.chain.ChainTransform; -import org.elasticsearch.watcher.transform.chain.ChainTransformFactory; -import org.elasticsearch.watcher.transform.script.ScriptTransform; -import org.elasticsearch.watcher.transform.script.ScriptTransformFactory; -import org.elasticsearch.watcher.transform.search.SearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransformFactory; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransform; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransformFactory; +import org.elasticsearch.xpack.watcher.transform.script.ScriptTransform; +import org.elasticsearch.xpack.watcher.transform.script.ScriptTransformFactory; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransformFactory; import java.util.HashMap; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java index 0398ffa2e82..948620410d2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/TransformRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java index deb90ba90aa..cabd57cbc78 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransform.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.chain; +package org.elasticsearch.xpack.watcher.transform.chain; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.transform.TransformRegistry; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransformFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransformFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java index 7dcfc20dbc5..294ece9df84 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ChainTransformFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformFactory.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.chain; +package org.elasticsearch.xpack.watcher.transform.chain; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.transform.TransformFactory; -import org.elasticsearch.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.transform.TransformFactory; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; import org.elasticsearch.xpack.common.init.LazyInitializable; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java index ee03a350e0b..5d2d3c0f109 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/chain/ExecutableChainTransform.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.chain; +package org.elasticsearch.xpack.watcher.transform.chain; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ExecutableScriptTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java similarity index 81% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ExecutableScriptTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java index aa8b0fbe6ee..5e2fbdba400 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ExecutableScriptTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ExecutableScriptTransform.java @@ -3,23 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.script; +package org.elasticsearch.xpack.watcher.transform.script; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.invalidScript; -import static org.elasticsearch.watcher.support.Variables.createCtxModel; +import static org.elasticsearch.xpack.watcher.support.Exceptions.invalidScript; +import static org.elasticsearch.xpack.watcher.support.Variables.createCtxModel; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java index 92dd953cb81..49811d00619 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransform.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.script; +package org.elasticsearch.xpack.watcher.transform.script; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransformFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransformFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java index 18d330f5e62..aa33f8138bc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/script/ScriptTransformFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformFactory.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.script; +package org.elasticsearch.xpack.watcher.transform.script; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.transform.TransformFactory; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.transform.TransformFactory; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/ExecutableSearchTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/ExecutableSearchTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java index e4a82796709..3e658ad3bfb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/ExecutableSearchTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/ExecutableSearchTransform.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.search; +package org.elasticsearch.xpack.watcher.transform.search; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -11,11 +11,11 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.watch.Payload; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransform.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java index a5c962cc215..1acfdf239e9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransform.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.search; +package org.elasticsearch.xpack.watcher.transform.search; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.search.SearchRequest; @@ -16,11 +16,11 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.search.aggregations.AggregatorParsers; import org.elasticsearch.search.suggest.Suggesters; -import org.elasticsearch.watcher.support.SearchRequestEquivalence; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.support.SearchRequestEquivalence; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTimeZone; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransformFactory.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransformFactory.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java index ca6a9d4e0bf..b99044c649e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/search/SearchTransformFactory.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/search/SearchTransformFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.search; +package org.elasticsearch.xpack.watcher.transform.search; import java.io.IOException; @@ -17,8 +17,8 @@ import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.indices.query.IndicesQueriesRegistry; import org.elasticsearch.search.aggregations.AggregatorParsers; import org.elasticsearch.search.suggest.Suggesters; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.transform.TransformFactory; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.transform.TransformFactory; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/WatcherTransportAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/WatcherTransportAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java index 2f2b0c578b9..74dcd226922 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/WatcherTransportAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/WatcherTransportAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions; +package org.elasticsearch.xpack.watcher.transport.actions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; @@ -17,7 +17,7 @@ import org.elasticsearch.license.plugin.core.LicenseUtils; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.WatcherLicensee; import java.util.function.Supplier; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java index 14c983095fa..49bb3368f67 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.ack; +package org.elasticsearch.xpack.watcher.transport.actions.ack; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java index dc658c76d9f..809d0f132f1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.ack; +package org.elasticsearch.xpack.watcher.transport.actions.ack; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -12,7 +12,7 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.support.validation.Validation; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java index f9716944fc0..5888e0e6dfc 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.ack; +package org.elasticsearch.xpack.watcher.transport.actions.ack; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java index 8660ff433e0..f19a2cd3307 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/AckWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/AckWatchResponse.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.ack; +package org.elasticsearch.xpack.watcher.transport.actions.ack; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/TransportAckWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/TransportAckWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java index 6db822e4754..5706d95c759 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/ack/TransportAckWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.ack; +package org.elasticsearch.xpack.watcher.transport.actions.ack; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -17,11 +17,11 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.watch.WatchStatus; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStore; /** * Performs the ack operation. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java index b8e5dbb408b..def0ffebbbb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.activate; +package org.elasticsearch.xpack.watcher.transport.actions.activate; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java index 78977479c2d..97f9658172f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.activate; +package org.elasticsearch.xpack.watcher.transport.actions.activate; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -11,7 +11,7 @@ import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.support.validation.Validation; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java index d0f81298824..74992a67869 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.activate; +package org.elasticsearch.xpack.watcher.transport.actions.activate; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java index 0377bf10143..512a88cd4a5 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/ActivateWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/ActivateWatchResponse.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.activate; +package org.elasticsearch.xpack.watcher.transport.actions.activate; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/TransportActivateWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/TransportActivateWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java index 3fdc7854bf7..930451d32da 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/activate/TransportActivateWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/activate/TransportActivateWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.activate; +package org.elasticsearch.xpack.watcher.transport.actions.activate; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -17,11 +17,11 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.watch.WatchStatus; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStore; /** * Performs the watch de/activation operation. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java index 2c795d9074d..4dfd63819c9 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.delete; +package org.elasticsearch.xpack.watcher.transport.actions.delete; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java index 7b161dfc539..92c36d3789e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.delete; +package org.elasticsearch.xpack.watcher.transport.actions.delete; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -12,7 +12,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.support.validation.Validation; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java index 8c270126872..15a524178a1 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.delete; +package org.elasticsearch.xpack.watcher.transport.actions.delete; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java index fbe0a4324e0..1a14dd25b2b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/DeleteWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/DeleteWatchResponse.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.delete; +package org.elasticsearch.xpack.watcher.transport.actions.delete; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/TransportDeleteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/TransportDeleteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java index be98e3e08db..74178752ec4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/delete/TransportDeleteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/delete/TransportDeleteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.delete; +package org.elasticsearch.xpack.watcher.transport.actions.delete; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -18,10 +18,10 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.watch.WatchStore; /** * Performs the delete operation. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java index 6f0b2e03740..3b43360e51c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.execute; +package org.elasticsearch.xpack.watcher.transport.actions.execute; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java index 6099381ad12..478c0996914 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.execute; +package org.elasticsearch.xpack.watcher.transport.actions.execute; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -13,10 +13,10 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.support.validation.Validation; -import org.elasticsearch.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; import java.io.IOException; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java index 887ff2d6ab0..3ccea8ab05a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchRequestBuilder.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.execute; +package org.elasticsearch.xpack.watcher.transport.actions.execute; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; import java.io.IOException; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java index 647a727aa0e..691ec7e8506 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/ExecuteWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/ExecuteWatchResponse.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.execute; +package org.elasticsearch.xpack.watcher.transport.actions.execute; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/TransportExecuteWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/TransportExecuteWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java index 238a7d88d69..dad654fd273 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/execute/TransportExecuteWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/execute/TransportExecuteWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.execute; +package org.elasticsearch.xpack.watcher.transport.actions.execute; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -20,28 +20,28 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.execution.ManualExecutionContext; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.TriggerService; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.execution.ManualExecutionContext; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * Performs the watch execution operation. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java index 3b081293bab..f3d75818974 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.get; +package org.elasticsearch.xpack.watcher.transport.actions.get; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java index 7c03dae0c93..0363dafba7e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.get; +package org.elasticsearch.xpack.watcher.transport.actions.get; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; @@ -12,7 +12,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.index.VersionType; -import org.elasticsearch.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.support.validation.Validation; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java index ea4e67b336f..cb266ac8fb4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.get; +package org.elasticsearch.xpack.watcher.transport.actions.get; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java index 427821c3f14..61b1fa23438 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/GetWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/GetWatchResponse.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.get; +package org.elasticsearch.xpack.watcher.transport.actions.get; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/TransportGetWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/TransportGetWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java index 3a85d1c8072..cb581d5c470 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/get/TransportGetWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/get/TransportGetWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.get; +package org.elasticsearch.xpack.watcher.transport.actions.get; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -21,12 +21,12 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.license.plugin.core.LicenseUtils; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java index 9025f6d7953..f06bab38c6c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.put; +package org.elasticsearch.xpack.watcher.transport.actions.put; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java index 1ecea9c6fd0..e1766038d82 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.put; +package org.elasticsearch.xpack.watcher.transport.actions.put; import org.elasticsearch.action.ActionRequestValidationException; @@ -14,8 +14,8 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.support.validation.Validation; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.support.validation.Validation; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java index 8a87aa4b913..cc5eb158d31 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchRequestBuilder.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.put; +package org.elasticsearch.xpack.watcher.transport.actions.put; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; public class PutWatchRequestBuilder extends MasterNodeOperationRequestBuilder { diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java index dba6483f070..4ae3c1ac821 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/PutWatchResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/PutWatchResponse.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.put; +package org.elasticsearch.xpack.watcher.transport.actions.put; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/TransportPutWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/TransportPutWatchAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java index 4ac9597b32c..f7636f2cb37 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/put/TransportPutWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/put/TransportPutWatchAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.put; +package org.elasticsearch.xpack.watcher.transport.actions.put; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -19,10 +19,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.plugin.core.LicenseUtils; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.watch.WatchStore; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/TransportWatcherServiceAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/TransportWatcherServiceAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java index de92311e0d2..b82e76e318a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/TransportWatcherServiceAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/TransportWatcherServiceAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.service; +package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -17,9 +17,9 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherLifeCycleService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.WatcherLifeCycleService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java index 064d3379da4..a43119d9158 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.service; +package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java index cbb57bfa5ac..1bd9cfb03a5 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.service; +package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java index ada5e7f3df2..799a4960ba5 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.service; +package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java index 32751836d29..55c76991687 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/service/WatcherServiceResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/service/WatcherServiceResponse.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.service; +package org.elasticsearch.xpack.watcher.transport.actions.service; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/TransportWatcherStatsAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/TransportWatcherStatsAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java index 5fb77a0f59d..a3943413afd 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/TransportWatcherStatsAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/TransportWatcherStatsAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.stats; +package org.elasticsearch.xpack.watcher.transport.actions.stats; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -17,12 +17,12 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.watcher.WatcherBuild; -import org.elasticsearch.watcher.WatcherLifeCycleService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.transport.actions.WatcherTransportAction; +import org.elasticsearch.xpack.watcher.WatcherBuild; +import org.elasticsearch.xpack.watcher.WatcherLifeCycleService; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.transport.actions.WatcherTransportAction; /** * Performs the stats operation. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsAction.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java index 6400f429adc..a2d75495893 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.stats; +package org.elasticsearch.xpack.watcher.transport.actions.stats; import org.elasticsearch.action.Action; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequest.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequest.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java index 1a709cfad6b..2ae56135225 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequest.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequest.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.stats; +package org.elasticsearch.xpack.watcher.transport.actions.stats; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeReadRequest; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java index f50e40e99a0..c2423bb19a4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsRequestBuilder.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.stats; +package org.elasticsearch.xpack.watcher.transport.actions.stats; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsResponse.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsResponse.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java index 5aaaaa3f637..91220f0420b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transport/actions/stats/WatcherStatsResponse.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/stats/WatcherStatsResponse.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.actions.stats; +package org.elasticsearch.xpack.watcher.transport.actions.stats; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Nullable; @@ -11,11 +11,11 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.WatcherBuild; -import org.elasticsearch.watcher.WatcherMetaData; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.execution.QueuedWatch; -import org.elasticsearch.watcher.execution.WatchExecutionSnapshot; +import org.elasticsearch.xpack.watcher.WatcherBuild; +import org.elasticsearch.xpack.watcher.WatcherMetaData; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.execution.QueuedWatch; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionSnapshot; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/AbstractTriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/AbstractTriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java index f4b0c8bd0d4..27eafe415e2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/AbstractTriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/AbstractTriggerEngine.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/Trigger.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/Trigger.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java index 540e9e4e013..eb3124cddc8 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/Trigger.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/Trigger.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerBuilders.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java similarity index 71% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerBuilders.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java index fb467665dbd..b8fd5dfb17c 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerBuilders.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerBuilders.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java index f43fbe5c733..24d192f90d6 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEngine.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEvent.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEvent.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java index 8bff03f6f05..85c5ce6473f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerEvent.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerEvent.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; import org.joda.time.DateTime; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java index 93abe49cae9..236ba0a1b37 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerModule.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.Multibinder; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleModule; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleModule; import java.util.HashSet; import java.util.Set; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java index 2f5c0985fcd..92ca3dce3f2 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/TriggerService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/TriggerService.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.component.AbstractComponent; @@ -20,7 +20,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import static java.util.Collections.unmodifiableMap; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTrigger.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTrigger.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java index 54c6eb4d276..68efc970975 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTrigger.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTrigger.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.manual; +package org.elasticsearch.xpack.watcher.trigger.manual; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.Trigger; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java index 1ac30300d45..5773f3a3ea7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEngine.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.manual; +package org.elasticsearch.xpack.watcher.trigger.manual; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.io.IOException; import java.util.Collection; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEvent.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEvent.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java index 931da7b0d02..b0f2184cff7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEvent.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/manual/ManualTriggerEvent.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.manual; +package org.elasticsearch.xpack.watcher.trigger.manual; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Cron.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Cron.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java index 916923d16cf..9ba5e2a7992 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Cron.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Cron.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.joda.time.DateTimeZone; @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import java.util.TimeZone; import java.util.TreeSet; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronSchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronSchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java index dcf74365979..739ea54ccfa 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronSchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronSchedule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronnableSchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronnableSchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java index 62a2ae44c6e..6db0812ad01 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/CronnableSchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import java.util.Arrays; import java.util.Comparator; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/DailySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/DailySchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java index 1b86cb9edd3..ef53be93bfe 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/DailySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailySchedule.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/HourlySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/HourlySchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java index f91cd63a43b..93902dbffee 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/HourlySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlySchedule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; @@ -11,7 +11,7 @@ import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; import java.io.IOException; import java.util.ArrayList; @@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/IntervalSchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/IntervalSchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java index efdad1f7442..fd481f8530f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/IntervalSchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalSchedule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.ToXContent; @@ -14,7 +14,7 @@ import java.io.IOException; import java.util.Locale; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/MonthlySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/MonthlySchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java index bbca070390c..b57a7a12044 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/MonthlySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlySchedule.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.MonthTimes; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java index 80056291005..ce2a552a03b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedule.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java index 24acad477ce..7c6170fbf93 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleModule.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.engine.SchedulerScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.engine.TickerScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.engine.SchedulerScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleTriggerEngine; import java.util.HashMap; import java.util.Locale; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistry.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistry.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java index 11c5fb7b742..236ec6049cf 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistry.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.inject.Inject; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTrigger.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTrigger.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java index 97075543daa..55e519f634e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTrigger.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.Trigger; import java.io.IOException; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java index a2857471f6c..c82141dc1fb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEngine.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.trigger.AbstractTriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.trigger.AbstractTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import org.joda.time.DateTime; import java.io.IOException; import java.util.Map; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEvent.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEvent.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java index e3014c95833..7f31e393697 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEvent.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEvent.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedules.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedules.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java index 36f03652dc3..ea9ed90e61a 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/Schedules.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/Schedules.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; /** * A static factory for all available schedules. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/WeeklySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/WeeklySchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java index 5b592821b82..f49f087daa7 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/WeeklySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklySchedule.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/YearlySchedule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/YearlySchedule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java index 3920a2831e7..015de3d7feb 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/YearlySchedule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlySchedule.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.trigger.schedule.support.YearTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.YearTimes; import java.io.IOException; import java.util.ArrayList; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java index d7860ed362e..392fc178d22 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleTriggerEngine.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.engine; +package org.elasticsearch.xpack.watcher.trigger.schedule.engine; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.FutureUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java index e59b0be61bd..cf6e3f9cbd5 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.engine; +package org.elasticsearch.xpack.watcher.trigger.schedule.engine; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayOfWeek.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayOfWeek.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java index 14944915823..1a366f233f3 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayOfWeek.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayTimes.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java index dbfad297ffe..a2e1c4c7a13 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/DayTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayTimes.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseFieldMatcher; @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Strings.join; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Month.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Month.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java index b2444cb3e4b..53e53ad6d79 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Month.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/MonthTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/MonthTimes.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java index d6b6ded4dd8..339cf0b9a55 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/MonthTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/MonthTimes.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseFieldMatcher; @@ -19,8 +19,8 @@ import java.util.Locale; import java.util.Set; import static org.elasticsearch.common.util.set.Sets.newHashSet; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Strings.join; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Times.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Times.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java index 184618856fe..e281dc3eed6 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/Times.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Times.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/WeekTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/WeekTimes.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java index ad8f764bb2f..994926f2056 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/WeekTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/WeekTimes.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseFieldMatcher; @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.Set; import static org.elasticsearch.common.util.set.Sets.newHashSet; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Strings.join; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/YearTimes.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/YearTimes.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java index e6e018b8b7b..57396b43d87 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/support/YearTimes.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/YearTimes.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.support; +package org.elasticsearch.xpack.watcher.trigger.schedule.support; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseFieldMatcher; @@ -21,8 +21,8 @@ import java.util.Locale; import java.util.Set; import static org.elasticsearch.common.util.set.Sets.newHashSet; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Strings.join; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java index 54151cc8e7b..ef424056d39 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.tool; +package org.elasticsearch.xpack.watcher.trigger.schedule.tool; import java.util.Arrays; import java.util.List; @@ -14,7 +14,7 @@ import org.elasticsearch.cli.Command; import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.UserError; import org.elasticsearch.cli.Terminal; -import org.elasticsearch.watcher.trigger.schedule.Cron; +import org.elasticsearch.xpack.watcher.trigger.schedule.Cron; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Payload.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Payload.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java index 95e1c6947bc..e4729d85979 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Payload.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Payload.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.xcontent.ToXContent; @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static org.elasticsearch.watcher.support.WatcherUtils.responseToData; +import static org.elasticsearch.xpack.watcher.support.WatcherUtils.responseToData; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Watch.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Watch.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java index bb4be83179e..bc2f4d9e59f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/Watch.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/Watch.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Nullable; @@ -19,27 +19,27 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.ActionRegistry; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.ConditionRegistry; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.InputRegistry; -import org.elasticsearch.watcher.input.none.ExecutableNoneInput; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.HaltedClock; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.support.xcontent.WatcherXContentParser; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.TransformRegistry; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.actions.ActionRegistry; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.ConditionRegistry; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.InputRegistry; +import org.elasticsearch.xpack.watcher.input.none.ExecutableNoneInput; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.HaltedClock; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import org.joda.time.DateTime; import org.joda.time.PeriodType; @@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicLong; import static java.util.Collections.unmodifiableMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentHelper.createParser; -import static org.elasticsearch.watcher.support.Exceptions.ioException; +import static org.elasticsearch.xpack.watcher.support.Exceptions.ioException; public class Watch implements TriggerEngine.Job, ToXContent { @@ -253,7 +253,7 @@ public class Watch implements TriggerEngine.Job, ToXContent { /** * Parses the watch represented by the given source. When parsing, any sensitive data that the - * source might contain (e.g. passwords) will be converted to {@link org.elasticsearch.watcher.support.secret.Secret secrets} + * source might contain (e.g. passwords) will be converted to {@link org.elasticsearch.xpack.watcher.support.secret.Secret secrets} * Such that the returned watch will potentially hide this sensitive data behind a "secret". A secret * is an abstraction around sensitive data (text). There can be different implementations of how the * secret holds the data, depending on the wired up {@link SecretService}. When shield is installed, a @@ -263,7 +263,7 @@ public class Watch implements TriggerEngine.Job, ToXContent { * This method is only called once - when the user adds a new watch. From that moment on, all representations * of the watch in the system will be use secrets for sensitive data. * - * @see org.elasticsearch.watcher.WatcherService#putWatch(String, BytesReference, TimeValue, boolean) + * @see org.elasticsearch.xpack.watcher.WatcherService#putWatch(String, BytesReference, TimeValue, boolean) */ public Watch parseWithSecrets(String id, boolean includeStatus, BytesReference source, DateTime now) throws IOException { return parse(id, includeStatus, true, source, now); diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchLockService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchLockService.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java index a89df40e98b..2aa1f9edc8b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchLockService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchLockService.java @@ -3,20 +3,20 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.support.concurrent.FairKeyedLock; +import org.elasticsearch.xpack.watcher.support.concurrent.FairKeyedLock; import org.joda.time.PeriodType; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchModule.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java similarity index 80% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchModule.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java index 888e7156279..e8a2d38b09e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchModule.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchModule.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.common.inject.AbstractModule; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java index 8f6acf7f949..da6928923e4 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStatus.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; @@ -16,11 +16,11 @@ import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.throttler.AckThrottler; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.xcontent.WatcherXContentParser; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.throttler.AckThrottler; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -30,11 +30,11 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.unmodifiableMap; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.parseDate; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.readDate; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.readOptionalDate; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.writeDate; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.writeOptionalDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.parseDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.readDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.readOptionalDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.writeDate; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.writeOptionalDate; /** * @@ -169,9 +169,9 @@ public class WatchStatus implements ToXContent, Streamable { /** * Notifies this status that the givne actions were acked. If the current state of one of these actions is - * {@link org.elasticsearch.watcher.actions.ActionStatus.AckStatus.State#ACKABLE ACKABLE}, - * then we'll it'll change to {@link org.elasticsearch.watcher.actions.ActionStatus.AckStatus.State#ACKED ACKED} - * (when set to {@link org.elasticsearch.watcher.actions.ActionStatus.AckStatus.State#ACKED ACKED}, the {@link AckThrottler} + * {@link org.elasticsearch.xpack.watcher.actions.ActionStatus.AckStatus.State#ACKABLE ACKABLE}, + * then we'll it'll change to {@link org.elasticsearch.xpack.watcher.actions.ActionStatus.AckStatus.State#ACKED ACKED} + * (when set to {@link org.elasticsearch.xpack.watcher.actions.ActionStatus.AckStatus.State#ACKED ACKED}, the {@link AckThrottler} * will throttle the execution of the action. * * @return {@code true} if the state of changed due to the ack, {@code false} otherwise. diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStore.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStore.java rename to elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java index 2b5b3792e37..5b91661cf94 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStore.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchStore.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import java.io.IOException; import java.util.Collection; @@ -40,7 +40,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; -import static org.elasticsearch.watcher.support.Exceptions.illegalState; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalState; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/resources/org/elasticsearch/watcher/trigger/schedule/tool/croneval-eval.help b/elasticsearch/x-pack/watcher/src/main/resources/org/elasticsearch/watcher/trigger/schedule/tool/croneval-eval.help deleted file mode 100644 index 70698e4b7de..00000000000 --- a/elasticsearch/x-pack/watcher/src/main/resources/org/elasticsearch/watcher/trigger/schedule/tool/croneval-eval.help +++ /dev/null @@ -1,27 +0,0 @@ -NAME - - croneval - Validates and evaluates a cron expression - -SYNOPSIS - - croneval "" [-c count] - -DESCRIPTION - - Validates a given cron expression and if valid, presents the the future - times that this cron expression will be triggered. - - It is possible to control the number of future times that will be presented - using the `-n` option (defaults to 10). - -ARGUMENTS - - The cron expression to evaluate. Note that since the - expression contains white spaces it must be quoted - in order for it to be passed in as a single argument - to the tool. - -OPTIONS - - -c,--count The number of future times this expression will be - triggered at. \ No newline at end of file diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java index 5d4fdbea81a..e7864a85b20 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java @@ -11,7 +11,7 @@ import java.util.Map; /** * A mock script engine that registers itself under the 'mustache' name so that - * {@link org.elasticsearch.watcher.support.text.DefaultTextTemplateEngine} + * {@link org.elasticsearch.xpack.watcher.support.text.DefaultTextTemplateEngine} * uses it and adds validation that watcher tests don't rely on mustache templating/ */ public class MockMustacheScriptEngine extends MockScriptEngine { diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java index 131748a3dd7..2a1cfcdd893 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java @@ -92,8 +92,8 @@ public class SleepScriptEngine implements ScriptEngineService { public void close() throws IOException { } - public static org.elasticsearch.watcher.support.Script sleepScript(long millis) { - return new org.elasticsearch.watcher.support.Script.Builder.Inline("") + public static org.elasticsearch.xpack.watcher.support.Script sleepScript(long millis) { + return new org.elasticsearch.xpack.watcher.support.Script.Builder.Inline("") .lang("sleep") .params(Collections.singletonMap("millis", millis)).build(); } diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherF.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherF.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java index 35b38e03b54..4a91fc6e6f9 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherF.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherLifeCycleServiceTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherLifeCycleServiceTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java index 006dce9e9fa..193e927cf43 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherLifeCycleServiceTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; import org.elasticsearch.cluster.ClusterChangedEvent; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginDisableTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginDisableTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java index 468afd30644..770dc0d4407 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginDisableTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.apache.http.HttpStatus; import org.apache.http.impl.client.CloseableHttpClient; @@ -22,7 +22,7 @@ import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolInfo; -import org.elasticsearch.watcher.execution.InternalWatchExecutor; +import org.elasticsearch.xpack.watcher.execution.InternalWatchExecutor; import org.elasticsearch.xpack.XPackPlugin; import java.util.Collection; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java index a1c9e59aeea..2a60917218b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherPluginTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherServiceTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherServiceTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java index e5373764f22..ab0f585ec34 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/WatcherServiceTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher; +package org.elasticsearch.xpack.watcher; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.action.delete.DeleteResponse; @@ -14,17 +14,17 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerService; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchLockService; -import org.elasticsearch.watcher.watch.WatchStatus; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchLockService; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/ActionErrorIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/ActionErrorIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java index 911ff570bd8..d62df74f188 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/ActionErrorIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/ActionErrorIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; @@ -14,12 +14,12 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; @@ -27,9 +27,9 @@ import java.util.Collections; import java.util.List; import static org.elasticsearch.index.query.QueryBuilders.termsQuery; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; /** diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java index 8d0b248bde5..8bc312df0e9 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.xpack.watcher.actions; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -21,14 +21,14 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.matchAllRequest; -import static org.elasticsearch.watcher.transform.TransformBuilders.searchTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.matchAllRequest; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.searchTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java index 4ec0c5f134b..293a3b6544e 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.xpack.watcher.actions.email; import com.google.common.base.Charsets; import org.elasticsearch.ElasticsearchParseException; @@ -16,23 +16,23 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.support.xcontent.WatcherParams; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import org.elasticsearch.xpack.notification.email.Authentication; import org.elasticsearch.xpack.notification.email.DataAttachment; @@ -63,7 +63,7 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailAttachmentTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailAttachmentTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java index f3d0ca41df4..19f821396e9 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailAttachmentTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.xpack.watcher.actions.email; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -20,13 +20,13 @@ import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentPars import org.elasticsearch.xpack.notification.email.attachment.EmailAttachments; import org.elasticsearch.xpack.notification.email.attachment.HttpRequestAttachment; import org.elasticsearch.xpack.notification.email.support.EmailServer; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; import org.junit.After; import org.junit.Before; @@ -45,15 +45,15 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.emailAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.emailAction; import static org.elasticsearch.xpack.notification.email.DataAttachment.JSON; import static org.elasticsearch.xpack.notification.email.DataAttachment.YAML; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.newInputSearchRequest; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.newInputSearchRequest; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactoryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactoryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java index 07050ce213d..0d157d940b7 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionFactoryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionFactoryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.hipchat; +package org.elasticsearch.xpack.watcher.actions.hipchat; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; @@ -16,12 +16,12 @@ import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.HipChatService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.junit.Before; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.hipchatAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.hipchatAction; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java index b170ff56f38..9055665f5af 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/hipchat/HipChatActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/hipchat/HipChatActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.hipchat; +package org.elasticsearch.xpack.watcher.actions.hipchat; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; @@ -13,18 +13,18 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.HipChatService; import org.elasticsearch.xpack.notification.hipchat.SentMessages; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -36,7 +36,7 @@ import java.util.Map; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionIntegrationTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionIntegrationTests.java index 3cc06267010..4bbae26cc62 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.index; +package org.elasticsearch.xpack.watcher.actions.index; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.search.SearchRequest; @@ -12,12 +12,12 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -25,13 +25,13 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.dateHistogram; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java index beefbda1513..39dc979a77e 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/index/IndexActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/index/IndexActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.index; +package org.elasticsearch.xpack.watcher.actions.index; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.search.SearchResponse; @@ -16,14 +16,14 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.Action.Result.Status; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action.Result.Status; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/logging/LoggingActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/logging/LoggingActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java index fc5cd194572..1ba66c4636d 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/logging/LoggingActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/logging/LoggingActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.logging; +package org.elasticsearch.xpack.watcher.actions.logging; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.SuppressLoggerChecks; @@ -13,12 +13,12 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.elasticsearch.xpack.notification.email.Attachment; import org.joda.time.DateTime; import org.junit.Before; @@ -30,7 +30,7 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java index 5d731e548ee..34a00fb806d 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionFactoryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.pagerduty; +package org.elasticsearch.xpack.watcher.actions.pagerduty; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -13,11 +13,11 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.junit.Before; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.triggerPagerDutyAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.triggerPagerDutyAction; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java index 7f55f5f6017..f4cb524d5b0 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/pagerduty/PagerDutyActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/pagerduty/PagerDutyActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.pagerduty; +package org.elasticsearch.xpack.watcher.actions.pagerduty; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; @@ -14,20 +14,20 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent; import org.elasticsearch.xpack.notification.pagerduty.IncidentEventContext; import org.elasticsearch.xpack.notification.pagerduty.IncidentEventDefaults; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount; import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService; import org.elasticsearch.xpack.notification.pagerduty.SentEvent; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -37,8 +37,8 @@ import java.util.HashMap; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.pagerDutyAction; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.pagerDutyAction; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionFactoryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionFactoryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java index 42f759fa607..2e6c3ae7485 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionFactoryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionFactoryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.slack; +package org.elasticsearch.xpack.watcher.actions.slack; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -13,11 +13,11 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.notification.slack.SlackAccount; import org.elasticsearch.xpack.notification.slack.SlackService; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import org.junit.Before; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.slackAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.slackAction; import static org.elasticsearch.xpack.notification.slack.message.SlackMessageTests.createRandomTemplate; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java index b314691e844..8d2018f9e90 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/slack/SlackActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.slack; +package org.elasticsearch.xpack.watcher.actions.slack; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; @@ -13,19 +13,19 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action; import org.elasticsearch.xpack.notification.slack.SentMessages; import org.elasticsearch.xpack.notification.slack.SlackAccount; import org.elasticsearch.xpack.notification.slack.SlackService; import org.elasticsearch.xpack.notification.slack.message.SlackMessage; import org.elasticsearch.xpack.notification.slack.message.SlackMessageDefaults; import org.elasticsearch.xpack.notification.slack.message.SlackMessageTests; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -38,8 +38,8 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.slackAction; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.slackAction; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContextBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/AckThrottlerTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/AckThrottlerTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java index 5ea159c23d1..2a27b7578a8 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/AckThrottlerTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/AckThrottlerTests.java @@ -3,19 +3,19 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.DateTime; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.formatDate; -import static org.elasticsearch.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.formatDate; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java index 446551de1ba..0354f12078a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/ActionThrottleTests.java @@ -3,34 +3,34 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.email.EmailAction; -import org.elasticsearch.watcher.actions.index.IndexAction; -import org.elasticsearch.watcher.actions.logging.LoggingAction; -import org.elasticsearch.watcher.actions.webhook.WebhookAction; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.execution.ManualExecutionContext; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.email.EmailAction; +import org.elasticsearch.xpack.watcher.actions.index.IndexAction; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookAction; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.execution.ManualExecutionContext; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.elasticsearch.xpack.notification.email.EmailTemplate; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -41,11 +41,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.actions.ActionBuilders.webhookAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.webhookAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottlerTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottlerTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java index cb732562131..916db655049 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottlerTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/PeriodThrottlerTests.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.PeriodType; -import static org.elasticsearch.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/WatchThrottlerTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/WatchThrottlerTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java index d958bab3a92..ca4a94a79cb 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/WatchThrottlerTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/throttler/WatchThrottlerTests.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.throttler; +package org.elasticsearch.xpack.watcher.actions.throttler; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.WatcherLicensee; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java index dee838b2d5c..e117a21eff2 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -15,28 +15,28 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.Action.Result.Status; -import org.elasticsearch.watcher.execution.TriggeredExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpProxy; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.Action.Result.Status; +import org.elasticsearch.xpack.watcher.execution.TriggeredExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpProxy; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.elasticsearch.xpack.notification.email.Attachment; import org.elasticsearch.xpack.notification.email.Authentication; import org.elasticsearch.xpack.notification.email.Email; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java index d8501d0efe9..f5356b85820 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -15,15 +15,15 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.Callback; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.watcher.actions.ActionBuilders; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.actions.ActionBuilders; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import org.junit.After; import org.junit.Before; @@ -31,12 +31,12 @@ import java.net.BindException; import java.nio.file.Path; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentSource; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentSource; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java index b53cf623106..9b282d528b9 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.webhook; +package org.elasticsearch.xpack.watcher.actions.webhook; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -15,25 +15,25 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.util.Callback; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.watcher.actions.ActionBuilders; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.actions.ActionBuilders; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import org.junit.After; import org.junit.Before; import java.net.BindException; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentSource; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentSource; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/always/AlwaysConditionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/always/AlwaysConditionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java index e42c52a37d5..acfd131c8ae 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/always/AlwaysConditionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/always/AlwaysConditionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.always; +package org.elasticsearch.xpack.watcher.condition.always; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -11,8 +11,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java index 37c6aa4bf93..f1c5472073b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionSearchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionSearchTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; @@ -16,14 +16,14 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.Map; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java index 596874d94b7..f71b89b89e6 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/CompareConditionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/CompareConditionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare; +package org.elasticsearch.xpack.watcher.condition.compare; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -11,11 +11,11 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.condition.compare.CompareCondition.Op; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition.Op; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import java.util.Arrays; @@ -23,7 +23,7 @@ import java.util.Locale; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java index 1c864a220ee..8b64b57ab92 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionSearchTests.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare.array; +package org.elasticsearch.xpack.watcher.condition.compare.array; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.Arrays; @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.collection.IsMapContaining.hasEntry; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java index 83fdec0240a..b16d153ceeb 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/compare/array/ArrayCompareConditionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/compare/array/ArrayCompareConditionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.compare.array; +package org.elasticsearch.xpack.watcher.condition.compare.array; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -11,10 +11,10 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.junit.Rule; import org.junit.rules.ExpectedException; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.is; @@ -349,4 +349,4 @@ public class ArrayCompareConditionTests extends ESTestCase { factory.parseCondition("_id", parser); } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/never/NeverConditionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/never/NeverConditionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java index d516018d50e..6ee71c66988 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/never/NeverConditionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/never/NeverConditionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.never; +package org.elasticsearch.xpack.watcher.condition.never; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -11,9 +11,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java index c7b31c95c5f..d6f46ccebe8 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionSearchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionSearchTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.script; +package org.elasticsearch.xpack.watcher.condition.script; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.search.SearchResponse; @@ -18,16 +18,16 @@ import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.junit.After; import org.junit.Before; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java index eb7aaaab607..f01e3f03a57 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/condition/script/ScriptConditionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/condition/script/ScriptConditionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.condition.script; +package org.elasticsearch.xpack.watcher.condition.script; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; @@ -19,11 +19,11 @@ import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.After; @@ -33,9 +33,9 @@ import java.io.IOException; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.test.WatcherTestUtils.getScriptServiceProxy; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getScriptServiceProxy; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ExecutionServiceTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ExecutionServiceTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java index 48d6f09c1d7..6647bc8e5a8 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ExecutionServiceTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ExecutionServiceTests.java @@ -3,37 +3,37 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.Action; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableAction; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.actions.throttler.ActionThrottler; -import org.elasticsearch.watcher.actions.throttler.Throttler; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.never.NeverCondition; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.validation.WatcherSettingsValidation; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchLockService; -import org.elasticsearch.watcher.watch.WatchStatus; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.actions.Action; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableAction; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.actions.throttler.ActionThrottler; +import org.elasticsearch.xpack.watcher.actions.throttler.Throttler; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.never.NeverCondition; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.validation.WatcherSettingsValidation; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchLockService; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ManualExecutionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ManualExecutionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java index 6c6cbad76eb..9f6bbed6100 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/ManualExecutionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionTests.java @@ -3,35 +3,35 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.logging.LoggingAction; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequest; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -42,13 +42,13 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.condition.ConditionBuilders.neverCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.neverCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreLifeCycleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreLifeCycleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java index 3221e65f0f3..c5f992f9d58 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreLifeCycleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreLifeCycleTests.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.input.none.ExecutableNoneInput; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.input.none.ExecutableNoneInput; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java index 02dac16174a..86b5238db45 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchStoreTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStoreTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; @@ -33,7 +33,7 @@ import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import org.hamcrest.core.IsNull; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java index 68552575042..852f80cf7d7 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/execution/TriggeredWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchTests.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.execution; +package org.elasticsearch.xpack.watcher.execution; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreSettingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreSettingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java index 6cb1031b619..a401da098d4 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreSettingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreSettingsTests.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java index 2522e341f59..1f52b12c660 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryStoreTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java @@ -3,24 +3,24 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.WatcherModule; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.WatcherModule; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.junit.Before; import org.mockito.Matchers; -import static org.elasticsearch.watcher.test.WatcherMatchers.indexRequest; +import static org.elasticsearch.xpack.watcher.test.WatcherMatchers.indexRequest; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.joda.time.DateTimeZone.UTC; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateEmailMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateEmailMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java index ee2c2eb5710..1500c2f6dc2 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateEmailMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; @@ -11,19 +11,19 @@ import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.xpack.notification.email.EmailTemplate; import org.elasticsearch.xpack.notification.email.support.EmailServer; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import org.junit.After; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.emailAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.emailAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateHttpMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateHttpMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java index af354ecde42..784fb119fa5 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateHttpMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -12,10 +12,10 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import org.junit.After; import org.junit.Before; @@ -23,12 +23,12 @@ import java.net.BindException; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.webhookAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.webhookAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateIndexActionMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateIndexActionMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java index 11fd4c6e9bb..1bb90565419 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateIndexActionMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java index 06effa551b2..066750967a3 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java @@ -3,26 +3,26 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTimeMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTimeMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java index 4cf6bc3b7e7..f59478281ca 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTimeMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTimeMappingsTests.java @@ -3,26 +3,26 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.io.IOException; import java.util.Map; import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractValue; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTransformMappingsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java similarity index 84% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTransformMappingsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java index 17b886a0c3c..3a2085c8aa4 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateTransformMappingsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java @@ -3,28 +3,28 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.xpack.watcher.history; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.io.IOException; import java.util.Map; import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractValue; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/InputRegistryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/InputRegistryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java index 007453058ab..1860f2e1bde 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/InputRegistryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/InputRegistryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input; +package org.elasticsearch.xpack.watcher.input; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainInputTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java similarity index 78% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainInputTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java index 515500629d6..d355ffc36fa 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainInputTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainInputTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.chain; +package org.elasticsearch.xpack.watcher.input.chain; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -13,25 +13,25 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.execution.TriggeredExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.input.InputRegistry; -import org.elasticsearch.watcher.input.http.HttpInput; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInputFactory; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.TriggeredExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.InputRegistry; +import org.elasticsearch.xpack.watcher.input.http.HttpInput; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInputFactory; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.DateTime; import java.util.ArrayList; @@ -40,14 +40,14 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.input.InputBuilders.chainInput; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.chainInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.hasSize; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java index 5a57dee4727..9c1211cf07b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/chain/ChainIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java @@ -3,31 +3,31 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.chain; +package org.elasticsearch.xpack.watcher.input.chain; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.node.Node; -import org.elasticsearch.watcher.input.http.HttpInput; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.input.http.HttpInput; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.input.InputBuilders.chainInput; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.IntervalSchedule.Interval.Unit.SECONDS; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.chainInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule.Interval.Unit.SECONDS; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; public class ChainIntegrationTests extends AbstractWatcherIntegrationTestCase { diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java index 32892090ea5..e598df495ef 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.http; +package org.elasticsearch.xpack.watcher.input.http; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.IndicesOptions; @@ -12,16 +12,16 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.node.Node; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; import java.net.InetSocketAddress; @@ -29,13 +29,13 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentSource; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentSource; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; public class HttpInputIntegrationTests extends AbstractWatcherIntegrationTestCase { diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java index 60ca93c46d0..06af1320756 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/http/HttpInputTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/http/HttpInputTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.http; +package org.elasticsearch.xpack.watcher.input.http; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.MapBuilder; @@ -14,34 +14,34 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.execution.TriggeredExecutionContext; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.input.InputBuilders; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpContentType; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequest; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.HttpResponse; -import org.elasticsearch.watcher.support.http.Scheme; -import org.elasticsearch.watcher.support.http.auth.HttpAuth; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.TriggeredExecutionContext; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.input.InputBuilders; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpContentType; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequest; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.HttpResponse; +import org.elasticsearch.xpack.watcher.support.http.Scheme; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.joda.time.DateTime; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/simple/SimpleInputTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/simple/SimpleInputTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java index 9a90b3db89e..fcb55fc994a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/simple/SimpleInputTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/simple/SimpleInputTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.simple; +package org.elasticsearch.xpack.watcher.input.simple; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.settings.Settings; @@ -11,10 +11,10 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.Input; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.Input; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.util.ArrayList; import java.util.HashMap; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/license/LicenseTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/license/LicenseTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/license/LicenseTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/license/LicenseTests.java index 0be401bbbef..4a34a5ab986 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/license/LicenseTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/license/LicenseTests.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.license; +package org.elasticsearch.xpack.watcher.license; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.core.AbstractLicenseeTestCase; -import org.elasticsearch.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.WatcherLicensee; import static org.elasticsearch.license.core.License.OperationMode.BASIC; import static org.elasticsearch.license.core.License.OperationMode.GOLD; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchActionTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchActionTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java index 6e6262d0501..97bf5762fc6 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/rest/action/RestExecuteWatchActionTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.rest.action; +package org.elasticsearch.xpack.watcher.rest.action; import com.google.common.collect.Lists; import org.elasticsearch.client.Client; @@ -14,9 +14,9 @@ import org.elasticsearch.rest.RestChannel; import org.elasticsearch.rest.RestController; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; -import org.elasticsearch.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; @@ -73,4 +73,4 @@ public class RestExecuteWatchActionTests extends ESTestCase { return restRequest; } -} \ No newline at end of file +} diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/shield/BasicShieldTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/shield/BasicShieldTests.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/shield/BasicShieldTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/shield/BasicShieldTests.java index 3d8d707bbb7..e12c7565f2c 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/shield/BasicShieldTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/shield/BasicShieldTests.java @@ -3,29 +3,29 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.shield; +package org.elasticsearch.xpack.watcher.shield; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.shield.Security; import org.elasticsearch.shield.authc.support.SecuredString; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import java.util.Collections; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; import static org.joda.time.DateTimeZone.UTC; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/DynamicIndexNameIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java similarity index 81% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/DynamicIndexNameIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java index e42520ef884..abcd33831cc 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/DynamicIndexNameIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/DynamicIndexNameIntegrationTests.java @@ -3,30 +3,30 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.util.Callback; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; import org.joda.time.format.DateTimeFormat; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.searchTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.searchTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.is; /** diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/FilterXContentTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/FilterXContentTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java index 0d4bf816706..18cabae6073 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/FilterXContentTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/FilterXContentTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.MapBuilder; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/VariablesTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java similarity index 79% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/VariablesTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java index 089e344b5bb..70614be781c 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/VariablesTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/VariablesTests.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.joda.time.DateTime; import java.util.Map; import static java.util.Collections.singletonMap; -import static org.elasticsearch.watcher.test.WatcherTestUtils.assertValue; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.assertValue; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java index 0e08b99431a..13a2458ccb6 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherDateTimeUtilsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherDateTimeUtilsTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.ElasticsearchParseException; @@ -22,7 +22,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentParser; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentParser; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java index bdae08dc757..e1528f9c86b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherIndexTemplateRegistryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherIndexTemplateRegistryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.elasticsearch.common.settings.Setting; @@ -11,8 +11,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.watcher.WatcherModule; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.WatcherModule; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import java.util.ArrayList; import java.util.Collection; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherUtilsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherUtilsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java index 131f08c59b6..54920cff411 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/WatcherUtilsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support; +package org.elasticsearch.xpack.watcher.support; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.formatDate; -import static org.elasticsearch.watcher.support.WatcherUtils.DEFAULT_INDICES_OPTIONS; -import static org.elasticsearch.watcher.support.WatcherUtils.flattenModel; -import static org.elasticsearch.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; +import static org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils.formatDate; +import static org.elasticsearch.xpack.watcher.support.WatcherUtils.DEFAULT_INDICES_OPTIONS; +import static org.elasticsearch.xpack.watcher.support.WatcherUtils.flattenModel; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; @@ -44,9 +44,9 @@ import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.input.search.ExecutableSearchInput; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; import org.joda.time.DateTime; /** diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockMock.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockMock.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockMock.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockMock.java index 36b174b6cbf..8327bcbbb03 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockMock.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockMock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.common.unit.TimeValue; import org.joda.time.DateTime; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockTests.java index de6ff6c4476..91685a1cd22 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/clock/ClockTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/clock/ClockTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.clock; +package org.elasticsearch.xpack.watcher.support.clock; import org.elasticsearch.test.ESTestCase; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLockTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLockTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLockTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLockTests.java index efe0e47d016..bbeb3ff18b7 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/concurrent/FairKeyedLockTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/concurrent/FairKeyedLockTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.concurrent; +package org.elasticsearch.xpack.watcher.support.concurrent; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpClientTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpClientTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpClientTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpClientTests.java index 83bcb26e299..2ff5ad02b71 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpClientTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpClientTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -16,10 +16,10 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.Network; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; import org.junit.After; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpConnectionTimeoutTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpConnectionTimeoutTests.java index b12261f5da1..1dee7c2fcf8 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpConnectionTimeoutTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.common.settings.Settings; @@ -11,7 +11,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.Network; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpReadTimeoutTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpReadTimeoutTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpReadTimeoutTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpReadTimeoutTests.java index b87d8413672..8bd05bf8d17 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpReadTimeoutTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpReadTimeoutTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import com.squareup.okhttp.mockwebserver.Dispatcher; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -14,7 +14,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; import org.junit.After; import org.junit.Before; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTemplateTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplateTests.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTemplateTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplateTests.java index d1bf3c8d869..bbb1081de22 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTemplateTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTemplateTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.unit.TimeValue; @@ -13,12 +13,12 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.test.MockTextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine; import org.jboss.netty.handler.codec.http.HttpHeaders; import java.util.Collections; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTests.java index e539bcf0b57..bfcd72c7871 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpRequestTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpRequestTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.xcontent.ToXContent; @@ -11,7 +11,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpResponseTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpResponseTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpResponseTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpResponseTests.java index bcb5e25e4ba..4adf7a71be1 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpResponseTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/http/HttpResponseTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.http; +package org.elasticsearch.xpack.watcher.support.http; import com.google.common.collect.Lists; import org.elasticsearch.common.bytes.BytesArray; @@ -22,7 +22,7 @@ import java.util.Map; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentParser; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentParser; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.hasEntry; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/text/TextTemplateTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/text/TextTemplateTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateTests.java index d9fcdb65f68..7d431c8192e 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/text/TextTemplateTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/text/TextTemplateTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.text; +package org.elasticsearch.xpack.watcher.support.text; import org.elasticsearch.ElasticsearchParseException; @@ -17,7 +17,7 @@ import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; import org.junit.Before; import java.util.Collections; @@ -27,7 +27,7 @@ import java.util.Map; import static java.util.Collections.singletonMap; import static java.util.Collections.unmodifiableMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/MapPathTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/MapPathTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java index f3c7c20d03c..24093f2a6f4 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/MapPathTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/MapPathTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import org.elasticsearch.test.ESTestCase; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/XContentSourceTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/XContentSourceTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java index 01f4306f413..0009a8007be 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/xcontent/XContentSourceTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/xcontent/XContentSourceTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.support.xcontent; +package org.elasticsearch.xpack.watcher.support.xcontent; import org.elasticsearch.common.bytes.BytesReference; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTestCase.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTestCase.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index a4e18eb1d4a..6fc8423f499 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; @@ -39,23 +39,23 @@ import org.elasticsearch.test.TestCluster; import org.elasticsearch.test.store.MockFSIndexStore; import org.elasticsearch.test.transport.AssertingLocalTransport; import org.elasticsearch.test.transport.MockTransportService; -import org.elasticsearch.watcher.WatcherLifeCycleService; -import org.elasticsearch.watcher.WatcherService; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ExecutionService; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.trigger.ScheduleTriggerEngineMock; -import org.elasticsearch.watcher.trigger.TriggerService; -import org.elasticsearch.watcher.trigger.schedule.ScheduleModule; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.WatcherLifeCycleService; +import org.elasticsearch.xpack.watcher.WatcherService; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ExecutionService; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.trigger.ScheduleTriggerEngineMock; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleModule; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.elasticsearch.xpack.TimeWarpedXPackPlugin; import org.elasticsearch.xpack.XPackClient; import org.elasticsearch.xpack.XPackPlugin; @@ -90,9 +90,9 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; -import static org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry.HISTORY_TEMPLATE_NAME; -import static org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry.TRIGGERED_TEMPLATE_NAME; -import static org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry.WATCHES_TEMPLATE_NAME; +import static org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry.HISTORY_TEMPLATE_NAME; +import static org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry.TRIGGERED_TEMPLATE_NAME; +import static org.elasticsearch.xpack.watcher.support.WatcherIndexTemplateRegistry.WATCHES_TEMPLATE_NAME; import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/MockTextTemplateEngine.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java similarity index 74% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/MockTextTemplateEngine.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java index 933f9bd79e0..b6609191bae 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/MockTextTemplateEngine.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/MockTextTemplateEngine.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; import java.util.Map; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/TimeWarpedWatcher.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java similarity index 82% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/TimeWarpedWatcher.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java index 8283107ad77..daed1b5c080 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/TimeWarpedWatcher.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/TimeWarpedWatcher.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.Watcher; -import org.elasticsearch.watcher.execution.ExecutionModule; -import org.elasticsearch.watcher.execution.SyncTriggerListener; -import org.elasticsearch.watcher.execution.WatchExecutor; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.clock.ClockModule; -import org.elasticsearch.watcher.trigger.ScheduleTriggerEngineMock; -import org.elasticsearch.watcher.trigger.TriggerModule; -import org.elasticsearch.watcher.trigger.manual.ManualTriggerEngine; +import org.elasticsearch.xpack.watcher.Watcher; +import org.elasticsearch.xpack.watcher.execution.ExecutionModule; +import org.elasticsearch.xpack.watcher.execution.SyncTriggerListener; +import org.elasticsearch.xpack.watcher.execution.WatchExecutor; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.clock.ClockModule; +import org.elasticsearch.xpack.watcher.trigger.ScheduleTriggerEngineMock; +import org.elasticsearch.xpack.watcher.trigger.TriggerModule; +import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEngine; import java.util.ArrayList; import java.util.Collection; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatchExecutionContextMockBuilder.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java similarity index 86% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatchExecutionContextMockBuilder.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java index 4c9ba9b9921..16b9144c1c1 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatchExecutionContextMockBuilder.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatchExecutionContextMockBuilder.java @@ -3,15 +3,15 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; import org.elasticsearch.common.collect.MapBuilder; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; import org.joda.time.DateTime; import java.util.Collections; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherMatchers.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherMatchers.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java index 63e8abd8263..ae2e6b8f3d3 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherMatchers.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherMatchers.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; import org.elasticsearch.action.index.IndexRequest; import org.hamcrest.Description; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherTestUtils.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherTestUtils.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java index bba5a58489c..13b2e6b1c58 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/WatcherTestUtils.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test; +package org.elasticsearch.xpack.watcher.test; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchType; @@ -31,43 +31,43 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; -import org.elasticsearch.watcher.actions.email.EmailAction; -import org.elasticsearch.watcher.actions.email.ExecutableEmailAction; -import org.elasticsearch.watcher.actions.webhook.ExecutableWebhookAction; -import org.elasticsearch.watcher.actions.webhook.WebhookAction; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.input.search.ExecutableSearchInput; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.support.secret.Secret; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.transform.search.ExecutableSearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransform; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.CronSchedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.watch.Payload; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStatus; import org.elasticsearch.xpack.notification.email.Authentication; import org.elasticsearch.xpack.notification.email.EmailService; import org.elasticsearch.xpack.notification.email.EmailTemplate; import org.elasticsearch.xpack.notification.email.HtmlSanitizer; import org.elasticsearch.xpack.notification.email.Profile; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.actions.email.EmailAction; +import org.elasticsearch.xpack.watcher.actions.email.ExecutableEmailAction; +import org.elasticsearch.xpack.watcher.actions.webhook.ExecutableWebhookAction; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookAction; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.secret.Secret; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.transform.search.ExecutableSearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransform; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.CronSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.hamcrest.Matcher; import org.joda.time.DateTime; import org.mockito.Mockito; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/ScheduleEngineTriggerBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/ScheduleEngineTriggerBenchmark.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java index 45119805a49..e086f8a3059 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/ScheduleEngineTriggerBenchmark.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/ScheduleEngineTriggerBenchmark.java @@ -3,23 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.bench; +package org.elasticsearch.xpack.watcher.test.bench; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.metrics.MeanMetric; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.engine.SchedulerScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.engine.TickerScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.engine.SchedulerScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleTriggerEngine; import java.util.ArrayList; import java.util.Arrays; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import static java.util.Collections.emptyMap; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; /** * diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java index c0f620dcca9..22dfa525042 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.bench; +package org.elasticsearch.xpack.watcher.test.bench; import org.elasticsearch.Version; import org.elasticsearch.action.search.SearchRequest; @@ -14,13 +14,13 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.MockNode; import org.elasticsearch.node.Node; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.watcher.Watcher; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.transport.actions.put.PutWatchRequest; -import org.elasticsearch.watcher.trigger.ScheduleTriggerEngineMock; -import org.elasticsearch.watcher.trigger.TriggerModule; +import org.elasticsearch.xpack.watcher.Watcher; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchRequest; +import org.elasticsearch.xpack.watcher.trigger.ScheduleTriggerEngineMock; +import org.elasticsearch.xpack.watcher.trigger.TriggerModule; import org.elasticsearch.xpack.XPackPlugin; import java.util.ArrayList; @@ -28,12 +28,12 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; /** * Starts a master only node with watcher and benchmarks the executor service side, so no scheduling. The benchmark diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherScheduleEngineBenchmark.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java index 3527af6925a..379fcd91f8a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherScheduleEngineBenchmark.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.bench; +package org.elasticsearch.xpack.watcher.test.bench; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -28,14 +28,14 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.threadpool.ThreadPoolStats; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.actions.ActionBuilders; -import org.elasticsearch.watcher.actions.logging.LoggingLevel; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.actions.ActionBuilders; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingLevel; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.elasticsearch.xpack.XPackPlugin; import java.io.IOException; @@ -48,10 +48,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.search.aggregations.AggregationBuilders.histogram; import static org.elasticsearch.search.aggregations.AggregationBuilders.percentiles; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; /** */ diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java similarity index 88% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java index c6616b66132..b0dc1d45e06 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.search.SearchRequest; @@ -16,21 +16,21 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.Schedules; -import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedules; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.MonthTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -39,22 +39,22 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.newInputSearchRequest; -import static org.elasticsearch.watcher.test.WatcherTestUtils.xContentSource; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.daily; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.hourly; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.monthly; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.weekly; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.newInputSearchRequest; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.xContentSource; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.daily; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.hourly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.monthly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.weekly; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BootStrapTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BootStrapTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java index 79118a70a16..210e295db79 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BootStrapTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import org.elasticsearch.action.WriteConsistencyLevel; import org.elasticsearch.action.search.SearchRequest; @@ -11,21 +11,21 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.condition.Condition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.execution.TriggeredWatch; -import org.elasticsearch.watcher.execution.TriggeredWatchStore; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.history.WatchRecord; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.Watch; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.condition.Condition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.execution.TriggeredWatch; +import org.elasticsearch.xpack.watcher.execution.TriggeredWatchStore; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.history.WatchRecord; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.Watch; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.hamcrest.Matchers; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -36,14 +36,14 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.newInputSearchRequest; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.newInputSearchRequest; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.joda.time.DateTimeZone.UTC; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/ExecutionVarsIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/ExecutionVarsIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java index 097dbb8ba69..66cd8bba4ba 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/ExecutionVarsIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/ExecutionVarsIntegrationTests.java @@ -3,29 +3,29 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.util.Callback; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.List; import java.util.Map; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/HttpSecretsIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/HttpSecretsIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java index 14f073e0fb4..72524ebaab0 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/HttpSecretsIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -12,19 +12,19 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.basic.ApplicableBasicAuth; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuth; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.WatchStore; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.ApplicableBasicAuth; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuth; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.WatchStore; import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; @@ -33,14 +33,14 @@ import java.net.BindException; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.actions.ActionBuilders.webhookAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.httpInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.webhookAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.httpInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatchMetadataTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java similarity index 73% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatchMetadataTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java index eb44937e2d1..e255b3cdd8a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatchMetadataTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java @@ -3,23 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.actions.logging.LoggingAction; -import org.elasticsearch.watcher.actions.logging.LoggingLevel; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.history.HistoryStore; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.xcontent.ObjectPath; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction; +import org.elasticsearch.xpack.watcher.actions.logging.LoggingLevel; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.history.HistoryStore; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import java.util.ArrayList; @@ -30,12 +30,12 @@ import java.util.Map; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.joda.time.DateTimeZone.UTC; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatcherSettingsFilterTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatcherSettingsFilterTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java index 90760bb74dc..12f2fb6b423 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/WatcherSettingsFilterTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/WatcherSettingsFilterTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.xpack.watcher.test.integration; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; @@ -15,7 +15,7 @@ import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import org.junit.After; import java.io.IOException; @@ -23,8 +23,8 @@ import java.util.Map; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.BASIC_AUTH_HEADER; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; -import static org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase.ShieldSettings.TEST_PASSWORD; -import static org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase.ShieldSettings.TEST_USERNAME; +import static org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase.ShieldSettings.TEST_PASSWORD; +import static org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase.ShieldSettings.TEST_USERNAME; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/TransformIntegrationTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/TransformIntegrationTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java index de3344394e1..989c17e4a25 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/TransformIntegrationTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform; +package org.elasticsearch.xpack.watcher.transform; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.search.SearchRequest; @@ -12,10 +12,10 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.io.IOException; import java.io.InputStream; @@ -26,16 +26,16 @@ import java.nio.file.Path; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.transform.TransformBuilders.chainTransform; -import static org.elasticsearch.watcher.transform.TransformBuilders.scriptTransform; -import static org.elasticsearch.watcher.transform.TransformBuilders.searchTransform; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.chainTransform; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.scriptTransform; +import static org.elasticsearch.xpack.watcher.transform.TransformBuilders.searchTransform; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/chain/ChainTransformTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/chain/ChainTransformTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java index c315928eb3d..321bd567875 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/chain/ChainTransformTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.chain; +package org.elasticsearch.xpack.watcher.transform.chain; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -11,12 +11,12 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.transform.TransformFactory; -import org.elasticsearch.watcher.transform.TransformRegistry; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.transform.TransformFactory; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.watch.Payload; import java.io.IOException; import java.util.ArrayList; @@ -160,7 +160,7 @@ public class ChainTransformTests extends ESTestCase { return new Result("named", new Payload.Simple(data)); } - public static class Transform implements org.elasticsearch.watcher.transform.Transform { + public static class Transform implements org.elasticsearch.xpack.watcher.transform.Transform { private final String name; @@ -237,7 +237,7 @@ public class ChainTransformTests extends ESTestCase { return new Result(TYPE); } - public static class Transform implements org.elasticsearch.watcher.transform.Transform { + public static class Transform implements org.elasticsearch.xpack.watcher.transform.Transform { @Override public String type() { return TYPE; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/script/ScriptTransformTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java similarity index 92% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/script/ScriptTransformTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java index e801635ba04..1eb4b14f58c 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/script/ScriptTransformTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transform/script/ScriptTransformTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.script; +package org.elasticsearch.xpack.watcher.transform.script; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -16,12 +16,12 @@ import org.elasticsearch.script.ScriptException; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.execution.WatchExecutionContext; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.Variables; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.transform.Transform; -import org.elasticsearch.watcher.watch.Payload; +import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.Variables; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.transform.Transform; +import org.elasticsearch.xpack.watcher.watch.Payload; import org.junit.After; import org.junit.Before; @@ -32,11 +32,11 @@ import java.util.Map; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Exceptions.illegalArgument; -import static org.elasticsearch.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; -import static org.elasticsearch.watcher.test.WatcherTestUtils.getScriptServiceProxy; -import static org.elasticsearch.watcher.test.WatcherTestUtils.mockExecutionContext; -import static org.elasticsearch.watcher.test.WatcherTestUtils.simplePayload; +import static org.elasticsearch.xpack.watcher.support.Exceptions.illegalArgument; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.EMPTY_PAYLOAD; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getScriptServiceProxy; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.mockExecutionContext; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.simplePayload; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/activate/ActivateWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java similarity index 83% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/activate/ActivateWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java index 1859f292fd5..20a096a3662 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/activate/ActivateWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.activate; +package org.elasticsearch.xpack.watcher.transport.action.activate; import org.elasticsearch.action.get.GetResponse; @@ -13,24 +13,24 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ExecutionState; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.activate.ActivateWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ExecutionState; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.activate.ActivateWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.watcher.actions.ActionBuilders.indexAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.indexAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/DeleteWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java similarity index 71% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/DeleteWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java index 8ca38d4ff47..cf6d61ebbc1 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/DeleteWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java @@ -3,20 +3,20 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.delete; +package org.elasticsearch.xpack.watcher.transport.action.delete; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchRequest; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/ForceDeleteWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/ForceDeleteWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java index 9c0d94b18e1..51c5883cc6b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/delete/ForceDeleteWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/ForceDeleteWatchTests.java @@ -3,25 +3,25 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.delete; +package org.elasticsearch.xpack.watcher.transport.action.delete; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.SleepScriptEngine; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.transport.actions.service.WatcherServiceResponse; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.service.WatcherServiceResponse; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.scriptCondition; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.scriptCondition; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java index 698d80ca314..73841fc1ca5 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java @@ -3,25 +3,25 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.execute; +package org.elasticsearch.xpack.watcher.transport.action.execute; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.ActionExecutionMode; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.ack.AckWatchResponse; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; -import org.elasticsearch.watcher.watch.WatchStatus; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.ActionExecutionMode; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.ack.AckWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchRequestBuilder; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.watch.WatchStatus; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -29,14 +29,14 @@ import java.util.HashMap; import java.util.Map; import static java.util.Collections.singletonMap; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.condition.ConditionBuilders.neverCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.neverCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java similarity index 75% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java index 3faa7e31adc..b47f2d1c0cb 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchWithDateMathTests.java @@ -3,27 +3,27 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.execute; +package org.elasticsearch.xpack.watcher.transport.action.execute; import org.apache.lucene.util.LuceneTestCase.BadApple; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.execution.Wid; -import org.elasticsearch.watcher.support.WatcherDateTimeUtils; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.execution.Wid; +import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.execute.ExecuteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import org.joda.time.DateTime; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/get/GetWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java similarity index 74% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/get/GetWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java index 3333207ca4a..6e78c03c24a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/get/GetWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/get/GetWatchTests.java @@ -3,23 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.get; +package org.elasticsearch.xpack.watcher.transport.action.get; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.watcher.support.xcontent.XContentSource; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; -import org.elasticsearch.watcher.transport.actions.get.GetWatchResponse; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.support.xcontent.XContentSource; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchRequest; +import org.elasticsearch.xpack.watcher.transport.actions.get.GetWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import java.util.Map; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/put/PutWatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java similarity index 79% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/put/PutWatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java index 369de9086ce..07e72e5f22a 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/put/PutWatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/put/PutWatchTests.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.put; +package org.elasticsearch.xpack.watcher.transport.action.put; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.watcher.client.WatchSourceBuilder; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; -import static org.elasticsearch.watcher.actions.ActionBuilders.loggingAction; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.alwaysCondition; -import static org.elasticsearch.watcher.input.InputBuilders.simpleInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.actions.ActionBuilders.loggingAction; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.alwaysCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java similarity index 85% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java index 787e35e6d17..a4d05811d59 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/SlowWatchStatsTests.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.stats; +package org.elasticsearch.xpack.watcher.transport.action.stats; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.SleepScriptEngine; import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.actions.ActionBuilders; -import org.elasticsearch.watcher.condition.ConditionBuilders; -import org.elasticsearch.watcher.execution.ExecutionPhase; -import org.elasticsearch.watcher.execution.QueuedWatch; -import org.elasticsearch.watcher.input.InputBuilders; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.actions.ActionBuilders; +import org.elasticsearch.xpack.watcher.condition.ConditionBuilders; +import org.elasticsearch.xpack.watcher.execution.ExecutionPhase; +import org.elasticsearch.xpack.watcher.execution.QueuedWatch; +import org.elasticsearch.xpack.watcher.input.InputBuilders; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import org.joda.time.DateTime; import java.util.ArrayList; @@ -26,9 +26,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/WatcherStatsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java similarity index 74% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/WatcherStatsTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java index adf8636ce5a..7c41d915a73 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/WatcherStatsTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java @@ -3,32 +3,32 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transport.action.stats; +package org.elasticsearch.xpack.watcher.transport.action.stats; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.watcher.WatcherBuild; -import org.elasticsearch.watcher.WatcherState; -import org.elasticsearch.watcher.client.WatcherClient; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transport.actions.delete.DeleteWatchResponse; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsRequest; -import org.elasticsearch.watcher.transport.actions.stats.WatcherStatsResponse; +import org.elasticsearch.xpack.watcher.WatcherBuild; +import org.elasticsearch.xpack.watcher.WatcherState; +import org.elasticsearch.xpack.watcher.client.WatcherClient; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transport.actions.delete.DeleteWatchResponse; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRequest; +import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; -import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; -import static org.elasticsearch.watcher.condition.ConditionBuilders.compareCondition; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.cron; +import static org.elasticsearch.xpack.watcher.client.WatchSourceBuilders.watchBuilder; +import static org.elasticsearch.xpack.watcher.condition.ConditionBuilders.compareCondition; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/ScheduleTriggerEngineMock.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java similarity index 87% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/ScheduleTriggerEngineMock.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java index 64052343faf..faf3db461aa 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/ScheduleTriggerEngineMock.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger; +package org.elasticsearch.xpack.watcher.trigger; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; @@ -11,12 +11,12 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/CronScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/CronScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java index 728562838bd..c029f7052b0 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/CronScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronScheduleTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/DailyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/DailyScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java index cd08fd033a6..18d6ee385f6 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/DailyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/DailyScheduleTests.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Strings.join; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/HourlyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/HourlyScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java index 836e749ce6a..6602729b3f5 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/HourlyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/HourlyScheduleTests.java @@ -3,21 +3,21 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.support.Strings; +import org.elasticsearch.xpack.watcher.support.Strings; import java.util.Arrays; import java.util.stream.Collectors; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Integers.asIterable; -import static org.elasticsearch.watcher.support.Integers.contains; +import static org.elasticsearch.xpack.watcher.support.Integers.asIterable; +import static org.elasticsearch.xpack.watcher.support.Integers.contains; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.containsString; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/IntervalScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/IntervalScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java index a202b282e96..dec68cf1101 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/IntervalScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/IntervalScheduleTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/MonthlyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/MonthlyScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java index 80d7c1c2ff9..c361a5a7d28 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/MonthlyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/MonthlyScheduleTests.java @@ -3,18 +3,18 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; -import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.MonthTimes; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Strings.join; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.hasItemInArray; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistryTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistryTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java index 7ffc9113b1d..6bdb46868ea 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleRegistryTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.bytes.BytesReference; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTestCase.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTestCase.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java index c0410c5f865..d9a8e9bad07 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTestCase.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java @@ -3,29 +3,29 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.trigger.schedule.support.DayOfWeek; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; -import org.elasticsearch.watcher.trigger.schedule.support.Month; -import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; -import org.elasticsearch.watcher.trigger.schedule.support.YearTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayOfWeek; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.Month; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.MonthTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.YearTimes; import java.io.IOException; import java.util.EnumSet; import java.util.HashSet; import java.util.Set; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.daily; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.hourly; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.monthly; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.weekly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.daily; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.hourly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.monthly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.weekly; /** * diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEventTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEventTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java index 5f26c19c07d..de6bd801f47 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEventTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTriggerEventTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -11,7 +11,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/WeeklyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/WeeklyScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java index c79a7c755ea..f0033de7725 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/WeeklyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/WeeklyScheduleTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; @@ -12,12 +12,12 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.trigger.schedule.support.DayOfWeek; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayOfWeek; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Strings.join; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.contains; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/YearlyScheduleTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/YearlyScheduleTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java index aeaec39622a..d230e1122ac 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/YearlyScheduleTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/YearlyScheduleTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule; +package org.elasticsearch.xpack.watcher.trigger.schedule; import org.elasticsearch.ElasticsearchParseException; @@ -12,11 +12,11 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.watcher.trigger.schedule.support.DayTimes; -import org.elasticsearch.watcher.trigger.schedule.support.YearTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.YearTimes; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.watcher.support.Strings.join; +import static org.elasticsearch.xpack.watcher.support.Strings.join; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.hasItemInArray; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java index 3a565e5e253..13c53a2ff26 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/BaseTriggerEngineTestCase.java @@ -3,17 +3,17 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.engine; +package org.elasticsearch.xpack.watcher.trigger.schedule.engine; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerEvent; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.support.DayOfWeek; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerEvent; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayOfWeek; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; @@ -25,10 +25,10 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.daily; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.hourly; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; -import static org.elasticsearch.watcher.trigger.schedule.Schedules.weekly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.daily; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.hourly; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval; +import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.weekly; import static org.hamcrest.Matchers.is; import static org.joda.time.DateTimeZone.UTC; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java similarity index 74% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java index f2bb8522ada..70cb7e077a6 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/SchedulerScheduleEngineTests.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.engine; +package org.elasticsearch.xpack.watcher.trigger.schedule.engine; import org.apache.lucene.util.LuceneTestCase.BadApple; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; import static org.mockito.Mockito.mock; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java similarity index 74% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java index 0cbd5c76fbf..07affb3138d 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.engine; +package org.elasticsearch.xpack.watcher.trigger.schedule.engine; import org.apache.lucene.util.LuceneTestCase.BadApple; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; import static org.mockito.Mockito.mock; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalToolTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalToolTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java index df618aebb71..22388424948 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalToolTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalToolTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.tool; +package org.elasticsearch.xpack.watcher.trigger.schedule.tool; import org.elasticsearch.cli.Command; import org.elasticsearch.cli.CommandTestCase; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/EvalCron.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java similarity index 89% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/EvalCron.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java index da33910c62c..8d945304116 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/trigger/schedule/tool/EvalCron.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/EvalCron.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.trigger.schedule.tool; +package org.elasticsearch.xpack.watcher.trigger.schedule.tool; import org.elasticsearch.cli.Terminal; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java index 7529565cac1..6ff4d47c57f 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchLockServiceTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchLockServiceTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.ElasticsearchTimeoutException; import org.elasticsearch.common.unit.TimeValue; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchStoreTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java similarity index 99% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchStoreTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java index faa42d79ed4..f97a6504345 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchStoreTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchStoreTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; @@ -32,7 +32,7 @@ import org.elasticsearch.search.SearchHitField; import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; import org.junit.Before; import java.util.Collections; diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java similarity index 76% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchTests.java rename to elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java index bdfc7bacdb0..efa8c8399eb 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/watch/WatchTests.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.watch; +package org.elasticsearch.xpack.watcher.watch; import java.util.ArrayList; import java.util.Arrays; @@ -25,97 +25,97 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryParser; import org.elasticsearch.indices.query.IndicesQueriesRegistry; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.watcher.actions.ActionFactory; -import org.elasticsearch.watcher.actions.ActionRegistry; -import org.elasticsearch.watcher.actions.ActionStatus; -import org.elasticsearch.watcher.actions.ActionWrapper; -import org.elasticsearch.watcher.actions.ExecutableActions; +import org.elasticsearch.xpack.watcher.actions.ActionFactory; +import org.elasticsearch.xpack.watcher.actions.ActionRegistry; +import org.elasticsearch.xpack.watcher.actions.ActionStatus; +import org.elasticsearch.xpack.watcher.actions.ActionWrapper; +import org.elasticsearch.xpack.watcher.actions.ExecutableActions; import org.elasticsearch.xpack.notification.email.DataAttachment; -import org.elasticsearch.watcher.actions.email.EmailAction; -import org.elasticsearch.watcher.actions.email.EmailActionFactory; -import org.elasticsearch.watcher.actions.email.ExecutableEmailAction; -import org.elasticsearch.watcher.actions.index.ExecutableIndexAction; -import org.elasticsearch.watcher.actions.index.IndexAction; -import org.elasticsearch.watcher.actions.index.IndexActionFactory; -import org.elasticsearch.watcher.actions.throttler.ActionThrottler; -import org.elasticsearch.watcher.actions.webhook.ExecutableWebhookAction; -import org.elasticsearch.watcher.actions.webhook.WebhookAction; -import org.elasticsearch.watcher.actions.webhook.WebhookActionFactory; -import org.elasticsearch.watcher.condition.ConditionFactory; -import org.elasticsearch.watcher.condition.ConditionRegistry; -import org.elasticsearch.watcher.condition.ExecutableCondition; -import org.elasticsearch.watcher.condition.always.AlwaysCondition; -import org.elasticsearch.watcher.condition.always.AlwaysConditionFactory; -import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; -import org.elasticsearch.watcher.condition.compare.CompareCondition; -import org.elasticsearch.watcher.condition.compare.CompareCondition.Op; -import org.elasticsearch.watcher.condition.compare.CompareConditionFactory; -import org.elasticsearch.watcher.condition.compare.ExecutableCompareCondition; -import org.elasticsearch.watcher.condition.compare.array.ArrayCompareCondition; -import org.elasticsearch.watcher.condition.compare.array.ArrayCompareConditionFactory; -import org.elasticsearch.watcher.condition.compare.array.ExecutableArrayCompareCondition; -import org.elasticsearch.watcher.condition.script.ExecutableScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptCondition; -import org.elasticsearch.watcher.condition.script.ScriptConditionFactory; -import org.elasticsearch.watcher.input.ExecutableInput; -import org.elasticsearch.watcher.input.InputBuilders; -import org.elasticsearch.watcher.input.InputFactory; -import org.elasticsearch.watcher.input.InputRegistry; -import org.elasticsearch.watcher.input.none.ExecutableNoneInput; -import org.elasticsearch.watcher.input.search.ExecutableSearchInput; -import org.elasticsearch.watcher.input.search.SearchInput; -import org.elasticsearch.watcher.input.search.SearchInputFactory; -import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInput; -import org.elasticsearch.watcher.input.simple.SimpleInputFactory; -import org.elasticsearch.watcher.WatcherLicensee; -import org.elasticsearch.watcher.support.Script; -import org.elasticsearch.watcher.support.WatcherUtils; -import org.elasticsearch.watcher.support.clock.Clock; -import org.elasticsearch.watcher.support.clock.ClockMock; -import org.elasticsearch.watcher.support.clock.SystemClock; -import org.elasticsearch.watcher.support.http.HttpClient; -import org.elasticsearch.watcher.support.http.HttpMethod; -import org.elasticsearch.watcher.support.http.HttpRequestTemplate; -import org.elasticsearch.watcher.support.http.auth.HttpAuthRegistry; -import org.elasticsearch.watcher.support.http.auth.basic.BasicAuthFactory; -import org.elasticsearch.watcher.support.ScriptServiceProxy; -import org.elasticsearch.watcher.support.init.proxy.WatcherClientProxy; -import org.elasticsearch.watcher.support.secret.SecretService; -import org.elasticsearch.watcher.support.text.TextTemplate; -import org.elasticsearch.watcher.support.text.TextTemplateEngine; -import org.elasticsearch.watcher.test.WatcherTestUtils; -import org.elasticsearch.watcher.transform.ExecutableTransform; -import org.elasticsearch.watcher.transform.TransformFactory; -import org.elasticsearch.watcher.transform.TransformRegistry; -import org.elasticsearch.watcher.transform.chain.ChainTransform; -import org.elasticsearch.watcher.transform.chain.ChainTransformFactory; -import org.elasticsearch.watcher.transform.chain.ExecutableChainTransform; -import org.elasticsearch.watcher.transform.script.ExecutableScriptTransform; -import org.elasticsearch.watcher.transform.script.ScriptTransform; -import org.elasticsearch.watcher.transform.script.ScriptTransformFactory; -import org.elasticsearch.watcher.transform.search.ExecutableSearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransform; -import org.elasticsearch.watcher.transform.search.SearchTransformFactory; -import org.elasticsearch.watcher.trigger.Trigger; -import org.elasticsearch.watcher.trigger.TriggerEngine; -import org.elasticsearch.watcher.trigger.TriggerService; -import org.elasticsearch.watcher.trigger.schedule.CronSchedule; -import org.elasticsearch.watcher.trigger.schedule.DailySchedule; -import org.elasticsearch.watcher.trigger.schedule.HourlySchedule; -import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; -import org.elasticsearch.watcher.trigger.schedule.MonthlySchedule; -import org.elasticsearch.watcher.trigger.schedule.Schedule; -import org.elasticsearch.watcher.trigger.schedule.ScheduleRegistry; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; -import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEngine; -import org.elasticsearch.watcher.trigger.schedule.WeeklySchedule; -import org.elasticsearch.watcher.trigger.schedule.YearlySchedule; -import org.elasticsearch.watcher.trigger.schedule.support.DayOfWeek; -import org.elasticsearch.watcher.trigger.schedule.support.Month; -import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; -import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; -import org.elasticsearch.watcher.trigger.schedule.support.YearTimes; +import org.elasticsearch.xpack.watcher.actions.email.EmailAction; +import org.elasticsearch.xpack.watcher.actions.email.EmailActionFactory; +import org.elasticsearch.xpack.watcher.actions.email.ExecutableEmailAction; +import org.elasticsearch.xpack.watcher.actions.index.ExecutableIndexAction; +import org.elasticsearch.xpack.watcher.actions.index.IndexAction; +import org.elasticsearch.xpack.watcher.actions.index.IndexActionFactory; +import org.elasticsearch.xpack.watcher.actions.throttler.ActionThrottler; +import org.elasticsearch.xpack.watcher.actions.webhook.ExecutableWebhookAction; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookAction; +import org.elasticsearch.xpack.watcher.actions.webhook.WebhookActionFactory; +import org.elasticsearch.xpack.watcher.condition.ConditionFactory; +import org.elasticsearch.xpack.watcher.condition.ConditionRegistry; +import org.elasticsearch.xpack.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.always.AlwaysConditionFactory; +import org.elasticsearch.xpack.watcher.condition.always.ExecutableAlwaysCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.CompareCondition.Op; +import org.elasticsearch.xpack.watcher.condition.compare.CompareConditionFactory; +import org.elasticsearch.xpack.watcher.condition.compare.ExecutableCompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.array.ArrayCompareCondition; +import org.elasticsearch.xpack.watcher.condition.compare.array.ArrayCompareConditionFactory; +import org.elasticsearch.xpack.watcher.condition.compare.array.ExecutableArrayCompareCondition; +import org.elasticsearch.xpack.watcher.condition.script.ExecutableScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptCondition; +import org.elasticsearch.xpack.watcher.condition.script.ScriptConditionFactory; +import org.elasticsearch.xpack.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.watcher.input.InputBuilders; +import org.elasticsearch.xpack.watcher.input.InputFactory; +import org.elasticsearch.xpack.watcher.input.InputRegistry; +import org.elasticsearch.xpack.watcher.input.none.ExecutableNoneInput; +import org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInput; +import org.elasticsearch.xpack.watcher.input.search.SearchInputFactory; +import org.elasticsearch.xpack.watcher.input.simple.ExecutableSimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInput; +import org.elasticsearch.xpack.watcher.input.simple.SimpleInputFactory; +import org.elasticsearch.xpack.watcher.WatcherLicensee; +import org.elasticsearch.xpack.watcher.support.Script; +import org.elasticsearch.xpack.watcher.support.WatcherUtils; +import org.elasticsearch.xpack.watcher.support.clock.Clock; +import org.elasticsearch.xpack.watcher.support.clock.ClockMock; +import org.elasticsearch.xpack.watcher.support.clock.SystemClock; +import org.elasticsearch.xpack.watcher.support.http.HttpClient; +import org.elasticsearch.xpack.watcher.support.http.HttpMethod; +import org.elasticsearch.xpack.watcher.support.http.HttpRequestTemplate; +import org.elasticsearch.xpack.watcher.support.http.auth.HttpAuthRegistry; +import org.elasticsearch.xpack.watcher.support.http.auth.basic.BasicAuthFactory; +import org.elasticsearch.xpack.watcher.support.ScriptServiceProxy; +import org.elasticsearch.xpack.watcher.support.init.proxy.WatcherClientProxy; +import org.elasticsearch.xpack.watcher.support.secret.SecretService; +import org.elasticsearch.xpack.watcher.support.text.TextTemplate; +import org.elasticsearch.xpack.watcher.support.text.TextTemplateEngine; +import org.elasticsearch.xpack.watcher.test.WatcherTestUtils; +import org.elasticsearch.xpack.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.watcher.transform.TransformFactory; +import org.elasticsearch.xpack.watcher.transform.TransformRegistry; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransform; +import org.elasticsearch.xpack.watcher.transform.chain.ChainTransformFactory; +import org.elasticsearch.xpack.watcher.transform.chain.ExecutableChainTransform; +import org.elasticsearch.xpack.watcher.transform.script.ExecutableScriptTransform; +import org.elasticsearch.xpack.watcher.transform.script.ScriptTransform; +import org.elasticsearch.xpack.watcher.transform.script.ScriptTransformFactory; +import org.elasticsearch.xpack.watcher.transform.search.ExecutableSearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransform; +import org.elasticsearch.xpack.watcher.transform.search.SearchTransformFactory; +import org.elasticsearch.xpack.watcher.trigger.Trigger; +import org.elasticsearch.xpack.watcher.trigger.TriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.TriggerService; +import org.elasticsearch.xpack.watcher.trigger.schedule.CronSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.DailySchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.HourlySchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.MonthlySchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.Schedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleRegistry; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger; +import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEngine; +import org.elasticsearch.xpack.watcher.trigger.schedule.WeeklySchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.YearlySchedule; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.DayOfWeek; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.Month; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.MonthTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.WeekTimes; +import org.elasticsearch.xpack.watcher.trigger.schedule.support.YearTimes; import org.elasticsearch.xpack.notification.email.EmailService; import org.elasticsearch.xpack.notification.email.EmailTemplate; import org.elasticsearch.xpack.notification.email.HtmlSanitizer; @@ -130,9 +130,9 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; import static java.util.Collections.unmodifiableMap; -import static org.elasticsearch.watcher.input.InputBuilders.searchInput; -import static org.elasticsearch.watcher.test.WatcherTestUtils.matchAllRequest; -import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; +import static org.elasticsearch.xpack.watcher.input.InputBuilders.searchInput; +import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.matchAllRequest; +import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/actions/email/service/logo.png b/elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/watcher/actions/email/service/logo.png rename to elasticsearch/x-pack/watcher/src/test/resources/org/elasticsearch/xpack/watcher/actions/email/service/logo.png diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json index aab5f9dd3f8..4b66c5b9ee4 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json @@ -1,5 +1,5 @@ { - "watcher.ack_watch": { + "xpack.watcher.ack_watch": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-ack-watch.html", "methods": [ "PUT", "POST" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json index 19685687932..0c4c50c5f64 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json @@ -1,5 +1,5 @@ { - "watcher.activate_watch": { + "xpack.watcher.activate_watch": { "documentation": "https://www.elastic.co/guide/en/watcher/current/api-rest.html#api-rest-activate-watch", "methods": [ "PUT", "POST" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json index df56e1ceca3..7b2de81feb4 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json @@ -1,5 +1,5 @@ { - "watcher.deactivate_watch": { + "xpack.watcher.deactivate_watch": { "documentation": "https://www.elastic.co/guide/en/watcher/current/api-rest.html#api-rest-deactivate-watch", "methods": [ "PUT", "POST" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json index 70180c40e6e..cb239ad72d4 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json @@ -1,5 +1,5 @@ { - "watcher.delete_watch": { + "xpack.watcher.delete_watch": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-delete-watch.html", "methods": [ "DELETE" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json index 5f01ce4bcbd..a9f0a59a88b 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json @@ -1,5 +1,5 @@ { - "watcher.execute_watch": { + "xpack.watcher.execute_watch": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-execute-watch.html", "methods": [ "PUT", "POST" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json index ee9ba11c1ee..3e11f083e56 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json @@ -1,5 +1,5 @@ { - "watcher.get_watch": { + "xpack.watcher.get_watch": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-get-watch.html", "methods": [ "GET" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json index 411a9641dcd..eeb36bd99ab 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json @@ -1,5 +1,5 @@ { - "watcher.put_watch": { + "xpack.watcher.put_watch": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-put-watch.html", "methods": [ "PUT", "POST" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.restart.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.restart.json index d8b28f6cf9f..cb0c1ffe5bc 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.restart.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.restart.json @@ -1,5 +1,5 @@ { - "watcher.restart": { + "xpack.watcher.restart": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html", "methods": [ "PUT" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.start.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.start.json index 1dde681bfd1..cfe0d023018 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.start.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.start.json @@ -1,5 +1,5 @@ { - "watcher.start": { + "xpack.watcher.start": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html", "methods": [ "PUT" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stats.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stats.json index 3be7eb474c1..91f97150ae5 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stats.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stats.json @@ -1,5 +1,5 @@ { - "watcher.stats": { + "xpack.watcher.stats": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-stats.html", "methods": [ "GET" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stop.json b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stop.json index f573432d453..da09848d109 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stop.json +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/api/watcher.stop.json @@ -1,5 +1,5 @@ { - "watcher.stop": { + "xpack.watcher.stop": { "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html", "methods": [ "PUT" ], "url": { diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml index 6c31a423b8a..27a5674dc10 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > @@ -40,13 +40,13 @@ wait_for_status: yellow - do: - watcher.ack_watch: + xpack.watcher.ack_watch: watch_id: "my_watch" - match: { "_status.actions.test_index.ack.state" : "awaits_successful_execution" } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "my_watch" - match: { found: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/20_ack_individual_action.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/20_ack_individual_action.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml index 3d1d2c1b43f..3c5aefa09d0 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/ack_watch/20_ack_individual_action.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/ack_watch/20_ack_individual_action.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > @@ -40,14 +40,14 @@ wait_for_status: yellow - do: - watcher.ack_watch: + xpack.watcher.ack_watch: watch_id: "my_watch" action_id: "test_index" - match: { "_status.actions.test_index.ack.state" : "awaits_successful_execution" } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "my_watch" - match: { found: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/activate_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml similarity index 86% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/activate_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml index 100942d08b5..70fea686a1d 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/activate_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/activate_watch/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > @@ -40,7 +40,7 @@ wait_for_status: yellow - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch" - match: { found : true} @@ -48,26 +48,26 @@ - match: { _status.state.active: true } - do: - watcher.deactivate_watch: + xpack.watcher.deactivate_watch: watch_id: "my_watch" - match: { "_status.state.active" : false } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch" - match: { found : true} - match: { _id: "my_watch" } - match: { _status.state.active: false } - do: - watcher.activate_watch: + xpack.watcher.activate_watch: watch_id: "my_watch" - match: { "_status.state.active" : true } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch" - match: { found : true} @@ -75,7 +75,7 @@ - match: { _status.state.active: true } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "my_watch" - match: { found: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml similarity index 95% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml index 104b15037db..509fe741583 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/array_compare_watch/10_basic.yaml @@ -10,12 +10,12 @@ wait_for_status: yellow - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watcher_state": "started" } - match: { "watch_count": 0 } - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "array-compare-watch" body: > { @@ -93,7 +93,7 @@ - do: indices.refresh: {} - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 1 } # Simulate a Thread.sleep() @@ -137,10 +137,10 @@ - gte: { hits.total: 1 } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "array-compare-watch" - match: { found: true } - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 0 } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml index 0867c419293..351d484b38e 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/delete_watch/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > @@ -39,6 +39,6 @@ - match: { _id: "my_watch" } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "my_watch" - match: { found: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml index e21a90b5da3..faa96303041 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" body: > { @@ -39,7 +39,7 @@ - match: { created: true } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch" - match: { found : true} - match: { _id: "my_watch" } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml similarity index 88% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml index aff4b65cd34..c4805bcbcfe 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/get_watch/20_missing.yaml @@ -7,7 +7,7 @@ - do: catch: missing - watcher.get_watch: + xpack.watcher.get_watch: id: "missing_watch" - match: { found : false} - match: { _id: "missing_watch" } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/getting_started/10_monitor_cluster_health.yaml similarity index 93% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/getting_started/10_monitor_cluster_health.yaml index 01431cee5c4..c84dc9b07dd 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/getting_started/10_monitor_cluster_health.yaml @@ -5,12 +5,12 @@ wait_for_status: yellow - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watcher_state": "started" } - match: { "watch_count": 0 } - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "cluster_health_watch" body: > { @@ -52,7 +52,7 @@ - match: { _id: "cluster_health_watch" } - match: { created: true } - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 1 } # Simulate a Thread.sleep() @@ -96,10 +96,10 @@ - gte: { hits.total: 1 } - do: - watcher.delete_watch: + xpack.watcher.delete_watch: id: "cluster_health_watch" - match: { found: true } - - do: {watcher.stats:{}} + - do: {xpack.watcher.stats:{}} - match: { "watch_count": 0 } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml similarity index 100% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/hijack/10_basic.yaml diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml index 2b6f679ad62..50bb7e60ff4 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/10_basic.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml index 77159c26a5b..d9ba99221cd 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/20_put_watch_with_throttle_period.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch1" master_timeout: "40s" body: > @@ -40,7 +40,7 @@ - match: { _id: "my_watch1" } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch1" - match: { found : true} - match: { _id: "my_watch1" } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml index 227e2ff4141..c53847a0064 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch1" master_timeout: "40s" body: > @@ -40,7 +40,7 @@ - match: { _id: "my_watch1" } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch1" - match: { found : true} - match: { _id: "my_watch1" } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml index fbae8034698..2a533f3320b 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/40_put_watch_as_inactive.yaml @@ -5,7 +5,7 @@ wait_for_status: yellow - do: - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" active: false @@ -40,7 +40,7 @@ - match: { _id: "my_watch" } - do: - watcher.get_watch: + xpack.watcher.get_watch: id: "my_watch" - match: { found : true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/50_email_attachment_validation.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/50_email_attachment_validation.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml index dd53e3c81f0..cd4dfed54b9 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/50_email_attachment_validation.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/put_watch/50_email_attachment_validation.yaml @@ -6,7 +6,7 @@ - do: catch: /Configured URL is empty/ - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > @@ -46,7 +46,7 @@ - do: catch: /Malformed URL/ - watcher.put_watch: + xpack.watcher.put_watch: id: "my_watch" master_timeout: "40s" body: > diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml similarity index 78% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml index ffd5cf88c62..d6ff96323f6 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/restart_watcher/10_basic.yaml @@ -4,5 +4,5 @@ cluster.health: wait_for_status: yellow - - do: {watcher.restart: {}} + - do: {xpack.watcher.restart: {}} - match: { acknowledged: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml similarity index 79% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml index d3d25ae1ea7..575d01fcee7 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/start_watcher/10_basic.yaml @@ -4,5 +4,5 @@ cluster.health: wait_for_status: yellow - - do: {watcher.start: {}} + - do: {xpack.watcher.start: {}} - match: { acknowledged: true } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml similarity index 77% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml index a9e98671dc2..28569e03742 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stats/10_basic.yaml @@ -1,6 +1,6 @@ --- "Test watcher stats output": - - do: {watcher.stats: {}} + - do: {xpack.watcher.stats: {}} - match: { "watcher_state": "started" } - match: { "manually_stopped": false } diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml similarity index 70% rename from elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml rename to elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml index a4bac7b78a1..518714c57ab 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/xpack/watcher/stop_watcher/10_basic.yaml @@ -4,8 +4,8 @@ cluster.health: wait_for_status: yellow - - do: {watcher.stop: {}} + - do: {xpack.watcher.stop: {}} - match: { acknowledged: true } - - do: {watcher.start: {}} + - do: {xpack.watcher.start: {}} - match: { acknowledged: true }