honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts with latest master

This commit is contained in:
Tal Levy 2018-06-04 12:06:10 -07:00
parent 2294c3bea4
commit 32902b78db
4 changed files with 3 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/action/DeleteLifecycleAction.java
View File

@ -40,39 +40,6 @@ public class DeleteLifecycleAction
public Response(boolean acknowledged) { public Response(boolean acknowledged) {
super(acknowledged); super(acknowledged);
} }
@Override
public void readFrom(StreamInput in) throws IOException {
readAcknowledged(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
writeAcknowledged(out);
}
@Override
public int hashCode() {
return Objects.hash(isAcknowledged());
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (obj.getClass() != getClass()) {
return false;
}
Response other = (Response) obj;
return Objects.equals(isAcknowledged(), other.isAcknowledged());
}
@Override
public String toString() {
return Strings.toString(this, true, true);
}
} }
public static class Request extends AcknowledgedRequest<Request> { public static class Request extends AcknowledgedRequest<Request> {

33
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/action/MoveToStepAction.java
View File

@ -44,39 +44,6 @@ public class MoveToStepAction extends Action<MoveToStepAction.Request, MoveToSte
public Response(boolean acknowledged) { public Response(boolean acknowledged) {
super(acknowledged); super(acknowledged);
} }
@Override
public void readFrom(StreamInput in) throws IOException {
readAcknowledged(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
writeAcknowledged(out);
}
@Override
public int hashCode() {
return Objects.hash(isAcknowledged());
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (obj.getClass() != getClass()) {
return false;
}
Response other = (Response) obj;
return Objects.equals(isAcknowledged(), other.isAcknowledged());
}
@Override
public String toString() {
return Strings.toString(this, true, true);
}
} }
public static class Request extends AcknowledgedRequest<Request> implements ToXContentObject { public static class Request extends AcknowledgedRequest<Request> implements ToXContentObject {

39
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/action/PutLifecycleAction.java
View File

@ -43,39 +43,6 @@ public class PutLifecycleAction extends Action<PutLifecycleAction.Request, PutLi
public Response(boolean acknowledged) { public Response(boolean acknowledged) {
super(acknowledged); super(acknowledged);
} }
@Override
public void readFrom(StreamInput in) throws IOException {
readAcknowledged(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
writeAcknowledged(out);
}
@Override
public int hashCode() {
return Objects.hash(isAcknowledged());
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (obj.getClass() != getClass()) {
return false;
}
Response other = (Response) obj;
return Objects.equals(isAcknowledged(), other.isAcknowledged());
}
@Override
public String toString() {
return Strings.toString(this, true, true);
}
} }
public static class Request extends AcknowledgedRequest<Request> implements ToXContentObject { public static class Request extends AcknowledgedRequest<Request> implements ToXContentObject {
@ -86,13 +53,13 @@ public class PutLifecycleAction extends Action<PutLifecycleAction.Request, PutLi
static { static {
PARSER.declareObject(ConstructingObjectParser.constructorArg(), (p, name) -> LifecyclePolicy.parse(p, name), POLICY_FIELD); PARSER.declareObject(ConstructingObjectParser.constructorArg(), (p, name) -> LifecyclePolicy.parse(p, name), POLICY_FIELD);
} }
private LifecyclePolicy policy; private LifecyclePolicy policy;
public Request(LifecyclePolicy policy) { public Request(LifecyclePolicy policy) {
this.policy = policy; this.policy = policy;
} }
public Request() { public Request() {
} }

33
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/action/RetryAction.java
View File

@ -45,39 +45,6 @@ public class RetryAction extends Action<RetryAction.Request, RetryAction.Respons
public Response(boolean acknowledged) { public Response(boolean acknowledged) {
super(acknowledged); super(acknowledged);
} }
@Override
public void readFrom(StreamInput in) throws IOException {
readAcknowledged(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
writeAcknowledged(out);
}
@Override
public int hashCode() {
return Objects.hash(isAcknowledged());
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (obj.getClass() != getClass()) {
return false;
}
Response other = (Response) obj;
return Objects.equals(isAcknowledged(), other.isAcknowledged());
}
@Override
public String toString() {
return Strings.toString(this, true, true);
}
} }
public static class Request extends AcknowledgedRequest<Request> implements IndicesRequest.Replaceable { public static class Request extends AcknowledgedRequest<Request> implements IndicesRequest.Replaceable {