Delete unnecessary semicolon
Change-Id: I2eaa4d900342a665f6dc4731a298b30a9ec40696
diff --git a/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
index 20a6165..86d9837 100644
--- a/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
+++ b/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
@@ -301,19 +301,10 @@
* @throws InterruptedException if the thread go interupted
*/
private void trackIntents() throws InterruptedException {
- int count = 0;
- while (!latch.await(100, TimeUnit.NANOSECONDS)) {
- if (intentBatchService.getPendingOperations().isEmpty()) {
- latch.countDown();
- }
- count++;
- if (count > ITERATIONMAX) {
- log.warn("A batch is stuck processing. " +
- "pending : {}",
- intentBatchService.getPendingOperations());
- shutdownAndAwaitTermination(installWorker);
- }
- }
+ //FIXME
+ // TODO generate keys for each set of intents to allow manager to throttle
+ // TODO may also look into the store to see how many operations are pending
+
//if everything is good proceed.
if (!installWorker.isShutdown()) {
installWorker.execute(this);
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
index b01e1ae..98ce292 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
@@ -15,19 +15,12 @@
*/
package org.onosproject.sdnip;
-import static org.easymock.EasyMock.reportMatcher;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.commons.collections4.CollectionUtils;
import org.easymock.IArgumentMatcher;
import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.intent.IntentOperation;
-import org.onosproject.net.intent.IntentOperations;
import org.onosproject.sdnip.IntentSynchronizer.IntentKey;
+import static org.easymock.EasyMock.reportMatcher;
+
/**
* Helper class for testing operations submitted to the IntentService.
*/
@@ -54,13 +47,15 @@
* Matcher method to set the expected intent operations to match against
* (ignoring the intent ID for each intent).
*
- * @param intentOperations the expected Intent Operations
+ * param intentOperations the expected Intent Operations
* @return the submitted Intent Operations
*/
+ /*
static IntentOperations eqExceptId(IntentOperations intentOperations) {
reportMatcher(new IdAgnosticIntentOperationsMatcher(intentOperations));
return intentOperations;
}
+ */
/*
* EasyMock matcher that matches {@link Intent} but
@@ -120,22 +115,13 @@
* value properties of the provided intent match the expected values, but
* ignores the intent ID when testing equality.
*/
+ /*
private static final class IdAgnosticIntentOperationsMatcher implements
IArgumentMatcher {
- private final IntentOperations intentOperations;
+ //private final IntentOperations intentOperations;
private String providedString;
- /**
- * Constructor taking the expected intent operations to match against.
- *
- * @param intentOperations the expected intent operations
- */
- public IdAgnosticIntentOperationsMatcher(
- IntentOperations intentOperations) {
- this.intentOperations = intentOperations;
- }
-
@Override
public void appendTo(StringBuffer strBuffer) {
strBuffer.append("IntentOperationsMatcher unable to match: "
@@ -178,6 +164,7 @@
providedReplaceIntents);
}
+
/**
* Extracts the intents per operation type. Each intent is encapsulated
* in IntentKey so it can be compared by excluding the Intent ID.
@@ -189,6 +176,7 @@
* @param replaceIntents the REPLACE intents
* @param updateIntents the UPDATE intents
*/
+ /*
private void extractIntents(IntentOperations intentOperations,
List<IntentKey> submitIntents,
List<IntentId> withdrawIntentIds,
@@ -220,4 +208,5 @@
}
}
}
+ */
}