Cleaning up Javadocs in core-ui classes.
Added common constants to AbstractCellFormatter.
Change-Id: Ie20ea62f059646e7d6c7f3660dd60a60c40532fe
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelEndPointFormatter.java b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelEndPointFormatter.java
index 5414f2c..cc68876 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelEndPointFormatter.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelEndPointFormatter.java
@@ -20,9 +20,11 @@
import org.onosproject.ui.table.CellFormatter;
import org.onosproject.ui.table.cell.AbstractCellFormatter;
+import java.util.Optional;
+
/**
- * Formats a optical tunnel endpoint as "(type)/(element-id)/(port)".
- * Formats a ip tunnel endpoint as "ip".
+ * Formats an optical tunnel endpoint as "(type)/(element-id)/(port)".
+ * Formats an IP tunnel endpoint as "ip".
*/
@Beta
public final class TunnelEndPointFormatter extends AbstractCellFormatter {
@@ -30,17 +32,26 @@
private TunnelEndPointFormatter() {
}
+ private String safeOptional(Optional<?> optional) {
+ return optional.isPresent() ? optional.get().toString() : QUERY;
+ }
+
@Override
protected String nonNullFormat(Object value) {
if (value instanceof DefaultOpticalTunnelEndPoint) {
- DefaultOpticalTunnelEndPoint cp = (DefaultOpticalTunnelEndPoint) value;
- return cp.type() + "/" + cp.elementId().get() + "/" + cp.portNumber().get();
+ DefaultOpticalTunnelEndPoint ep =
+ (DefaultOpticalTunnelEndPoint) value;
+
+ String e = safeOptional(ep.elementId());
+ String p = safeOptional(ep.portNumber());
+ return ep.type() + SLASH + e + SLASH + p;
+
} else if (value instanceof IpTunnelEndPoint) {
IpTunnelEndPoint cp = (IpTunnelEndPoint) value;
return cp.ip().toString();
}
- return "";
+ return EMPTY;
}
/**