Fix @Nullable import in watcher

Original commit: elastic/x-pack-elasticsearch@017ead8ff7

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatAction.java

@@ -7,6 +7,7 @@ package org.elasticsearch.watcher.actions.hipchat;
 
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -16,7 +17,6 @@ import org.elasticsearch.watcher.actions.hipchat.service.HipChatMessage;
 import org.elasticsearch.watcher.actions.hipchat.service.SentMessages;
 import org.elasticsearch.watcher.support.text.TextTemplate;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 
 /**

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/service/HipChatMessage.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.watcher.actions.hipchat.service;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.settings.Settings;
@@ -15,7 +16,6 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.watcher.support.text.TextTemplateEngine;
 import org.elasticsearch.watcher.support.text.TextTemplate;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.*;
 

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/service/IntegrationAccount.java

@@ -7,6 +7,7 @@ package org.elasticsearch.watcher.actions.hipchat.service;
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsException;
@@ -19,7 +20,6 @@ import org.elasticsearch.watcher.actions.hipchat.service.HipChatMessage.Format;
 import org.elasticsearch.watcher.support.http.*;
 import org.elasticsearch.watcher.support.text.TextTemplateEngine;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/service/SentMessages.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.watcher.actions.hipchat.service;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
 import org.elasticsearch.watcher.support.http.HttpRequest;
 import org.elasticsearch.watcher.support.http.HttpResponse;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/service/UserAccount.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.watcher.actions.hipchat.service;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.common.logging.ESLogger;
@@ -19,7 +20,6 @@ import org.elasticsearch.watcher.actions.hipchat.service.HipChatMessage.Format;
 import org.elasticsearch.watcher.support.http.*;
 import org.elasticsearch.watcher.support.text.TextTemplateEngine;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/service/V1Account.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.watcher.actions.hipchat.service;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.common.logging.ESLogger;
@@ -15,7 +16,6 @@ import org.elasticsearch.watcher.actions.hipchat.service.HipChatMessage.Format;
 import org.elasticsearch.watcher.support.http.*;
 import org.elasticsearch.watcher.support.text.TextTemplateEngine;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackAction.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.watcher.actions.slack;
 
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseFieldMatcher;
@@ -15,7 +16,6 @@ import org.elasticsearch.watcher.actions.Action;
 import org.elasticsearch.watcher.actions.slack.service.SentMessages;
 import org.elasticsearch.watcher.actions.slack.service.message.SlackMessage;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 
 /**

watcher/src/main/java/org/elasticsearch/watcher/actions/slack/service/SentMessages.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.watcher.actions.slack.service;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
@@ -12,7 +13,6 @@ import org.elasticsearch.watcher.actions.slack.service.message.SlackMessage;
 import org.elasticsearch.watcher.support.http.HttpRequest;
 import org.elasticsearch.watcher.support.http.HttpResponse;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;

watcher/src/main/java/org/elasticsearch/watcher/support/SearchRequestEquivalence.java

@@ -6,9 +6,9 @@
 package org.elasticsearch.watcher.support;
 
 import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 
-import javax.annotation.Nullable;
 import java.util.Arrays;
 
 import static org.elasticsearch.watcher.support.Exceptions.illegalState;

watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpResponse.java

@@ -6,6 +6,7 @@
 package org.elasticsearch.watcher.support.http;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.bytes.BytesArray;
@@ -23,8 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
 
@@ -218,4 +217,4 @@ public class HttpResponse implements ToXContent {
         ParseField HEADERS = new ParseField("headers");
         ParseField BODY = new ParseField("body");
     }
-}
+}

watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java

@@ -7,6 +7,7 @@ package org.elasticsearch.watcher.support.xcontent;
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.xcontent.XContentLocation;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -16,7 +17,6 @@ import org.elasticsearch.watcher.support.clock.SystemClock;
 import org.elasticsearch.watcher.support.secret.Secret;
 import org.elasticsearch.watcher.support.secret.SecretService;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEngine.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.watcher.trigger.manual;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.watcher.support.Exceptions;
 import org.elasticsearch.watcher.trigger.TriggerEngine;
 import org.elasticsearch.watcher.trigger.TriggerService;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;

watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEngine.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.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;
@@ -13,7 +14,6 @@ import org.elasticsearch.watcher.trigger.AbstractTriggerEngine;
 import org.elasticsearch.watcher.trigger.TriggerService;
 import org.joda.time.DateTime;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Map;