Refactor: Remove unused parameter
Change-Id: Ieef2177484fbe94e17d4a3105237ed2c6f36e116
Showing
1 changed file
with
4 additions
and
5 deletions
... | @@ -209,11 +209,10 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu | ... | @@ -209,11 +209,10 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu |
209 | * Checks if current allocations on given resource can satisfy request. | 209 | * Checks if current allocations on given resource can satisfy request. |
210 | * If the resource is null, return true. | 210 | * If the resource is null, return true. |
211 | * | 211 | * |
212 | - * @param request the intent making the request | ||
213 | * @param resource the resource on which to map the intent | 212 | * @param resource the resource on which to map the intent |
214 | * @return true if the resource can accept the request, false otherwise | 213 | * @return true if the resource can accept the request, false otherwise |
215 | */ | 214 | */ |
216 | - private boolean isAvailable(Intent request, IntentId resource) { | 215 | + private boolean isAvailable(IntentId resource) { |
217 | if (resource == null) { | 216 | if (resource == null) { |
218 | return true; | 217 | return true; |
219 | } | 218 | } |
... | @@ -271,7 +270,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu | ... | @@ -271,7 +270,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu |
271 | continue; | 270 | continue; |
272 | } | 271 | } |
273 | 272 | ||
274 | - if (isAvailable(circuitIntent, connIntent.id())) { | 273 | + if (isAvailable(connIntent.id())) { |
275 | return connIntent; | 274 | return connIntent; |
276 | } | 275 | } |
277 | } | 276 | } |
... | @@ -303,7 +302,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu | ... | @@ -303,7 +302,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu |
303 | if (ochCP != null) { | 302 | if (ochCP != null) { |
304 | OchPort ochPort = (OchPort) deviceService.getPort(ochCP.deviceId(), ochCP.port()); | 303 | OchPort ochPort = (OchPort) deviceService.getPort(ochCP.deviceId(), ochCP.port()); |
305 | IntentId intentId = deviceResourceService.getAllocations(ochPort); | 304 | IntentId intentId = deviceResourceService.getAllocations(ochPort); |
306 | - if (isAvailable(circuitIntent, intentId)) { | 305 | + if (isAvailable(intentId)) { |
307 | return ochPort; | 306 | return ochPort; |
308 | } | 307 | } |
309 | } | 308 | } |
... | @@ -317,7 +316,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu | ... | @@ -317,7 +316,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu |
317 | } | 316 | } |
318 | 317 | ||
319 | IntentId intentId = deviceResourceService.getAllocations(port); | 318 | IntentId intentId = deviceResourceService.getAllocations(port); |
320 | - if (isAvailable(circuitIntent, intentId)) { | 319 | + if (isAvailable(intentId)) { |
321 | return (OchPort) port; | 320 | return (OchPort) port; |
322 | } | 321 | } |
323 | } | 322 | } | ... | ... |
-
Please register or login to post a comment