Roll back resource API changes that triggered a bug in the Java compiler
Change-Id: I9e6891fe156148692e59476cb2bec6defb1f9a70
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java
index d777c81..d394e1c 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java
@@ -43,7 +43,7 @@
* @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 @@
* @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);
}
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
index c28720c..1a2fa2c 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
@@ -66,7 +66,7 @@
* @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.
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
index e67bbe9..29eeb24 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
@@ -37,7 +37,7 @@
* @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 @@
* @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 @@
* @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.