StringBuffer -> StringBuilder
Change-Id: Ibacf9357619712909544ddeb901bbef04c822bfe
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
index 6edebdf..1f980d6 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
@@ -348,7 +348,7 @@
PortCriterion portCriterion = null;
EthCriterion ethCriterion = null;
VlanIdCriterion vidCriterion = null;
- Collection<IPCriterion> ips = new ArrayList<IPCriterion>();
+ Collection<IPCriterion> ips = new ArrayList<>();
if (!filt.key().equals(Criteria.dummy()) &&
filt.key().type() == Criterion.Type.IN_PORT) {
portCriterion = (PortCriterion) filt.key();
@@ -613,7 +613,7 @@
}
// ofdpa cannot match on ALL portnumber, so we need to use separate
// rules for each port.
- List<PortNumber> portnums = new ArrayList<PortNumber>();
+ List<PortNumber> portnums = new ArrayList<>();
if (portCriterion.port() == PortNumber.ALL) {
for (Port port : deviceService.getPorts(deviceId)) {
if (port.number().toLong() > 0 && port.number().toLong() < OFPP_MAX) {
@@ -624,7 +624,7 @@
portnums.add(portCriterion.port());
}
- List<FlowRule> rules = new ArrayList<FlowRule>();
+ List<FlowRule> rules = new ArrayList<>();
for (PortNumber pnum : portnums) {
OfdpaMatchVlanVid ofdpaMatchVlanVid = new OfdpaMatchVlanVid(vidCriterion.vlanId());
// for unicast IP packets
@@ -1328,7 +1328,7 @@
List<Deque<GroupKey>> gkeys = appKryo.deserialize(nextGroup.data());
for (Deque<GroupKey> gkd : gkeys) {
Group lastGroup = null;
- StringBuffer gchain = new StringBuffer();
+ StringBuilder gchain = new StringBuilder();
for (GroupKey gk : gkd) {
Group g = groupService.getGroup(deviceId, gk);
if (g == null) {
@@ -1340,7 +1340,7 @@
lastGroup = g;
}
// add port information for last group in group-chain
- List<Instruction> lastGroupIns = new ArrayList<Instruction>();
+ List<Instruction> lastGroupIns = new ArrayList<>();
if (lastGroup != null && !lastGroup.buckets().buckets().isEmpty()) {
lastGroupIns = lastGroup.buckets().buckets().get(0)
.treatment().allInstructions();
diff --git a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
index 09a79f5..0b41457 100644
--- a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
+++ b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
@@ -585,7 +585,7 @@
@Override
public String toString() {
- final StringBuffer sb = new StringBuffer("\n");
+ final StringBuilder sb = new StringBuilder("\n");
final IPacket pkt = this.getPayload();
diff --git a/utils/misc/src/main/java/org/onlab/packet/IPv4.java b/utils/misc/src/main/java/org/onlab/packet/IPv4.java
index b8b58bc..95695dc 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IPv4.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IPv4.java
@@ -511,7 +511,7 @@
* @return string form of ip address
*/
public static String fromIPv4Address(final int ipAddress) {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
int result = 0;
for (int i = 0; i < 4; ++i) {
result = ipAddress >> (3 - i) * 8 & 0xff;
@@ -537,7 +537,7 @@
if (ipAddresses == null) {
return "null";
}
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append("[");
for (final Integer ip : ipAddresses) {
sb.append(IPv4.fromIPv4Address(ip));
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
index 10ccf8f..75b5b2f 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
@@ -537,7 +537,7 @@
*/
private String ipv6ToStringHelper() {
//Populate a buffer with the string of the full address with leading zeros stripped
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
buff.append(String.format("%x:%x:%x:%x:%x:%x:%x:%x",
(((octets[0] & BIT_MASK) << 8) | (octets[1] & BIT_MASK)),
(((octets[2] & BIT_MASK) << 8) | (octets[3] & BIT_MASK)),