Fix checkstyle whitespace issues - WHITESPACE ONLY
Change-Id: Ic205c1afd639c6008d61d9de95cb764eeb6238ca
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/web/AutoPortFast.java b/src/main/java/net/onrc/onos/core/linkdiscovery/web/AutoPortFast.java
index 028776b..4b7eeca 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/web/AutoPortFast.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/web/AutoPortFast.java
@@ -14,10 +14,10 @@
@Get("json")
public String retrieve() {
ILinkDiscoveryService linkDiscovery;
- linkDiscovery = (ILinkDiscoveryService)getContext().getAttributes().
+ linkDiscovery = (ILinkDiscoveryService) getContext().getAttributes().
get(ILinkDiscoveryService.class.getCanonicalName());
- String param = ((String)getRequestAttributes().get("state")).toLowerCase();
+ String param = ((String) getRequestAttributes().get("state")).toLowerCase();
if (param.equals("enable") || param.equals("true")) {
linkDiscovery.setAutoPortFastFeature(true);
} else if (param.equals("disable") || param.equals("false")) {
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinkWithType.java b/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinkWithType.java
index c956cb1..733f28c 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinkWithType.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinkWithType.java
@@ -15,9 +15,10 @@
/**
* This class is both the datastructure and the serializer
* for a link with the corresponding type of link.
+ *
* @author alexreimers
*/
-@JsonSerialize(using=LinkWithType.class)
+@JsonSerialize(using = LinkWithType.class)
public class LinkWithType extends JsonSerializer<LinkWithType> {
public long srcSwDpid;
public short srcPort;
@@ -28,8 +29,9 @@
public LinkType type;
// Do NOT delete this, it's required for the serializer
- public LinkWithType() {}
-
+ public LinkWithType() {
+ }
+
public LinkWithType(Link link,
int srcPortState,
int dstPortState,
@@ -43,23 +45,23 @@
this.type = type;
}
- @Override
- public void serialize(LinkWithType lwt, JsonGenerator jgen, SerializerProvider arg2)
- throws IOException, JsonProcessingException {
- // You ****MUST*** use lwt for the fields as it's actually a different object.
- jgen.writeStartObject();
- jgen.writeStringField("src-switch", HexString.toHexString(lwt.srcSwDpid));
- jgen.writeNumberField("src-port", lwt.srcPort);
- jgen.writeNumberField("src-port-state", lwt.srcPortState);
- jgen.writeStringField("dst-switch", HexString.toHexString(lwt.dstSwDpid));
- jgen.writeNumberField("dst-port", lwt.dstPort);
- jgen.writeNumberField("dst-port-state", lwt.dstPortState);
- jgen.writeStringField("type", lwt.type.toString());
- jgen.writeEndObject();
- }
-
- @Override
- public Class<LinkWithType> handledType() {
- return LinkWithType.class;
- }
+ @Override
+ public void serialize(LinkWithType lwt, JsonGenerator jgen, SerializerProvider arg2)
+ throws IOException, JsonProcessingException {
+ // You ****MUST*** use lwt for the fields as it's actually a different object.
+ jgen.writeStartObject();
+ jgen.writeStringField("src-switch", HexString.toHexString(lwt.srcSwDpid));
+ jgen.writeNumberField("src-port", lwt.srcPort);
+ jgen.writeNumberField("src-port-state", lwt.srcPortState);
+ jgen.writeStringField("dst-switch", HexString.toHexString(lwt.dstSwDpid));
+ jgen.writeNumberField("dst-port", lwt.dstPort);
+ jgen.writeNumberField("dst-port-state", lwt.dstPortState);
+ jgen.writeStringField("type", lwt.type.toString());
+ jgen.writeEndObject();
+ }
+
+ @Override
+ public Class<LinkWithType> handledType() {
+ return LinkWithType.class;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinksResource.java b/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinksResource.java
index 2714f66..81c0b9e 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinksResource.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/web/LinksResource.java
@@ -17,20 +17,20 @@
@Get("json")
public Set<LinkWithType> retrieve() {
- ILinkDiscoveryService ld = (ILinkDiscoveryService)getContext().getAttributes().
+ ILinkDiscoveryService ld = (ILinkDiscoveryService) getContext().getAttributes().
get(ILinkDiscoveryService.class.getCanonicalName());
Map<Link, LinkInfo> links = new HashMap<Link, LinkInfo>();
Set<LinkWithType> returnLinkSet = new HashSet<LinkWithType>();
if (ld != null) {
links.putAll(ld.getLinks());
- for(Entry<Link, LinkInfo> e : links.entrySet()) {
+ for (Entry<Link, LinkInfo> e : links.entrySet()) {
Link link = e.getKey();
LinkInfo info = e.getValue();
LinkWithType lwt = new LinkWithType(link,
- info.getSrcPortState(),
- info.getDstPortState(),
- ld.getLinkType(link, info));
+ info.getSrcPortState(),
+ info.getDstPortState(),
+ ld.getLinkType(link, info));
returnLinkSet.add(lwt);
}
}