Refactoring of IntentId based APIs

- getIntent
- getIntentState
- getInstallableIntents

Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
index 2350f05..3b05b7e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
@@ -19,8 +19,8 @@
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.Key;
 
 import java.math.BigInteger;
 
@@ -43,8 +43,8 @@
             id = id.replaceFirst("0x", "");
         }
 
-        IntentId intentId = IntentId.valueOf(new BigInteger(id, 16).longValue());
-        Intent intent = service.getIntent(intentId);
+        Key key = Key.of(new BigInteger(id, 16).longValue(), appId());
+        Intent intent = service.getIntent(key);
         if (intent != null) {
             service.withdraw(intent);
         }