Fix Java lint reported errors
Replaced some API deprecations with TODO comments
Added suppressions for rawtypes fromes in OF code
Removed superfluous casts in OF code
Turned on -Werror to make future warnings break the build
Change-Id: I63a1770e1e2d0d97089d49261ac17c83fdd9b5e8
diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index df70dd4..9fd8870 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -374,6 +374,7 @@
ShortestPathIntent intent = new ShortestPathIntent(intentId,
sw.getDpid(), inPort.getNumber(), srcMacAddress.toLong(),
destinationDpid, destinationPort, dstMacAddress.toLong());
+
intent.setIdleTimeout(idleTimeout + SRC_SWITCH_TIMEOUT_ADJUST_SECOND);
intent.setFirstSwitchIdleTimeout(idleTimeout);
IntentOperation.Operator operator = IntentOperation.Operator.ADD;
diff --git a/src/main/java/net/onrc/onos/core/datagrid/IEventChannel.java b/src/main/java/net/onrc/onos/core/datagrid/IEventChannel.java
index 0c1663a..23b7be9 100644
--- a/src/main/java/net/onrc/onos/core/datagrid/IEventChannel.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/IEventChannel.java
@@ -79,7 +79,7 @@
* @param key the key of the entry to get.
* @return the entry if found, otherwise null.
*/
- @Deprecated
+ // TODO - this is intended to be refactored and removed
V getEntry(K key);
/**
@@ -87,12 +87,12 @@
*
* @return all entries that are currently in the channel.
*/
- @Deprecated
+ // TODO - this is intended to be refactored and removed
Collection<V> getAllEntries();
/**
* Remove all entries in the channel.
*/
- @Deprecated
+ // TODO - this is intended to be refactored and removed
void removeAllEntries();
}
diff --git a/src/main/java/net/onrc/onos/core/datastore/serializers/Device.java b/src/main/java/net/onrc/onos/core/datastore/serializers/Device.java
index 41b9991..0bbf5af 100644
--- a/src/main/java/net/onrc/onos/core/datastore/serializers/Device.java
+++ b/src/main/java/net/onrc/onos/core/datastore/serializers/Device.java
@@ -588,7 +588,7 @@
public Builder addAllPortIds(
java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
ensurePortIdsIsMutable();
- super.addAll(values, portIds_);
+ Builder.addAll(values, portIds_);
onChanged();
return this;
}
diff --git a/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
index 660cb7c..3c8d345 100644
--- a/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
@@ -110,42 +110,42 @@
return pathIntentId;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public int getIdleTimeout() {
return idleTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public int getHardTimeout() {
return hardTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public void setIdleTimeout(int idleTimeout) {
this.idleTimeout = idleTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public void setHardTimeout(int hardTimeout) {
this.hardTimeout = hardTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public int getFirstSwitchIdleTimeout() {
return firstSwitchIdleTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public int getFirstSwitchHardTimetout() {
return firstSwitchHardTimetout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public void setFirstSwitchIdleTimeout(int firstSwitchIdleTimeout) {
this.firstSwitchIdleTimeout = firstSwitchIdleTimeout;
}
- @Deprecated
+ // TODO - this is intended to be refactored and removed
public void setFirstSwitchHardTimetout(int firstSwitchHardTimetout) {
this.firstSwitchHardTimetout = firstSwitchHardTimetout;
}