Browse Source

Remove Dead Code from o.e.action (#39884)

* none of these are used
Armin Braun 6 years ago
parent
commit
b30a61915d

+ 0 - 110
server/src/main/java/org/elasticsearch/action/ThreadingModel.java

@@ -1,110 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action;
-
-
-public enum ThreadingModel {
-    NONE((byte) 0),
-    OPERATION((byte) 1),
-    LISTENER((byte) 2),
-    OPERATION_LISTENER((byte) 3);
-
-    private byte id;
-
-    ThreadingModel(byte id) {
-        this.id = id;
-    }
-
-    public byte id() {
-        return this.id;
-    }
-
-    /**
-     * {@code true} if the actual operation the action represents will be executed
-     * on a different thread than the calling thread (assuming it will be executed
-     * on the same node).
-     */
-    public boolean threadedOperation() {
-        return this == OPERATION || this == OPERATION_LISTENER;
-    }
-
-    /**
-     * {@code true} if the invocation of the action result listener will be executed
-     * on a different thread (than the calling thread or an "expensive" thread, like the
-     * IO thread).
-     */
-    public boolean threadedListener() {
-        return this == LISTENER || this == OPERATION_LISTENER;
-    }
-
-    public ThreadingModel addListener() {
-        if (this == NONE) {
-            return LISTENER;
-        }
-        if (this == OPERATION) {
-            return OPERATION_LISTENER;
-        }
-        return this;
-    }
-
-    public ThreadingModel removeListener() {
-        if (this == LISTENER) {
-            return NONE;
-        }
-        if (this == OPERATION_LISTENER) {
-            return OPERATION;
-        }
-        return this;
-    }
-
-    public ThreadingModel addOperation() {
-        if (this == NONE) {
-            return OPERATION;
-        }
-        if (this == LISTENER) {
-            return OPERATION_LISTENER;
-        }
-        return this;
-    }
-
-    public ThreadingModel removeOperation() {
-        if (this == OPERATION) {
-            return NONE;
-        }
-        if (this == OPERATION_LISTENER) {
-            return LISTENER;
-        }
-        return this;
-    }
-
-    public static ThreadingModel fromId(byte id) {
-        if (id == 0) {
-            return NONE;
-        } else if (id == 1) {
-            return OPERATION;
-        } else if (id == 2) {
-            return LISTENER;
-        } else if (id == 3) {
-            return OPERATION_LISTENER;
-        } else {
-            throw new IllegalArgumentException("No threading model for [" + id + "]");
-        }
-    }
-}

+ 0 - 57
server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java

@@ -1,57 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.upgrade.post;
-
-
-import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.index.shard.ShardId;
-
-import java.io.IOException;
-
-public final class ShardUpgradeRequest extends BroadcastShardRequest {
-
-    private UpgradeRequest request = new UpgradeRequest();
-
-    public ShardUpgradeRequest() {
-    }
-
-    ShardUpgradeRequest(ShardId shardId, UpgradeRequest request) {
-        super(shardId, request);
-        this.request = request;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        request.readFrom(in);
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        request.writeTo(out);
-    }
-
-    public UpgradeRequest upgradeRequest() {
-        return this.request;
-    }
-}

+ 0 - 5
server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java

@@ -43,11 +43,6 @@ public abstract class BroadcastShardRequest extends TransportRequest implements
         this.originalIndices = new OriginalIndices(request);
     }
 
-    protected BroadcastShardRequest(ShardId shardId, OriginalIndices originalIndices) {
-        this.shardId = shardId;
-        this.originalIndices = originalIndices;
-    }
-
     public ShardId shardId() {
         return this.shardId;
     }