Sho SHIMIZU
Committed by Gerrit Code Review

Make ResourceService API more flexible in parameter

Change-Id: Ic8b803cc6ae3b2798de525bfd6545ac5c57e8fdd
......@@ -808,7 +808,7 @@ public class OpticalPathProvisionerTest {
private static class TestResourceService implements ResourceService {
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
List<ResourceAllocation> allocations = new ArrayList<>();
resources.forEach(r -> allocations.add(new ResourceAllocation(r, consumer.consumerId())));
......@@ -955,4 +955,4 @@ public class OpticalPathProvisionerTest {
return 0;
}
}
}
\ No newline at end of file
}
......
......@@ -300,7 +300,7 @@ public class PathComputationTest {
}
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
for (Resource resource: resources) {
if (resource instanceof ContinuousResource) {
List<ResourceAllocation> allocs = new LinkedList<>();
......@@ -1197,4 +1197,4 @@ public class PathComputationTest {
UNKNOWN, UNKNOWN, UNKNOWN,
UNKNOWN, new ChassisId(), builder.build()));
}
}
\ No newline at end of file
}
......
......@@ -43,7 +43,7 @@ public class ResourceServiceAdapter implements ResourceService {
}
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
// TODO Auto-generated method stub
return null;
}
......
......@@ -43,7 +43,7 @@ public interface ResourceAdminService {
* @return true if registration is successfully done, false otherwise. Registration
* succeeds when each resource is not registered or unallocated.
*/
boolean register(List<Resource> resources);
boolean register(List<? extends Resource> resources);
/**
* Unregisters the specified resources.
......@@ -63,5 +63,5 @@ public interface ResourceAdminService {
* @return true if unregistration is successfully done, false otherwise. Unregistration
* succeeds when each resource is not registered or unallocated.
*/
boolean unregister(List<ResourceId> ids);
boolean unregister(List<? extends ResourceId> ids);
}
......
......@@ -64,7 +64,7 @@ public interface ResourceService extends ResourceQueryService, ListenerService<R
* @param resources resources to be allocated
* @return non-empty list of allocation information if succeeded, otherwise empty list
*/
List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources);
List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources);
/**
* Transactionally allocates the specified resources to the specified user.
......
......@@ -37,7 +37,7 @@ public interface ResourceStore extends Store<ResourceEvent, ResourceStoreDelegat
* @param resources resources to be registered
* @return true if the registration succeeds, false otherwise
*/
boolean register(List<Resource> resources);
boolean register(List<? extends Resource> resources);
/**
* Unregisters the resources in transactional way.
......@@ -48,7 +48,7 @@ public interface ResourceStore extends Store<ResourceEvent, ResourceStoreDelegat
* @param ids resources to be unregistered
* @return true if the registration succeeds, false otherwise
*/
boolean unregister(List<ResourceId> ids);
boolean unregister(List<? extends ResourceId> ids);
/**
* Allocates the specified resources to the specified consumer in transactional way.
......@@ -60,7 +60,7 @@ public interface ResourceStore extends Store<ResourceEvent, ResourceStoreDelegat
* @param consumer resource consumer which the resources are allocated to
* @return true if the allocation succeeds, false otherwise.
*/
boolean allocate(List<Resource> resources, ResourceConsumer consumer);
boolean allocate(List<? extends Resource> resources, ResourceConsumer consumer);
/**
* Releases the specified allocated resources in transactional way.
......
......@@ -192,7 +192,7 @@ public class IntentTestsMocks {
}
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
return null;
}
......
......@@ -38,7 +38,7 @@ public class MockResourceService implements ResourceService {
private final Map<Resource, ResourceConsumer> assignment = new HashMap<>();
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
assignment.putAll(
resources.stream().collect(Collectors.toMap(Function.identity(), x -> consumer))
);
......
......@@ -84,7 +84,7 @@ public final class ResourceManager extends AbstractListenerManager<ResourceEvent
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer,
List<Resource> resources) {
List<? extends Resource> resources) {
checkPermission(RESOURCE_WRITE);
checkNotNull(consumer);
checkNotNull(resources);
......@@ -202,14 +202,14 @@ public final class ResourceManager extends AbstractListenerManager<ResourceEvent
}
@Override
public boolean register(List<Resource> resources) {
public boolean register(List<? extends Resource> resources) {
checkNotNull(resources);
return store.register(resources);
}
@Override
public boolean unregister(List<ResourceId> ids) {
public boolean unregister(List<? extends ResourceId> ids) {
checkNotNull(ids);
return store.unregister(ids);
......
......@@ -113,7 +113,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean register(List<Resource> resources) {
public boolean register(List<? extends Resource> resources) {
checkNotNull(resources);
if (log.isTraceEnabled()) {
resources.forEach(r -> log.trace("registering {}", r));
......@@ -155,7 +155,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean unregister(List<ResourceId> ids) {
public boolean unregister(List<? extends ResourceId> ids) {
checkNotNull(ids);
TransactionContext tx = service.transactionContextBuilder().build();
......@@ -204,7 +204,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean allocate(List<Resource> resources, ResourceConsumer consumer) {
public boolean allocate(List<? extends Resource> resources, ResourceConsumer consumer) {
checkNotNull(resources);
checkNotNull(consumer);
......
......@@ -274,7 +274,7 @@ public class BgpTopologyProviderTest {
Map<ResourceId, List<Resource>> registeredRes = new HashMap<>();
@Override
public boolean register(List<Resource> resources) {
public boolean register(List<? extends Resource> resources) {
for (Resource res : resources) {
List<Resource> resource = new LinkedList<>();
resource.add(res);
......@@ -287,7 +287,7 @@ public class BgpTopologyProviderTest {
}
@Override
public boolean unregister(List<ResourceId> ids) {
public boolean unregister(List<? extends ResourceId> ids) {
for (ResourceId id : ids) {
if (registeredRes.containsKey(id)) {
registeredRes.remove(id);
......