honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 22:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dakrone/fix-nullable'

Browse Source 
Original commit: elastic/x-pack-elasticsearch@4ce4f5c3eb
This commit is contained in:
Lee Hinman 2015-11-11 12:27:41 -07:00
commit 7f0863ce83
13 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/src/main/java/org/elasticsearch/watcher/actions/hipchat/HipChatAction.java
View File

@ -7,6 +7,7 @@ package org.elasticsearch.watcher.actions.hipchat;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.xcontent.XContentBuilder; 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.actions.hipchat.service.SentMessages;
import org.elasticsearch.watcher.support.text.TextTemplate; import org.elasticsearch.watcher.support.text.TextTemplate;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
/** /**

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

@ -6,6 +6,7 @@
package org.elasticsearch.watcher.actions.hipchat.service; package org.elasticsearch.watcher.actions.hipchat.service;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.settings.Settings; 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.TextTemplateEngine;
import org.elasticsearch.watcher.support.text.TextTemplate; import org.elasticsearch.watcher.support.text.TextTemplate;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;

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

@ -7,6 +7,7 @@ package org.elasticsearch.watcher.actions.hipchat.service;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsException; 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.http.*;
import org.elasticsearch.watcher.support.text.TextTemplateEngine; import org.elasticsearch.watcher.support.text.TextTemplateEngine;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

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

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

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.watcher.actions.hipchat.service; package org.elasticsearch.watcher.actions.hipchat.service;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.logging.ESLogger; 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.http.*;
import org.elasticsearch.watcher.support.text.TextTemplateEngine; import org.elasticsearch.watcher.support.text.TextTemplateEngine;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.watcher.actions.hipchat.service; package org.elasticsearch.watcher.actions.hipchat.service;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.logging.ESLogger; 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.http.*;
import org.elasticsearch.watcher.support.text.TextTemplateEngine; import org.elasticsearch.watcher.support.text.TextTemplateEngine;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
watcher/src/main/java/org/elasticsearch/watcher/actions/slack/SlackAction.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.watcher.actions.slack; package org.elasticsearch.watcher.actions.slack;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParseFieldMatcher; 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.SentMessages;
import org.elasticsearch.watcher.actions.slack.service.message.SlackMessage; import org.elasticsearch.watcher.actions.slack.service.message.SlackMessage;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
/** /**

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

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.watcher.actions.slack.service; package org.elasticsearch.watcher.actions.slack.service;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; 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.HttpRequest;
import org.elasticsearch.watcher.support.http.HttpResponse; import org.elasticsearch.watcher.support.http.HttpResponse;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;

2
watcher/src/main/java/org/elasticsearch/watcher/support/SearchRequestEquivalence.java
View File

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

3
watcher/src/main/java/org/elasticsearch/watcher/support/http/HttpResponse.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.watcher.support.http; package org.elasticsearch.watcher.support.http;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
@ -23,8 +24,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
import static java.util.Collections.emptyMap; import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableMap;

2
watcher/src/main/java/org/elasticsearch/watcher/support/xcontent/WatcherXContentParser.java
View File

@ -7,6 +7,7 @@ package org.elasticsearch.watcher.support.xcontent;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentLocation;
import org.elasticsearch.common.xcontent.XContentParser; 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.Secret;
import org.elasticsearch.watcher.support.secret.SecretService; import org.elasticsearch.watcher.support.secret.SecretService;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
watcher/src/main/java/org/elasticsearch/watcher/trigger/manual/ManualTriggerEngine.java
View File

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

2
watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/ScheduleTriggerEngine.java
View File

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.watcher.trigger.schedule; package org.elasticsearch.watcher.trigger.schedule;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.watcher.support.WatcherDateTimeUtils; import org.elasticsearch.watcher.support.WatcherDateTimeUtils;
@ -13,7 +14,6 @@ import org.elasticsearch.watcher.trigger.AbstractTriggerEngine;
import org.elasticsearch.watcher.trigger.TriggerService; import org.elasticsearch.watcher.trigger.TriggerService;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;