Remove constructs deprecated in Emu from old resource API
Change-Id: I384cb924f950e366b2a01f205233ba726dec9eb4
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
deleted file mode 100644
index 728382a..0000000
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.resource;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Abstraction of allocated resource.
- */
-@Beta
-public interface ResourceAllocation {
-}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
deleted file mode 100644
index 4da6c6a..0000000
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.resource;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Abstraction of resource request.
- */
-@Beta
-public interface ResourceRequest {
-}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
deleted file mode 100644
index 7583213..0000000
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2014-2015 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.resource;
-
-import com.google.common.annotations.Beta;
-
-/**
- * Represents types for link resources.
- */
-@Beta
-public enum ResourceType {
- /**
- * Lambda resource type.
- */
- LAMBDA,
-
- /**
- * Bandwidth resource type.
- */
- BANDWIDTH,
-
- /**
- * MPLS label resource type.
- */
- MPLS_LABEL,
-}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceAllocations.java b/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceAllocations.java
index edba21c..8c6ca73 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceAllocations.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceAllocations.java
@@ -15,13 +15,11 @@
*/
package org.onosproject.net.resource.link;
-import org.onosproject.net.resource.ResourceAllocation;
-
/**
* Representation of allocated link resources.
*
* @deprecated 1.4.0 Emu Release
*/
@Deprecated
-public interface LinkResourceAllocations extends ResourceAllocation {
+public interface LinkResourceAllocations {
}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/package-info.java b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
deleted file mode 100644
index a05dfda..0000000
--- a/core/api/src/main/java/org/onosproject/net/resource/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Abstractions for reserving network resources.
- * <p>
- * Note: Classes under the package will be removed.
- * Developers should not use the classes.
- * </p>
- */
-package org.onosproject.net.resource;