Sho SHIMIZU
Committed by Gerrit Code Review

Change the second type parameter of BatchOperationEntry

- Remove the bounded type parameter for BatchOperationTarget
- FlowRule and Intent don't inherit from BatchOperationTarget
- Remove BatchOperationTarget because nothing depends on it

Change-Id: I3b414d25409e9bbe5de37ffef10b08bc1799be74
......@@ -27,7 +27,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
* This is the interface to classes which are maintained by BatchOperation as
* its entries.
*/
public class BatchOperationEntry<T extends Enum<?>, U extends BatchOperationTarget> {
public class BatchOperationEntry<T extends Enum<?>, U> {
private final T operator;
private final U target;
......
/*
* Copyright 2014 Open Networking Laboratory
*
* Licensed 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.onosproject.net.flow;
/**
* An interface of the class which is assigned to BatchOperation.
*/
public interface BatchOperationTarget {
}
......@@ -22,7 +22,7 @@ import org.onosproject.net.DeviceId;
* Represents a generalized match &amp; action pair to be applied to
* an infrastructure device.
*/
public interface FlowRule extends BatchOperationTarget {
public interface FlowRule {
static final int MAX_TIMEOUT = 60;
static final int MIN_PRIORITY = 0;
......
......@@ -18,7 +18,6 @@ package org.onosproject.net.intent;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.IdGenerator;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.flow.BatchOperationTarget;
import java.util.Collection;
import java.util.Objects;
......@@ -32,7 +31,7 @@ import static com.google.common.base.Preconditions.checkState;
* Make sure that an Intent should be immutable when a new type is defined.
* </p>
*/
public abstract class Intent implements BatchOperationTarget {
public abstract class Intent {
private final IntentId id;
private final ApplicationId appId;
......
......@@ -43,7 +43,7 @@ public class BatchOperationTest {
final TestEntry entry2 = new TestEntry(TestType.OP2, new TestTarget(2));
private static final class TestTarget implements BatchOperationTarget {
private static final class TestTarget {
private int id;
private TestTarget(int id) {
......