Jonathan Hart
Committed by Gerrit Code Review

Roll back resource API changes that triggered a bug in the Java compiler

Change-Id: I9e6891fe156148692e59476cb2bec6defb1f9a70
......@@ -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<? extends Resource> resources);
boolean register(List<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<? extends ResourceId> ids);
boolean unregister(List<ResourceId> ids);
}
......
......@@ -66,7 +66,7 @@ public interface ResourceService extends ListenerService<ResourceEvent, Resource
* @param resources resources to be allocated
* @return non-empty list of allocation information if succeeded, otherwise empty list
*/
List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources);
List<ResourceAllocation> allocate(ResourceConsumer consumer, List<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<? extends Resource> resources);
boolean register(List<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<? extends ResourceId> ids);
boolean unregister(List<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<? extends Resource> resources, ResourceConsumer consumer);
boolean allocate(List<Resource> resources, ResourceConsumer consumer);
/**
* Releases the specified allocated resources in transactional way.
......
......@@ -80,7 +80,7 @@ public final class ResourceManager extends AbstractListenerManager<ResourceEvent
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer,
List<? extends Resource> resources) {
List<Resource> resources) {
checkNotNull(consumer);
checkNotNull(resources);
......@@ -164,14 +164,14 @@ public final class ResourceManager extends AbstractListenerManager<ResourceEvent
}
@Override
public boolean register(List<? extends Resource> resources) {
public boolean register(List<Resource> resources) {
checkNotNull(resources);
return store.register(resources);
}
@Override
public boolean unregister(List<? extends ResourceId> ids) {
public boolean unregister(List<ResourceId> ids) {
checkNotNull(ids);
return store.unregister(ids);
......
......@@ -44,7 +44,7 @@ class MockResourceService implements ResourceService {
private final Map<Resource, ResourceConsumer> assignment = new HashMap<>();
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
assignment.putAll(
resources.stream().collect(Collectors.toMap(x -> x, x -> consumer))
);
......
......@@ -150,7 +150,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean register(List<? extends Resource> resources) {
public boolean register(List<Resource> resources) {
checkNotNull(resources);
if (log.isTraceEnabled()) {
resources.forEach(r -> log.trace("registering {}", r));
......@@ -189,7 +189,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean unregister(List<? extends ResourceId> ids) {
public boolean unregister(List<ResourceId> ids) {
checkNotNull(ids);
TransactionContext tx = service.transactionContextBuilder().build();
......@@ -253,7 +253,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
}
@Override
public boolean allocate(List<? extends Resource> resources, ResourceConsumer consumer) {
public boolean allocate(List<Resource> resources, ResourceConsumer consumer) {
checkNotNull(resources);
checkNotNull(consumer);
......