Revert "Use Optional instead of null to remove FIXME comment"

This reverts commit 9639df7b.
This is due to the regression described in ONOS-825.

Change-Id: I2909ed3e3461439596f99bf0cd94da3792a0ff64

@@ -17,25 +17,23 @@ package org.onosproject.net.flow;
 
 
 import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
 import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
 
 
-import java.util.Optional;
-
 
 
 public class FlowRuleBatchEntry
 public class FlowRuleBatchEntry
         extends BatchOperationEntry<FlowRuleOperation, FlowRule> {
         extends BatchOperationEntry<FlowRuleOperation, FlowRule> {
 
 
-    private final Optional<Long> id;
+    private final Long id; // FIXME: consider using Optional<Long>
 
 
     public FlowRuleBatchEntry(FlowRuleOperation operator, FlowRule target) {
     public FlowRuleBatchEntry(FlowRuleOperation operator, FlowRule target) {
         super(operator, target);
         super(operator, target);
-        this.id = Optional.empty();
+        this.id = null;
     }
     }
 
 
-    public FlowRuleBatchEntry(FlowRuleOperation operator, FlowRule target, long id) {
+    public FlowRuleBatchEntry(FlowRuleOperation operator, FlowRule target, Long id) {
         super(operator, target);
         super(operator, target);
-        this.id = Optional.of(id);
+        this.id = id;
     }
     }
 
 
-    public Optional<Long> id() {
+    public Long id() {
         return id;
         return id;
     }
     }
 
 

@@ -385,7 +385,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
 
 
         private final Set<FlowEntry> offendingFlowMods = Sets.newHashSet();
         private final Set<FlowEntry> offendingFlowMods = Sets.newHashSet();
         // Failed batch operation id
         // Failed batch operation id
-        private Optional<Long> failedId;
+        private Long failedId;
 
 
         private final CountDownLatch countDownLatch;
         private final CountDownLatch countDownLatch;
         private BatchState state;
         private BatchState state;
@@ -509,7 +509,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
         public CompletedBatchOperation get() throws InterruptedException, ExecutionException {
         public CompletedBatchOperation get() throws InterruptedException, ExecutionException {
             countDownLatch.await();
             countDownLatch.await();
             this.state = BatchState.FINISHED;
             this.state = BatchState.FINISHED;
-            Set<Long> failedIds = (failedId.isPresent()) ?  Sets.newHashSet(failedId.get()) : Collections.emptySet();
+            Set<Long> failedIds = (failedId != null) ?  Sets.newHashSet(failedId) : Collections.emptySet();
             CompletedBatchOperation result =
             CompletedBatchOperation result =
                     new CompletedBatchOperation(ok.get(), offendingFlowMods, failedIds);
                     new CompletedBatchOperation(ok.get(), offendingFlowMods, failedIds);
             //FIXME do cleanup here (moved by BOC)
             //FIXME do cleanup here (moved by BOC)
@@ -523,7 +523,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
                 TimeoutException {
                 TimeoutException {
             if (countDownLatch.await(timeout, unit)) {
             if (countDownLatch.await(timeout, unit)) {
                 this.state = BatchState.FINISHED;
                 this.state = BatchState.FINISHED;
-                Set<Long> failedIds = (failedId.isPresent()) ? Sets.newHashSet(failedId.get()) : Collections.emptySet();
+                Set<Long> failedIds = (failedId != null) ?  Sets.newHashSet(failedId) : Collections.emptySet();
                 CompletedBatchOperation result =
                 CompletedBatchOperation result =
                         new CompletedBatchOperation(ok.get(), offendingFlowMods, failedIds);
                         new CompletedBatchOperation(ok.get(), offendingFlowMods, failedIds);
                 // FIXME do cleanup here (moved by BOC)
                 // FIXME do cleanup here (moved by BOC)