Alerting: Split alerting into packages

This commit adds separate packages for actions,triggers,rest, and the scheduler.

Original commit: elastic/x-pack-elasticsearch@e104bbc521

src/main/java/org/elasticsearch/alerting/Alert.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.alerting;
 
+import org.elasticsearch.alerting.actions.AlertAction;
+import org.elasticsearch.alerting.triggers.AlertTrigger;
 import org.elasticsearch.common.joda.time.DateTime;
 import org.elasticsearch.common.unit.TimeValue;
 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 java.io.IOException;
 import java.util.List;

src/main/java/org/elasticsearch/alerting/AlertManager.java

@@ -20,6 +20,11 @@ import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.alerting.actions.AlertAction;
+import org.elasticsearch.alerting.actions.AlertActionManager;
+import org.elasticsearch.alerting.scheduler.AlertScheduler;
+import org.elasticsearch.alerting.triggers.AlertTrigger;
+import org.elasticsearch.alerting.triggers.TriggerManager;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Nullable;

src/main/java/org/elasticsearch/alerting/AlertResult.java

@@ -7,8 +7,8 @@ package org.elasticsearch.alerting;
 
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.alerting.triggers.AlertTrigger;
 import org.elasticsearch.common.joda.time.DateTime;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.util.Arrays;
 

src/main/java/org/elasticsearch/alerting/AlertingModule.java

@@ -5,6 +5,10 @@
  */
 package org.elasticsearch.alerting;
 
+import org.elasticsearch.alerting.actions.AlertActionManager;
+import org.elasticsearch.alerting.rest.AlertRestHandler;
+import org.elasticsearch.alerting.scheduler.AlertScheduler;
+import org.elasticsearch.alerting.triggers.TriggerManager;
 import org.elasticsearch.common.inject.AbstractModule;
 
 public class AlertingModule extends AbstractModule {

src/main/java/org/elasticsearch/alerting/actions/AlertAction.java

@@ -3,8 +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.alerting;
+package org.elasticsearch.alerting.actions;
 
+import org.elasticsearch.alerting.AlertResult;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 

src/main/java/org/elasticsearch/alerting/actions/AlertActionFactory.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.alerting;
+package org.elasticsearch.alerting.actions;
 
 public interface AlertActionFactory {
     AlertAction createAction(Object parameters);

src/main/java/org/elasticsearch/alerting/actions/AlertActionManager.java

@@ -3,8 +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.alerting;
+package org.elasticsearch.alerting.actions;
 
+import org.elasticsearch.alerting.Alert;
+import org.elasticsearch.alerting.AlertManager;
+import org.elasticsearch.alerting.AlertResult;
+import org.elasticsearch.alerting.actions.AlertAction;
+import org.elasticsearch.alerting.actions.AlertActionFactory;
+import org.elasticsearch.alerting.actions.EmailAlertActionFactory;
+import org.elasticsearch.alerting.actions.IndexAlertActionFactory;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;

src/main/java/org/elasticsearch/alerting/actions/EmailAlertAction.java

@@ -3,20 +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.alerting;
+package org.elasticsearch.alerting.actions;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.alerting.AlertResult;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentHelper;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHitField;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Properties;
 import javax.mail.*;
 import javax.mail.internet.AddressException;

src/main/java/org/elasticsearch/alerting/actions/EmailAlertActionFactory.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.alerting;
+package org.elasticsearch.alerting.actions;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchIllegalArgumentException;

src/main/java/org/elasticsearch/alerting/actions/IndexAlertAction.java

@@ -3,10 +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.alerting;
+package org.elasticsearch.alerting.actions;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.alerting.AlertResult;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;

src/main/java/org/elasticsearch/alerting/actions/IndexAlertActionFactory.java

@@ -3,10 +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.alerting;
+package org.elasticsearch.alerting.actions;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.Client;
 
 import java.util.Locale;

src/main/java/org/elasticsearch/alerting/actions/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/**
+ */
+package org.elasticsearch.alerting.actions;

src/main/java/org/elasticsearch/alerting/rest/AlertRestHandler.java

@@ -3,9 +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.alerting;
+package org.elasticsearch.alerting.rest;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
+import org.elasticsearch.alerting.Alert;
+import org.elasticsearch.alerting.AlertManager;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;

src/main/java/org/elasticsearch/alerting/rest/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/**
+ */
+package org.elasticsearch.alerting.rest;

src/main/java/org/elasticsearch/alerting/scheduler/AlertExecutorJob.java

@@ -3,8 +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.alerting;
+package org.elasticsearch.alerting.scheduler;
 
+import org.elasticsearch.alerting.scheduler.AlertScheduler;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;

src/main/java/org/elasticsearch/alerting/scheduler/AlertScheduler.java

@@ -3,11 +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.alerting;
+package org.elasticsearch.alerting.scheduler;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.alerting.Alert;
+import org.elasticsearch.alerting.actions.AlertActionManager;
+import org.elasticsearch.alerting.AlertManager;
+import org.elasticsearch.alerting.AlertResult;
+import org.elasticsearch.alerting.triggers.TriggerManager;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterService;
@@ -208,7 +213,7 @@ public class AlertScheduler extends AbstractLifecycleComponent implements Cluste
     }
 
     public void addAlert(String alertName, Alert alert) {
-        JobDetail job = JobBuilder.newJob(org.elasticsearch.alerting.AlertExecutorJob.class).withIdentity(alertName).build();
+        JobDetail job = JobBuilder.newJob(AlertExecutorJob.class).withIdentity(alertName).build();
         job.getJobDataMap().put("manager",this);
         CronTrigger cronTrigger = TriggerBuilder.newTrigger()
                 .withSchedule(CronScheduleBuilder.cronSchedule(alert.schedule()))

src/main/java/org/elasticsearch/alerting/scheduler/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/**
+  */
+package org.elasticsearch.alerting.scheduler;

src/main/java/org/elasticsearch/alerting/triggers/AlertTrigger.java

@@ -3,9 +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.alerting;
+package org.elasticsearch.alerting.triggers;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
+import org.elasticsearch.alerting.triggers.ScriptedAlertTrigger;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 

src/main/java/org/elasticsearch/alerting/triggers/ScriptedAlertTrigger.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.alerting;
+package org.elasticsearch.alerting.triggers;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.xcontent.ToXContent;

src/main/java/org/elasticsearch/alerting/triggers/TriggerManager.java

@@ -3,11 +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.alerting;
+package org.elasticsearch.alerting.triggers;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.ElasticsearchIllegalStateException;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.alerting.Alert;
+import org.elasticsearch.alerting.AlertManager;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;

src/main/java/org/elasticsearch/alerting/triggers/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/**
+  */
+package org.elasticsearch.alerting.triggers;

src/main/java/org/elasticsearch/plugin/alerting/AlertingPlugin.java

@@ -6,7 +6,7 @@
 package org.elasticsearch.plugin.alerting;
 
 import org.elasticsearch.alerting.AlertManager;
-import org.elasticsearch.alerting.AlertScheduler;
+import org.elasticsearch.alerting.scheduler.AlertScheduler;
 import org.elasticsearch.alerting.AlertingModule;
 import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.common.component.LifecycleComponent;

src/test/java/org/elasticsearch/alerting/BasicAlertingTest.java

@@ -5,6 +5,12 @@
  */
 package org.elasticsearch.alerting;
 
+import org.elasticsearch.alerting.actions.AlertAction;
+import org.elasticsearch.alerting.actions.AlertActionFactory;
+import org.elasticsearch.alerting.actions.AlertActionManager;
+import org.elasticsearch.alerting.scheduler.AlertScheduler;
+import org.elasticsearch.alerting.triggers.AlertTrigger;
+import org.elasticsearch.alerting.triggers.ScriptedAlertTrigger;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;