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.
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
index 744931a..1138fd6 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
@@ -80,7 +80,7 @@
@Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer,
- List<? extends Resource> resources) {
+ List<Resource> resources) {
checkNotNull(consumer);
checkNotNull(resources);
@@ -164,14 +164,14 @@
}
@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);
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
index b3ad768..4083f5b 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
@@ -44,7 +44,7 @@
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))
);
diff --git a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
index eddc8d7..fa23fba 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
@@ -150,7 +150,7 @@
}
@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 @@
}
@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 @@
}
@Override
- public boolean allocate(List<? extends Resource> resources, ResourceConsumer consumer) {
+ public boolean allocate(List<Resource> resources, ResourceConsumer consumer) {
checkNotNull(resources);
checkNotNull(consumer);