fixed typo and undeprecated a method
Change-Id: Ia15c4df9978ac66d4cd5288f9462d3238958893e
diff --git a/core/api/src/main/java/org/onosproject/net/intent/Intent.java b/core/api/src/main/java/org/onosproject/net/intent/Intent.java
index 1146013..6630ce9 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/Intent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/Intent.java
@@ -58,7 +58,6 @@
* @param appId application identifier
* @param resources required network resources (optional)
*/
- @Deprecated
protected Intent(ApplicationId appId,
Collection<NetworkResource> resources) {
this(appId, null, resources);
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConvertionException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConversionException.java
similarity index 91%
rename from core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConvertionException.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConversionException.java
index e31f617..8bae2af 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConvertionException.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/FlowRuleBatchOperationConversionException.java
@@ -24,11 +24,11 @@
import static com.google.common.base.Preconditions.checkNotNull;
// TODO: Reconsider error handling and intent exception design. Otherwise, write Javadoc.
-public class FlowRuleBatchOperationConvertionException extends IntentException {
+public class FlowRuleBatchOperationConversionException extends IntentException {
private final List<FlowRuleBatchOperation> converted;
- public FlowRuleBatchOperationConvertionException(List<FlowRuleBatchOperation> converted, Throwable cause) {
+ public FlowRuleBatchOperationConversionException(List<FlowRuleBatchOperation> converted, Throwable cause) {
super("exception occurred during IntentInstaller.install()", cause);
this.converted = ImmutableList.copyOf((checkNotNull(converted)));
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/Installing.java b/core/net/src/main/java/org/onosproject/net/intent/impl/Installing.java
index b5274b5..fae62e1 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/Installing.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/Installing.java
@@ -49,7 +49,7 @@
// TODO: call FlowRuleService API to push FlowRules and track resources,
// which the submitted intent will use.
return Optional.of(new Installed(intentManager, intent, installables, converted));
- } catch (FlowRuleBatchOperationConvertionException e) {
+ } catch (FlowRuleBatchOperationConversionException e) {
log.warn("Unable to install intent {} due to:", intent.id(), e.getCause());
return Optional.of(new InstallingFailed(intentManager, intent, installables, e.converted()));
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index c29a336..05efb22 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -437,7 +437,7 @@
registerSubclassInstallerIfNeeded(installable);
batches.addAll(getInstaller(installable).install(installable));
} catch (Exception e) { // TODO this should be IntentException
- throw new FlowRuleBatchOperationConvertionException(batches, e);
+ throw new FlowRuleBatchOperationConversionException(batches, e);
}
}
return batches;